eng-2129-slots-and-slotDefinitions-to-ref_content

Author: maparent

packages/database/src/crossAppContracts.ts

@@ -25,6 +25,7 @@ export type CrossAppNodeSchema = CrossAppSchemaBase & {
   label: string;
   template?: string;
   templateTitle?: string;
+  slotDefinitions?: Record<string, LocalId | undefined>;
 };
 
 // A relation type schema
@@ -75,6 +76,7 @@ type InlineCrossAppTypedContent = InlineCrossAppContent & {
 // A node instance
 export type CrossAppNode = CrossAppBase & {
   nodeType: LocalId;
+  slots?: Record<string, LocalId>;
   content: {
     direct: InlineCrossAppContent;
     full?: InlineCrossAppTypedContent;

packages/database/src/lib/__tests__/dbToCrossAppConverters.test.ts

@@ -51,13 +51,16 @@ describe("dbNodeSchemaToCrossApp", () => {
         extra: "kept",
       },
     });
-    expect(dbNodeSchemaToCrossApp(schema, spaceMap, accountMap)).toEqual({
+    expect(
+      dbNodeSchemaToCrossApp({ schema, spaceMap, accountMap, schemaMap: {} }),
+    ).toEqual({
       rid: "orn:obsidian.schema:vault-a/concept-1",
       localId: "concept-1",
       createdAt: new Date("2026-06-14T11:00:00Z"),
       modifiedAt: new Date("2026-06-14T13:00:00Z"),
       label: "Some concept",
       metadata: { extra: "kept" },
+      slotDefinitions: {},
       template: "template body",
       templateTitle: "Template Title",
       authorId: "account-local-1",
@@ -66,16 +69,16 @@ describe("dbNodeSchemaToCrossApp", () => {
 
   it("throws when the author is unknown", () => {
     const schema = baseConcept({ author_id: 999 });
-    expect(() => dbNodeSchemaToCrossApp(schema, spaceMap, accountMap)).toThrow(
-      "Missing author",
-    );
+    expect(() =>
+      dbNodeSchemaToCrossApp({ schema, spaceMap, accountMap, schemaMap: {} }),
+    ).toThrow("Missing author");
   });
 
   it("throws when the space is unknown", () => {
     const schema = baseConcept({ space_id: 999 });
-    expect(() => dbNodeSchemaToCrossApp(schema, spaceMap, accountMap)).toThrow(
-      "Missing space",
-    );
+    expect(() =>
+      dbNodeSchemaToCrossApp({ schema, spaceMap, accountMap, schemaMap: {} }),
+    ).toThrow("Missing space");
   });
 });
 

packages/database/src/lib/crossAppConverters.ts

@@ -86,16 +86,20 @@ export const crossAppNodeToDbConcept = (
     ]),
     created: node.createdAt?.toISOString(),
     last_modified: node.modifiedAt?.toISOString(),
+    local_reference_content: node.slots,
   });
 };
 
 export const crossAppNodeSchemaToDbConcept = (
   node: CrossAppNodeSchema,
 ): LocalConceptDataInput => {
+  const slots = Object.keys(node.slotDefinitions ?? {});
   const literalInfo = filterUndefined({
     template: node.templateTitle,
     template_content: node.template,
+    slots: slots.length > 0 ? slots : undefined,
   });
+  const referenceContent = slots.length ? node.slotDefinitions! : undefined;
   const spaceUri = node.rid
     ? ridToSpaceUriAndLocalId(node.rid).spaceUri
     : undefined;
@@ -107,6 +111,7 @@ export const crossAppNodeSchemaToDbConcept = (
     is_schema: true,
     literal_content:
       Object.keys(literalInfo).length > 0 ? literalInfo : undefined,
+    local_reference_content: referenceContent,
     created: node.createdAt?.toISOString(),
     last_modified: node.modifiedAt?.toISOString(),
   });

packages/database/src/lib/dbToCrossAppConverters.ts

@@ -15,6 +15,7 @@ const getConceptMap = async (
   conceptIds: number[],
   spaceMap: Record<number, string>,
 ): Promise<Record<number, string>> => {
+  if (conceptIds.length === 0) return {};
   const request = await client
     .from("my_concepts")
     .select("id, space_id, source_local_id")
@@ -79,12 +80,22 @@ const asSimpleLocalId = (
   return rid;
 };
 
-export const dbNodeSchemaToCrossApp = (
-  schema: Concept,
-  spaceMap: Record<number, string>,
-  accountMap: Record<number, string>,
-): CrossAppNodeSchema => {
-  const { template, template_content, ...other } =
+export const dbNodeSchemaToCrossApp = ({
+  schema,
+  spaceMap,
+  accountMap,
+  schemaMap,
+}: {
+  schema: Concept;
+  spaceMap: Record<number, string>;
+  accountMap: Record<number, string>;
+  schemaMap: Record<number, string>;
+}): CrossAppNodeSchema => {
+  const referenceContent = (schema.reference_content ?? {}) as Record<
+    string,
+    number
+  >;
+  const { template, template_content, roles, ...other } =
     schema.literal_content as Record<string, Json>;
   const authorId = accountMap[schema.author_id || 0];
   if (authorId === undefined) throw new Error("Missing author");
@@ -95,6 +106,11 @@ export const dbNodeSchemaToCrossApp = (
     schema.source_local_id!,
     "schema",
   );
+  const slotDefinitions: Record<string, string> = Object.fromEntries(
+    ((roles as string[] | undefined) ?? [])
+      .map((r) => [r, schemaMap[referenceContent[r] ?? 0]])
+      .filter(([, s]) => s !== undefined) as [string, string][],
+  );
   return {
     rid,
     localId: schema.source_local_id!,
@@ -105,6 +121,7 @@ export const dbNodeSchemaToCrossApp = (
     template: template_content as string | undefined,
     templateTitle: template as string | undefined,
     authorId,
+    slotDefinitions,
   };
 };
 
@@ -126,7 +143,11 @@ export const dbNodeSchemasToCrossApp = async ({
     );
     accountMap = await getAccountMap(client, [...authorIds]);
   }
-  return schemas.map((r) => dbNodeSchemaToCrossApp(r, spaceMap, accountMap));
+  const referredSchemaIds = schemas.flatMap((schema) => schema.refs);
+  const schemaMap = await getConceptMap(client, referredSchemaIds, spaceMap);
+  return schemas.map((schema) =>
+    dbNodeSchemaToCrossApp({ schema, spaceMap, accountMap, schemaMap }),
+  );
 };
 
 export const dbRelationTypeSchemaToCrossApp = (