@_linked/core 2.34.0 → 2.36.0

package/lib/esm/queries/FieldSet.js

@@ -1,10 +1,11 @@
 import { getUniquePropertyShapes, getPropertyShape } from '../shapes/nodeShapeData.js';
 import { PropertyPath, walkPropertyPath } from './PropertyPath.js';
-import { getShapeClass, getAllShapeClasses, getNodeShape } from '../utils/ShapeClass.js';
+import { captureCatalog, getActiveShapeCatalog, getAllNodeShapes, getAllShapeClasses, getNodeShape, getShapeClass, withShapeCatalog, getQueryShapeClass, } from '../utils/ShapeClass.js';
 import { createProxiedPathBuilder } from './ProxiedPathBuilder.js';
 import { isExpressionNode, ExpressionNode } from '../expressions/ExpressionNode.js';
 import { encodeValueExpr, decodeValueExpr } from './DslJsonExpression.js';
 import { serializeWherePath, deserializeWherePath, } from './QueryBuilderSerialization.js';
+import { topLevelDetails, unresolvedShapeError, unresolvedValueShapeError } from '../utils/unresolvedShape.js';
 const isQueryBuilderObject = (obj) => obj !== null &&
     typeof obj === 'object' &&
     'property' in obj &&
@@ -45,11 +46,33 @@ const RELATION_OPTION_KEYS = new Set([
  * Every mutation method returns a new FieldSet — the original is never modified.
  */
 export class FieldSet {
-    constructor(shape, entries) {
+    constructor(shape, entries, catalog = FieldSet.captureFor(shape)) {
         this.shape = shape;
         this.entries = entries;
+        this._catalog = catalog;
+    }
+    /** The catalog this FieldSet resolves shapes in (undefined = the global registry). */
+    get catalog() {
+        return this._catalog;
+    }
+    /**
+     * The catalog a FieldSet rooted at `shape` captures: the active one for an IRI or a
+     * shape it holds, none for a shape it does not (an authored class built by code that
+     * runs inside a project scope), else the catalog an adapter class came from.
+     */
+    static captureFor(shape) {
+        if (typeof shape === 'function')
+            return captureCatalog(shape);
+        const active = getActiveShapeCatalog();
+        if (active === undefined || typeof shape === 'string')
+            return active;
+        return active.has(shape.id) ? active : undefined;
     }
     static for(shape, fieldsOrFn) {
+        const catalog = FieldSet.captureFor(shape);
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => FieldSet.for(shape, fieldsOrFn));
+        }
         const resolved = FieldSet.resolveShapeInput(shape);
         const resolvedShape = resolved.nodeShape;
         if (typeof fieldsOrFn === 'function') {
@@ -97,6 +120,10 @@ export class FieldSet {
     }
     static all(shape, opts) {
         var _a;
+        const catalog = FieldSet.captureFor(shape);
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => FieldSet.all(shape, opts));
+        }
         const depth = (_a = opts === null || opts === void 0 ? void 0 : opts.depth) !== null && _a !== void 0 ? _a : 1;
         if (depth < 1) {
             throw new Error('FieldSet.all() requires depth >= 1. Use a node reference ({id}) for depth 0.');
@@ -117,7 +144,7 @@ export class FieldSet {
             const entry = { path: new PropertyPath(nodeShape, [ps]) };
             // If depth > 1, recurse into nested shapes
             if (depth > 1 && ps.valueShape) {
-                const nestedShapeClass = getShapeClass(ps.valueShape);
+                const nestedShapeClass = getQueryShapeClass(ps.valueShape);
                 if ((nestedShapeClass === null || nestedShapeClass === void 0 ? void 0 : nestedShapeClass.shape) && !visited.has(nestedShapeClass.shape.id)) {
                     visited.add(nestedShapeClass.shape.id);
                     const nestedFs = FieldSet.allForShape(nestedShapeClass.shape, depth - 1, visited);
@@ -158,15 +185,19 @@ export class FieldSet {
                 }
             }
         }
-        return new FieldSet(shape, merged);
+        return new FieldSet(shape, merged, sets[0]._catalog);
     }
     // ---------------------------------------------------------------------------
     // Composition methods — each returns a new FieldSet
     // ---------------------------------------------------------------------------
     /** Returns a new FieldSet with only the given fields. */
     select(fields) {
+        const catalog = this._catalog;
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => this.select(fields));
+        }
         const entries = FieldSet.resolveInputs(this.shape, fields);
-        return new FieldSet(this.shape, entries);
+        return new FieldSet(this.shape, entries, this._catalog);
     }
     /**
      * Clone this FieldSet, preserving the sub-select carrier fields
@@ -174,7 +205,7 @@ export class FieldSet {
      * applying the supplied overrides. Used by `.limit()`/`.offset()`/`.orderBy()`.
      */
     cloneWith(overrides) {
-        const clone = new FieldSet(this.shape, this.entries);
+        const clone = new FieldSet(this.shape, this.entries, this._catalog);
         // The sub-select carrier fields are declared `readonly` (normally set once at
         // construction via `forSubSelect`). Copy this FieldSet's identity onto the
         // clone through a mutable view, then layer the pagination overrides on top.
@@ -201,6 +232,10 @@ export class FieldSet {
      * the rest of the DSL, or a property-name string (`.orderBy('name')`).
      */
     orderBy(paths, direction = 'ASC') {
+        const catalog = this._catalog;
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => this.orderBy(paths, direction));
+        }
         const orderBy = typeof paths === 'function'
             ? this.orderByFromProxy(paths, direction)
             : (Array.isArray(paths) ? paths : [paths]).map((label) => {
@@ -231,6 +266,10 @@ export class FieldSet {
     }
     /** Returns a new FieldSet with additional entries. */
     add(fields) {
+        const catalog = this._catalog;
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => this.add(fields));
+        }
         const newEntries = FieldSet.resolveInputs(this.shape, fields);
         // Deduplicate
         const existing = new Set(this.entries.map((e) => e.path.toString()));
@@ -240,24 +279,28 @@ export class FieldSet {
                 combined.push(entry);
             }
         }
-        return new FieldSet(this.shape, combined);
+        return new FieldSet(this.shape, combined, this._catalog);
     }
     /** Returns a new FieldSet without entries matching the given labels. */
     remove(labels) {
         const labelSet = new Set(labels);
         const filtered = this.entries.filter((e) => { var _a; return !labelSet.has((_a = e.path.terminal) === null || _a === void 0 ? void 0 : _a.label); });
-        return new FieldSet(this.shape, filtered);
+        return new FieldSet(this.shape, filtered, this._catalog);
     }
     /** Synonym for replacing all entries — returns a new FieldSet with only the given fields. */
     set(fields) {
+        const catalog = this._catalog;
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => this.set(fields));
+        }
         const entries = FieldSet.resolveInputs(this.shape, fields);
-        return new FieldSet(this.shape, entries);
+        return new FieldSet(this.shape, entries, this._catalog);
     }
     /** Returns a new FieldSet keeping only entries matching the given labels. */
     pick(labels) {
         const labelSet = new Set(labels);
         const filtered = this.entries.filter((e) => { var _a; return labelSet.has((_a = e.path.terminal) === null || _a === void 0 ? void 0 : _a.label); });
-        return new FieldSet(this.shape, filtered);
+        return new FieldSet(this.shape, filtered, this._catalog);
     }
     /** Returns all PropertyPaths in this FieldSet. */
     paths() {
@@ -275,6 +318,10 @@ export class FieldSet {
      * Shape is identified by its IRI, paths by dot-separated labels.
      */
     toJSON() {
+        const catalog = this._catalog;
+        if (catalog !== getActiveShapeCatalog()) {
+            return withShapeCatalog(catalog, () => this.toJSON());
+        }
         return { shape: this.shape.id, fields: this.toFieldsJSON() };
     }
     /** Serialize just the field entries (used for nested relation sub-fields). */
@@ -337,7 +384,7 @@ export class FieldSet {
         var _a, _b;
         const seg = entry.path.segments[idx];
         const valueShapeId = (_a = seg === null || seg === void 0 ? void 0 : seg.valueShape) === null || _a === void 0 ? void 0 : _a.id;
-        return (valueShapeId && ((_b = getShapeClass(valueShapeId)) === null || _b === void 0 ? void 0 : _b.shape)) || this.shape;
+        return (valueShapeId && ((_b = getQueryShapeClass(valueShapeId)) === null || _b === void 0 ? void 0 : _b.shape)) || this.shape;
     }
     /**
      * Reconstruct a FieldSet from a JSON object.
@@ -352,7 +399,7 @@ export class FieldSet {
     }
     /** Parse one field entry (string leaf / computed / relation-keyed) against `shape`. */
     static parseField(shape, raw) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         // Leaf path (may carry inline `as(Shape)` casts).
         if (typeof raw === 'string') {
             return { path: FieldSet.walkPathWithCasts(shape, raw) };
@@ -392,7 +439,7 @@ export class FieldSet {
             const idx = (_a = opts.whereIndex) !== null && _a !== void 0 ? _a : path.segments.length - 1;
             const seg = path.segments[idx];
             const valueShapeId = (_b = seg === null || seg === void 0 ? void 0 : seg.valueShape) === null || _b === void 0 ? void 0 : _b.id;
-            const scopedShape = (valueShapeId && ((_c = getShapeClass(valueShapeId)) === null || _c === void 0 ? void 0 : _c.shape)) || shape;
+            const scopedShape = (valueShapeId && ((_c = getQueryShapeClass(valueShapeId)) === null || _c === void 0 ? void 0 : _c.shape)) || shape;
             entry.scopedFilter = deserializeWherePath(scopedShape, opts.where);
             entry.scopedFilterIndex = idx;
         }
@@ -413,17 +460,37 @@ export class FieldSet {
         if (subFields) {
             const nested = opts.shape
                 ? FieldSet.resolveShape(opts.shape)
-                : (_e = FieldSet.nestedShapeOf(path)) !== null && _e !== void 0 ? _e : shape;
+                : FieldSet.requireNestedShapeOf(path, shape);
             entry.subSelect = FieldSet.fromFields(nested, subFields);
         }
         return entry;
     }
+    /**
+     * The shape sub-fields of `path` are read against: its terminal segment's value shape, or
+     * `shape` when that segment declares none. A declared value shape that does not resolve is
+     * an error: reading the sub-fields against `shape` instead would resolve them on the wrong
+     * shape (or fail with a message about the wrong property).
+     */
+    static requireNestedShapeOf(path, shape) {
+        var _a;
+        const nested = FieldSet.nestedShapeOf(path);
+        if (nested)
+            return nested;
+        const seg = path.segments[path.segments.length - 1];
+        if ((_a = seg === null || seg === void 0 ? void 0 : seg.valueShape) === null || _a === void 0 ? void 0 : _a.id) {
+            const owner = path.segments.length > 1
+                ? FieldSet.nestedShapeOf(new PropertyPath(path.rootShape, path.segments.slice(0, -1)))
+                : path.rootShape;
+            throw unresolvedValueShapeError(`Cannot resolve valueShape '${seg.valueShape.id}' for property '${seg.label}' in path '${path.toString()}'`, seg, owner);
+        }
+        return shape;
+    }
     /** The shape reached at the end of a relation path (its terminal segment's value shape). */
     static nestedShapeOf(path) {
         var _a, _b;
         const seg = path.segments[path.segments.length - 1];
         const valueShapeId = (_a = seg === null || seg === void 0 ? void 0 : seg.valueShape) === null || _a === void 0 ? void 0 : _a.id;
-        return (valueShapeId && ((_b = getShapeClass(valueShapeId)) === null || _b === void 0 ? void 0 : _b.shape)) || undefined;
+        return (valueShapeId && ((_b = getQueryShapeClass(valueShapeId)) === null || _b === void 0 ? void 0 : _b.shape)) || undefined;
     }
     // ---------------------------------------------------------------------------
     // Private helpers
@@ -433,8 +500,21 @@ export class FieldSet {
      * Accepts: ShapeConstructor (class with .shape), NodeShapeData, or IRI string.
      */
     static resolveShapeInput(shape) {
+        var _a;
+        // Inside a catalog the catalog's data is the authority for every IRI it holds, so an
+        // authored class (or metadata) for one of them resolves to the catalog's shape — as
+        // `resolveShape` does for the builders.
+        const catalog = getActiveShapeCatalog();
+        if (catalog !== undefined && typeof shape !== 'string') {
+            const id = typeof shape === 'function' ? (_a = shape.shape) === null || _a === void 0 ? void 0 : _a.id : shape === null || shape === void 0 ? void 0 : shape.id;
+            const own = id ? catalog.get(id) : undefined;
+            if (own) {
+                const shapeClass = getQueryShapeClass(id);
+                return shapeClass ? { nodeShape: own, shapeClass } : { nodeShape: own };
+            }
+        }
         if (typeof shape === 'string') {
-            const shapeClass = getShapeClass(shape);
+            const shapeClass = getQueryShapeClass(shape);
             if (shapeClass === null || shapeClass === void 0 ? void 0 : shapeClass.shape) {
                 return { nodeShape: shapeClass.shape, shapeClass };
             }
@@ -442,7 +522,7 @@ export class FieldSet {
             // below is already supported, it just was not reachable from an IRI.
             const nodeShape = getNodeShape(shape);
             if (!nodeShape) {
-                throw new Error(`Cannot resolve shape for '${shape}'`);
+                throw unresolvedShapeError(`Cannot resolve shape for '${shape}'`, topLevelDetails(shape));
             }
             return { nodeShape };
         }
@@ -452,7 +532,7 @@ export class FieldSet {
         }
         // NodeShapeData: has .id directly — try to look up its ShapeConstructor for full proxy support
         const nodeShape = shape;
-        const shapeClass = nodeShape.id ? getShapeClass(nodeShape.id) : undefined;
+        const shapeClass = nodeShape.id ? getQueryShapeClass(nodeShape.id) : undefined;
         return shapeClass
             ? { nodeShape, shapeClass }
             : { nodeShape };
@@ -493,9 +573,9 @@ export class FieldSet {
                         if (!(basePropertyShape === null || basePropertyShape === void 0 ? void 0 : basePropertyShape.valueShape)) {
                             throw new Error(`Property '${key}' has no valueShape; cannot resolve nested fields`);
                         }
-                        const nestedShapeClass = getShapeClass(basePropertyShape.valueShape);
+                        const nestedShapeClass = getQueryShapeClass(basePropertyShape.valueShape);
                         if (!nestedShapeClass || !nestedShapeClass.shape) {
-                            throw new Error(`Cannot resolve valueShape for property '${key}'`);
+                            throw unresolvedValueShapeError(`Cannot resolve valueShape '${basePropertyShape.valueShape.id}' for property '${key}'`, basePropertyShape);
                         }
                         for (const nestedField of value) {
                             const nestedPath = walkPropertyPath(nestedShapeClass.shape, nestedField);
@@ -656,11 +736,19 @@ export class FieldSet {
         return (_b = (_a = getShapeClass(id)) === null || _a === void 0 ? void 0 : _a.shape) !== null && _b !== void 0 ? _b : getNodeShape(id);
     }
     static shapeByLabel(label) {
+        // Inside a catalog every shape is data (core's built-ins aside), so scan its shapes;
+        // the global registry keeps scanning authored classes.
+        const matches = (shape) => !!shape && (shape.label === label || FieldSet.labelOfId(shape.id) === label);
+        if (getActiveShapeCatalog() !== undefined) {
+            for (const shape of getAllNodeShapes().values())
+                if (matches(shape))
+                    return shape;
+            return undefined;
+        }
         for (const cls of getAllShapeClasses().values()) {
             const shape = cls.shape;
-            if (shape && (shape.label === label || FieldSet.labelOfId(shape.id) === label)) {
+            if (matches(shape))
                 return shape;
-            }
         }
         return undefined;
     }