chore: Isolate link types from runtime imports (#2285)

Author: jsantell

packages/runner/src/builder/json-utils.ts

@@ -1,6 +1,5 @@
 import { isRecord } from "@commontools/utils/types";
 import { type LegacyAlias } from "../sigil-types.ts";
-import { isLegacyAlias, isLink } from "../link-utils.ts";
 import {
   isRecipe,
   type JSONSchema,
@@ -17,7 +16,12 @@ import {
 import { getTopFrame } from "./recipe.ts";
 import { deepEqual } from "../path-utils.ts";
 import { Runtime } from "../runtime.ts";
-import { parseLink, sanitizeSchemaForLinks } from "../link-utils.ts";
+import {
+  isCellLink,
+  isLegacyAlias,
+  parseLink,
+  sanitizeSchemaForLinks,
+} from "../link-utils.ts";
 import {
   getCellOrThrow,
   isCellResultForDereferencing,
@@ -132,7 +136,7 @@ export function createJsonSchema(
   const seen = new Map<string, JSONSchemaMutable>();
 
   function analyzeType(value: any): JSONSchema {
-    if (isLink(value)) {
+    if (isCellLink(value)) {
       const link = parseLink(value);
       const linkAsStr = JSON.stringify(link);
       if (seen.has(linkAsStr)) {

packages/runner/src/cell.ts

@@ -61,11 +61,12 @@ import {
   type SigilWriteRedirectLink,
   type URI,
 } from "./sigil-types.ts";
-import { areLinksSame, isLink } from "./link-utils.ts";
 import type { Runtime } from "./runtime.ts";
 import {
+  areLinksSame,
   createSigilLinkFromParsedLink,
   findAndInlineDataURILinks,
+  isCellLink,
   type NormalizedFullLink,
   type NormalizedLink,
 } from "./link-utils.ts";
@@ -1400,7 +1401,7 @@ function recursivelyAddIDIfNeeded<T>(
   if (!frame) return value;
 
   // Not a record, no need to add IDs. Already a link, no need to add IDs.
-  if (!isRecord(value) || isLink(value)) return value;
+  if (!isRecord(value) || isCellLink(value)) return value;
 
   // Already seen, return previously annotated result.
   if (seen.has(value)) return seen.get(value) as T;
@@ -1415,7 +1416,7 @@ function recursivelyAddIDIfNeeded<T>(
       const value = recursivelyAddIDIfNeeded(v, frame, seen);
       // For objects on arrays only: Add ID if not already present.
       if (
-        isObject(value) && !isLink(value) && !(ID in value)
+        isObject(value) && !isCellLink(value) && !(ID in value)
       ) {
         return { [ID]: frame.generatedIdCounter++, ...value };
       } else {

packages/runner/src/data-updating.ts

@@ -10,8 +10,8 @@ import {
   areNormalizedLinksSame,
   createSigilLinkFromParsedLink,
   findAndInlineDataURILinks,
-  isAnyCellLink,
-  isLink,
+  isCellLink,
+  isPrimitiveCellLink,
   isWriteRedirectLink,
   type NormalizedFullLink,
   parseLink,
@@ -156,7 +156,7 @@ export function normalizeAndDiff(
       if (Array.isArray(parent)) {
         const base = runtime.getCellFromLink(link, undefined, tx);
         for (const v of parent) {
-          if (isLink(v)) {
+          if (isCellLink(v)) {
             const sibling = parseLink(v, base);
             const siblingId = tx.readValueOrThrow({
               ...sibling,
@@ -224,7 +224,9 @@ export function normalizeAndDiff(
 
   // Check for links that are data: URIs and inline them, by calling
   // normalizeAndDiff on the contents of the link.
-  if (isLink(newValue) && parseLink(newValue, link).id?.startsWith("data:")) {
+  if (
+    isCellLink(newValue) && parseLink(newValue, link).id?.startsWith("data:")
+  ) {
     return normalizeAndDiff(
       runtime,
       tx,
@@ -296,7 +298,7 @@ export function normalizeAndDiff(
     );
   }
 
-  if (isAnyCellLink(newValue)) {
+  if (isPrimitiveCellLink(newValue)) {
     diffLogger.debug(
       "diff",
       () =>
@@ -335,7 +337,7 @@ export function normalizeAndDiff(
       );
     }
     if (
-      isAnyCellLink(currentValue) &&
+      isPrimitiveCellLink(currentValue) &&
       areLinksSame(newValue, currentValue, link)
     ) {
       diffLogger.debug(
@@ -487,7 +489,7 @@ export function normalizeAndDiff(
     );
     // If the current value is not a (regular) object, set it to an empty object
     // Note that the alias case is handled above
-    if (!isRecord(currentValue) || isAnyCellLink(currentValue)) {
+    if (!isRecord(currentValue) || isPrimitiveCellLink(currentValue)) {
       diffLogger.debug(
         "diff",
         () =>
@@ -610,7 +612,7 @@ export function addCommonIDfromObjectID(
       obj[ID_FIELD] = fieldName;
     }
 
-    if (isRecord(obj) && !isCell(obj) && !isAnyCellLink(obj)) {
+    if (isRecord(obj) && !isCell(obj) && !isPrimitiveCellLink(obj)) {
       Object.values(obj).forEach((v) => traverse(v));
     }
   }

packages/runner/src/index.ts

@@ -10,7 +10,7 @@ export type {
 export * from "./interface.ts";
 export { raw } from "./module.ts";
 export type { Cell, Stream } from "./cell.ts";
-export type { NormalizedLink } from "./link-utils.ts";
+export type { NormalizedLink } from "./link-types.ts";
 export type { SigilLink, URI } from "./sigil-types.ts";
 export { createRef, type EntityId, getEntityId } from "./create-ref.ts";
 export type { CellResult as QueryResult } from "./query-result-proxy.ts";
@@ -47,8 +47,7 @@ export { addCommonIDfromObjectID } from "./data-updating.ts";
 export { resolveLink } from "./link-resolution.ts";
 export {
   areLinksSame,
-  isLegacyCellLink,
-  isLink,
+  isCellLink as isLink,
   isWriteRedirectLink,
   parseLink,
   parseLinkOrThrow,