Merge branch 'main' into cs-6860-update-eslint-plugin-ember-version

Author: FadhlanR

docs/computed-fields.md

@@ -37,28 +37,6 @@ When any field consumed by the computed field changes, the value will [rerender]
 
 Computed fields are eagerly evaluated, they do not need to be consumed for `computeVia` to run.
 
-## Async computation
-
-The calculation can be async:
-
-```typescript
-@field slowName = contains(StringCard, {
-  computeVia: async function () {
-    await new Promise((resolve) => setTimeout(resolve, 10));
-    return this.firstName;
-  }
-});
-```
-
-The values of async computed fields are available synchronously in other `computedVia` functions. Since async field values are not guaranteed to be present, you can use card API [`getIfReady`](https://github.com/cardstack/boxel/blob/307d78676ebdb93cee75d61b8812914013a094a7/packages/base/card-api.gts#L2112) avoid errors about the field not being ready:
-
-```javascript
-await getIfReady(this, 'fullName');
-// 'Carl Stack'
-await getIfReady(this, 'fullName');
-// {type: 'not-ready', fieldName: 'fullName', instance: …}
-```
-
 ## Computed `linksTo` and `linksToMany`
 
 While `computeVia` can currently only be applied to `contains`/`containsMany` fields, there’s a plan to let it work for `linksTo` and `linksToMany` in the future.

package.json

@@ -38,7 +38,8 @@
       "style-loader@2.0.0": "patches/style-loader@2.0.0.patch",
       "ember-css-url@1.0.0": "patches/ember-css-url@1.0.0.patch",
       "matrix-js-sdk@31.0.0": "patches/matrix-js-sdk@31.0.0.patch",
-      "ember-basic-dropdown@8.0.4": "patches/ember-basic-dropdown@8.0.4.patch"
+      "ember-basic-dropdown@8.0.4": "patches/ember-basic-dropdown@8.0.4.patch",
+      "ember-source@5.4.1": "patches/ember-source@5.4.1.patch"
     }
   },
   "devDependencies": {

packages/ai-bot/helpers.ts

@@ -253,10 +253,9 @@ export const attachedCardsToMessage = (
   history: DiscreteMatrixEvent[],
   aiBotUserId: string,
 ) => {
-  for (let card of getRelevantCards(history, aiBotUserId)) {
-    return `Full card data: ${JSON.stringify(card)}`;
-  }
-  return;
+  return `Full card data: ${JSON.stringify(
+    getRelevantCards(history, aiBotUserId),
+  )}`;
 };
 
 export function cleanContent(content: string) {

packages/ai-bot/tests/prompt-construction-test.ts

@@ -478,6 +478,105 @@ module('getModifyPrompt', () => {
     assert.equal(relevantCards.length, 2);
   });
 
+  test('Gets multiple uploaded cards in the system prompt', () => {
+    const history: DiscreteMatrixEvent[] = [
+      {
+        type: 'm.room.message',
+        event_id: '1',
+        origin_server_ts: 1234567890,
+        content: {
+          msgtype: 'org.boxel.message',
+          format: 'org.matrix.custom.html',
+          body: 'Hey',
+          formatted_body: 'Hey',
+          data: {
+            attachedCards: [
+              {
+                data: {
+                  type: 'card',
+                  id: 'http://localhost:4201/drafts/Author/1',
+                  attributes: {
+                    firstName: 'Terry',
+                    lastName: 'Pratchett',
+                  },
+                  meta: {
+                    adoptsFrom: {
+                      module: '../author',
+                      name: 'Author',
+                    },
+                  },
+                },
+              },
+            ],
+            context: {
+              openCards: [],
+              tools: [],
+              submode: 'interact',
+            },
+          },
+        },
+        sender: '@user:localhost',
+        room_id: 'room1',
+        unsigned: {
+          age: 115498,
+          transaction_id: '1',
+        },
+      },
+      {
+        type: 'm.room.message',
+        event_id: '1',
+        origin_server_ts: 1234567890,
+        content: {
+          msgtype: 'org.boxel.message',
+          format: 'org.matrix.custom.html',
+          body: 'Hey',
+          formatted_body: 'Hey',
+          data: {
+            attachedCards: [
+              {
+                data: {
+                  type: 'card',
+                  id: 'http://localhost:4201/drafts/Author/2',
+                  attributes: {
+                    firstName: 'Mr',
+                    lastName: 'T',
+                  },
+                  meta: {
+                    adoptsFrom: {
+                      module: '../author',
+                      name: 'Author',
+                    },
+                  },
+                },
+              },
+            ],
+            context: {
+              openCards: [],
+              tools: [],
+              submode: 'interact',
+            },
+          },
+        },
+        sender: '@user:localhost',
+        room_id: 'room1',
+        unsigned: {
+          age: 115498,
+          transaction_id: '2',
+        },
+      },
+    ];
+    const fullPrompt = getModifyPrompt(history, '@aibot:localhost');
+    const systemMessage = fullPrompt.find(
+      (message) => message.role === 'system',
+    );
+    assert.true(
+      systemMessage?.content?.includes('http://localhost:4201/drafts/Author/1'),
+    );
+    assert.true(
+      systemMessage?.content?.includes('http://localhost:4201/drafts/Author/2'),
+    );
+  });
+
   test('If a user stops sharing their context keep it in the system prompt', () => {
     const history: DiscreteMatrixEvent[] = [
       {

packages/base/card-api.gts

@@ -353,6 +353,9 @@ function cardTypeFor(
   if (primitive in field.card) {
     return field.card;
   }
+  if (boxedElement.value == null) {
+    return field.card;
+  }
   return Reflect.getPrototypeOf(boxedElement.value)!
     .constructor as typeof BaseDef;
 }
@@ -448,9 +451,12 @@ class ContainsMany<FieldT extends FieldDefConstructor>
     // WatchedArray proxy is not structuredClone-able, and hence cannot be
     // communicated over the postMessage boundary between worker and DOM.
     // TODO: can this be simplified since we don't have the worker anymore?
-    return [...instances].map((instance) => {
-      return this.card[queryableValue](instance, stack);
-    });
+    let results = [...instances]
+      .map((instance) => {
+        return this.card[queryableValue](instance, stack);
+      })
+      .filter((i) => i != null);
+    return results.length === 0 ? null : results;
   }
 
   serialize(
@@ -1138,17 +1144,23 @@ class LinksToMany<FieldT extends CardDefConstructor>
     // WatchedArray proxy is not structuredClone-able, and hence cannot be
     // communicated over the postMessage boundary between worker and DOM.
     // TODO: can this be simplified since we don't have the worker anymore?
-    return [...instances].map((instance) => {
-      if (primitive in instance) {
-        throw new Error(
-          `the linksToMany field '${this.name}' contains a primitive card '${instance.name}'`,
-        );
-      }
-      if (isNotLoadedValue(instance)) {
-        return { id: instance.reference };
-      }
-      return this.card[queryableValue](instance, stack);
-    });
+    let results = [...instances]
+      .map((instance) => {
+        if (instance == null) {
+          return null;
+        }
+        if (primitive in instance) {
+          throw new Error(
+            `the linksToMany field '${this.name}' contains a primitive card '${instance.name}'`,
+          );
+        }
+        if (isNotLoadedValue(instance)) {
+          return { id: instance.reference };
+        }
+        return this.card[queryableValue](instance, stack);
+      })
+      .filter((i) => i != null);
+    return results.length === 0 ? null : results;
   }
 
   serialize(
@@ -1173,6 +1185,15 @@ class LinksToMany<FieldT extends CardDefConstructor>
 
     let relationships: Record<string, Relationship> = {};
     values.map((value, i) => {
+      if (value == null) {
+        relationships[`${this.name}\.${i}`] = {
+          links: {
+            self: null,
+          },
+          data: null,
+        };
+        return;
+      }
       if (isNotLoadedValue(value)) {
         relationships[`${this.name}\.${i}`] = {
           links: {

packages/base/catalog-entry.gts

@@ -4,21 +4,13 @@ import {
   Component,
   CardDef,
   FieldDef,
-  BaseDef,
-  primitive,
   relativeTo,
   realmInfo,
 } from './card-api';
 import StringField from './string';
 import BooleanField from './boolean';
 import CodeRef from './code-ref';
-import {
-  baseCardRef,
-  isFieldDef,
-  loadCard,
-  Loader,
-} from '@cardstack/runtime-common';
-import { isEqual } from 'lodash';
+
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import GlimmerComponent from '@glimmer/component';
 
@@ -27,49 +19,10 @@ export class CatalogEntry extends CardDef {
   @field title = contains(StringField);
   @field description = contains(StringField);
   @field ref = contains(CodeRef);
-  @field isPrimitive = contains(BooleanField, {
-    computeVia: async function (this: CatalogEntry) {
-      let loader = Loader.getLoaderFor(Object.getPrototypeOf(this).constructor);
-
-      if (!loader) {
-        throw new Error(
-          'Could not find a loader for this instance’s class’s module',
-        );
-      }
 
-      let card: typeof BaseDef | undefined = await loadCard(this.ref, {
-        loader,
-        relativeTo: this[relativeTo],
-      });
-      if (!card) {
-        throw new Error(`Could not load card '${this.ref.name}'`);
-      }
-      // the base card is a special case where it is technically not a primitive, but because it has no fields
-      // it is not useful to treat as a composite card (for the purposes of creating new card instances).
-      return primitive in card || isEqual(baseCardRef, this.ref);
-    },
-  });
   // If it's not a field, then it's a card
-  @field isField = contains(BooleanField, {
-    computeVia: async function (this: CatalogEntry) {
-      let loader = Loader.getLoaderFor(Object.getPrototypeOf(this).constructor);
+  @field isField = contains(BooleanField);
 
-      if (!loader) {
-        throw new Error(
-          'Could not find a loader for this instance’s class’s module',
-        );
-      }
-
-      let card: typeof BaseDef | undefined = await loadCard(this.ref, {
-        loader,
-        relativeTo: this[relativeTo],
-      });
-      if (!card) {
-        throw new Error(`Could not load card '${this.ref.name}'`);
-      }
-      return isFieldDef(card);
-    },
-  });
   @field moduleHref = contains(StringField, {
     computeVia: function (this: CatalogEntry) {
       return new URL(this.ref.module, this[relativeTo]).href;
@@ -164,10 +117,6 @@ export class CatalogEntry extends CardDef {
         {{#if @model.showDemo}}
           <div data-test-demo><@fields.demo /></div>
         {{/if}}
-        {{! field needs to be used in order to be indexed }}
-        {{#if @model.isPrimitive}}
-          <div>Field is primitive</div>
-        {{/if}}
       </CatalogEntryContainer>
       <style>
         .container {

packages/base/fields/base64-image.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Base64 Image Field",
       "description": "A field capable of representing an image via base64 encoding.",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/base64-image",
         "name": "Base64ImageField"

packages/base/fields/biginteger-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Bigint Field",
       "description": "A field that captures big int values",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/big-integer",
         "name": "default"

packages/base/fields/boolean-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Boolean Field",
       "description": "A field that captures boolean values (true/false)",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/boolean",
         "name": "default"

packages/base/fields/code-ref-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Code Reference Field",
       "description": "A field that captures a reference to a card or field type",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/code-ref",
         "name": "default"

packages/base/fields/date-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Date Field",
       "description": "A field that captures date values",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/date",
         "name": "default"

packages/base/fields/datetime-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Date-time Field",
       "description": "A field that captures date-time values",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/datetime",
         "name": "default"

packages/base/fields/ethereum-address-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Ethereum Address Field",
       "description": "A field that captures checksum ethereum addresses",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/ethereum-address",
         "name": "default"

packages/base/fields/field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "General Field",
       "description": "A general field that can contain any field type.",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/card-api",
         "name": "FieldDef"

packages/base/fields/markdown-field.json

@@ -4,6 +4,7 @@
     "attributes": {
       "title": "Markdown Field",
       "description": "A field that captures markdown values",
+      "isField": true,
       "ref": {
         "module": "https://cardstack.com/base/markdown",
         "name": "default"