fix: make parseLink handle stream bases (adds regression test)

Author: mathpirate

packages/runner/src/link-utils.ts

@@ -236,18 +236,27 @@ export function parseLink(
 
   if (isCell(value) || isStream(value)) return value.getAsNormalizedFullLink();
 
+  let baseLink: NormalizedLink | undefined;
+  if (base) {
+    if (isCell(base) || isStream(base)) {
+      baseLink = base.getAsNormalizedFullLink();
+    } else {
+      baseLink = base as NormalizedLink;
+    }
+  }
+
   // Handle new sigil format
   if (isSigilLink(value)) {
     const link = value["/"][LINK_V1_TAG];
 
     // Resolve relative references
     let id = link.id;
     const path = link.path || [];
-    const resolvedSpace = link.space || base?.space;
+    const resolvedSpace = link.space || baseLink?.space;
 
     // If no id provided, use base cell's document
-    if (!id && base) {
-      id = isAnyCell(base) ? toURI(base.entityId) : base.id;
+    if (!id && baseLink?.id) {
+      id = baseLink.id;
     }
 
     return {
@@ -266,7 +275,7 @@ export function parseLink(
     return {
       id: toURI(value.cell["/"]),
       path: value.path.map((p) => p.toString()),
-      ...(base?.space && { space: base.space }),
+      ...(baseLink?.space && { space: baseLink.space }),
       type: "application/json",
     };
   }
@@ -275,7 +284,7 @@ export function parseLink(
     return {
       id: toURI(value["/"]),
       path: [],
-      ...(base?.space && { space: base.space }), // Space must come from context for JSON links
+      ...(baseLink?.space && { space: baseLink.space }), // Space must come from context for JSON links
       type: "application/json",
     };
   }
@@ -293,16 +302,16 @@ export function parseLink(
     }
 
     // If no cell provided, use base cell's document
-    if (!id && base) {
-      id = isAnyCell(base) ? toURI(base.entityId) : base.id;
+    if (!id && baseLink?.id) {
+      id = baseLink.id;
     }
 
     return {
       ...(id && { id }),
       path: Array.isArray(alias.path)
         ? alias.path.map((p) => p.toString())
         : [],
-      ...(base?.space && { space: base.space }),
+      ...(baseLink?.space && { space: baseLink.space }),
       type: "application/json",
       ...(alias.schema && { schema: alias.schema }),
       ...(alias.rootSchema && { rootSchema: alias.rootSchema }),

packages/runner/test/stream-base-parse-link.test.ts

@@ -0,0 +1,71 @@
+import { afterEach, beforeEach, describe, it } from "@std/testing/bdd";
+import { expect } from "@std/expect";
+import { Identity } from "@commontools/identity";
+import { StorageManager } from "@commontools/runner/storage/cache.deno";
+import { Runtime } from "../src/runtime.ts";
+import { parseLink } from "../src/link-utils.ts";
+import { LINK_V1_TAG, type SigilLink } from "../src/sigil-types.ts";
+import { isStream } from "../src/cell.ts";
+
+const signer = await Identity.fromPassphrase("parse-link stream base regression");
+const space = signer.did();
+
+describe("parseLink stream base", () => {
+  let storageManager: ReturnType<typeof StorageManager.emulate>;
+  let runtime: Runtime;
+
+  beforeEach(() => {
+    storageManager = StorageManager.emulate({ as: signer });
+    runtime = new Runtime({
+      apiUrl: new URL(import.meta.url),
+      storageManager,
+    });
+  });
+
+  afterEach(async () => {
+    await runtime?.storageManager.synced();
+    await runtime?.dispose();
+    await storageManager?.close();
+  });
+
+  it("should safely resolve links when a Stream is provided as the base", async () => {
+    const tx = runtime.edit();
+    const backingCell = runtime.getCell(
+      space,
+      "regression-parseLink-stream-base",
+      undefined,
+      tx,
+    );
+    backingCell.set({
+      events: { $stream: true },
+    });
+    await tx.commit();
+
+    const schema = {
+      type: "object",
+      properties: {
+        events: {
+          type: "object",
+          asStream: true,
+        },
+      },
+      required: ["events"],
+    } as const;
+
+    const typedCell = backingCell.asSchema(schema);
+    const eventsStream = typedCell.key("events");
+    expect(isStream(eventsStream)).toBe(true);
+
+    const sigil: SigilLink = {
+      "/": {
+        [LINK_V1_TAG]: {
+          path: ["payload"],
+        },
+      },
+    };
+
+    const call = () => parseLink(sigil, eventsStream);
+
+    expect(call).not.toThrow();
+  });
+});