Merge branch 'code-ref-modules' into return-of-the-skill-commands

Author: lukemelia

packages/base/code-ref.gts

@@ -37,9 +37,11 @@ export default class CodeRefField extends FieldDef {
     _visited?: Set<string>,
     opts?: SerializeOpts,
   ) {
+    const moduleIsUrlLike =
+      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
     return {
       ...codeRef,
-      ...(opts?.maybeRelativeURL && !opts?.useAbsoluteURL
+      ...(opts?.maybeRelativeURL && !opts?.useAbsoluteURL && moduleIsUrlLike
         ? { module: opts.maybeRelativeURL(codeRef.module) }
         : {}),
     };
@@ -70,12 +72,18 @@ function maybeSerializeCodeRef(
   stack: CardDef[] = [],
 ) {
   if (codeRef) {
-    // if a stack is passed in, use the containing card to resolve relative references
-    let moduleHref =
-      stack.length > 0
-        ? new URL(codeRef.module, stack[0][relativeTo]).href
-        : codeRef.module;
-    return `${moduleHref}/${codeRef.name}`;
+    const moduleIsUrlLike =
+      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
+    if (moduleIsUrlLike) {
+      // if a stack is passed in, use the containing card to resolve relative references
+      let moduleHref =
+        stack.length > 0
+          ? new URL(codeRef.module, stack[0][relativeTo]).href
+          : codeRef.module;
+      return `${moduleHref}/${codeRef.name}`;
+    } else {
+      return `${codeRef.module}/${codeRef.name}`;
+    }
   }
   return undefined;
 }

packages/base/skill-card.gts

@@ -1,15 +1,15 @@
-import BooleanField from './boolean';
-import CodeRefField from './code-ref';
-import MarkdownField from './markdown';
-import StringField from './string';
 import {
   CardDef,
   Component,
-  field,
   FieldDef,
+  field,
   contains,
   containsMany,
 } from './card-api';
+import BooleanField from './boolean';
+import CodeRefField from './code-ref';
+import MarkdownField from './markdown';
+import StringField from './string';
 import RobotIcon from '@cardstack/boxel-icons/robot';
 
 function djb2_xor(str: string) {
@@ -22,6 +22,13 @@ function djb2_xor(str: string) {
   return (h >>> 0).toString(16);
 }
 
+function friendlyModuleName(fullModuleUrl: string) {
+  return fullModuleUrl
+    .split('/')
+    .slice(-1)[0]
+    .replace(/\.gts$/, ' ');
+}
+
 export class CommandField extends FieldDef {
   static displayName = 'CommandField';
   @field codeRef = contains(CodeRefField, {
@@ -49,13 +56,6 @@ export class CommandField extends FieldDef {
   });
 }
 
-function friendlyModuleName(fullModuleUrl: string) {
-  return fullModuleUrl
-    .split('/')
-    .slice(-1)[0]
-    .replace(/\.gts$/, ' ');
-}
-
 export class SkillCard extends CardDef {
   static displayName = 'Skill';
   static icon = RobotIcon;

packages/host/tests/integration/realm-indexing-and-querying-test.gts

@@ -734,6 +734,27 @@ module(`Integration | realm indexing and querying`, function (hooks) {
             },
           },
         },
+        'people-skill.json': {
+          data: {
+            attributes: {
+              instructions: 'How to win friends and influence people',
+              commands: [
+                {
+                  codeRef: {
+                    module: `@cardstack/boxel-host/commands/switch-submode`,
+                    name: 'default',
+                  },
+                },
+              ],
+            },
+            meta: {
+              adoptsFrom: {
+                module: 'https://cardstack.com/base/skill-card',
+                name: 'SkillCard',
+              },
+            },
+          },
+        },
       },
     });
     let indexer = realm.realmIndexQueryEngine;
@@ -807,6 +828,66 @@ module(`Integration | realm indexing and querying`, function (hooks) {
         `search entry was an error: ${entry?.error.errorDetail.message}`,
       );
     }
+    entry = await indexer.cardDocument(new URL(`${testRealmURL}people-skill`));
+    if (entry?.type === 'doc') {
+      assert.deepEqual(entry.doc.data, {
+        id: `${testRealmURL}people-skill`,
+        type: 'card',
+        links: {
+          self: `${testRealmURL}people-skill`,
+        },
+        attributes: {
+          commands: [
+            {
+              codeRef: {
+                module: '@cardstack/boxel-host/commands/switch-submode',
+                name: 'default',
+              },
+              functionName: 'switch-submode_dd88',
+              requiresApproval: null,
+            },
+          ],
+          description: null,
+          instructions: 'How to win friends and influence people',
+          thumbnailURL: null,
+          title: null,
+        },
+        meta: {
+          adoptsFrom: {
+            module: 'https://cardstack.com/base/skill-card',
+            name: 'SkillCard',
+          },
+          lastModified: adapter.lastModifiedMap.get(
+            `${testRealmURL}people-skill.json`,
+          ),
+          resourceCreatedAt: adapter.resourceCreatedAtMap.get(
+            `${testRealmURL}people-skill.json`,
+          ),
+          realmInfo: testRealmInfo,
+          realmURL: testRealmURL,
+        },
+      });
+      let instance = await indexer.instance(
+        new URL(`${testRealmURL}people-skill`),
+      );
+      assert.deepEqual(instance?.searchDoc, {
+        _cardType: 'Skill',
+        id: `${testRealmURL}people-skill`,
+        instructions: 'How to win friends and influence people',
+        commands: [
+          {
+            codeRef: `@cardstack/boxel-host/commands/switch-submode/default`,
+            functionName: 'switch-submode_dd88',
+            requiresApproval: false,
+          },
+        ],
+      });
+    } else {
+      assert.ok(
+        false,
+        `search entry was an error: ${entry?.error.errorDetail.message}`,
+      );
+    }
   });
 
   test('can recover from rendering a card that has a template error', async function (assert) {