@_linked/core 2.10.0 → 2.10.1-next.20260702053252

package/lib/cjs/queries/ZcExpression.js

@@ -0,0 +1,369 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.segmentsToPath = segmentsToPath;
+exports.pathToSegmentIds = pathToSegmentIds;
+exports.encodeValueExpr = encodeValueExpr;
+exports.decodeValueExpr = decodeValueExpr;
+exports.encodeCondition = encodeCondition;
+exports.decodeCondition = decodeCondition;
+const ExpressionNode_js_1 = require("../expressions/ExpressionNode.js");
+const PropertyPath_js_1 = require("./PropertyPath.js");
+const COMPARISON_OPS = new Set([
+    '=',
+    '!=',
+    '>',
+    '>=',
+    '<',
+    '<=',
+]);
+const COMBINATORS = new Set(['and', 'or', 'not']);
+// ---------------------------------------------------------------------------
+// Path helpers
+// ---------------------------------------------------------------------------
+/** PropertyShape id = `{shapeId}/{label}` (SHACL.ts), so the label is the last segment. */
+function labelOf(segmentIri) {
+    const i = segmentIri.lastIndexOf('/');
+    return i >= 0 ? segmentIri.slice(i + 1) : segmentIri;
+}
+/** Property-shape IRIs → a dotted label path. */
+function segmentsToPath(segmentIds) {
+    return segmentIds.map(labelOf).join('.');
+}
+/** A dotted label path → its property-shape IRIs, resolved against `shape`. */
+function pathToSegmentIds(shape, path) {
+    return (0, PropertyPath_js_1.walkPropertyPath)(shape, path).segments.map((s) => s.id);
+}
+// ---------------------------------------------------------------------------
+// refs merging
+// ---------------------------------------------------------------------------
+function mergeRefs(into, from) {
+    for (const [k, v] of from)
+        into.set(k, v);
+}
+// ---------------------------------------------------------------------------
+// VALUE tier
+// ---------------------------------------------------------------------------
+/** Encode an IR expression used as a value/operand into a Z-c value. */
+function encodeValueExpr(ir, refs) {
+    switch (ir.kind) {
+        case 'literal_expr': {
+            const v = ir.value;
+            if (v instanceof Date)
+                return { date: v.toISOString() };
+            return v;
+        }
+        case 'reference_expr':
+            if (ir.contextName !== undefined)
+                return { $ctx: ir.contextName };
+            return { id: ir.value };
+        case 'context_property_expr':
+            return { $ctx: ir.contextName, path: labelOf(ir.property) };
+        case 'property_expr': {
+            const segs = refs.get(ir.sourceAlias);
+            return { path: segs ? segmentsToPath(segs) : labelOf(ir.property) };
+        }
+        case 'alias_expr': {
+            const segs = refs.get(ir.alias);
+            // A bare alias_expr as a value is the node at the end of the traversal.
+            return { path: segs ? segmentsToPath(segs) : ir.alias };
+        }
+        case 'binary_expr':
+            return [
+                ir.operator,
+                encodeValueExpr(ir.left, refs),
+                encodeValueExpr(ir.right, refs),
+            ];
+        case 'logical_expr':
+            return [ir.operator, ...ir.expressions.map((e) => encodeValueExpr(e, refs))];
+        case 'not_expr':
+            return ['not', encodeValueExpr(ir.expression, refs)];
+        case 'function_expr':
+            return [ir.name, ...ir.args.map((a) => encodeValueExpr(a, refs))];
+        case 'aggregate_expr':
+            return [ir.name, ...ir.args.map((a) => encodeValueExpr(a, refs))];
+        default:
+            throw new Error(`Cannot encode expression of kind '${ir.kind}'`);
+    }
+}
+/** Decode a Z-c value back into an IR expression + its placeholder refs. */
+function decodeValueExpr(zc, shape) {
+    // S-expr array
+    if (Array.isArray(zc)) {
+        const [head, ...operands] = zc;
+        const refs = new Map();
+        const args = operands.map((o) => {
+            const { ir, refs: r } = decodeValueExpr(o, shape);
+            mergeRefs(refs, r);
+            return ir;
+        });
+        return { ir: headToIR(head, args), refs };
+    }
+    // Objects: recognized value-objects
+    if (zc !== null && typeof zc === 'object') {
+        const o = zc;
+        if ('id' in o) {
+            return { ir: { kind: 'reference_expr', value: o.id }, refs: new Map() };
+        }
+        if ('$ctx' in o) {
+            if (typeof o.path === 'string') {
+                const property = pathToSegmentIds(shape, o.path).pop();
+                return {
+                    ir: { kind: 'context_property_expr', contextName: o.$ctx, property },
+                    refs: new Map(),
+                };
+            }
+            return { ir: { kind: 'reference_expr', contextName: o.$ctx }, refs: new Map() };
+        }
+        if ('date' in o) {
+            return { ir: { kind: 'literal_expr', value: new Date(o.date) }, refs: new Map() };
+        }
+        if ('path' in o) {
+            return propertyOrAlias(shape, o.path);
+        }
+        if ('list' in o) {
+            throw new Error('A {list} value is only valid as an in/nin operand');
+        }
+    }
+    // bare scalar literal
+    return { ir: { kind: 'literal_expr', value: zc }, refs: new Map() };
+}
+/**
+ * Resolve a dotted path to its expression node:
+ *  - empty path `""` → `alias_expr` (the bare subject, e.g. `p.equals(x)`);
+ *  - any non-empty path → `property_expr` (a property access, relation or not —
+ *    `p.bestFriend.equals(x)` compares the property value, no traversal).
+ */
+function propertyOrAlias(shape, path) {
+    const node = path === ''
+        ? (0, ExpressionNode_js_1.tracedAliasExpression)([])
+        : (0, ExpressionNode_js_1.tracedPropertyExpression)(pathToSegmentIds(shape, path));
+    return { ir: node.ir, refs: node._refs };
+}
+/** Build an IR node from an S-expr head symbol/name + decoded args. */
+function headToIR(head, args) {
+    if (head === 'and' || head === 'or') {
+        return { kind: 'logical_expr', operator: head, expressions: args };
+    }
+    if (head === 'not') {
+        return { kind: 'not_expr', expression: args[0] };
+    }
+    if (COMPARISON_OPS.has(head) || '+-*/'.includes(head)) {
+        return { kind: 'binary_expr', operator: head, left: args[0], right: args[1] };
+    }
+    if (AGGREGATES.has(head)) {
+        return { kind: 'aggregate_expr', name: head, args };
+    }
+    // default: a named function (verbatim IR function name, e.g. STRLEN)
+    return { kind: 'function_expr', name: head, args };
+}
+const AGGREGATES = new Set(['count', 'sum', 'avg', 'min', 'max']);
+// ---------------------------------------------------------------------------
+// CONDITION tier
+// ---------------------------------------------------------------------------
+/** Encode a where-clause node (boolean) into a Z-c condition. */
+function encodeCondition(node, shape) {
+    if (node instanceof ExpressionNode_js_1.ExistsCondition) {
+        return encodeExists(node, shape);
+    }
+    return encodeBoolExpr(node.ir, node._refs, shape);
+}
+function encodeExists(ec, shape) {
+    const rel = segmentsToPath(ec.pathSegmentIds);
+    let quantifier;
+    let predIr = ec.predicate.ir;
+    const predRefs = ec.predicate._refs;
+    if (!ec.negated) {
+        quantifier = 'some';
+    }
+    else if (predIr.kind === 'not_expr') {
+        // every(fn) was built as NOT EXISTS(NOT fn) — unwrap the inner predicate.
+        quantifier = 'every';
+        predIr = predIr.expression;
+    }
+    else {
+        quantifier = 'none';
+    }
+    let base = {
+        [`${rel}.${quantifier}`]: encodeBoolExpr(predIr, predRefs, shape),
+    };
+    // Fold any chained and/or conditions into nested logical combinators.
+    for (const { op, condition } of ec.chain) {
+        const c = encodeCondition(condition instanceof ExpressionNode_js_1.ExistsCondition ? condition : condition, shape);
+        base = { [op]: [base, c] };
+    }
+    return base;
+}
+/** Encode a boolean IR expression into a Z-c condition (path-keyed where possible). */
+function encodeBoolExpr(ir, refs, shape) {
+    if (ir.kind === 'logical_expr') {
+        const parts = ir.expressions.map((e) => encodeBoolExpr(e, refs, shape));
+        if (ir.operator === 'and') {
+            const merged = tryMergeAnd(parts);
+            if (merged)
+                return merged;
+        }
+        return { [ir.operator]: parts };
+    }
+    if (ir.kind === 'not_expr') {
+        return { not: encodeBoolExpr(ir.expression, refs, shape) };
+    }
+    if (ir.kind === 'binary_expr' && COMPARISON_OPS.has(ir.operator)) {
+        const key = pathKeyOf(ir.left, refs);
+        if (key !== null) {
+            const value = encodeValueExpr(ir.right, refs);
+            if (ir.operator === '=')
+                return { [key]: value };
+            return { [key]: { [ir.operator]: value } };
+        }
+    }
+    // Fallback: S-expr (boolean expression that isn't a simple path-keyed shape).
+    return encodeValueExpr(ir, refs);
+}
+/** A path key for a left operand that is a single property/alias/context property. */
+function pathKeyOf(ir, refs) {
+    if (ir.kind === 'property_expr') {
+        const segs = refs.get(ir.sourceAlias);
+        return segs ? segmentsToPath(segs) : labelOf(ir.property);
+    }
+    if (ir.kind === 'alias_expr') {
+        const segs = refs.get(ir.alias);
+        return segs ? segmentsToPath(segs) : null;
+    }
+    if (ir.kind === 'context_property_expr') {
+        return null; // a context property on the LHS is uncommon; use S-expr
+    }
+    return null;
+}
+/** Merge AND conjuncts into one path-keyed object iff all are distinct single-key path conditions. */
+function tryMergeAnd(parts) {
+    const out = {};
+    for (const p of parts) {
+        if (Array.isArray(p) || typeof p !== 'object' || p === null)
+            return null;
+        const keys = Object.keys(p);
+        if (keys.length !== 1)
+            return null;
+        const k = keys[0];
+        if (COMBINATORS.has(k) || k in out)
+            return null;
+        out[k] = p[k];
+    }
+    return out;
+}
+/** Decode a Z-c condition into a runtime WherePath (`{expressionNode}` | `{existsCondition}`). */
+function decodeCondition(zc, shape) {
+    const node = decodeConditionNode(zc, shape);
+    return node instanceof ExpressionNode_js_1.ExistsCondition
+        ? { existsCondition: node }
+        : { expressionNode: node };
+}
+function decodeConditionNode(zc, shape) {
+    // S-expr fallback
+    if (Array.isArray(zc)) {
+        const { ir, refs } = decodeValueExpr(zc, shape);
+        return new ExpressionNode_js_1.ExpressionNode(ir, refs);
+    }
+    const o = zc;
+    const keys = Object.keys(o);
+    // Combinators
+    if (keys.length === 1 && COMBINATORS.has(keys[0])) {
+        const k = keys[0];
+        if (k === 'not') {
+            const inner = decodeConditionNode(o.not, shape);
+            if (inner instanceof ExpressionNode_js_1.ExistsCondition)
+                return inner.not();
+            return new ExpressionNode_js_1.ExpressionNode({ kind: 'not_expr', expression: inner.ir }, inner._refs);
+        }
+        // and / or
+        const elems = o[k].map((c) => decodeConditionNode(c, shape));
+        // An exists-chain: first operand is an ExistsCondition → fold the rest as its chain.
+        if (elems[0] instanceof ExpressionNode_js_1.ExistsCondition) {
+            let ec = elems[0];
+            for (let i = 1; i < elems.length; i++) {
+                ec = (k === 'and' ? ec.and(elems[i]) : ec.or(elems[i]));
+            }
+            return ec;
+        }
+        const refs = new Map();
+        const expressions = elems.map((e) => {
+            mergeRefs(refs, e._refs);
+            return e.ir;
+        });
+        return new ExpressionNode_js_1.ExpressionNode({ kind: 'logical_expr', operator: k, expressions }, refs);
+    }
+    // Single quantifier key: "rel.some" | "rel.every" | "rel.none"
+    if (keys.length === 1) {
+        const q = matchQuantifier(keys[0]);
+        if (q) {
+            const predicate = expressionNodeFromCondition(o[keys[0]], shape);
+            const segmentIds = pathToSegmentIds(shape, q.rel);
+            if (q.kind === 'some')
+                return new ExpressionNode_js_1.ExistsCondition(segmentIds, predicate, false);
+            if (q.kind === 'none')
+                return new ExpressionNode_js_1.ExistsCondition(segmentIds, predicate, true);
+            // every(fn) = NOT EXISTS(NOT fn)
+            return new ExpressionNode_js_1.ExistsCondition(segmentIds, new ExpressionNode_js_1.ExpressionNode({ kind: 'not_expr', expression: predicate.ir }, predicate._refs), true);
+        }
+    }
+    // Path-keyed condition(s): one or more `path: value|opMap` → AND of comparisons.
+    const refs = new Map();
+    const comparisons = [];
+    for (const key of keys) {
+        const left = propertyOrAlias(shape, key);
+        mergeRefs(refs, left.refs);
+        const v = o[key];
+        for (const cmp of comparisonsFor(left.ir, v, shape, refs))
+            comparisons.push(cmp);
+    }
+    const ir = comparisons.length === 1
+        ? comparisons[0]
+        : { kind: 'logical_expr', operator: 'and', expressions: comparisons };
+    return new ExpressionNode_js_1.ExpressionNode(ir, refs);
+}
+function comparisonsFor(left, value, shape, refs) {
+    // operator map: { ">": 18, "<": 65 }
+    if (isOpMap(value)) {
+        return Object.entries(value).map(([op, v]) => {
+            const r = decodeValueExpr(v, shape);
+            mergeRefs(refs, r.refs);
+            return { kind: 'binary_expr', operator: op, left, right: r.ir };
+        });
+    }
+    // implicit equals
+    const r = decodeValueExpr(value, shape);
+    mergeRefs(refs, r.refs);
+    return [{ kind: 'binary_expr', operator: '=', left, right: r.ir }];
+}
+/** An object whose keys are all operator symbols (not a recognized value-object). */
+function isOpMap(value) {
+    if (Array.isArray(value) || value === null || typeof value !== 'object')
+        return false;
+    const keys = Object.keys(value);
+    if (keys.length === 0)
+        return false;
+    if (keys.some((k) => k === 'id' || k === '$ctx' || k === 'path' || k === 'date' || k === 'list')) {
+        return false;
+    }
+    // Only comparison operators form an op-map. `in`/`nin` are intentionally NOT
+    // recognized here: there is no matching IR operator or encoder path yet, so
+    // accepting them would only produce a broken decode (backlog 002, G7).
+    return keys.every((k) => COMPARISON_OPS.has(k));
+}
+function matchQuantifier(key) {
+    for (const kind of ['some', 'every', 'none']) {
+        if (key.endsWith(`.${kind}`)) {
+            return { rel: key.slice(0, -(kind.length + 1)), kind };
+        }
+    }
+    return null;
+}
+/** A quantifier predicate decodes to an ExpressionNode (its inner boolean). */
+function expressionNodeFromCondition(zc, shape) {
+    const node = decodeConditionNode(zc, shape);
+    if (node instanceof ExpressionNode_js_1.ExistsCondition) {
+        // Nested exists as a predicate is uncommon; wrap is not representable here.
+        throw new Error('Nested exists inside a quantifier predicate is not supported');
+    }
+    return node;
+}
+//# sourceMappingURL=ZcExpression.js.map

package/lib/cjs/queries/ZcExpression.js.map

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

package/lib/cjs/queries/lowerMutationJSON.d.ts

@@ -1,10 +1,23 @@
+/**
+ * Lower mutation DSL-JSON to canonical IR.
+ *
+ * This is the **IR side** of mutation (de)serialization, kept deliberately
+ * separate from the IR-free wire codec in `MutationSerialization.ts`. The
+ * canonical-IR builders (`IRMutation` / `IRLower` / …) are reachable only from
+ * here and from `lower()`, so a client that serializes mutations to JSON and
+ * forwards them (without ever lowering) tree-shakes the whole IR pipeline away.
+ */
+import type { NodeShape } from '../shapes/SHACL.js';
 import { type NodeDescriptionValue } from './QueryFactory.js';
 import type { IRCreateQuery } from './CreateQuery.js';
 import type { IRUpdateQuery } from './UpdateQuery.js';
 import type { IRDeleteQuery } from './DeleteQuery.js';
 import { type MutationJSON, type MutationNodeDataJSON } from './MutationSerialization.js';
-/** Rebuild a normalized node description from JSON, resolving labels via the shape. */
-export declare function decodeNodeData(json: MutationNodeDataJSON): NodeDescriptionValue;
+/**
+ * Rebuild a normalized node description from path-keyed JSON, resolving labels via the
+ * shape. `shape` is the shape inferred from context; `__shape` overrides it.
+ */
+export declare function decodeNodeData(json: MutationNodeDataJSON, shape?: NodeShape): NodeDescriptionValue;
 /**
  * Lower a mutation DSL-JSON envelope to the canonical IR mutation the dataset
  * expects. Mirrors the IR that `lower()` produces from the live builder.

package/lib/cjs/queries/lowerMutationJSON.js

@@ -17,6 +17,7 @@ const IRMutation_js_1 = require("./IRMutation.js");
 const ContextRef_js_1 = require("./ContextRef.js");
 const wireVersion_js_1 = require("./wireVersion.js");
 const MutationSerialization_js_1 = require("./MutationSerialization.js");
+const ZcExpression_js_1 = require("./ZcExpression.js");
 function requireShape(shapeId) {
     var _a;
     const shape = (_a = (0, ShapeClass_js_1.getShapeClass)(shapeId)) === null || _a === void 0 ? void 0 : _a.shape;
@@ -25,53 +26,72 @@ function requireShape(shapeId) {
     }
     return shape;
 }
-/** Decode a tagged value to the normalized form the canonical-IR builders consume. */
-function decodeValue(json) {
-    switch (json.kind) {
-        case 'unset':
-            return undefined;
-        case 'lit':
-            return json.value;
-        case 'date':
-            return new Date(json.value);
-        case 'ref':
-            return { id: json.id };
-        case 'ctxRef': {
-            // Lowering path: a mutation must hit a concrete node, so resolve the
-            // context now and throw if it isn't set.
-            const id = (0, ContextRef_js_1.resolveContextId)(json.name, true);
-            return { id };
-        }
-        case 'node':
-            return decodeNodeData(json.data);
-        case 'array':
-            return json.items.map((item) => decodeValue(item));
-        case 'setMod': {
-            const mod = {};
-            if (json.add) {
-                mod.$add = json.add.map((v) => decodeValue(v));
-            }
-            if (json.remove)
-                mod.$remove = json.remove.map((id) => ({ id }));
-            return mod;
+/**
+ * Decode a Z-c value to the normalized form the canonical-IR builders consume.
+ * `currentShape` resolves computed `{path}`/S-expr; `prop` gives a nested node's shape.
+ */
+function decodeValue(json, currentShape, prop) {
+    var _a;
+    // S-expr computed value (no IR on the wire)
+    if (Array.isArray(json)) {
+        const { ir, refs } = (0, ZcExpression_js_1.decodeValueExpr)(json, currentShape);
+        return new ExpressionNode_js_1.ExpressionNode(ir, refs);
+    }
+    if (json === null)
+        return null;
+    if (typeof json !== 'object')
+        return json; // bare scalar literal
+    const o = json;
+    if ('unset' in o)
+        return undefined;
+    if ('date' in o)
+        return new Date(o.date);
+    if ('$ctx' in o) {
+        // Lowering path: a mutation must hit a concrete node, so resolve the
+        // context now and throw if it isn't set.
+        const id = (0, ContextRef_js_1.resolveContextId)(o.$ctx, true);
+        return { id };
+    }
+    if ('id' in o)
+        return { id: o.id };
+    if ('list' in o) {
+        return o.list.map((item) => decodeValue(item, currentShape, prop));
+    }
+    if ('add' in o || 'remove' in o) {
+        const mod = {};
+        if (o.add) {
+            mod.$add = o.add.map((v) => decodeValue(v, currentShape, prop));
         }
-        case 'expr':
-            return new ExpressionNode_js_1.ExpressionNode(json.ir, (0, MutationSerialization_js_1.recordToRefs)(json.refs));
+        if (o.remove)
+            mod.$remove = o.remove.map((id) => ({ id }));
+        return mod;
+    }
+    if ('path' in o) {
+        const { ir, refs } = (0, ZcExpression_js_1.decodeValueExpr)(json, currentShape);
+        return new ExpressionNode_js_1.ExpressionNode(ir, refs);
     }
+    // Otherwise: a bare path-keyed nested-node create.
+    return decodeNodeData(o, (_a = (0, MutationSerialization_js_1.valueShapeOf)(prop)) !== null && _a !== void 0 ? _a : currentShape);
 }
-/** Rebuild a normalized node description from JSON, resolving labels via the shape. */
-function decodeNodeData(json) {
-    const shape = requireShape(json.shape);
-    const fields = json.fields.map((f) => {
-        const prop = shape.getPropertyShape(f.prop);
+/**
+ * Rebuild a normalized node description from path-keyed JSON, resolving labels via the
+ * shape. `shape` is the shape inferred from context; `__shape` overrides it.
+ */
+function decodeNodeData(json, shape) {
+    const nodeShape = typeof json.__shape === 'string' ? requireShape(json.__shape) : shape;
+    const fields = [];
+    for (const [key, val] of Object.entries(json)) {
+        if (key === '__id' || key === '__shape' || val === undefined)
+            continue;
+        const prop = nodeShape.getPropertyShape(key);
         if (!prop) {
-            throw new Error(`Property '${f.prop}' not found on shape '${shape.label || shape.id}'`);
+            throw new Error(`Property '${key}' not found on shape '${nodeShape.label || nodeShape.id}'`);
         }
-        return { prop, val: decodeValue(f.value) };
-    });
-    const desc = { shape, fields };
-    if (json.id)
-        desc.__id = json.id;
+        fields.push({ prop, val: decodeValue(val, nodeShape, prop) });
+    }
+    const desc = { shape: nodeShape, fields };
+    if (typeof json.__id === 'string')
+        desc.__id = json.__id;
     return desc;
 }
 function lowerWhere(shape, json) {
@@ -86,14 +106,16 @@ function lowerWhere(shape, json) {
 function lowerMutationJSON(json) {
     (0, wireVersion_js_1.assertWireVersion)(json.v);
     switch (json.op) {
-        case 'create':
+        case 'create': {
+            const shape = requireShape(json.shape);
             return (0, IRMutation_js_1.buildCanonicalCreateMutationIR)({
-                shape: requireShape(json.shape),
-                description: decodeNodeData(json.data),
+                shape,
+                description: decodeNodeData(json.data, shape),
             });
+        }
         case 'update': {
             const shape = requireShape(json.shape);
-            const updates = decodeNodeData(json.data);
+            const updates = decodeNodeData(json.data, shape);
             if (json.mode === 'for') {
                 // A `{$ctx}` target resolves against the current context map; a mutation
                 // must hit a concrete subject, so an unresolved context throws.

package/lib/cjs/queries/lowerMutationJSON.js.map

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

package/lib/cjs/shapes/SHACL.js

@@ -322,7 +322,17 @@ const connectValueShape = (config, propertyKey, property) => {
         }
     }
 };
+/**
+ * The DSL-JSON where-clause combinators. A property may not be named after one,
+ * because a condition key in those positions has no `{path}` escape (the key is a
+ * bare string). See documentation/dsl-json.md (Reserved words).
+ */
+const RESERVED_PROPERTY_LABELS = new Set(['and', 'or', 'not']);
 function registerPropertyShape(shape, propertyShape) {
+    if (RESERVED_PROPERTY_LABELS.has(propertyShape.label)) {
+        throw new Error(`Property label '${propertyShape.label}' is reserved (a DSL-JSON boolean combinator) ` +
+            `and cannot be used as a property name. See documentation/dsl-json.md (Reserved words).`);
+    }
     const inherited = shape.getPropertyShape(propertyShape.label, true);
     const existing = shape.getPropertyShape(propertyShape.label, false);
     if (!existing && inherited) {