@metaobjectsdev/metadata 1.0.12 → 1.1.0

package/dist/naming.d.ts

@@ -18,17 +18,75 @@ export declare function packageOfResolutionKey(fqn: string): string;
 export declare function toSnakeCase(s: string): string;
 export declare function toKebabCase(s: string): string;
 /**
- * Column-naming strategy applied by the persistence layer to fields with no
- * explicit `@column` override. Persistence-layer config (set on
- * ObjectManager / buildExpectedSchema / codegen config), not a metadata attr —
- * the same metadata can drive snake_case (PG convention) or literal (EF
- * convention) consumers. TS port defaults to snake_case; C# port defaults to
- * literal.
+ * How a field with no `@column` becomes a column name. One project setting,
+ * `naming.columns` in `.metaobjects/config.json`, read by every port (ADR-0058): the
+ * loaded root carries it ({@link physicalNamingOf}), so codegen, migrate, the runtime
+ * and verify resolve the same name. Not a metadata attr: `@column` is the per-field
+ * override, this is the rule for the rest.
  */
 export type ColumnNamingStrategy = "snake_case" | "literal" | "kebab-case";
-/** Single source of truth for the TS-port default. */
+/** Every column-naming rule, in the order the conformance corpus lists them. */
+export declare const COLUMN_NAMING_STRATEGIES: readonly ColumnNamingStrategy[];
+/** The default in EVERY port: what `meta migrate` has always created. */
 export declare const DEFAULT_COLUMN_NAMING_STRATEGY: ColumnNamingStrategy;
+/**
+ * How an object with no physical-name attribute (`@table`, `@view`, ...) and no source name
+ * gets its table name: the entity (or source) name cased by this rule. The entity-name
+ * fallback keeps the frozen legacy pluralizer under every rule ({@link pluralizeTableNameLegacy}).
+ */
+export type TableNamingRule = "snake_case" | "literal";
+/** Every table-naming rule. */
+export declare const TABLE_NAMING_RULES: readonly TableNamingRule[];
+/** The project's physical-naming rules: `naming` in `.metaobjects/config.json` (ADR-0058). */
+export interface PhysicalNaming {
+    readonly columns: ColumnNamingStrategy;
+    readonly tables: TableNamingRule;
+}
+/** The default in every port, equal to what `meta migrate` has always created. */
+export declare const DEFAULT_PHYSICAL_NAMING: PhysicalNaming;
+/**
+ * The physical-naming rules for the tree `node` belongs to: what its root carries, set by the
+ * project-aware load from `.metaobjects/config.json`, else {@link DEFAULT_PHYSICAL_NAMING}.
+ * Read through the root, not passed around, so every consumer of one loaded model resolves
+ * the same physical names.
+ */
+export declare function physicalNamingOf(node: MetaData): PhysicalNaming;
+/** The migration guide every refusal of a former naming source names (ADR-0058). */
+export declare const PHYSICAL_NAMING_MIGRATION_GUIDE_PATH = "docs/features/migrations/physical-naming.md";
+/** The guide on `main`: the default when a caller has no release to pin to. */
+export declare const PHYSICAL_NAMING_MIGRATION_GUIDE: string;
+/**
+ * What a former column-naming source prints when it is still used (ADR-0058): the one
+ * setting, where it goes, and the guide. Same words in every port. `what` names the source
+ * exactly; `value` is the rule it gave, carried into the example so the move is mechanical.
+ */
+export declare function physicalNamingRemovedMessage(what: string, value?: string, guide?: string): string;
+/** `name` cased by the table rule. */
+export declare function applyTableNamingRule(name: string, rule: TableNamingRule): string;
 export declare function applyColumnNamingStrategy(name: string, strategy: ColumnNamingStrategy): string;
+/**
+ * FROZEN — byte-for-byte the pre-fix suffix-only pluralization rule, with no
+ * already-plural detection. This is the DEFAULT PHYSICAL NAME derivation only:
+ * `resolveTableName`'s no-source fallback and `MetaSource.physicalName`'s step-4
+ * owner-name fallback, both reached only when metadata declares no explicit
+ * physical name. An adopter's live database was created with this rule; changing
+ * it would make `meta migrate` propose a rename for every already-plural entity
+ * name on the next run. Never call this for an API/code-surface name (REST paths,
+ * generated hook/query/finder/list names, DbSet/collection variable names) — those
+ * go through {@link pluralize}, which fixes the doubling this function
+ * deliberately still has.
+ */
+export declare function pluralizeTableNameLegacy(s: string): string;
+/**
+ * API/code-surface pluralization: REST collection/route paths, entity-descriptor
+ * URLs, generated hook/query/finder/list function names, DbSet/collection names —
+ * every generator-facing use. Adds already-plural detection ({@link isAlreadyPlural})
+ * on top of the historical suffix rule ({@link pluralizeTableNameLegacy}).
+ *
+ * NOT for default physical table/column name derivation — that fallback is frozen
+ * (see `pluralizeTableNameLegacy`) so an existing adopter database never sees a
+ * proposed rename.
+ */
 export declare function pluralize(s: string): string;
 /**
  * THE `@role: primary` source lookup for this package — and the one place the

package/dist/naming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"naming.d.ts","sourceRoot":"","sources":["../src/naming.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAWtE;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI7D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK7C;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,CAAC;AAE3E,sDAAsD;AACtD,eAAO,MAAM,8BAA8B,EAAE,oBAAmC,CAAC;AAEjF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAM9F;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAI3C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAe3D;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAgBzE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,CASzD;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,QAAQ,EACf,QAAQ,GAAE,oBAAqD,GAC9D,MAAM,CAKR;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,gBAAgB,CAK9B,IAAI,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/E,MAAM,CASR;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAWvE;AAED,2GAA2G;AAC3G,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,QAAQ,EAChB,QAAQ,GAAE,oBAAqD,GAC9D,aAAa,CAYf"}
+{"version":3,"file":"naming.d.ts","sourceRoot":"","sources":["../src/naming.ts"],"names":[],"mappings":"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"}

package/dist/naming.js

@@ -1,3 +1,4 @@
+import { docsBlobUrl } from "./docs-ref.js";
 import { TYPE_FIELD } from "./shared/base-types.js";
 import { PACKAGE_SEPARATOR } from "./shared/structural.js";
 import { FIELD_ATTR_COLUMN } from "./persistence/db/db-constants.js";
@@ -43,8 +44,45 @@ export function toSnakeCase(s) {
 export function toKebabCase(s) {
     return toSnakeCase(s).replace(/_/g, "-");
 }
-/** Single source of truth for the TS-port default. */
+/** Every column-naming rule, in the order the conformance corpus lists them. */
+export const COLUMN_NAMING_STRATEGIES = ["snake_case", "literal", "kebab-case"];
+/** The default in EVERY port: what `meta migrate` has always created. */
 export const DEFAULT_COLUMN_NAMING_STRATEGY = "snake_case";
+/** Every table-naming rule. */
+export const TABLE_NAMING_RULES = ["snake_case", "literal"];
+/** The default in every port, equal to what `meta migrate` has always created. */
+export const DEFAULT_PHYSICAL_NAMING = Object.freeze({
+    columns: DEFAULT_COLUMN_NAMING_STRATEGY,
+    tables: "snake_case",
+});
+/**
+ * The physical-naming rules for the tree `node` belongs to: what its root carries, set by the
+ * project-aware load from `.metaobjects/config.json`, else {@link DEFAULT_PHYSICAL_NAMING}.
+ * Read through the root, not passed around, so every consumer of one loaded model resolves
+ * the same physical names.
+ */
+export function physicalNamingOf(node) {
+    const naming = node.root().physicalNaming;
+    return naming ?? DEFAULT_PHYSICAL_NAMING;
+}
+/** The migration guide every refusal of a former naming source names (ADR-0058). */
+export const PHYSICAL_NAMING_MIGRATION_GUIDE_PATH = "docs/features/migrations/physical-naming.md";
+/** The guide on `main`: the default when a caller has no release to pin to. */
+export const PHYSICAL_NAMING_MIGRATION_GUIDE = docsBlobUrl(PHYSICAL_NAMING_MIGRATION_GUIDE_PATH);
+/**
+ * What a former column-naming source prints when it is still used (ADR-0058): the one
+ * setting, where it goes, and the guide. Same words in every port. `what` names the source
+ * exactly; `value` is the rule it gave, carried into the example so the move is mechanical.
+ */
+export function physicalNamingRemovedMessage(what, value = "literal", guide = PHYSICAL_NAMING_MIGRATION_GUIDE) {
+    return (`${what} was removed in 1.1.0. Column and table naming is one project setting now, read by ` +
+        `every port: "naming" in .metaobjects/config.json, for example "naming": { "columns": "${value}" }. ` +
+        `Move it there and delete ${what}. See ${guide}`);
+}
+/** `name` cased by the table rule. */
+export function applyTableNamingRule(name, rule) {
+    return rule === "literal" ? name : toSnakeCase(name);
+}
 export function applyColumnNamingStrategy(name, strategy) {
     switch (strategy) {
         case "literal": return name;
@@ -52,13 +90,66 @@ export function applyColumnNamingStrategy(name, strategy) {
         case "snake_case": return toSnakeCase(name);
     }
 }
-export function pluralize(s) {
+/** The four letters that precede a genuinely SINGULAR "...s" ending in the common
+ *  patterns this codebase's entity names hit — Status, Address, Bonus, Alias, Gas,
+ *  Analysis. Anything else before a final "s" reads as already-plural. */
+const ALREADY_PLURAL_EXCLUDED_PRECEDING_CHARS = new Set(["s", "u", "i", "a"]);
+/**
+ * True when `s` already reads as a plural noun, so running it through the ordinary
+ * suffix rule would double it — the real defect this file exists to fix:
+ * `ProgramPurchaseStats` → `ProgramPurchaseStatses` shipped as six REST collection
+ * paths and TanStack hook names in an adopter's app.
+ *
+ * Heuristic, not a dictionary: a word ending in "s" is already-plural UNLESS the
+ * character immediately before that final "s" is one of s/u/i/a (case-insensitive).
+ * Covers Stats, Settings, Details, News, Analytics, Series, Photos; leaves Status,
+ * Address, Bonus, Alias, Gas, Analysis on the ordinary suffix path (unchanged).
+ *
+ * Known miss, deliberately not fixed here: a genuinely singular word ending in
+ * "...s" with none of those four letters before it reads as already-plural too —
+ * `Lens` → `Lens` (correct plural `Lenses`). Fixing that needs a real dictionary,
+ * which this function is not; the heuristic optimizes for the shape the doubling
+ * defect actually hits (entity names that are already a plural concept).
+ */
+function isAlreadyPlural(s) {
+    if (!/s$/i.test(s) || s.length < 2)
+        return false;
+    return !ALREADY_PLURAL_EXCLUDED_PRECEDING_CHARS.has(s[s.length - 2].toLowerCase());
+}
+/**
+ * FROZEN — byte-for-byte the pre-fix suffix-only pluralization rule, with no
+ * already-plural detection. This is the DEFAULT PHYSICAL NAME derivation only:
+ * `resolveTableName`'s no-source fallback and `MetaSource.physicalName`'s step-4
+ * owner-name fallback, both reached only when metadata declares no explicit
+ * physical name. An adopter's live database was created with this rule; changing
+ * it would make `meta migrate` propose a rename for every already-plural entity
+ * name on the next run. Never call this for an API/code-surface name (REST paths,
+ * generated hook/query/finder/list names, DbSet/collection variable names) — those
+ * go through {@link pluralize}, which fixes the doubling this function
+ * deliberately still has.
+ */
+export function pluralizeTableNameLegacy(s) {
     if (/(s|x|z|ch|sh)$/i.test(s))
         return s + "es";
     if (/[^aeiou]y$/i.test(s))
         return s.slice(0, -1) + "ies";
     return s + "s";
 }
+/**
+ * API/code-surface pluralization: REST collection/route paths, entity-descriptor
+ * URLs, generated hook/query/finder/list function names, DbSet/collection names —
+ * every generator-facing use. Adds already-plural detection ({@link isAlreadyPlural})
+ * on top of the historical suffix rule ({@link pluralizeTableNameLegacy}).
+ *
+ * NOT for default physical table/column name derivation — that fallback is frozen
+ * (see `pluralizeTableNameLegacy`) so an existing adopter database never sees a
+ * proposed rename.
+ */
+export function pluralize(s) {
+    if (isAlreadyPlural(s))
+        return s;
+    return pluralizeTableNameLegacy(s);
+}
 /**
  * THE `@role: primary` source lookup for this package — and the one place the
  * primary-source DIVERGENCE refusal lives, so that every caller inherits it.
@@ -159,9 +250,11 @@ export function resolveTableName(entity) {
     const source = primaryRdbSource(entity);
     if (source !== undefined)
         return source.physicalName;
-    return pluralize(toSnakeCase(entity.name));
+    // Frozen: this is a DEFAULT PHYSICAL name, not an API-surface name. See
+    // pluralizeTableNameLegacy's doc. Cased by the project's table rule (ADR-0058).
+    return pluralizeTableNameLegacy(applyTableNamingRule(entity.name, physicalNamingOf(entity).tables));
 }
-export function resolveColumnName(field, strategy = DEFAULT_COLUMN_NAMING_STRATEGY) {
+export function resolveColumnName(field, strategy = physicalNamingOf(field).columns) {
     // ADR-0039: resolving — a concrete field may inherit @column via extends.
     const col = field.attr(FIELD_ATTR_COLUMN);
     if (typeof col === "string" && col)
@@ -240,7 +333,7 @@ export function resolveTableSchema(entity) {
         return schema;
     return undefined;
 }
-export function buildNameMap(entity, strategy = DEFAULT_COLUMN_NAMING_STRATEGY) {
+export function buildNameMap(entity, strategy = physicalNamingOf(entity).columns) {
     const jsToDb = new Map();
     const dbToJs = new Map();
     // Effective children so a TPH subtype's name map covers inherited base

package/dist/naming.js.map

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

package/dist/object-serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-serializer.d.ts","sourceRoot":"","sources":["../src/object-serializer.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAe/D,MAAM,WAAW,sBAAsB;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,6EAA6E;AAC7E,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,IAAI,CAAC,EAAE,sBAAsB,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED,2EAA2E;AAC3E,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB"}
+{"version":3,"file":"object-serializer.d.ts","sourceRoot":"","sources":["../src/object-serializer.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAgB/D,MAAM,WAAW,sBAAsB;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,6EAA6E;AAC7E,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,IAAI,CAAC,EAAE,sBAAsB,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED,2EAA2E;AAC3E,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB"}

package/dist/object-serializer.js

@@ -8,6 +8,7 @@
 // spec — Java's object reader does not validate either).
 import { DATA_TYPE_BOOLEAN, DATA_TYPE_INT, DATA_TYPE_LONG, DATA_TYPE_DOUBLE, DATA_TYPE_STRING, DATA_TYPE_DATE, DATA_TYPE_OBJECT, } from "./data-type.js";
 import { TYPE_OBJECT } from "./shared/base-types.js";
+import { lookupCanonical } from "./naming-refs.js";
 const TYPE_DISCRIMINATOR = "@type";
 /** Serialize an application-object instance to wire JSON, driven by `mo`. */
 export function objectToJson(mo, instance, opts) {
@@ -114,19 +115,15 @@ function coerceNumeric(raw) {
     }
     return raw;
 }
-/** Resolve an object-typed field's `@objectRef` to its target MetaObject by
- *  walking to the tree root and looking up the named object child. Returns
- *  undefined when there is no ref or it does not resolve (caller passes the
- *  raw value through — best-effort). */
+/** Resolve an object-typed field's `@objectRef` to its target MetaObject. The loader
+ *  has already rewritten the ref to its canonical spelling (ADR-0059 R5), so it is
+ *  looked up exactly, with no referrer (R7). Returns undefined when there is no ref
+ *  or it does not resolve (caller passes the raw value through — best-effort). */
 function resolveObjectRef(field, mo) {
     const ref = field.objectRef;
     if (ref === undefined)
         return undefined;
-    // ADR-0039: own — lookup is on the tree ROOT, which has no super chain
-    // (it never `extends`), so its own children ARE its effective children.
-    const found = mo.root().ownChildByTypeAndName(TYPE_OBJECT, ref);
-    if (found === undefined)
-        return undefined;
+    const found = lookupCanonical(mo.root(), ref, { ownerType: TYPE_OBJECT });
     return found;
 }
 //# sourceMappingURL=object-serializer.js.map

package/dist/object-serializer.js.map

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

package/dist/parser-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser-core.d.ts","sourceRoot":"","sources":["../src/parser-core.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAU,YAAY,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AAGzD,OAAO,EAAkB,KAAK,WAAW,EAAE,KAAK,aAAa,EAAoB,MAAM,aAAa,CAAC;AAQrG,OAAO,EAAmB,KAAK,OAAO,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgC9E,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;8EAC0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;0EAEsE;IACtE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C;;gFAE4E;IAC5E,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,4EAA4E;IAC5E,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC7B;qFACiF;IACjF,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,mEAAmE;IACnE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;0DACsD;IACtD,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC;iDAC6C;IAC7C,QAAQ,CAAC,YAAY,EAAE,SAAS,eAAe,EAAE,CAAC;IAClD,uDAAuD;IACvD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;CACtC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB;;;;;;OAMG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAC;IAClC;;;;;;;OAOG;IACH,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAYD,wBAAgB,SAAS,IAAI,WAAW,CAuBvC;AAiND;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAK7E;AA8FD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,GAAG,WAAW,CA8M1E;AA+jBD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,IAAI,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,gBAAgB,EAAE,aAAa,EAAE,CAAA;CAAE,CAgFjF"}
+{"version":3,"file":"parser-core.d.ts","sourceRoot":"","sources":["../src/parser-core.ts"],"names":[],"mappings":"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"}

package/dist/parser-core.js

@@ -32,13 +32,13 @@ import { retiredSubType, retirementHint, retirementSuggestions } from "./retired
 import { resolvedSource } from "./source.js";
 import { semanticDiff } from "./semantic-diff.js";
 import { resolveSuperRef, isChildTargetingRef, extendsTargetCompatible, EXTENDS_TARGET_MISMATCH_RULE, } from "./super-resolve.js";
+import { RefOverDropError } from "./naming-refs.js";
 import { JsonPathBuilder } from "./json-path.js";
 import { getYamlPosition } from "./core/yaml-positions.js";
 import { TYPE_ATTR, TYPE_FIELD, TYPE_OBJECT, TYPE_VALIDATOR, SUBTYPE_BASE, } from "./shared/base-types.js";
 import { RESERVED_KEYS, RESERVED_KEY_NAME, RESERVED_KEY_PACKAGE, RESERVED_KEY_EXTENDS, RESERVED_KEY_ABSTRACT, RESERVED_KEY_OVERLAY, RESERVED_KEY_IS_ARRAY, RESERVED_KEY_CHILDREN, RESERVED_KEY_VALUE, JSON_KEY_SCHEMA, ATTR_PREFIX, TYPE_SUBTYPE_SEPARATOR, PACKAGE_SEPARATOR, } from "./shared/structural.js";
 import { ATTR_SUBTYPE_PROPERTIES, ATTR_SUBTYPE_STRINGARRAY } from "./core/attr/attr-constants.js";
 import { attrClassFor } from "./attr-class-map.js";
-import { isRelativeRef, REF_BEARING_ATTR_NAMES } from "./naming-refs.js";
 // ---------------------------------------------------------------------------
 // Internal helper — build a parse-phase ErrorSource envelope.
 //
@@ -82,37 +82,6 @@ function reportProblem(msg, strict, warnings, code) {
     warnings.push(msg);
 }
 // ---------------------------------------------------------------------------
-// FR-032 (ADR-0032) — canonical-JSON ref guard.
-//
-// Canonical JSON is the self-contained interchange form: every ref-bearing attr
-// MUST be fully-qualified. A relative authoring form (leading `::` or `..::`)
-// surviving into canonical JSON is `ERR_RELATIVE_REF_IN_CANONICAL`. The guard
-// fires ONLY for JSON-format input — YAML-format input has already been
-// desugar-expanded via expandRef (so any `::`/`..::` there is correct authoring
-// that was lowered to FQN before buildTree sees it). Like ERR_RESERVED_ATTR,
-// this is a hard error routed through the loader's error sink even in lax mode.
-// ---------------------------------------------------------------------------
-function guardRelativeRefInCanonical(refLabel, rawValue, strict, warnings, path) {
-    if (_currentFormat !== "json")
-        return;
-    if (typeof rawValue !== "string")
-        return;
-    if (!isRelativeRef(rawValue))
-        return;
-    const msg = `Relative reference '${rawValue}' on ${refLabel} at ${path} is not allowed in ` +
-        `canonical JSON — canonical JSON must be fully-qualified. Relative forms ` +
-        `(leading '::' or '..::') are YAML-authoring sugar that the desugar expands.`;
-    if (strict) {
-        throw new ParseError(msg, { code: "ERR_RELATIVE_REF_IN_CANONICAL", source: errSource() });
-    }
-    if (_currentErrors !== undefined) {
-        _currentErrors.push(new ParseError(msg, { code: "ERR_RELATIVE_REF_IN_CANONICAL", source: errSource() }));
-    }
-    else {
-        warnings.push(msg);
-    }
-}
-// ---------------------------------------------------------------------------
 // The one message for an authored `<type>.base`, so both doors say the same thing.
 //
 // Every registered `base` subtype is an ABSTRACT REGISTRY ANCHOR: the shared root that
@@ -478,10 +447,11 @@ export function buildTree(parsed, opts) {
         if (opts.intoRoot !== undefined) {
             // --- Merge mode: parse root's attrs/children into the existing root ---
             // The JSON root's own package/super/reserved-keys are not re-applied to the
-            // existing root. BUT: children from the NEW JSON should inherit from the
-            // NEW root's package, not the existing root's.
+            // existing root. Children from the NEW document take the NEW document's
+            // package — and a document with no `package` declares root-level nodes,
+            // whatever was loaded before it (ADR-0059 R10: the default package is per file).
             const newRootPkg = rootDataObj[RESERVED_KEY_PACKAGE];
-            const contextPkg = (typeof newRootPkg === "string" ? newRootPkg : opts.intoRoot.package) ?? "";
+            const contextPkg = typeof newRootPkg === "string" ? newRootPkg : "";
             parseNodeInto(rootDataObj, opts.intoRoot, opts.intoRoot, // accumulating root for super resolution
             contextPkg, opts.registry, warnings, errors, strict, source, rootKey);
             _currentPath.pop();
@@ -565,9 +535,9 @@ parent) {
     // this node by its effective qualified key regardless of post-merge tree
     // shape or load order. This does NOT touch the node's `package` or `fqn()`
     // (objects stay bare per FR5d). Mirrors Java's parse-time getDefaultPackageName().
-    if (inheritedContextPkg !== "") {
-        model.setFileDefaultPackage(inheritedContextPkg);
-    }
+    // Recorded even when empty: "" says the file declares no package (ADR-0059
+    // R10), which is not the same as a node built in code with no file at all.
+    model.setFileDefaultPackage(inheritedContextPkg);
     // --- Apply reserved keys (package, extends, abstract, isArray) ---
     applyReservedKeys(model, nodeData, strict, source, path, warnings, inheritedContextPkg);
     // --- Inherit package from context if not explicitly set ---
@@ -596,7 +566,16 @@ parent) {
     if (model.superRef !== undefined && accumRoot !== undefined && !_deferSuperResolution) {
         // FR-024: thread the referrer's type so dotted `Entity.child` refs resolve
         // type-scoped — kept consistent with the deferred path (super-resolve.ts).
-        const superModel = resolveSuperRef(model.superRef, effectivePkg, accumRoot, { type: model.type });
+        let superModel;
+        try {
+            superModel = resolveSuperRef(model.superRef, effectivePkg, accumRoot, { type: model.type });
+        }
+        catch (e) {
+            if (!(e instanceof RefOverDropError))
+                throw e;
+            // ADR-0059 R2 — `..::` dropped more segments than the package has.
+            throw new ParseError(`the extends ref '${model.superRef}' on ${model.fqn()} climbs above the root package — each '..::' drops one segment of the declaring package`, { code: "ERR_BAD_ATTR_VALUE", source: resolvedSource(errSource(), model.fqn(), model.superRef) });
+        }
         if (superModel !== undefined) {
             // FR-024 — a dotted child-targeting ref must resolve to a node of the
             // SAME type and subtype as the extending node. Dotted-only check; the
@@ -1065,9 +1044,6 @@ function applyReservedKeys(model, nodeData, strict, source, path, warnings, cont
             reportProblem(`"${RESERVED_KEY_EXTENDS}" must be a string at ${path}`, strict, warnings, "ERR_UNRESOLVED_SUPER");
         }
         else {
-            // FR-032: canonical JSON `extends` must be FQN; reject a surviving
-            // relative form (no-op for YAML-format input, which was desugar-expanded).
-            guardRelativeRefInCanonical(`"${RESERVED_KEY_EXTENDS}"`, rawExtends, strict, warnings, path);
             model.setSuper(rawExtends);
         }
     }
@@ -1136,12 +1112,6 @@ function applyInlineAttrsAndUnknownKeys(model, nodeData, strict, source, path, w
             continue;
         }
         const rawVal = nodeData[key];
-        // FR-032: a ref-bearing inline attr (@objectRef/@references/@from/@of/@via/
-        // @parameterRef/@payloadRef/@responseRef) in canonical JSON must be FQN —
-        // reject a surviving relative form. No-op for YAML-format input.
-        if (REF_BEARING_ATTR_NAMES.has(attrName)) {
-            guardRelativeRefInCanonical(`${ATTR_PREFIX}${attrName}`, rawVal, strict, warnings, path);
-        }
         try {
             const attr = materializeAttr(model, attrName, rawVal, registry);
             model.setMetaAttr(attr);