@typicalday/firegraph 0.2.0 → 0.4.0

package/dist/index.js

@@ -773,6 +773,9 @@ function matchSegments(path, pi, pattern, qi) {
 function tripleKey(aType, axbType, bType) {
   return `${aType}:${axbType}:${bType}`;
 }
+function tripleKeyFor(e) {
+  return tripleKey(e.aType, e.axbType, e.bType);
+}
 function createRegistry(input) {
   const map = /* @__PURE__ */ new Map();
   let entries;
@@ -783,14 +786,35 @@ function createRegistry(input) {
   }
   const entryList = Object.freeze([...entries]);
   for (const entry of entries) {
+    if (entry.targetGraph && entry.targetGraph.includes("/")) {
+      throw new ValidationError(
+        `Entry (${entry.aType}) -[${entry.axbType}]-> (${entry.bType}) has invalid targetGraph "${entry.targetGraph}" \u2014 must be a single segment (no "/")`
+      );
+    }
     const key = tripleKey(entry.aType, entry.axbType, entry.bType);
     const validator = entry.jsonSchema ? compileSchema(entry.jsonSchema, `(${entry.aType}) -[${entry.axbType}]-> (${entry.bType})`) : void 0;
     map.set(key, { entry, validate: validator });
   }
+  const axbIndex = /* @__PURE__ */ new Map();
+  const axbBuild = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const existing = axbBuild.get(entry.axbType);
+    if (existing) {
+      existing.push(entry);
+    } else {
+      axbBuild.set(entry.axbType, [entry]);
+    }
+  }
+  for (const [key, arr] of axbBuild) {
+    axbIndex.set(key, Object.freeze(arr));
+  }
   return {
     lookup(aType, axbType, bType) {
       return map.get(tripleKey(aType, axbType, bType))?.entry;
     },
+    lookupByAxbType(axbType) {
+      return axbIndex.get(axbType) ?? [];
+    },
     validate(aType, axbType, bType, data, scopePath) {
       const rec = map.get(tripleKey(aType, axbType, bType));
       if (!rec) {
@@ -818,6 +842,45 @@ function createRegistry(input) {
     }
   };
 }
+function createMergedRegistry(base, extension) {
+  const baseKeys = new Set(base.entries().map(tripleKeyFor));
+  return {
+    lookup(aType, axbType, bType) {
+      return base.lookup(aType, axbType, bType) ?? extension.lookup(aType, axbType, bType);
+    },
+    lookupByAxbType(axbType) {
+      const baseResults = base.lookupByAxbType(axbType);
+      const extResults = extension.lookupByAxbType(axbType);
+      if (extResults.length === 0) return baseResults;
+      if (baseResults.length === 0) return extResults;
+      const seen = new Set(baseResults.map(tripleKeyFor));
+      const merged = [...baseResults];
+      for (const entry of extResults) {
+        if (!seen.has(tripleKeyFor(entry))) {
+          merged.push(entry);
+        }
+      }
+      return Object.freeze(merged);
+    },
+    validate(aType, axbType, bType, data, scopePath) {
+      if (baseKeys.has(tripleKey(aType, axbType, bType))) {
+        return base.validate(aType, axbType, bType, data, scopePath);
+      }
+      return extension.validate(aType, axbType, bType, data, scopePath);
+    },
+    entries() {
+      const extEntries = extension.entries();
+      if (extEntries.length === 0) return base.entries();
+      const merged = [...base.entries()];
+      for (const entry of extEntries) {
+        if (!baseKeys.has(tripleKeyFor(entry))) {
+          merged.push(entry);
+        }
+      }
+      return Object.freeze(merged);
+    }
+  };
+}
 function discoveryToEntries(discovery) {
   const entries = [];
   for (const [name, entity] of discovery.nodes) {
@@ -837,6 +900,12 @@ function discoveryToEntries(discovery) {
     if (!topology) continue;
     const fromTypes = Array.isArray(topology.from) ? topology.from : [topology.from];
     const toTypes = Array.isArray(topology.to) ? topology.to : [topology.to];
+    const resolvedTargetGraph = entity.targetGraph ?? topology.targetGraph;
+    if (resolvedTargetGraph && resolvedTargetGraph.includes("/")) {
+      throw new ValidationError(
+        `Edge "${axbType}" has invalid targetGraph "${resolvedTargetGraph}" \u2014 must be a single segment (no "/")`
+      );
+    }
     for (const aType of fromTypes) {
       for (const bType of toTypes) {
         entries.push({
@@ -848,7 +917,8 @@ function discoveryToEntries(discovery) {
           inverseLabel: topology.inverseLabel,
           titleField: entity.titleField,
           subtitleField: entity.subtitleField,
-          allowedIn: entity.allowedIn
+          allowedIn: entity.allowedIn,
+          targetGraph: resolvedTargetGraph
         });
       }
     }
@@ -898,7 +968,8 @@ var EDGE_TYPE_SCHEMA = {
     subtitleField: { type: "string" },
     viewTemplate: { type: "string" },
     viewCss: { type: "string" },
-    allowedIn: { type: "array", items: { type: "string", minLength: 1 } }
+    allowedIn: { type: "array", items: { type: "string", minLength: 1 } },
+    targetGraph: { type: "string", minLength: 1, pattern: "^[^/]+$" }
   },
   additionalProperties: false
 };
@@ -959,7 +1030,8 @@ async function createRegistryFromGraph(reader) {
           inverseLabel: data.inverseLabel,
           titleField: data.titleField,
           subtitleField: data.subtitleField,
-          allowedIn: data.allowedIn
+          allowedIn: data.allowedIn,
+          targetGraph: data.targetGraph
         });
       }
     }
@@ -975,14 +1047,12 @@ var GraphClientImpl = class _GraphClientImpl {
     this.db = db;
     this.scopePath = scopePath;
     this.adapter = createFirestoreAdapter(db, collectionPath);
-    if (options?.registry && options?.registryMode) {
-      throw new DynamicRegistryError(
-        'Cannot provide both "registry" and "registryMode". Use "registry" for static mode or "registryMode" for dynamic mode.'
-      );
-    }
     if (options?.registryMode) {
       this.dynamicConfig = options.registryMode;
       this.bootstrapRegistry = createBootstrapRegistry();
+      if (options.registry) {
+        this.staticRegistry = options.registry;
+      }
       const metaCollectionPath = options.registryMode.collection;
       if (metaCollectionPath && metaCollectionPath !== collectionPath) {
         this.metaAdapter = createFirestoreAdapter(db, metaCollectionPath);
@@ -1034,18 +1104,20 @@ var GraphClientImpl = class _GraphClientImpl {
   /**
    * Get the appropriate registry for validating a write to the given type.
    *
-   * - Static mode: returns staticRegistry (or undefined if none set)
-   * - Dynamic mode:
+   * - Static-only mode: returns staticRegistry (or undefined if none set)
+   * - Dynamic mode (pure or merged):
    *   - Meta-types (nodeType, edgeType): validated against bootstrapRegistry
    *   - Domain types: validated against dynamicRegistry (falls back to
    *     bootstrapRegistry which rejects unknown types)
+   *   - Merged mode: dynamicRegistry is a merged wrapper (static + dynamic
+   *     extension), so static entries take priority automatically.
    */
   getRegistryForType(aType) {
     if (!this.dynamicConfig) return this.staticRegistry;
     if (aType === META_NODE_TYPE || aType === META_EDGE_TYPE) {
       return this.bootstrapRegistry;
     }
-    return this.dynamicRegistry ?? this.bootstrapRegistry;
+    return this.dynamicRegistry ?? this.staticRegistry ?? this.bootstrapRegistry;
   }
   /**
    * Get the Firestore adapter for writing the given type.
@@ -1059,13 +1131,13 @@ var GraphClientImpl = class _GraphClientImpl {
   }
   /**
    * Get the combined registry for transaction/batch context.
-   * In static mode, returns staticRegistry.
+   * In static-only mode, returns staticRegistry.
    * In dynamic mode, returns dynamicRegistry (which includes bootstrap entries)
-   * or bootstrapRegistry if not yet reloaded.
+   * or falls back to staticRegistry (merged mode) or bootstrapRegistry.
    */
   getCombinedRegistry() {
     if (!this.dynamicConfig) return this.staticRegistry;
-    return this.dynamicRegistry ?? this.bootstrapRegistry;
+    return this.dynamicRegistry ?? this.staticRegistry ?? this.bootstrapRegistry;
   }
   // ---------------------------------------------------------------------------
   // Query dispatch
@@ -1213,6 +1285,33 @@ var GraphClientImpl = class _GraphClientImpl {
     );
   }
   // ---------------------------------------------------------------------------
+  // Collection group query
+  // ---------------------------------------------------------------------------
+  async findEdgesGlobal(params, collectionName) {
+    const name = collectionName ?? this.adapter.collectionPath.split("/").pop();
+    const plan = buildEdgeQueryPlan(params);
+    if (plan.strategy === "get") {
+      throw new FiregraphError(
+        "findEdgesGlobal() requires a query, not a direct document lookup. Omit one of aUid/axbType/bUid to force a query strategy.",
+        "INVALID_QUERY"
+      );
+    }
+    this.checkQuerySafety(plan.filters, params.allowCollectionScan);
+    const collectionGroupRef = this.db.collectionGroup(name);
+    let q = collectionGroupRef;
+    for (const f of plan.filters) {
+      q = q.where(f.field, f.op, f.value);
+    }
+    if (plan.options?.orderBy) {
+      q = q.orderBy(plan.options.orderBy.field, plan.options.orderBy.direction ?? "asc");
+    }
+    if (plan.options?.limit !== void 0) {
+      q = q.limit(plan.options.limit);
+    }
+    const snap = await q.get();
+    return snap.docs.map((doc) => doc.data());
+  }
+  // ---------------------------------------------------------------------------
   // Bulk operations
   // ---------------------------------------------------------------------------
   async removeNodeCascade(uid, options) {
@@ -1235,6 +1334,11 @@ var GraphClientImpl = class _GraphClientImpl {
         `Cannot define type "${name}": this name is reserved for the meta-registry.`
       );
     }
+    if (this.staticRegistry?.lookup(name, NODE_RELATION, name)) {
+      throw new DynamicRegistryError(
+        `Cannot define node type "${name}": already defined in the static registry.`
+      );
+    }
     const uid = generateDeterministicUid(META_NODE_TYPE, name);
     const data = { name, jsonSchema };
     if (description !== void 0) data.description = description;
@@ -1256,6 +1360,19 @@ var GraphClientImpl = class _GraphClientImpl {
         `Cannot define type "${name}": this name is reserved for the meta-registry.`
       );
     }
+    if (this.staticRegistry) {
+      const fromTypes = Array.isArray(topology.from) ? topology.from : [topology.from];
+      const toTypes = Array.isArray(topology.to) ? topology.to : [topology.to];
+      for (const aType of fromTypes) {
+        for (const bType of toTypes) {
+          if (this.staticRegistry.lookup(aType, name, bType)) {
+            throw new DynamicRegistryError(
+              `Cannot define edge type "${name}" for (${aType}) -> (${bType}): already defined in the static registry.`
+            );
+          }
+        }
+      }
+    }
     const uid = generateDeterministicUid(META_EDGE_TYPE, name);
     const data = {
       name,
@@ -1264,6 +1381,7 @@ var GraphClientImpl = class _GraphClientImpl {
     };
     if (jsonSchema !== void 0) data.jsonSchema = jsonSchema;
     if (topology.inverseLabel !== void 0) data.inverseLabel = topology.inverseLabel;
+    if (topology.targetGraph !== void 0) data.targetGraph = topology.targetGraph;
     if (description !== void 0) data.description = description;
     if (options?.titleField !== void 0) data.titleField = options.titleField;
     if (options?.subtitleField !== void 0) data.subtitleField = options.subtitleField;
@@ -1279,7 +1397,12 @@ var GraphClientImpl = class _GraphClientImpl {
       );
     }
     const reader = this.createMetaReader();
-    this.dynamicRegistry = await createRegistryFromGraph(reader);
+    const dynamicOnly = await createRegistryFromGraph(reader);
+    if (this.staticRegistry) {
+      this.dynamicRegistry = createMergedRegistry(this.staticRegistry, dynamicOnly);
+    } else {
+      this.dynamicRegistry = dynamicOnly;
+    }
   }
   /**
    * Create a GraphReader for the meta-collection.
@@ -1338,6 +1461,10 @@ function generateId() {
 var DEFAULT_LIMIT = 10;
 var DEFAULT_MAX_READS = 100;
 var DEFAULT_CONCURRENCY = 5;
+var _crossGraphWarned = false;
+function isGraphClient(reader) {
+  return "subgraph" in reader && typeof reader.subgraph === "function";
+}
 var Semaphore = class {
   constructor(slots) {
     this.slots = slots;
@@ -1363,9 +1490,10 @@ var Semaphore = class {
   }
 };
 var TraversalBuilderImpl = class {
-  constructor(reader, startUid) {
+  constructor(reader, startUid, registry) {
     this.reader = reader;
     this.startUid = startUid;
+    this.registry = registry;
   }
   hops = [];
   follow(axbType, options) {
@@ -1382,11 +1510,13 @@ var TraversalBuilderImpl = class {
     const semaphore = new Semaphore(concurrency);
     let totalReads = 0;
     let truncated = false;
-    let sourceUids = [this.startUid];
+    let sources = [
+      { uid: this.startUid, reader: this.reader }
+    ];
     const hopResults = [];
     for (let depth = 0; depth < this.hops.length; depth++) {
       const hop = this.hops[depth];
-      if (sourceUids.length === 0) {
+      if (sources.length === 0) {
         hopResults.push({
           axbType: hop.axbType,
           depth,
@@ -1397,9 +1527,12 @@ var TraversalBuilderImpl = class {
         continue;
       }
       const hopEdges = [];
-      const sourceCount = sourceUids.length;
+      const sourceCount = sources.length;
       let hopTruncated = false;
-      const tasks = sourceUids.map((uid) => async () => {
+      const resolvedTargetGraph = this.resolveTargetGraph(hop);
+      const direction = hop.direction ?? "forward";
+      const isCrossGraph = direction === "forward" && !!resolvedTargetGraph;
+      const tasks = sources.map(({ uid, reader: sourceReader }) => async () => {
         if (totalReads >= maxReads) {
           hopTruncated = true;
           return;
@@ -1411,19 +1544,18 @@ var TraversalBuilderImpl = class {
             return;
           }
           totalReads++;
-          const direction2 = hop.direction ?? "forward";
           const params = { axbType: hop.axbType };
-          if (direction2 === "forward") {
+          if (direction === "forward") {
             params.aUid = uid;
             if (hop.bType) params.bType = hop.bType;
           } else {
             params.bUid = uid;
             if (hop.aType) params.aType = hop.aType;
           }
-          if (direction2 === "forward" && hop.aType) {
+          if (direction === "forward" && hop.aType) {
             params.aType = hop.aType;
           }
-          if (direction2 === "reverse" && hop.bType) {
+          if (direction === "reverse" && hop.bType) {
             params.bType = hop.bType;
           }
           if (hop.orderBy) params.orderBy = hop.orderBy;
@@ -1433,31 +1565,58 @@ var TraversalBuilderImpl = class {
           } else {
             params.limit = limit;
           }
-          let edges = await this.reader.findEdges(params);
+          let hopReader;
+          let nextReader;
+          if (isCrossGraph) {
+            if (isGraphClient(this.reader)) {
+              hopReader = this.reader.subgraph(uid, resolvedTargetGraph);
+              nextReader = hopReader;
+            } else {
+              hopReader = sourceReader;
+              nextReader = sourceReader;
+              if (!_crossGraphWarned) {
+                _crossGraphWarned = true;
+                console.warn(
+                  `[firegraph] Traversal hop "${hop.axbType}" has targetGraph "${resolvedTargetGraph}" but the reader does not support subgraph(). Cross-graph hop will query the current collection instead. Pass a GraphClient to createTraversal() to enable cross-graph traversal.`
+                );
+              }
+            }
+          } else {
+            hopReader = sourceReader;
+            nextReader = sourceReader;
+          }
+          let edges2 = await hopReader.findEdges(params);
           if (hop.filter) {
-            edges = edges.filter(hop.filter);
-            edges = edges.slice(0, limit);
+            edges2 = edges2.filter(hop.filter);
+            edges2 = edges2.slice(0, limit);
+          }
+          for (const edge of edges2) {
+            hopEdges.push({ edge, reader: nextReader });
           }
-          hopEdges.push(...edges);
         } finally {
           semaphore.release();
         }
       });
       await Promise.all(tasks.map((task) => task()));
+      const edges = hopEdges.map((h) => h.edge);
       hopResults.push({
         axbType: hop.axbType,
         depth,
-        edges: returnIntermediates ? [...hopEdges] : hopEdges,
+        edges: returnIntermediates ? [...edges] : edges,
         sourceCount,
         truncated: hopTruncated
       });
       if (hopTruncated) {
         truncated = true;
       }
-      const direction = hop.direction ?? "forward";
-      sourceUids = [...new Set(
-        hopEdges.map((e) => direction === "forward" ? e.bUid : e.aUid)
-      )];
+      const seen = /* @__PURE__ */ new Map();
+      for (const { edge, reader: edgeReader } of hopEdges) {
+        const nextUid = direction === "forward" ? edge.bUid : edge.aUid;
+        if (!seen.has(nextUid)) {
+          seen.set(nextUid, edgeReader);
+        }
+      }
+      sources = [...seen.entries()].map(([uid, reader]) => ({ uid, reader }));
     }
     const lastHop = hopResults[hopResults.length - 1];
     return {
@@ -1467,9 +1626,25 @@ var TraversalBuilderImpl = class {
       truncated
     };
   }
+  /**
+   * Resolve the targetGraph for a hop. Priority:
+   * 1. Explicit `hop.targetGraph` (user override)
+   * 2. Registry `targetGraph` for the axbType (if registry available)
+   * 3. undefined (no cross-graph)
+   */
+  resolveTargetGraph(hop) {
+    if (hop.targetGraph) return hop.targetGraph;
+    if (this.registry) {
+      const entries = this.registry.lookupByAxbType(hop.axbType);
+      for (const entry of entries) {
+        if (entry.targetGraph) return entry.targetGraph;
+      }
+    }
+    return void 0;
+  }
 };
-function createTraversal(reader, startUid) {
-  return new TraversalBuilderImpl(reader, startUid);
+function createTraversal(reader, startUid, registry) {
+  return new TraversalBuilderImpl(reader, startUid, registry);
 }
 
 // src/views.ts
@@ -1717,7 +1892,8 @@ function loadEdgeEntity(dir, name) {
     viewDefaults: meta?.viewDefaults,
     viewsPath,
     sampleData,
-    allowedIn: meta?.allowedIn
+    allowedIn: meta?.allowedIn,
+    targetGraph: topology.targetGraph ?? meta?.targetGraph
   };
 }
 function getSubdirectories(dir) {
@@ -1760,6 +1936,20 @@ function discoverEntities(entitiesDir) {
   };
 }
 
+// src/cross-graph.ts
+function resolveAncestorCollection(collectionPath, uid) {
+  const segments = collectionPath.split("/");
+  for (let i = 1; i < segments.length; i += 2) {
+    if (segments[i] === uid) {
+      return segments.slice(0, i).join("/");
+    }
+  }
+  return null;
+}
+function isAncestorUid(collectionPath, uid) {
+  return resolveAncestorCollection(collectionPath, uid) !== null;
+}
+
 // src/indexes.ts
 function baseIndexes(collection) {
   return [
@@ -1802,7 +1992,43 @@ function extractSchemaFields(schema) {
   if (s.type !== "object" || !s.properties) return [];
   return Object.keys(s.properties);
 }
-function generateIndexConfig(collection, entities) {
+function collectionGroupIndexes(collectionName) {
+  return [
+    {
+      collectionGroup: collectionName,
+      queryScope: "COLLECTION_GROUP",
+      fields: [
+        { fieldPath: "aUid", order: "ASCENDING" },
+        { fieldPath: "axbType", order: "ASCENDING" }
+      ]
+    },
+    {
+      collectionGroup: collectionName,
+      queryScope: "COLLECTION_GROUP",
+      fields: [
+        { fieldPath: "axbType", order: "ASCENDING" },
+        { fieldPath: "bUid", order: "ASCENDING" }
+      ]
+    },
+    {
+      collectionGroup: collectionName,
+      queryScope: "COLLECTION_GROUP",
+      fields: [
+        { fieldPath: "aType", order: "ASCENDING" },
+        { fieldPath: "axbType", order: "ASCENDING" }
+      ]
+    },
+    {
+      collectionGroup: collectionName,
+      queryScope: "COLLECTION_GROUP",
+      fields: [
+        { fieldPath: "axbType", order: "ASCENDING" },
+        { fieldPath: "bType", order: "ASCENDING" }
+      ]
+    }
+  ];
+}
+function generateIndexConfig(collection, entities, registryEntries) {
   const indexes = baseIndexes(collection);
   if (entities) {
     for (const [, entity] of entities.nodes) {
@@ -1834,6 +2060,17 @@ function generateIndexConfig(collection, entities) {
       }
     }
   }
+  if (registryEntries) {
+    const targetGraphNames = /* @__PURE__ */ new Set();
+    for (const entry of registryEntries) {
+      if (entry.targetGraph) {
+        targetGraphNames.add(entry.targetGraph);
+      }
+    }
+    for (const name of targetGraphNames) {
+      indexes.push(...collectionGroupIndexes(name));
+    }
+  }
   return { indexes, fieldOverrides: [] };
 }
 export {
@@ -1866,6 +2103,7 @@ export {
   computeNodeDocId,
   createBootstrapRegistry,
   createGraphClient,
+  createMergedRegistry,
   createRegistry,
   createRegistryFromGraph,
   createTraversal,
@@ -1876,9 +2114,11 @@ export {
   generateId,
   generateIndexConfig,
   generateTypes,
+  isAncestorUid,
   jsonSchemaToFieldMeta,
   matchScope,
   matchScopeAny,
+  resolveAncestorCollection,
   resolveView
 };
 //# sourceMappingURL=index.js.map