@metaobjectsdev/metadata 0.9.0-rc.1 → 0.10.0

package/dist/subtype-rules.js

@@ -1,12 +1,27 @@
 // Cross-language subtype rules for object subtypes.
 //
-//   - value objects MUST NOT have a primary identity (error)
+//   - value objects MUST NOT have ANY identity (primary, secondary,
+//     reference) — values are pure data shapes (error, FR-024/ADR-0028)
+//   - value objects MUST NOT have a source.* child — values are not
+//     persisted shapes (error, FR-024/ADR-0028)
 //   - entity objects SHOULD have a primary identity, unless @isAbstract (warning)
+//   - projection objects may only extend other projections (error,
+//     FR-024/ADR-0028); identity on a projection is OPTIONAL (no warning)
+//   - projection sources must have a read-only @kind — view,
+//     materializedView, storedProc, tableFunction (ERR_PROJECTION_SOURCE_WRITABLE)
 //   - base objects have no rule (template, may or may not have identity)
+//   - every identity.* node MUST have a name (FR-024 D2: identities are named,
+//     author-chosen, so the dotted by-name extends form can address them)
+//
+// The entity-primary-source-readonly hard cutover (an entity whose PRIMARY
+// source is a read-only kind must become a projection) is deferred to
+// FR-024 Phase E (B4b) — view-primary entities still load today.
 import { ParseError } from "./errors.js";
-import { TYPE_OBJECT, TYPE_IDENTITY } from "./shared/base-types.js";
+import { TYPE_OBJECT, TYPE_IDENTITY, TYPE_SOURCE, } from "./shared/base-types.js";
 import { IDENTITY_SUBTYPE_PRIMARY } from "./core/identity/identity-constants.js";
-import { OBJECT_SUBTYPE_ENTITY, OBJECT_SUBTYPE_VALUE, } from "./core/object/object-constants.js";
+import { OBJECT_SUBTYPE_ENTITY, OBJECT_SUBTYPE_VALUE, OBJECT_SUBTYPE_PROJECTION, } from "./core/object/object-constants.js";
+import { MetaSource } from "./persistence/source/meta-source.js";
+import { SOURCE_READ_ONLY_KINDS } from "./persistence/source/source-constants.js";
 export function validateSubtypeRules(root) {
     const errors = [];
     const warnings = [];
@@ -14,21 +29,90 @@ export function validateSubtypeRules(root) {
     return { errors, warnings };
 }
 function walk(model, errors, warnings) {
+    // FR-024 D2 — identity nodes require an author-chosen name (any nesting:
+    // object children AND field-nested identities). A nameless node parses
+    // with name === "".
+    if (model.type === TYPE_IDENTITY && model.name === "") {
+        const owner = model.parent?.fqn();
+        errors.push(new ParseError(`identity.${model.subType}${owner !== undefined && owner !== "" ? ` under '${owner}'` : ""} has no name — ` +
+            `identity nodes require an author-chosen name (e.g. "id") so dotted ` +
+            `extends refs can address them (FR-024)`, { code: "ERR_IDENTITY_NAME_REQUIRED", source: model.source }));
+    }
     if (model.type === TYPE_OBJECT) {
-        const hasPrimary = model.children().some((c) => c.type === TYPE_IDENTITY && c.subType === IDENTITY_SUBTYPE_PRIMARY);
-        if (model.subType === OBJECT_SUBTYPE_VALUE && hasPrimary) {
-            errors.push(new ParseError(`value object '${model.fqn()}' must not have a primary identity ` +
-                `(use subType: "entity" for records with identity)`, { code: "ERR_SUBTYPE_RULE_VIOLATION", source: model.source }));
-        }
-        else if (model.subType === OBJECT_SUBTYPE_ENTITY &&
-            !hasPrimary &&
-            !model.isAbstract) {
-            warnings.push(`entity object '${model.fqn()}' has no primary identity ` +
-                `(add an identity child or mark @isAbstract: true)`);
+        switch (model.subType) {
+            case OBJECT_SUBTYPE_VALUE:
+                validateValuePurity(model, errors);
+                break;
+            case OBJECT_SUBTYPE_ENTITY:
+                validateEntityIdentity(model, warnings);
+                break;
+            case OBJECT_SUBTYPE_PROJECTION:
+                validateProjectionLicensing(model, errors);
+                break;
+            default:
+                // object.base is a template — no rule.
+                break;
         }
     }
     for (const child of model.ownChildren()) {
         walk(child, errors, warnings);
     }
 }
+// FR-024 value purity (ADR-0028): a value object is a pure data shape — it
+// carries NO identity of any subtype and NO source.
+function validateValuePurity(model, errors) {
+    for (const child of model.children()) {
+        if (child.type === TYPE_IDENTITY) {
+            errors.push(new ParseError(`value object '${model.fqn()}' must not have an identity ` +
+                `(${TYPE_IDENTITY}.${child.subType} '${child.name}') — value objects are ` +
+                `pure data shapes; use subType: "entity" for records with identity ` +
+                `(FR-024, ADR-0028)`, { code: "ERR_SUBTYPE_RULE_VIOLATION", source: child.source }));
+        }
+        else if (child.type === TYPE_SOURCE) {
+            errors.push(new ParseError(`value object '${model.fqn()}' must not have a source ` +
+                `(${TYPE_SOURCE}.${child.subType}) — value objects are not persisted ` +
+                `shapes; use subType: "entity" or "projection" for stored objects ` +
+                `(FR-024, ADR-0028)`, { code: "ERR_SUBTYPE_RULE_VIOLATION", source: child.source }));
+        }
+    }
+}
+// Entities SHOULD have a primary identity unless abstract (warning).
+function validateEntityIdentity(model, warnings) {
+    const hasPrimary = model
+        .children()
+        .some((c) => c.type === TYPE_IDENTITY && c.subType === IDENTITY_SUBTYPE_PRIMARY);
+    if (!hasPrimary && !model.isAbstract) {
+        warnings.push(`entity object '${model.fqn()}' has no primary identity ` +
+            `(add an identity child or mark @isAbstract: true)`);
+    }
+}
+// FR-024 projection licensing (ADR-0028):
+//   - a projection's object-level extends may only target another
+//     object.projection (ERR_SUBTYPE_RULE_VIOLATION);
+//   - every source.* on a projection must have a read-only @kind
+//     (ERR_PROJECTION_SOURCE_WRITABLE);
+//   - identity is OPTIONAL on a projection — no warning when absent.
+function validateProjectionLicensing(model, errors) {
+    const sup = model.superResolved;
+    if (sup !== undefined &&
+        (sup.type !== TYPE_OBJECT || sup.subType !== OBJECT_SUBTYPE_PROJECTION)) {
+        errors.push(new ParseError(`projection '${model.fqn()}' extends '${sup.fqn()}' which is ` +
+            `${sup.type}.${sup.subType} — a projection may only extend another ` +
+            `projection (FR-024, ADR-0028)`, { code: "ERR_SUBTYPE_RULE_VIOLATION", source: model.source }));
+    }
+    // OWN sources only: an inherited source is validated on the (projection)
+    // object that declares it; an inherited source from a non-projection super
+    // is unreachable without first tripping the extends rule above.
+    for (const child of model.ownChildren()) {
+        if (child.type !== TYPE_SOURCE)
+            continue;
+        const kind = child instanceof MetaSource ? child.effectiveKind : child.subType;
+        if (!SOURCE_READ_ONLY_KINDS.has(kind)) {
+            errors.push(new ParseError(`projection '${model.fqn()}' has a writable source (@kind "${kind}") — ` +
+                `a projection is a derived read-only representation; its sources must ` +
+                `be read-only kinds (view, materializedView, storedProc, ` +
+                `tableFunction) (FR-024, ADR-0028)`, { code: "ERR_PROJECTION_SOURCE_WRITABLE", source: child.source }));
+        }
+    }
+}
 //# sourceMappingURL=subtype-rules.js.map

package/dist/subtype-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"subtype-rules.js","sourceRoot":"","sources":["../src/subtype-rules.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,6DAA6D;AAC7D,kFAAkF;AAClF,yEAAyE;AAGzE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAO3C,MAAM,UAAU,oBAAoB,CAAC,IAAc;IACjD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,IAAI,CAAC,KAAe,EAAE,MAAoB,EAAE,QAAkB;IACrE,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,wBAAwB,CAC1E,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,KAAK,oBAAoB,IAAI,UAAU,EAAE,CAAC;YACzD,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,iBAAiB,KAAK,CAAC,GAAG,EAAE,qCAAqC;gBAC/D,mDAAmD,EACrD,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAC7D,CACF,CAAC;QACJ,CAAC;aAAM,IACL,KAAK,CAAC,OAAO,KAAK,qBAAqB;YACvC,CAAC,UAAU;YACX,CAAC,KAAK,CAAC,UAAU,EACjB,CAAC;YACD,QAAQ,CAAC,IAAI,CACX,kBAAkB,KAAK,CAAC,GAAG,EAAE,4BAA4B;gBACvD,mDAAmD,CACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC;AACH,CAAC"}
+{"version":3,"file":"subtype-rules.js","sourceRoot":"","sources":["../src/subtype-rules.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,EAAE;AACF,oEAAoE;AACpE,wEAAwE;AACxE,oEAAoE;AACpE,gDAAgD;AAChD,kFAAkF;AAClF,mEAAmE;AACnE,0EAA0E;AAC1E,6DAA6D;AAC7D,mFAAmF;AACnF,yEAAyE;AACzE,+EAA+E;AAC/E,0EAA0E;AAC1E,EAAE;AACF,2EAA2E;AAC3E,sEAAsE;AACtE,iEAAiE;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAOlF,MAAM,UAAU,oBAAoB,CAAC,IAAc;IACjD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,IAAI,CAAC,KAAe,EAAE,MAAoB,EAAE,QAAkB;IACrE,yEAAyE;IACzE,uEAAuE;IACvE,oBAAoB;IACpB,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,YAAY,KAAK,CAAC,OAAO,GAAG,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,iBAAiB;YACzG,qEAAqE;YACrE,wCAAwC,EAC1C,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAC7D,CACF,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,QAAQ,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,oBAAoB;gBACvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACnC,MAAM;YACR,KAAK,qBAAqB;gBACxB,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACxC,MAAM;YACR,KAAK,yBAAyB;gBAC5B,2BAA2B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM;YACR;gBACE,uCAAuC;gBACvC,MAAM;QACV,CAAC;IACH,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,oDAAoD;AACpD,SAAS,mBAAmB,CAAC,KAAe,EAAE,MAAoB;IAChE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,iBAAiB,KAAK,CAAC,GAAG,EAAE,8BAA8B;gBACxD,IAAI,aAAa,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,IAAI,yBAAyB;gBAC1E,oEAAoE;gBACpE,oBAAoB,EACtB,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAC7D,CACF,CAAC;QACJ,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACtC,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,iBAAiB,KAAK,CAAC,GAAG,EAAE,2BAA2B;gBACrD,IAAI,WAAW,IAAI,KAAK,CAAC,OAAO,sCAAsC;gBACtE,mEAAmE;gBACnE,oBAAoB,EACtB,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAC7D,CACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,qEAAqE;AACrE,SAAS,sBAAsB,CAAC,KAAe,EAAE,QAAkB;IACjE,MAAM,UAAU,GAAG,KAAK;SACrB,QAAQ,EAAE;SACV,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,wBAAwB,CAC1E,CAAC;IACJ,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CACX,kBAAkB,KAAK,CAAC,GAAG,EAAE,4BAA4B;YACvD,mDAAmD,CACtD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,0CAA0C;AAC1C,kEAAkE;AAClE,sDAAsD;AACtD,iEAAiE;AACjE,wCAAwC;AACxC,qEAAqE;AACrE,SAAS,2BAA2B,CAClC,KAAe,EACf,MAAoB;IAEpB,MAAM,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC;IAChC,IACE,GAAG,KAAK,SAAS;QACjB,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,OAAO,KAAK,yBAAyB,CAAC,EACvE,CAAC;QACD,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,eAAe,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,CAAC,GAAG,EAAE,aAAa;YAC5D,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,0CAA0C;YACpE,+BAA+B,EACjC,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAC7D,CACF,CAAC;IACJ,CAAC;IAED,yEAAyE;IACzE,2EAA2E;IAC3E,gEAAgE;IAChE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,SAAS;QACzC,MAAM,IAAI,GACR,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QACpE,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,IAAI,CACT,IAAI,UAAU,CACZ,eAAe,KAAK,CAAC,GAAG,EAAE,mCAAmC,IAAI,OAAO;gBACtE,uEAAuE;gBACvE,0DAA0D;gBAC1D,mCAAmC,EACrC,EAAE,IAAI,EAAE,gCAAgC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CACjE,CACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/super-resolve.d.ts

@@ -1,4 +1,23 @@
 import type { MetaData } from "./shared/meta-data.js";
+/**
+ * FR-024 (ADR-0029): the type-scope of the node whose `extends` is being
+ * resolved. A dotted `Entity.child` ref selects among the owner's children of
+ * the SAME type as the referrer — a field ref resolves fields, an identity
+ * ref resolves identities. Required for the dotted branch; ignored for
+ * dot-free refs (legacy behavior unchanged).
+ */
+export interface ReferrerScope {
+    readonly type: string;
+}
+/**
+ * FR-024: true when a ref's final `::`-segment contains a `.` — i.e. the ref
+ * targets a child nested inside an object (`Customer.id`,
+ * `acme::sales::Customer.id`). Names cannot contain `.`, so this is
+ * unambiguous. Call sites use this to apply the dotted-only
+ * type/subtype-mismatch check (ERR_EXTENDS_TARGET_MISMATCH) without altering
+ * shipped top-level extends behavior.
+ */
+export declare function isChildTargetingRef(ref: string): boolean;
 /**
  * Resolve a single super reference string against a tree.
  *
@@ -6,12 +25,21 @@ import type { MetaData } from "./shared/meta-data.js";
  * against the loader's accumulating root (intoRoot). Java semantics: if the
  * ref cannot be resolved, the parser throws ParseError.
  *
- * @param ref - The raw super reference (e.g., "Fruit", "::pkg::Name", "..::common::id")
+ * FR-024 (ADR-0029): a ref whose final segment is dotted (`Customer.id`)
+ * targets a child nested inside an object. The owner part resolves with the
+ * existing strategies (absolute / relative / bare / same-package); the child
+ * is then selected among the owner's EFFECTIVE children (so inherited
+ * children resolve) by name AND the referrer's type (type-scoped). A dotted
+ * ref that does not resolve returns undefined WITHOUT falling through to the
+ * bare lookup; a dotted ref with no `referrerScope` is unresolvable.
+ *
+ * @param ref - The raw super reference (e.g., "Fruit", "::pkg::Name", "..::common::id", "Customer.id")
  * @param contextPackage - The package of the model whose super is being resolved
  * @param root - The root MetaData of the accumulating tree to search within
+ * @param referrerScope - FR-024: the extending node's type — required to resolve dotted refs
  * @returns The resolved MetaData, or undefined if the reference cannot be resolved
  */
-export declare function resolveSuperRef(ref: string, contextPackage: string, root: MetaData): MetaData | undefined;
+export declare function resolveSuperRef(ref: string, contextPackage: string, root: MetaData, referrerScope?: ReferrerScope): MetaData | undefined;
 export interface DeferredSuperFailure {
     /** FQN of the node whose super ref could not be resolved. */
     nodeFqn: string;
@@ -19,6 +47,25 @@ export interface DeferredSuperFailure {
     ref: string;
     /** ADR-0009 provenance envelope of the referencing node (FR5a). */
     source: import("./source.js").ErrorSource;
+    /**
+     * FR-024: why resolution failed.
+     * - "unresolved" — no target found (loader emits ERR_UNRESOLVED_SUPER).
+     * - "target-mismatch" — a dotted child-targeting ref resolved, but the
+     *   target's type/subtype differs from the extending node's (loader emits
+     *   ERR_EXTENDS_TARGET_MISMATCH). Applies ONLY to dotted refs — top-level
+     *   extends behavior is unchanged.
+     */
+    kind: "unresolved" | "target-mismatch";
+    /** target-mismatch only: the resolved target's identity, for the message. */
+    target?: {
+        type: string;
+        subType: string;
+    };
+    /** target-mismatch only: the extending node's type/subtype, for the message. */
+    referrer?: {
+        type: string;
+        subType: string;
+    };
 }
 /**
  * Walk the tree and resolve every node's superRef against the full root.

package/dist/super-resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"super-resolve.d.ts","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAyCtD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,QAAQ,GACb,QAAQ,GAAG,SAAS,CAsCtB;AAMD,MAAM,WAAW,oBAAoB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC;CAC3C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,EAAE,CAkB5E"}
+{"version":3,"file":"super-resolve.d.ts","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAyCtD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIxD;AAsBD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,QAAQ,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,QAAQ,GAAG,SAAS,CAiDtB;AAMD,MAAM,WAAW,oBAAoB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC;IAC1C;;;;;;;OAOG;IACH,IAAI,EAAE,YAAY,GAAG,iBAAiB,CAAC;IACvC,6EAA6E;IAC7E,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,gFAAgF;IAChF,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,EAAE,CAyC5E"}

package/dist/super-resolve.js

@@ -1,16 +1,24 @@
-// super reference resolution — package navigation helpers
+// super reference resolution — pure FQN match (FR-032 / ADR-0032)
 //
-// Reference syntax (Java metaobjects-core conventions):
-//   Bare name       "Fruit"            → resolve in contextPackage, then root fallback
-//   Absolute        "::fishstore::Fish" → strip leading ::, walk from root
-//   Relative parent "..::common::id"   → up one package level, then resolve "common::id"
-//   Multi-level     "..::..::shared::User" → up two levels, then resolve "shared::User"
-//   Same-package    "common::id"       → try contextPackage prepend first, then root-rooted
+// FR-032 made canonical refs fully-qualified: the YAML desugar expands every
+// authored relative/bare-current ref to its FQN (`expandRef`, naming-refs.ts),
+// and the canonical-JSON guard rejects any surviving `::`/`..::` form. So the
+// refs that reach this resolver are already FQN, and resolution is a pure tree
+// match:
+//   Qualified  "pkg::Name"            → findInTree(fqn)
+//   Bare       "Name" (rare in-tree)  → current package only (`<ctx>::Name`),
+//                                        then literal (root-level). NO root
+//                                        fallback for a packaged bare ref.
+// The old `::`-strip (absolute), `..::`-reduce (relative) and
+// bare-current-then-root-fallback branches were DELETED — that fallback was the
+// silent-shadowing footgun ADR-0032 removes.
 //
-// Super resolution is now IMMEDIATE during parse (Java behavior).
-// This module provides only the lookup helper; the parser calls it inline.
-// The old resolveSupers() multi-pass walker has been deleted.
-import { PACKAGE_SEPARATOR, PACKAGE_PARENT } from "./shared/structural.js";
+// FR-024: a ref whose final `::`-segment is dotted (`pkg::Customer.id`) targets
+// a child nested in the owner object — resolved type-scoped to the referrer.
+//
+// Super resolution is IMMEDIATE during parse (Java behavior). This module
+// provides only the lookup helper; the parser calls it inline.
+import { PACKAGE_SEPARATOR, CHILD_REF_SEPARATOR } from "./shared/structural.js";
 // ---------------------------------------------------------------------------
 // Tree search helper
 // ---------------------------------------------------------------------------
@@ -45,9 +53,37 @@ function findInTree(root, fqn) {
     }
     return undefined;
 }
-// ---------------------------------------------------------------------------
-// Reference parsing & resolution
-// ---------------------------------------------------------------------------
+/**
+ * FR-024: true when a ref's final `::`-segment contains a `.` — i.e. the ref
+ * targets a child nested inside an object (`Customer.id`,
+ * `acme::sales::Customer.id`). Names cannot contain `.`, so this is
+ * unambiguous. Call sites use this to apply the dotted-only
+ * type/subtype-mismatch check (ERR_EXTENDS_TARGET_MISMATCH) without altering
+ * shipped top-level extends behavior.
+ */
+export function isChildTargetingRef(ref) {
+    const lastSep = ref.lastIndexOf(PACKAGE_SEPARATOR);
+    const lastSegment = lastSep === -1 ? ref : ref.slice(lastSep + PACKAGE_SEPARATOR.length);
+    return lastSegment.includes(CHILD_REF_SEPARATOR);
+}
+/**
+ * FR-024: split a child-targeting ref into the owner-object ref and the child
+ * traversal path. A multi-dot ref (`X.y.z`) traverses child names to any depth
+ * (object → field → view); returns undefined only for degenerate empty parts
+ * (`.id`, `Customer.`, `Customer..x`).
+ */
+function parseChildTargetingRef(ref) {
+    const lastSep = ref.lastIndexOf(PACKAGE_SEPARATOR);
+    const segStart = lastSep === -1 ? 0 : lastSep + PACKAGE_SEPARATOR.length;
+    const lastSegment = ref.slice(segStart);
+    const parts = lastSegment.split(CHILD_REF_SEPARATOR);
+    if (parts.length < 2 || parts.some((p) => p === ""))
+        return undefined;
+    return {
+        ownerRef: ref.slice(0, segStart) + parts[0],
+        path: parts.slice(1),
+    };
+}
 /**
  * Resolve a single super reference string against a tree.
  *
@@ -55,44 +91,72 @@ function findInTree(root, fqn) {
  * against the loader's accumulating root (intoRoot). Java semantics: if the
  * ref cannot be resolved, the parser throws ParseError.
  *
- * @param ref - The raw super reference (e.g., "Fruit", "::pkg::Name", "..::common::id")
+ * FR-024 (ADR-0029): a ref whose final segment is dotted (`Customer.id`)
+ * targets a child nested inside an object. The owner part resolves with the
+ * existing strategies (absolute / relative / bare / same-package); the child
+ * is then selected among the owner's EFFECTIVE children (so inherited
+ * children resolve) by name AND the referrer's type (type-scoped). A dotted
+ * ref that does not resolve returns undefined WITHOUT falling through to the
+ * bare lookup; a dotted ref with no `referrerScope` is unresolvable.
+ *
+ * @param ref - The raw super reference (e.g., "Fruit", "::pkg::Name", "..::common::id", "Customer.id")
  * @param contextPackage - The package of the model whose super is being resolved
  * @param root - The root MetaData of the accumulating tree to search within
+ * @param referrerScope - FR-024: the extending node's type — required to resolve dotted refs
  * @returns The resolved MetaData, or undefined if the reference cannot be resolved
  */
-export function resolveSuperRef(ref, contextPackage, root) {
-    // -------------------------------------------------------------------------
-    // 1. Absolute reference: leading "::"
+export function resolveSuperRef(ref, contextPackage, root, referrerScope) {
     // -------------------------------------------------------------------------
-    if (ref.startsWith(PACKAGE_SEPARATOR)) {
-        const absolutePath = ref.slice(PACKAGE_SEPARATOR.length);
-        return findInTree(root, absolutePath);
-    }
+    // 0. FR-024 dotted child-targeting ref: `<rootRef>.<child>...<child>`
+    //
+    // Addressing model (ADR-0029): the package qualifies the ROOT-level node
+    // only; each subsequent segment traverses CHILD NAMES, to any depth
+    // (object → field → view: `Customer.priceCents.display`). INTERMEDIATE
+    // segments select by unique name among the current node's effective
+    // children (a cross-type name collision, e.g. a field AND an identity both
+    // named "id", is ambiguous → unresolved); the FINAL segment is type-scoped
+    // to the referrer (a field ref resolves fields, a view ref views), which is
+    // also what disambiguates the common 2-segment `Customer.id` case.
     // -------------------------------------------------------------------------
-    // 2. Relative reference: one or more leading "..::"
-    // -------------------------------------------------------------------------
-    if (ref.startsWith(PACKAGE_PARENT + PACKAGE_SEPARATOR)) {
-        const parts = ref.split(PACKAGE_SEPARATOR);
-        let levels = 0;
-        while (levels < parts.length && parts[levels] === PACKAGE_PARENT) {
-            levels++;
-        }
-        const pkgParts = contextPackage !== "" ? contextPackage.split(PACKAGE_SEPARATOR) : [];
-        const remainder = parts.slice(levels);
-        if (pkgParts.length < levels || remainder.length === 0) {
+    if (isChildTargetingRef(ref)) {
+        if (referrerScope === undefined)
             return undefined;
+        const parsed = parseChildTargetingRef(ref);
+        if (parsed === undefined)
+            return undefined; // degenerate (empty segment)
+        let current = resolveSuperRef(parsed.ownerRef, contextPackage, root);
+        if (current === undefined)
+            return undefined;
+        for (let i = 0; i < parsed.path.length - 1; i++) {
+            const seg = parsed.path[i];
+            const matches = current.children().filter((c) => c.name === seg);
+            if (matches.length !== 1)
+                return undefined; // missing or ambiguous intermediate
+            current = matches[0];
         }
-        const allParts = [...pkgParts.slice(0, pkgParts.length - levels), ...remainder];
-        return findInTree(root, allParts.join(PACKAGE_SEPARATOR));
+        const last = parsed.path[parsed.path.length - 1];
+        return current
+            .children()
+            .find((c) => c.name === last && c.type === referrerScope.type);
     }
     // -------------------------------------------------------------------------
-    // 3. Bare name OR same-package shorthand (contains "::" but no leading
-    //    "::" or "..::"): try contextPackage prepend first, then root-rooted.
+    // 1. FR-032 (ADR-0032): refs in the loaded tree are already fully-qualified.
+    //    The YAML desugar expanded every relative/bare-current ref to FQN
+    //    (`expandRef`), and the canonical-JSON guard rejects any surviving
+    //    `::`/`..::` form (ERR_RELATIVE_REF_IN_CANONICAL). So resolution is a
+    //    pure FQN match — the old `::`-strip (absolute), `..::`-reduce (relative)
+    //    and bare-current-then-ROOT-FALLBACK branches are deleted (the footgun).
+    //
+    //    A qualified ref (`pkg::Name`) matches its node directly. A bare ref
+    //    (no `::`) is the rare in-tree case: a root-level/empty-package type, or
+    //    a bare ref constructed during dotted-owner recursion — resolve it in the
+    //    current package ONLY (try `<ctx>::ref`), then bare (root-level) as the
+    //    literal name. NO root fallback for a packaged bare ref.
     // -------------------------------------------------------------------------
-    if (contextPackage !== "") {
-        const found = findInTree(root, `${contextPackage}${PACKAGE_SEPARATOR}${ref}`);
-        if (found !== undefined)
-            return found;
+    if (!ref.includes(PACKAGE_SEPARATOR) && contextPackage !== "") {
+        const inPackage = findInTree(root, `${contextPackage}${PACKAGE_SEPARATOR}${ref}`);
+        if (inPackage !== undefined)
+            return inPackage;
     }
     return findInTree(root, ref);
 }
@@ -117,8 +181,24 @@ export function resolveDeferredSupers(root) {
         if (node.superResolved !== undefined)
             return;
         const effectivePkg = node.package ?? node.fileDefaultPackage ?? "";
-        const target = resolveSuperRef(node.superRef, effectivePkg, root);
+        // FR-024: thread the referrer's type so dotted `Entity.child` refs resolve
+        // type-scoped (a field ref selects fields; an identity ref identities).
+        const target = resolveSuperRef(node.superRef, effectivePkg, root, { type: node.type });
         if (target !== undefined) {
+            // FR-024: a dotted ref must target a node of the SAME type and subtype
+            // as the extending node. Dotted-only — top-level extends is unchanged.
+            if (isChildTargetingRef(node.superRef) &&
+                (target.type !== node.type || target.subType !== node.subType)) {
+                failures.push({
+                    nodeFqn: node.fqn(),
+                    ref: node.superRef,
+                    source: node.source,
+                    kind: "target-mismatch",
+                    target: { type: target.type, subType: target.subType },
+                    referrer: { type: node.type, subType: node.subType },
+                });
+                return;
+            }
             try {
                 node.setSuperResolved(target);
             }
@@ -127,7 +207,12 @@ export function resolveDeferredSupers(root) {
             }
         }
         else {
-            failures.push({ nodeFqn: node.fqn(), ref: node.superRef, source: node.source });
+            failures.push({
+                nodeFqn: node.fqn(),
+                ref: node.superRef,
+                source: node.source,
+                kind: "unresolved",
+            });
         }
     });
     return failures;

package/dist/super-resolve.js.map

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

package/dist/template/meta-template.d.ts

@@ -2,9 +2,10 @@ import { MetaData } from "../shared/meta-data.js";
 /**
  * `template.*` node — the fourth-pillar metatype (FR-004, R1).
  *
- * A single class backs both subtypes (`template.prompt`, `template.output`),
+ * A single class backs every subtype (`template.base/prompt/output/toolcall`),
  * mirroring `MetaSource`: the loader dispatches by subtype and per-subtype
- * attribute schemas (see `template-schema.ts`) drive validation. Typed accessors
+ * attribute schemas (FR-033: externalized to spec/metamodel/template.json,
+ * embedded at build into TEMPLATE_DEFINITION) drive validation. Typed accessors
  * are deferred to the render-engine / verify work — attr values read generically
  * via `ownAttr(...)` until then, so no untested forward-looking surface ships.
  */

package/dist/template/meta-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta-template.d.ts","sourceRoot":"","sources":["../../src/template/meta-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,QAAQ;CAAG"}
+{"version":3,"file":"meta-template.d.ts","sourceRoot":"","sources":["../../src/template/meta-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;;;;;;;;GASG;AACH,qBAAa,YAAa,SAAQ,QAAQ;CAAG"}

package/dist/template/meta-template.js

@@ -2,9 +2,10 @@ import { MetaData } from "../shared/meta-data.js";
 /**
  * `template.*` node — the fourth-pillar metatype (FR-004, R1).
  *
- * A single class backs both subtypes (`template.prompt`, `template.output`),
+ * A single class backs every subtype (`template.base/prompt/output/toolcall`),
  * mirroring `MetaSource`: the loader dispatches by subtype and per-subtype
- * attribute schemas (see `template-schema.ts`) drive validation. Typed accessors
+ * attribute schemas (FR-033: externalized to spec/metamodel/template.json,
+ * embedded at build into TEMPLATE_DEFINITION) drive validation. Typed accessors
  * are deferred to the render-engine / verify work — attr values read generically
  * via `ownAttr(...)` until then, so no untested forward-looking surface ships.
  */

package/dist/template/meta-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"meta-template.js","sourceRoot":"","sources":["../../src/template/meta-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;;;;;;;GAQG;AACH,MAAM,OAAO,YAAa,SAAQ,QAAQ;CAAG"}
+{"version":3,"file":"meta-template.js","sourceRoot":"","sources":["../../src/template/meta-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;;;;;;;;GASG;AACH,MAAM,OAAO,YAAa,SAAQ,QAAQ;CAAG"}

package/dist/template/prompt-definition.embedded.d.ts

@@ -0,0 +1,3 @@
+import type { ProviderDefinition } from "../provider-data.js";
+export declare const PROMPT_DEFINITION: ProviderDefinition;
+//# sourceMappingURL=prompt-definition.embedded.d.ts.map

package/dist/template/prompt-definition.embedded.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-definition.embedded.d.ts","sourceRoot":"","sources":["../../src/template/prompt-definition.embedded.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,eAAO,MAAM,iBAAiB,EAAE,kBA8W/B,CAAC"}