Merge branch 'main' into cs-7706-adding-renderType-to-prerendered-search

cardstack · Jan 31, 2025 · eac4b76 · eac4b76
2 parents fe0ba01 + 1f3544b
commit eac4b76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/packages/host/app/services/card-service.ts b/packages/host/app/services/card-service.ts
@@ -340,7 +340,7 @@ export default class CardService extends Service {
     return card;
   }
 
-  async getCard(url: URL | string): Promise<CardDef> {
+  async getCard<T extends CardDef = CardDef>(url: URL | string): Promise<T> {
     if (typeof url === 'string') {
       url = new URL(url);
     }
@@ -356,7 +356,7 @@ export default class CardService extends Service {
       json,
       new URL(json.data.id),
     );
-    return card;
+    return card as T;
   }
 
   private async loadPatchedCards(

diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
@@ -74,7 +74,6 @@ import type {
 import type { Tool } from 'https://cardstack.com/base/matrix-event';
 import { SkillCard } from 'https://cardstack.com/base/skill-card';
 
-import { getCard } from '../resources/card-resource';
 import { importResource } from '../resources/import';
 
 import { RoomResource, getRoom } from '../resources/room';
@@ -141,7 +140,6 @@ export default class MatrixService extends Service {
     new TrackedMap();
   private cardHashes: Map<string, string> = new Map(); // hashes <> event id
   private skillCardHashes: Map<string, string> = new Map(); // hashes <> event id
-  private defaultSkills: SkillCard[] = [];
 
   constructor(owner: Owner) {
     super(owner);
@@ -780,19 +778,11 @@ export default class MatrixService extends Service {
   }
 
   async loadDefaultSkills() {
-    if (this.defaultSkills.length > 0) {
-      return this.defaultSkills;
-    }
-
-    await Promise.all(
+    return await Promise.all(
       DefaultSkillCards.map(async (skillCardURL) => {
-        let cardResource = getCard(this, () => skillCardURL);
-        await cardResource.loaded;
-        this.defaultSkills.push(cardResource.card as SkillCard);
+        return await this.cardService.getCard<SkillCard>(skillCardURL);
       }),
     );
-
-    return this.defaultSkills;
   }
 
   @cached