@_linked/core 2.4.0 → 2.4.1-next.20260406154705

package/lib/esm/queries/QueryBuilderSerialization.js

@@ -0,0 +1,289 @@
+/**
+ * Serialization and deserialization helpers for QueryBuilder fields that contain
+ * live object references (PropertyShape, ExpressionNode, etc.).
+ *
+ * These convert between runtime WherePath / SortByPath / RawMinusEntry structures
+ * and plain JSON-safe representations that can round-trip through JSON.stringify/parse.
+ */
+import { getShapeClass } from '../utils/ShapeClass.js';
+import { walkPropertyPath } from './PropertyPath.js';
+import { ExpressionNode } from '../expressions/ExpressionNode.js';
+// ExistsCondition only exists after the WherePath refactor; access dynamically
+// so this file compiles on branches where it doesn't exist yet.
+import * as _exprModule from '../expressions/ExpressionNode.js';
+const ExistsConditionCtor = _exprModule.ExistsCondition;
+// =============================================================================
+// Serialization
+// =============================================================================
+export function serializeQueryPropertyPath(path) {
+    return path.map(serializeQueryStep);
+}
+function serializeQueryStep(step) {
+    // PropertyQueryStep — has a .property field that is a PropertyShape
+    if ('property' in step && step.property) {
+        const pqs = step;
+        const json = {
+            kind: 'property',
+            label: pqs.property.label,
+        };
+        if (pqs.where) {
+            json.where = serializeWherePath(pqs.where);
+        }
+        return json;
+    }
+    // SizeStep — has a .count field
+    if ('count' in step) {
+        const ss = step;
+        const json = {
+            kind: 'size',
+            count: serializeQueryPropertyPath(ss.count),
+        };
+        if (ss.label)
+            json.label = ss.label;
+        return json;
+    }
+    // ShapeReferenceValue — has .id and .shape
+    const ref = step;
+    return { kind: 'shapeRef', id: ref.id, shapeId: ref.shape.id };
+}
+export function serializeWherePath(where) {
+    var _a, _b;
+    if ('expressionNode' in where) {
+        const expr = where.expressionNode;
+        const json = {
+            kind: 'expression',
+            ir: expr.ir,
+        };
+        if (expr._refs.size > 0) {
+            const refs = {};
+            for (const [k, v] of expr._refs)
+                refs[k] = [...v];
+            json.refs = refs;
+        }
+        return json;
+    }
+    if ('firstPath' in where) {
+        const andOr = where;
+        return {
+            kind: 'andOr',
+            firstPath: serializeWherePath(andOr.firstPath),
+            andOr: andOr.andOr.map((token) => {
+                const t = {};
+                if (token.and)
+                    t.and = serializeWherePath(token.and);
+                if (token.or)
+                    t.or = serializeWherePath(token.or);
+                return t;
+            }),
+        };
+    }
+    if ('path' in where && 'method' in where && 'args' in where) {
+        const ev = where;
+        return {
+            kind: 'evaluation',
+            path: serializeQueryPropertyPath(ev.path),
+            method: ev.method,
+            args: ev.args.map(serializeQueryArg),
+        };
+    }
+    if ('existsCondition' in where) {
+        // WhereExistsPath — serialize the ExistsCondition structurally
+        const ec = where.existsCondition;
+        return {
+            kind: 'exists',
+            pathSegmentIds: [...ec.pathSegmentIds],
+            predicate: { ir: ec.predicate.ir, refs: serializePropertyRefMap(ec.predicate._refs) },
+            negated: (_a = ec.negated) !== null && _a !== void 0 ? _a : false,
+            chain: ((_b = ec.chain) !== null && _b !== void 0 ? _b : []).map((c) => {
+                var _a;
+                return ({
+                    op: c.op,
+                    condition: 'pathSegmentIds' in c.condition
+                        ? { kind: 'exists', pathSegmentIds: [...c.condition.pathSegmentIds], predicate: { ir: c.condition.predicate.ir, refs: serializePropertyRefMap(c.condition.predicate._refs) }, negated: (_a = c.condition.negated) !== null && _a !== void 0 ? _a : false, chain: [] }
+                        : { kind: 'expression', ir: c.condition.ir, refs: serializePropertyRefMap(c.condition._refs) },
+                });
+            }),
+        };
+    }
+    throw new Error(`Cannot serialize WherePath: ${JSON.stringify(Object.keys(where))}`);
+}
+function serializePropertyRefMap(refs) {
+    if (!refs || refs.size === 0)
+        return undefined;
+    const out = {};
+    for (const [k, v] of refs)
+        out[k] = [...v];
+    return out;
+}
+function serializeQueryArg(arg) {
+    if (typeof arg === 'string' || typeof arg === 'number' || typeof arg === 'boolean') {
+        return { kind: 'primitive', value: arg };
+    }
+    if (arg instanceof Date) {
+        return { kind: 'date', value: arg.toISOString() };
+    }
+    if (typeof arg === 'object' && arg !== null) {
+        if ('expressionNode' in arg || 'existsCondition' in arg || 'firstPath' in arg || ('path' in arg && 'method' in arg && 'args' in arg)) {
+            return { kind: 'where', where: serializeWherePath(arg) };
+        }
+        // ArgPath — has 'subject' and 'path'
+        if ('subject' in arg && 'path' in arg) {
+            const ap = arg;
+            return {
+                kind: 'argPath',
+                path: serializeQueryPropertyPath(ap.path),
+                subject: { id: ap.subject.id, shapeId: ap.subject.shape.id },
+            };
+        }
+        // NodeReferenceValue — has 'id'
+        if ('id' in arg) {
+            return { kind: 'nodeRef', id: arg.id };
+        }
+    }
+    throw new Error(`Cannot serialize query arg: ${JSON.stringify(arg)}`);
+}
+export function serializeSortByPath(sort) {
+    return {
+        paths: sort.paths.map((p) => p.toString()),
+        direction: sort.direction,
+    };
+}
+export function serializeRawMinusEntry(entry) {
+    const json = {};
+    if (entry.shapeId)
+        json.shapeId = entry.shapeId;
+    if (entry.where)
+        json.where = serializeWherePath(entry.where);
+    if (entry.propertyPaths) {
+        json.propertyPaths = entry.propertyPaths.map((pp) => pp.map((seg) => seg.propertyShapeId));
+    }
+    return json;
+}
+// =============================================================================
+// Deserialization
+// =============================================================================
+export function deserializeQueryPropertyPath(shape, steps) {
+    var _a;
+    const result = [];
+    let currentShape = shape;
+    for (const step of steps) {
+        if (step.kind === 'property') {
+            const propertyShape = currentShape.getPropertyShape(step.label);
+            if (!propertyShape) {
+                throw new Error(`Property '${step.label}' not found on shape '${currentShape.label || currentShape.id}'`);
+            }
+            const queryStep = { property: propertyShape };
+            if (step.where) {
+                const nestedShape = propertyShape.valueShape
+                    ? (_a = getShapeClass(propertyShape.valueShape)) === null || _a === void 0 ? void 0 : _a.shape
+                    : currentShape;
+                queryStep.where = deserializeWherePath(nestedShape || currentShape, step.where);
+            }
+            result.push(queryStep);
+            // Advance shape context for subsequent traversals
+            if (propertyShape.valueShape) {
+                const cls = getShapeClass(propertyShape.valueShape);
+                if (cls === null || cls === void 0 ? void 0 : cls.shape)
+                    currentShape = cls.shape;
+            }
+        }
+        else if (step.kind === 'size') {
+            result.push({
+                count: deserializeQueryPropertyPath(currentShape, step.count),
+                label: step.label,
+            });
+        }
+        else {
+            // shapeRef
+            result.push({ id: step.id, shape: { id: step.shapeId } });
+        }
+    }
+    return result;
+}
+export function deserializeWherePath(shape, json) {
+    if (json.kind === 'expression') {
+        const refs = new Map();
+        if (json.refs) {
+            for (const [k, v] of Object.entries(json.refs))
+                refs.set(k, v);
+        }
+        return { expressionNode: new ExpressionNode(json.ir, refs) };
+    }
+    if (json.kind === 'exists') {
+        if (!ExistsConditionCtor)
+            throw new Error('ExistsCondition is not available on this build');
+        const predRefs = deserializeRefMap(json.predicate.refs);
+        const predicate = new ExpressionNode(json.predicate.ir, predRefs);
+        const chain = json.chain.map((c) => {
+            if (c.condition.kind === 'exists') {
+                const innerRefs = deserializeRefMap(c.condition.predicate.refs);
+                return { op: c.op, condition: new ExistsConditionCtor(c.condition.pathSegmentIds, new ExpressionNode(c.condition.predicate.ir, innerRefs), c.condition.negated) };
+            }
+            const exprRefs = deserializeRefMap(c.condition.refs);
+            return { op: c.op, condition: new ExpressionNode(c.condition.ir, exprRefs) };
+        });
+        return { existsCondition: new ExistsConditionCtor(json.pathSegmentIds, predicate, json.negated, chain) };
+    }
+    if (json.kind === 'andOr') {
+        return {
+            firstPath: deserializeWherePath(shape, json.firstPath),
+            andOr: json.andOr.map((token) => {
+                const t = {};
+                if (token.and)
+                    t.and = deserializeWherePath(shape, token.and);
+                if (token.or)
+                    t.or = deserializeWherePath(shape, token.or);
+                return t;
+            }),
+        };
+    }
+    // evaluation (legacy)
+    return {
+        path: deserializeQueryPropertyPath(shape, json.path),
+        method: json.method,
+        args: json.args.map((a) => deserializeQueryArg(shape, a)),
+    };
+}
+function deserializeRefMap(refs) {
+    const m = new Map();
+    if (refs) {
+        for (const [k, v] of Object.entries(refs))
+            m.set(k, v);
+    }
+    return m;
+}
+function deserializeQueryArg(shape, json) {
+    switch (json.kind) {
+        case 'primitive':
+            return json.value;
+        case 'date':
+            return new Date(json.value);
+        case 'nodeRef':
+            return { id: json.id };
+        case 'where':
+            return deserializeWherePath(shape, json.where);
+        case 'argPath':
+            return {
+                path: deserializeQueryPropertyPath(shape, json.path),
+                subject: { id: json.subject.id, shape: { id: json.subject.shapeId } },
+            };
+    }
+}
+export function deserializeSortByPath(shape, json) {
+    return {
+        paths: json.paths.map((p) => walkPropertyPath(shape, p)),
+        direction: json.direction,
+    };
+}
+export function deserializeRawMinusEntry(shape, json) {
+    const entry = {};
+    if (json.shapeId)
+        entry.shapeId = json.shapeId;
+    if (json.where)
+        entry.where = deserializeWherePath(shape, json.where);
+    if (json.propertyPaths) {
+        entry.propertyPaths = json.propertyPaths.map((pp) => pp.map((id) => ({ propertyShapeId: id })));
+    }
+    return entry;
+}
+//# sourceMappingURL=QueryBuilderSerialization.js.map

package/lib/esm/queries/QueryBuilderSerialization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderSerialization.js","sourceRoot":"","sources":["../../../src/queries/QueryBuilderSerialization.ts"],"names":[],"mappings":"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"}

package/lib/esm/sparql/irToAlgebra.js

@@ -86,6 +86,34 @@ function joinNodes(left, right) {
         return right;
     return { type: 'join', left, right };
 }
+function bindingKey(alias, property) {
+    return `${alias}::${property}`;
+}
+function contextAliasKey(contextIri) {
+    return `__ctx__${contextIri}`;
+}
+function mergeKeySets(...sets) {
+    const merged = new Set();
+    for (const set of sets) {
+        for (const key of set) {
+            merged.add(key);
+        }
+    }
+    return merged;
+}
+function intersectKeySets(sets) {
+    if (sets.length === 0) {
+        return new Set();
+    }
+    const [first, ...rest] = sets;
+    const intersection = new Set(first);
+    for (const value of intersection) {
+        if (!rest.every((set) => set.has(value))) {
+            intersection.delete(value);
+        }
+    }
+    return intersection;
+}
 // ---------------------------------------------------------------------------
 // Pattern helpers
 // ---------------------------------------------------------------------------
@@ -126,7 +154,7 @@ class VariableRegistry {
         this.usedVarNames = new Set();
     }
     key(alias, property) {
-        return `${alias}::${property}`;
+        return bindingKey(alias, property);
     }
     has(alias, property) {
         return this.map.has(this.key(alias, property));
@@ -186,6 +214,13 @@ function containsAggregate(expr) {
  */
 export function selectToAlgebra(query, _options) {
     const registry = new VariableRegistry();
+    // Promote bindings only when the top-level WHERE would reject rows without
+    // them. This keeps human-like SPARQL for null-rejecting filters without
+    // over-constraining OR cases that can still match through other branches.
+    const requiredPropertyKeys = query.where
+        ? collectRequiredBindingKeys(query.where)
+        : new Set();
+    const requiredPropertyTriples = [];
     // Track property triples that need to be added as OPTIONAL
     const optionalPropertyTriples = [];
     // Track filtered traversals (inline where) — these get their own OPTIONAL blocks
@@ -218,14 +253,14 @@ export function selectToAlgebra(query, _options) {
     //    to discover any additional property_expr references.
     //    Properties already registered by inline filters (above) will be skipped.
     for (const item of query.projection) {
-        processExpressionForProperties(item.expression, registry, optionalPropertyTriples);
+        processExpressionForProperties(item.expression, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
     }
     if (query.where) {
-        processExpressionForProperties(query.where, registry, optionalPropertyTriples);
+        processExpressionForProperties(query.where, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
     }
     if (query.orderBy) {
         for (const orderItem of query.orderBy) {
-            processExpressionForProperties(orderItem.expression, registry, optionalPropertyTriples);
+            processExpressionForProperties(orderItem.expression, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
         }
     }
     // 5. Build the algebra tree
@@ -233,7 +268,7 @@ export function selectToAlgebra(query, _options) {
     //    - Wrap each optional property triple in a LeftJoin
     const requiredBgp = {
         type: 'bgp',
-        triples: [...requiredTriples, ...traverseTriples],
+        triples: [...requiredTriples, ...traverseTriples, ...requiredPropertyTriples],
     };
     let algebra = requiredBgp;
     // 5b. Build filtered OPTIONAL blocks for inline where traversals.
@@ -469,39 +504,42 @@ function processPattern(pattern, registry, traverseTriples, optionalPropertyTrip
 // ---------------------------------------------------------------------------
 // Expression processing — discover property_expr references
 // ---------------------------------------------------------------------------
-function processExpressionForProperties(expr, registry, optionalPropertyTriples) {
+function processExpressionForProperties(expr, registry, optionalPropertyTriples, requiredPropertyTriples = [], requiredPropertyKeys = new Set()) {
     switch (expr.kind) {
         case 'property_expr': {
             if (!registry.has(expr.sourceAlias, expr.property)) {
-                // Create a new OPTIONAL triple for this property
                 const varName = registry.getOrCreate(expr.sourceAlias, expr.property);
                 const predicate = expr.pathExpr
                     ? { kind: 'path', value: pathExprToSparql(expr.pathExpr), uris: collectPathUris(expr.pathExpr) }
                     : iriTerm(expr.property);
-                optionalPropertyTriples.push(tripleOf(varTerm(expr.sourceAlias), predicate, varTerm(varName)));
+                const triple = tripleOf(varTerm(expr.sourceAlias), predicate, varTerm(varName));
+                const triples = requiredPropertyKeys.has(bindingKey(expr.sourceAlias, expr.property))
+                    ? requiredPropertyTriples
+                    : optionalPropertyTriples;
+                triples.push(triple);
             }
             break;
         }
         case 'binary_expr':
-            processExpressionForProperties(expr.left, registry, optionalPropertyTriples);
-            processExpressionForProperties(expr.right, registry, optionalPropertyTriples);
+            processExpressionForProperties(expr.left, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
+            processExpressionForProperties(expr.right, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
             break;
         case 'logical_expr':
             for (const sub of expr.expressions) {
-                processExpressionForProperties(sub, registry, optionalPropertyTriples);
+                processExpressionForProperties(sub, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
             }
             break;
         case 'not_expr':
-            processExpressionForProperties(expr.expression, registry, optionalPropertyTriples);
+            processExpressionForProperties(expr.expression, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
             break;
         case 'function_expr':
             for (const arg of expr.args) {
-                processExpressionForProperties(arg, registry, optionalPropertyTriples);
+                processExpressionForProperties(arg, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
             }
             break;
         case 'aggregate_expr':
             for (const arg of expr.args) {
-                processExpressionForProperties(arg, registry, optionalPropertyTriples);
+                processExpressionForProperties(arg, registry, optionalPropertyTriples, requiredPropertyTriples, requiredPropertyKeys);
             }
             break;
         case 'exists_expr':
@@ -513,10 +551,14 @@ function processExpressionForProperties(expr, registry, optionalPropertyTriples)
             // Context entity property — emit a triple with fixed IRI as subject.
             // Use raw IRI as registry key to avoid collision between IRIs that
             // sanitize to the same string (e.g. ctx-1 vs ctx_1).
-            const ctxKey = `__ctx__${expr.contextIri}`;
+            const ctxKey = contextAliasKey(expr.contextIri);
             if (!registry.has(ctxKey, expr.property)) {
                 const varName = registry.getOrCreate(ctxKey, expr.property);
-                optionalPropertyTriples.push(tripleOf(iriTerm(expr.contextIri), iriTerm(expr.property), varTerm(varName)));
+                const triple = tripleOf(iriTerm(expr.contextIri), iriTerm(expr.property), varTerm(varName));
+                const triples = requiredPropertyKeys.has(bindingKey(ctxKey, expr.property))
+                    ? requiredPropertyTriples
+                    : optionalPropertyTriples;
+                triples.push(triple);
             }
             break;
         }
@@ -527,6 +569,37 @@ function processExpressionForProperties(expr, registry, optionalPropertyTriples)
             break;
     }
 }
+/**
+ * Compute which bindings are mandatory for a top-level FILTER to keep a row.
+ * AND makes either side required; OR only keeps bindings required by every branch.
+ */
+function collectRequiredBindingKeys(expr) {
+    switch (expr.kind) {
+        case 'property_expr':
+            return new Set([bindingKey(expr.sourceAlias, expr.property)]);
+        case 'context_property_expr':
+            return new Set([bindingKey(contextAliasKey(expr.contextIri), expr.property)]);
+        case 'binary_expr':
+            return mergeKeySets(collectRequiredBindingKeys(expr.left), collectRequiredBindingKeys(expr.right));
+        case 'function_expr':
+            return mergeKeySets(...expr.args.map((arg) => collectRequiredBindingKeys(arg)));
+        case 'not_expr':
+            return collectRequiredBindingKeys(expr.expression);
+        case 'logical_expr': {
+            const childSets = expr.expressions.map((sub) => collectRequiredBindingKeys(sub));
+            if (expr.operator === 'and') {
+                return mergeKeySets(...childSets);
+            }
+            return intersectKeySets(childSets);
+        }
+        case 'aggregate_expr':
+        case 'exists_expr':
+        case 'literal_expr':
+        case 'reference_expr':
+        case 'alias_expr':
+            return new Set();
+    }
+}
 // ---------------------------------------------------------------------------
 // Expression conversion
 // ---------------------------------------------------------------------------