cardstack · tintinthong · Feb 3, 2025 · Jan 29, 2025 · Jan 29, 2025 · Jan 29, 2025
diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
@@ -1912,7 +1912,7 @@ export class CardDef extends BaseDef {
       // we need to be careful that we don't trigger the ambient recompute() in our setters
       // when we are instantiating an instance that is placed in the identityMap that has
       // not had it's field values set yet, as computeds will be run that may assume dependent
-      // fields are available when they are not (e.g. CatalogEntry.isPrimitive trying to load
+      // fields are available when they are not (e.g. Spec.isPrimitive trying to load
       // it's 'ref' field). In this scenario, only the 'id' field is available. the rest of the fields
       // will be filled in later, so just set the 'id' directly in the deserialized cache to avoid
       // triggering the recompute.

diff --git a/packages/base/cards-grid.gts b/packages/base/cards-grid.gts
@@ -25,7 +25,7 @@ import { IconList, IconGrid } from '@cardstack/boxel-ui/icons';
 import { eq, cn } from '@cardstack/boxel-ui/helpers';
 import {
   chooseCard,
-  catalogEntryRef,
+  specRef,
   baseRealm,
   isCardInstance,
   SupportedMimeType,
@@ -36,7 +36,7 @@ import { tracked } from '@glimmer/tracking';
 import { DropdownArrowDown } from '@cardstack/boxel-ui/icons';
 // @ts-ignore no types
 import cssUrl from 'ember-css-url';
-import { type CatalogEntry } from './catalog-entry';
+import { Spec } from './spec';
 import StringField from './string';
 import { TrackedArray } from 'tracked-built-ins';
 import { MenuItem } from '@cardstack/boxel-ui/helpers';
@@ -381,7 +381,7 @@ class Isolated extends Component<typeof CardsGrid> {
     if (activeFilterRef) {
       preselectedCardTypeQuery = {
         filter: {
-          on: catalogEntryRef,
+          on: specRef,
           eq: { ref: activeFilterRef },
         },
         sort: [
@@ -392,10 +392,10 @@ class Isolated extends Component<typeof CardsGrid> {
         ],
       };
     }
-    let card = await chooseCard<CatalogEntry>(
+    let card = await chooseCard<Spec>(
       {
         filter: {
-          on: catalogEntryRef,
+          on: specRef,
           every: [{ eq: { isCard: true } }],
         },
       },

diff --git a/packages/base/fields/base64-image.json b/packages/base/fields/base64-image.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/biginteger-field.json b/packages/base/fields/biginteger-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/boolean-field.json b/packages/base/fields/boolean-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/code-ref-field.json b/packages/base/fields/code-ref-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/date-field.json b/packages/base/fields/date-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/datetime-field.json b/packages/base/fields/datetime-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/ethereum-address-field.json b/packages/base/fields/ethereum-address-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/field.json b/packages/base/fields/field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/markdown-field.json b/packages/base/fields/markdown-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/number-field.json b/packages/base/fields/number-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/skill-card.json b/packages/base/fields/skill-card.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/string-field.json b/packages/base/fields/string-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/fields/text-area-field.json b/packages/base/fields/text-area-field.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/base/catalog-entry.gts → packages/base/spec.gts b/packages/base/catalog-entry.gts → packages/base/spec.gts
@@ -35,29 +35,29 @@ import AppsIcon from '@cardstack/boxel-icons/apps';
 import LayoutList from '@cardstack/boxel-icons/layout-list';
 import Brain from '@cardstack/boxel-icons/brain';
 
-export type BoxelSpecType = 'card' | 'field' | 'app' | 'skill';
+export type SpecType = 'card' | 'field' | 'app' | 'skill';
 
-export class SpecType extends StringField {
+class SpecTypeField extends StringField {
   static displayName = 'Spec Type';
 }
 
-export class CatalogEntry extends CardDef {
-  static displayName = 'Catalog Entry';
+export class Spec extends CardDef {
+  static displayName = 'Spec';
   static icon = BoxModel;
   @field name = contains(StringField);
   @field readMe = contains(MarkdownField);
 
   @field ref = contains(CodeRef);
-  @field specType = contains(SpecType);
+  @field specType = contains(SpecTypeField);
 
   @field isField = contains(BooleanField, {
-    computeVia: function (this: CatalogEntry) {
+    computeVia: function (this: Spec) {
       return this.specType === 'field';
     },
   });
 
   @field isCard = contains(BooleanField, {
-    computeVia: function (this: CatalogEntry) {
+    computeVia: function (this: Spec) {
       return (
         this.specType === 'card' ||
         this.specType === 'app' ||
@@ -66,14 +66,14 @@ export class CatalogEntry extends CardDef {
     },
   });
   @field moduleHref = contains(StringField, {
-    computeVia: function (this: CatalogEntry) {
+    computeVia: function (this: Spec) {
       return new URL(this.ref.module, this[relativeTo]).href;
     },
   });
   @field linkedExamples = linksToMany(CardDef);
   @field containedExamples = containsMany(FieldDef, { isUsed: true });
   @field title = contains(StringField, {
-    computeVia: function (this: CatalogEntry) {
+    computeVia: function (this: Spec) {
       if (this.name) {
         return this.name;
       }
@@ -342,7 +342,7 @@ export class CatalogEntry extends CardDef {
     </template>
   };
 
-  static edit = CatalogEntry.isolated;
+  static edit = Spec.isolated;
 }
 
 interface SpecTagSignature {

diff --git a/packages/base/types/card.json b/packages/base/types/card.json
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/experiments-realm/CatalogEntry/1.json b/packages/experiments-realm/CatalogEntry/1.json
@@ -3,7 +3,7 @@
     "type": "card",
     "attributes": {
       "title": "Person",
-      "description": "Catalog entry for Person card",
+      "description": "Spec for Person card",
       "specType": "card",
       "ref": {
         "module": "../person",
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/experiments-realm/CatalogEntry/10.json b/packages/experiments-realm/CatalogEntry/10.json
@@ -3,7 +3,7 @@
     "type": "card",
     "attributes": {
       "title": "Friends from ../friends",
-      "description": "Catalog entry for Friends from ../friends",
+      "description": "Spec for Friends from ../friends",
       "specType": "card",
       "ref": {
         "module": "../friends",
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/experiments-realm/CatalogEntry/11.json b/packages/experiments-realm/CatalogEntry/11.json
@@ -3,7 +3,7 @@
     "type": "card",
     "attributes": {
       "title": "ContactCard",
-      "description": "Catalog entry for ContactCard",
+      "description": "Spec for ContactCard",
       "specType": "card",
       "ref": {
         "module": "../contact-card",
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/experiments-realm/CatalogEntry/2.json b/packages/experiments-realm/CatalogEntry/2.json
@@ -2,7 +2,7 @@
   "data": {
     "attributes": {
       "title": "Pet",
-      "description": "Catalog entry for Pet card",
+      "description": "Spec for Pet card",
       "ref": {
         "module": "../pet",
         "name": "Pet"
@@ -11,8 +11,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     },
     "type": "card"

diff --git a/packages/experiments-realm/CatalogEntry/6.json b/packages/experiments-realm/CatalogEntry/6.json
@@ -3,7 +3,7 @@
     "type": "card",
     "attributes": {
       "title": "Friend from /friend",
-      "description": "Catalog entry for Friend from /friend",
+      "description": "Spec for Friend from /friend",
       "specType": "card",
       "ref": {
         "module": "../friend",
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }

diff --git a/packages/experiments-realm/CatalogEntry/7.json b/packages/experiments-realm/CatalogEntry/7.json
@@ -3,7 +3,7 @@
     "type": "card",
     "attributes": {
       "title": "Booking Card",
-      "description": "Catalog entry for Booking Card",
+      "description": "Spec for Booking Card",
       "specType": "card",
       "ref": {
         "module": "../booking",
@@ -12,8 +12,8 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/catalog-entry",
-        "name": "CatalogEntry"
+        "module": "https://cardstack.com/base/spec",
+        "name": "Spec"
       }
     }
   }