npm - @metaobjectsdev/codegen-ts - Versions diffs - 0.15.19-rc.1 → 0.15.20 - Mend

@metaobjectsdev/codegen-ts 0.15.19-rc.1 → 0.15.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

package/dist/generators/api-model.js +5 -5
package/dist/generators/api-model.js.map +1 -1
package/dist/generators/output-prompt-file.d.ts.map +1 -1
package/dist/generators/output-prompt-file.js +3 -2
package/dist/generators/output-prompt-file.js.map +1 -1
package/dist/generators/prompt-render-file.d.ts.map +1 -1
package/dist/generators/prompt-render-file.js +3 -1
package/dist/generators/prompt-render-file.js.map +1 -1
package/dist/generators/render-helper-file.d.ts.map +1 -1
package/dist/generators/render-helper-file.js +3 -2
package/dist/generators/render-helper-file.js.map +1 -1
package/dist/generators/template-doc-builder.d.ts.map +1 -1
package/dist/generators/template-doc-builder.js +11 -5
package/dist/generators/template-doc-builder.js.map +1 -1
package/dist/generators/template-payload-tree.d.ts +1 -1
package/dist/generators/template-payload-tree.d.ts.map +1 -1
package/dist/generators/template-payload-tree.js +16 -9
package/dist/generators/template-payload-tree.js.map +1 -1
package/dist/generators/trace-helper-file.d.ts.map +1 -1
package/dist/generators/trace-helper-file.js +3 -2
package/dist/generators/trace-helper-file.js.map +1 -1
package/dist/payload-codegen.d.ts +4 -3
package/dist/payload-codegen.d.ts.map +1 -1
package/dist/payload-codegen.js +21 -14
package/dist/payload-codegen.js.map +1 -1
package/dist/templates/extract-delegate-emitter.d.ts.map +1 -1
package/dist/templates/extract-delegate-emitter.js +7 -10
package/dist/templates/extract-delegate-emitter.js.map +1 -1
package/dist/templates/extractor.d.ts.map +1 -1
package/dist/templates/extractor.js +9 -11
package/dist/templates/extractor.js.map +1 -1
package/dist/templates/output-parser.d.ts.map +1 -1
package/dist/templates/output-parser.js +8 -7
package/dist/templates/output-parser.js.map +1 -1
package/dist/templates/output-prompt.d.ts.map +1 -1
package/dist/templates/output-prompt.js +6 -4
package/dist/templates/output-prompt.js.map +1 -1
package/dist/templates/render-helper.d.ts.map +1 -1
package/dist/templates/render-helper.js +16 -8
package/dist/templates/render-helper.js.map +1 -1
package/package.json +6 -6
package/src/generators/api-model.ts +5 -5
package/src/generators/output-prompt-file.ts +3 -3
package/src/generators/prompt-render-file.ts +3 -1
package/src/generators/render-helper-file.ts +3 -3
package/src/generators/template-doc-builder.ts +20 -6
package/src/generators/template-payload-tree.ts +16 -11
package/src/generators/trace-helper-file.ts +7 -2
package/src/payload-codegen.ts +26 -15
package/src/templates/extract-delegate-emitter.ts +7 -10
package/src/templates/extractor.ts +9 -11
package/src/templates/output-parser.ts +8 -8
package/src/templates/output-prompt.ts +6 -5
package/src/templates/render-helper.ts +16 -8

package/dist/generators/api-model.js CHANGED Viewed

@@ -79,7 +79,7 @@
 //     (routes-file.ts: ownAttr(CODEGEN_ATTR_EMIT_ROUTES) !== false), so they get
 //     NO REST symbols here. The queries + validator generators do NOT honor
 //     @emitRoutes, so data-access + validation symbols still apply.
-import { OBJECT_SUBTYPE_VALUE, TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_SUBTYPE_PROMPT, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_FORMAT, TEMPLATE_ATTR_KIND, TEMPLATE_KIND_EMAIL, TEMPLATE_KIND_DEFAULT, TYPE_SOURCE, SOURCE_ATTR_PARAMETER_REF, refMatchesObject, } from "@metaobjectsdev/metadata";
+import { OBJECT_SUBTYPE_VALUE, TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_SUBTYPE_PROMPT, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_FORMAT, TEMPLATE_ATTR_KIND, TEMPLATE_KIND_EMAIL, TEMPLATE_KIND_DEFAULT, TYPE_SOURCE, SOURCE_ATTR_PARAMETER_REF, resolveObjectRef, } from "@metaobjectsdev/metadata";
 import { findByIdFnName, listFnName, createFnName, updateFnName, deleteByIdFnName, routesHandlerName, variableNameFromEntity, } from "../naming.js";
 import { getPkInfo } from "../templates/queries.js";
 import { isTphSubtype } from "../templates/zod-validators.js";
@@ -520,10 +520,10 @@ function callableArgsRef(obj, root) {
         if (typeof ref === "string" && ref !== "") {
             // Only count it when it resolves to a value object (the template's guard).
             // ADR-0039: resolving — root has no super (children()==ownChildren()).
-            const vo = root
-                .children()
-                .find((c) => c.subType === OBJECT_SUBTYPE_VALUE && refMatchesObject(c, ref));
-            if (vo !== undefined)
+            // ADR-0042: a bare @parameterRef resolves in the callable entity's package.
+            const referrerPkg = obj.package ?? obj.fileDefaultPackage ?? "";
+            const vo = resolveObjectRef(root, ref, referrerPkg).node;
+            if (vo?.subType === OBJECT_SUBTYPE_VALUE)
                 return ref;
         }
     }

package/dist/generators/api-model.js.map CHANGED Viewed

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

package/dist/generators/output-prompt-file.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"output-prompt-file.d.ts","sourceRoot":"","sources":["../../src/generators/output-prompt-file.ts"],"names":[],"mappings":"~~AAqBA~~,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,gBAAgB;IAC/B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,~~EAgCpB~~,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}
1	+ {"version":3,"file":"output-prompt-file.d.ts","sourceRoot":"","sources":["../../src/generators/output-prompt-file.ts"],"names":[],"mappings":"AAoBA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,gBAAgB;IAC/B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,EAiCpB,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}

package/dist/generators/output-prompt-file.js CHANGED Viewed

@@ -11,7 +11,7 @@
 //
 // Custom output directory:
 //   generators: [..., outputPrompt({ outDir: "src/generated/outputs" })]
-import { TYPE_OBJECT, TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_ATTR_PAYLOAD_REF, refMatchesObject, } from "@metaobjectsdev/metadata";
+import { TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_ATTR_PAYLOAD_REF, resolveObjectRef, } from "@metaobjectsdev/metadata";
 import { oncePerRun, } from "../generator.js";
 import { renderOutputPrompt, templateSupportsPrompt } from "../templates/output-prompt.js";
 export const outputPrompt = function outputPrompt(opts) {
@@ -34,7 +34,8 @@ export const outputPrompt = function outputPrompt(opts) {
                 const payloadRef = t.attr(TEMPLATE_ATTR_PAYLOAD_REF);
                 if (typeof payloadRef !== "string")
                     continue;
-                const vo = root.children().find((c) => c.type === TYPE_OBJECT && refMatchesObject(c, payloadRef));
+                // ADR-0042: a bare @payloadRef resolves in the template's package.
+                const vo = resolveObjectRef(root, payloadRef, t.package ?? t.fileDefaultPackage ?? "").node;
                 if (!vo)
                     continue;
                 files.push({

package/dist/generators/output-prompt-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"output-prompt-file.js","sourceRoot":"","sources":["../../src/generators/output-prompt-file.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,mFAAmF;AACnF,iFAAiF;AACjF,iFAAiF;AACjF,sFAAsF;AACtF,kDAAkD;AAClD,EAAE;AACF,2CAA2C;AAC3C,sEAAsE;AACtE,EAAE;AACF,2BAA2B;AAC3B,yEAAyE;AAEzE,OAAO,EACL,~~WAAW,EACX,~~aAAa,EACb,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIL,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAS3F,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,IAAuB;IACvE,MAAM,SAAS,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC;YAC5B,uEAAuE;YACvE,MAAM,OAAO,GAAG,IAAI;iBACjB,QAAQ,EAAE;iBACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,uBAAuB,CAAC,CAAC;YACpF,MAAM,KAAK,GAAkB,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,0DAA0D;gBAC1D,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;oBAAE,SAAS;gBACzC,4EAA4E;gBAC5E,oFAAoF;gBACpF,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;gBACrD,IAAI,OAAO,UAAU,KAAK,QAAQ;oBAAE,SAAS;gBAC7C,MAAM,EAAE,GAAG,~~IAAI~~,CAAC,~~QAAQ~~,EAAE,~~CAAC~~,~~IAAI~~,CAAC,CAAC,~~CAAC~~,~~EAAE~~,~~EAAE,~~CAAC,CAAC,~~CAAC~~,IAAI,~~KAAK~~,~~WAAW,IAAI,gBAAgB,~~CAAC,CAAC,~~EAAE~~,~~UAAU,~~CAAC~~,CAAC,CAAC~~;~~gBAClG~~,IAAI,CAAC,EAAE;oBAAE,SAAS;gBAClB,KAAK,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,GAAG,SAAS,GAAG,CAAC,CAAC,IAAI,YAAY;oBACvC,OAAO,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;iBAC1C,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;KACH,CAAC;IACF,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAuC,CAAC"}
1	+ {"version":3,"file":"output-prompt-file.js","sourceRoot":"","sources":["../../src/generators/output-prompt-file.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,mFAAmF;AACnF,iFAAiF;AACjF,iFAAiF;AACjF,sFAAsF;AACtF,kDAAkD;AAClD,EAAE;AACF,2CAA2C;AAC3C,sEAAsE;AACtE,EAAE;AACF,2BAA2B;AAC3B,yEAAyE;AAEzE,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIL,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAS3F,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,IAAuB;IACvE,MAAM,SAAS,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC;YAC5B,uEAAuE;YACvE,MAAM,OAAO,GAAG,IAAI;iBACjB,QAAQ,EAAE;iBACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,uBAAuB,CAAC,CAAC;YACpF,MAAM,KAAK,GAAkB,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,0DAA0D;gBAC1D,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;oBAAE,SAAS;gBACzC,4EAA4E;gBAC5E,oFAAoF;gBACpF,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;gBACrD,IAAI,OAAO,UAAU,KAAK,QAAQ;oBAAE,SAAS;gBAC7C,mEAAmE;gBACnE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC5F,IAAI,CAAC,EAAE;oBAAE,SAAS;gBAClB,KAAK,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,GAAG,SAAS,GAAG,CAAC,CAAC,IAAI,YAAY;oBACvC,OAAO,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;iBAC1C,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;KACH,CAAC;IACF,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAuC,CAAC"}

package/dist/generators/prompt-render-file.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"prompt-render-file.d.ts","sourceRoot":"","sources":["../../src/generators/prompt-render-file.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,gBAAgB;IAC/B,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,YAAY,~~EAmDpB~~,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}
1	+ {"version":3,"file":"prompt-render-file.d.ts","sourceRoot":"","sources":["../../src/generators/prompt-render-file.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,gBAAgB;IAC/B,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,YAAY,EAqDpB,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}

package/dist/generators/prompt-render-file.js CHANGED Viewed

@@ -39,7 +39,9 @@ export const promptRender = function promptRender(opts) {
             }
             // Emit payload interfaces with a single shared dedupe set so a lens
             // referenced by multiple payloads appears exactly once.
-            const payloadInterfaces = generatePayloadInterfacesBatch(ctx.loadedRoot, payloads.map((p) => p.name));
+            // ADR-0042: pass each payload's FQN (resolutionKey) so a bare name never
+            // mis-binds — payloads may span packages, so no single referrerPkg fits.
+            const payloadInterfaces = generatePayloadInterfacesBatch(ctx.loadedRoot, payloads.map((p) => p.resolutionKey()));
             if (payloadInterfaces.length > 0) {
                 parts.push(payloadInterfaces);
             }

package/dist/generators/prompt-render-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"prompt-render-file.js","sourceRoot":"","sources":["../../src/generators/prompt-render-file.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,+EAA+E;AAC/E,+EAA+E;AAC/E,0BAA0B;AAC1B,EAAE;AACF,2CAA2C;AAC3C,sCAAsC;AACtC,EAAE;AACF,sBAAsB;AACtB,oFAAoF;AAEpF,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAGL,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AASnD,6EAA6E;AAC7E,4EAA4E;AAC5E,MAAM,aAAa,GAAG,iEAAiE,CAAC;AAExF,oFAAoF;AACpF,iFAAiF;AACjF,uEAAuE;AACvE,SAAS,yBAAyB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,IAAuB;IACvE,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,YAAY,CAAC;IAC9C,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;YACrC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,oBAAoB,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;YAEvE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClD,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,KAAK,GAAa,CAAC,MAAM,gBAAgB,iBAAiB,CAAC,CAAC;YAElE,iFAAiF;YACjF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5B,CAAC;YAED,oEAAoE;YACpE,wDAAwD;YACxD,MAAM,iBAAiB,GAAG,8BAA8B,CACtD,GAAG,CAAC,UAAU,EACd,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,~~IAAI~~,CAAC,~~CAC5B~~,CAAC;YACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAChC,CAAC;YAED,wEAAwE;YACxE,wEAAwE;YACxE,wEAAwE;YACxE,wEAAwE;YACxE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,MAAM,KAAK,GAAG,oBAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC;qBACvD,KAAK,CAAC,IAAI,CAAC;qBACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChF,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,EAAE;oBAAE,KAAK,CAAC,KAAK,EAAE,CAAC;gBAClE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/B,CAAC;YAED,OAAO,CAAC;oBACN,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI;iBACvF,CAAC,CAAC;QACL,CAAC,CAAC;KACH,CAAC;IACF,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAuC,CAAC"}
1	+ {"version":3,"file":"prompt-render-file.js","sourceRoot":"","sources":["../../src/generators/prompt-render-file.ts"],"names":[],"mappings":"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"}

package/dist/generators/render-helper-file.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"render-helper-file.d.ts","sourceRoot":"","sources":["../../src/generators/render-helper-file.ts"],"names":[],"mappings":"~~AAwBA~~,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,WAAW,gBAAgB;IAC/B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,~~EAoCpB~~,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}
1	+ {"version":3,"file":"render-helper-file.d.ts","sourceRoot":"","sources":["../../src/generators/render-helper-file.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,WAAW,gBAAgB;IAC/B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,EAqCpB,gBAAgB,CAAC,gBAAgB,CAAC,CAAC"}

package/dist/generators/render-helper-file.js CHANGED Viewed

@@ -14,7 +14,7 @@
 //
 // Custom output directory:
 //   generators: [..., renderHelper({ outDir: "src/generated/render" })]
-import { TYPE_OBJECT, TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_ATTR_PAYLOAD_REF, refMatchesObject, } from "@metaobjectsdev/metadata";
+import { TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_ATTR_PAYLOAD_REF, resolveObjectRef, } from "@metaobjectsdev/metadata";
 import { oncePerRun, } from "../generator.js";
 import { projectProvider } from "../render-engine/framework-provider.js";
 import { renderRenderHelper } from "../templates/render-helper.js";
@@ -39,7 +39,8 @@ export const renderHelper = function renderHelper(opts) {
                 const payloadRef = t.attr(TEMPLATE_ATTR_PAYLOAD_REF);
                 if (typeof payloadRef !== "string")
                     continue;
-                const vo = root.children().find((c) => c.type === TYPE_OBJECT && refMatchesObject(c, payloadRef));
+                // ADR-0042: a bare @payloadRef resolves in the template's package.
+                const vo = resolveObjectRef(root, payloadRef, t.package ?? t.fileDefaultPackage ?? "").node;
                 if (!vo)
                     continue;
                 files.push({

package/dist/generators/render-helper-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"render-helper-file.js","sourceRoot":"","sources":["../../src/generators/render-helper-file.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,8EAA8E;AAC9E,0EAA0E;AAC1E,gFAAgF;AAChF,gFAAgF;AAChF,2EAA2E;AAC3E,6EAA6E;AAC7E,EAAE;AACF,2CAA2C;AAC3C,sCAAsC;AACtC,EAAE;AACF,2BAA2B;AAC3B,wEAAwE;AAExE,OAAO,EACL,~~WAAW,EACX,~~aAAa,EACb,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIL,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AASnE,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,IAAuB;IACvE,MAAM,SAAS,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC;YAC5B,2EAA2E;YAC3E,2EAA2E;YAC3E,2EAA2E;YAC3E,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAClD,uEAAuE;YACvE,MAAM,OAAO,GAAG,IAAI;iBACjB,QAAQ,EAAE;iBACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,uBAAuB,CAAC,CAAC;YACpF,MAAM,KAAK,GAAkB,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,4EAA4E;gBAC5E,oFAAoF;gBACpF,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;gBACrD,IAAI,OAAO,UAAU,KAAK,QAAQ;oBAAE,SAAS;gBAC7C,MAAM,EAAE,GAAG,~~IAAI~~,CAAC,~~QAAQ~~,EAAE,~~CAAC~~,~~IAAI~~,CAAC,CAAC,~~CAAC~~,~~EAAE~~,~~EAAE,~~CAAC,CAAC,~~CAAC~~,IAAI,~~KAAK~~,~~WAAW,IAAI,gBAAgB,~~CAAC,CAAC,~~EAAE~~,~~UAAU,~~CAAC~~,CAAC,CAAC~~;~~gBAClG~~,IAAI,CAAC,EAAE;oBAAE,SAAS;gBAClB,KAAK,CAAC,IAAI,CAAC;oBACT,qEAAqE;oBACrE,iEAAiE;oBACjE,IAAI,EAAE,GAAG,SAAS,GAAG,CAAC,CAAC,IAAI,YAAY;oBACvC,OAAO,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC;iBACpD,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;KACH,CAAC;IACF,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAuC,CAAC"}
1	+ {"version":3,"file":"render-helper-file.js","sourceRoot":"","sources":["../../src/generators/render-helper-file.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,8EAA8E;AAC9E,0EAA0E;AAC1E,gFAAgF;AAChF,gFAAgF;AAChF,2EAA2E;AAC3E,6EAA6E;AAC7E,EAAE;AACF,2CAA2C;AAC3C,sCAAsC;AACtC,EAAE;AACF,2BAA2B;AAC3B,wEAAwE;AAExE,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIL,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AASnE,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,YAAY,CAAC,IAAuB;IACvE,MAAM,SAAS,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC;YAC5B,2EAA2E;YAC3E,2EAA2E;YAC3E,2EAA2E;YAC3E,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAClD,uEAAuE;YACvE,MAAM,OAAO,GAAG,IAAI;iBACjB,QAAQ,EAAE;iBACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,uBAAuB,CAAC,CAAC;YACpF,MAAM,KAAK,GAAkB,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,4EAA4E;gBAC5E,oFAAoF;gBACpF,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;gBACrD,IAAI,OAAO,UAAU,KAAK,QAAQ;oBAAE,SAAS;gBAC7C,mEAAmE;gBACnE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC5F,IAAI,CAAC,EAAE;oBAAE,SAAS;gBAClB,KAAK,CAAC,IAAI,CAAC;oBACT,qEAAqE;oBACrE,iEAAiE;oBACjE,IAAI,EAAE,GAAG,SAAS,GAAG,CAAC,CAAC,IAAI,YAAY;oBACvC,OAAO,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC;iBACpD,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;KACH,CAAC;IACF,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAuC,CAAC"}

package/dist/generators/template-doc-builder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-doc-builder.d.ts","sourceRoot":"","sources":["../../src/generators/template-doc-builder.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,QAAQ,EAed,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AASlF,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;8EAC0E;IAC1E,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB;;;mFAG+E;IAC/E,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AA+CD,gEAAgE;AAChE,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,CAAC,EAAE,wBAAwB,GAC9B,eAAe,~~CAmGjB~~"}
1	+ {"version":3,"file":"template-doc-builder.d.ts","sourceRoot":"","sources":["../../src/generators/template-doc-builder.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,QAAQ,EAed,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AASlF,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;8EAC0E;IAC1E,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB;;;mFAG+E;IAC/E,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AA+CD,gEAAgE;AAChE,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,CAAC,EAAE,wBAAwB,GAC9B,eAAe,CAsGjB"}

package/dist/generators/template-doc-builder.js CHANGED Viewed

@@ -63,9 +63,11 @@ export function buildTemplateDocData(template, opts) {
     const isEmail = kindRaw === TEMPLATE_KIND_EMAIL;
     const kind = isEmail ? TEMPLATE_KIND_EMAIL : TEMPLATE_KIND_DOCUMENT;
     const payloadRefRaw = template.attr(TEMPLATE_ATTR_PAYLOAD_REF);
-    const payloadName = typeof payloadRefRaw === "string" && payloadRefRaw.length > 0
-        ? stripPackage(payloadRefRaw)
-        : "unknown";
+    // ADR-0042: keep the FULL ref for RESOLUTION (an FQN @payloadRef to another
+    // package must resolve exactly — the old bare-tail fallback that used to find
+    // it is gone); strip to the bare name only for DISPLAY labels.
+    const payloadRefFull = typeof payloadRefRaw === "string" && payloadRefRaw.length > 0 ? payloadRefRaw : "unknown";
+    const payloadName = payloadRefFull !== "unknown" ? stripPackage(payloadRefFull) : "unknown";
     const requiredTags = attrStringList(template.attr(TEMPLATE_ATTR_REQUIRED_TAGS));
     const maxChars = readMaxChars(template.attr(TEMPLATE_ATTR_MAX_CHARS));
     let format = "";
@@ -129,6 +131,7 @@ export function buildTemplateDocData(template, opts) {
             layout,
             template,
             payloadName,
+            payloadRefFull,
             // Document: the single @textRef (unlabeled). Email: one labeled part each.
             refs: parts !== undefined
                 ? parts.map((p) => ({ label: p.label, ref: p.ref }))
@@ -154,8 +157,11 @@ export function buildTemplateDocData(template, opts) {
  * resolved, so the caller omits the section entirely.
  */
 function buildTemplateSourceSection(args) {
-    const { provider, root, layout, template, payloadName, refs } = args;
-    const tree = buildEnrichedPayloadTree(root, payloadName);
+    const { provider, root, layout, template, payloadName, payloadRefFull, refs } = args;
+    // ADR-0042: resolve the payload tree from the FULL ref — an FQN cross-package
+    // @payloadRef resolves exactly; a bare same-package ref resolves in the
+    // template's package.
+    const tree = buildEnrichedPayloadTree(root, payloadRefFull, template.package ?? template.fileDefaultPackage ?? "");
     const fromNode = docPageNode(template);
     // Layout-aware field href: route through the SAME docPageHref the Payload
     // cross-link uses, so the link lands on the owner VO's REAL page in BOTH

package/dist/generators/template-doc-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-doc-builder.js","sourceRoot":"","sources":["../../src/generators/template-doc-builder.ts"],"names":[],"mappings":"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~~WAAW~~,~~GACf~~,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;~~QAC3D~~,CAAC,CAAC,YAAY,CAAC,~~aAAa~~,CAAC~~;QAC7B~~,CAAC,CAAC,SAAS,CAAC;~~IAEhB~~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~~AAsBD~~;;;;;;;;;GASG;AACH,SAAS,0BAA0B,CAAC,IAAsB;IACxD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;~~IACrE~~,MAAM,IAAI,GAA2B,wBAAwB,CAAC,IAAI,EAAE,~~WAAW~~,CAAC~~,CAAC~~;~~IACjF~~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"}
1	+ {"version":3,"file":"template-doc-builder.js","sourceRoot":"","sources":["../../src/generators/template-doc-builder.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+EAA+E;AAC/E,iFAAiF;AACjF,uEAAuE;AACvE,iFAAiF;AACjF,4EAA4E;AAC5E,sBAAsB;AAEtB,OAAO,EAGL,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,EAC3B,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACpB,YAAY,GACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,aAAa,EACb,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAA6B,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AAerC,8EAA8E;AAC9E,MAAM,mBAAmB,GACvB,2EAA2E;IAC3E,iDAAiD,CAAC;AACpD,MAAM,gBAAgB,GACpB,2EAA2E;IAC3E,6EAA6E,CAAC;AAEhF;;6BAE6B;AAC7B,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACrD,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAW;IACtC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAED;;;;0CAI0C;AAC1C,SAAS,cAAc,CAAC,IAA0B,EAAE,IAAY;IAC9D,MAAM,GAAG,GAAG,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,oBAAoB,CAClC,QAAkB,EAClB,IAA+B;IAE/B,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,MAAM,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,EAAE,UAAU,CAAC;IAC9B,wFAAwF;IACxF,MAAM,OAAO,GAAG,CAAE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAwB;QACxE,qBAAqB,CAAC,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,OAAO,GAAG,OAAO,KAAK,mBAAmB,CAAC;IAChD,MAAM,IAAI,GAAyB,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAE1F,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC/D,4EAA4E;IAC5E,8EAA8E;IAC9E,+DAA+D;IAC/D,MAAM,cAAc,GAClB,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,MAAM,WAAW,GAAG,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5F,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAEtE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAuC,CAAC;IAC5C,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC/D,KAAK,GAAG,EAAE,CAAC;QACX,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YAClF,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACpF,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACrF,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,CAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAwB,IAAI,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/F,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACtD,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,6EAA6E;IAC7E,4EAA4E;IAC5E,iEAAiE;IACjE,MAAM,WAAW,GAAG,WAAW,CAC7B,MAAM,EACN,WAAW,CAAC,QAAQ,CAAC,EACrB,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAClC,CAAC;IAEF,MAAM,IAAI,GAAoB;QAC5B,eAAe,EAAE,QAAQ,gBAAgB,qBAAqB;QAC9D,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI;QACJ,OAAO;QACP,MAAM;QACN,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;QACjD,UAAU;QACV,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,mBAAmB;KAC7D,CAAC;IAEF,IAAI,KAAK,KAAK,SAAS;QAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC9B,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS;QAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAErD,4EAA4E;IAC5E,6EAA6E;IAC7E,+EAA+E;IAC/E,0EAA0E;IAC1E,8EAA8E;IAC9E,IAAI,IAAI,EAAE,QAAQ,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QACpF,MAAM,OAAO,GAAG,0BAA0B,CAAC;YACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI;YACJ,MAAM;YACN,QAAQ;YACR,WAAW;YACX,cAAc;YACd,2EAA2E;YAC3E,IAAI,EACF,KAAK,KAAK,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBACpD,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA0BD;;;;;;;;;GASG;AACH,SAAS,0BAA0B,CAAC,IAAsB;IACxD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACrF,8EAA8E;IAC9E,wEAAwE;IACxE,sBAAsB;IACtB,MAAM,IAAI,GAA2B,wBAAwB,CAC3D,IAAI,EACJ,cAAc,EACd,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,kBAAkB,IAAI,EAAE,CACtD,CAAC;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEvC,0EAA0E;IAC1E,yEAAyE;IACzE,gEAAgE;IAChE,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,IAAY,EAAU,EAAE,CACxD,GAAG,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;IAE3F,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAE/E,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS,CAAC,mCAAmC;QACvE,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE;YAC5C,WAAW,EAAE,WAAW;YACxB,kBAAkB;YAClB,SAAS;SACV,CAAC,CAAC;QACH,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,WAAW,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7E,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,CAAC,oBAAoB,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,uBAAuB,CAC9B,IAAc,EACd,MAAoB,EACpB,QAAqB;IAErB,wEAAwE;IACxE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAC;IAClD,uEAAuE;IACvE,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,OAAO,KAAK,uBAAuB;YAAE,SAAS;QACxF,KAAK,MAAM,IAAI,IAAI;YACjB,sBAAsB;YACtB,yBAAyB;YACzB,2BAA2B;YAC3B,2BAA2B;SAC5B,EAAE,CAAC;YACF,uEAAuE;YACvE,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAW,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC"}

package/dist/generators/template-payload-tree.d.ts CHANGED Viewed

@@ -11,5 +11,5 @@ import type { AnnotatePayloadField } from "./template-source-annotate.js";
  * Returns `[]` when the VO can't be resolved — the annotator then leaves the
  * referencing variables unresolved (flagged "not on payload"), never throws.
  */
-export declare function buildEnrichedPayloadTree(root: MetaRoot, voName: string, seen?: ReadonlySet<string>): AnnotatePayloadField[];
+export declare function buildEnrichedPayloadTree(root: MetaRoot, voName: string, referrerPkg?: string, seen?: ReadonlySet<string>): AnnotatePayloadField[];
 //# sourceMappingURL=template-payload-tree.d.ts.map

package/dist/generators/template-payload-tree.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-payload-tree.d.ts","sourceRoot":"","sources":["../../src/generators/template-payload-tree.ts"],"names":[],"mappings":"AAoBA,OAAO,EAEL,KAAK,QAAQ,~~EAMd~~,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;~~AAY1E~~;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,WAAW,CAAC,MAAM,CAAa,GACpC,oBAAoB,EAAE,~~CA0BxB~~"}
1	+ {"version":3,"file":"template-payload-tree.d.ts","sourceRoot":"","sources":["../../src/generators/template-payload-tree.ts"],"names":[],"mappings":"AAoBA,OAAO,EAEL,KAAK,QAAQ,EAKd,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAW1E;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,WAAW,SAAK,EAChB,IAAI,GAAE,WAAW,CAAC,MAAM,CAAa,GACpC,oBAAoB,EAAE,CAgCxB"}

package/dist/generators/template-payload-tree.js CHANGED Viewed

@@ -17,14 +17,15 @@
 //   • isFieldRequired / neutralTypeStr — the SAME helpers the entity Constraints
 //     table uses, so the documented type/required can never drift from the
 //     entity page.
-import { TYPE_OBJECT, FIELD_SUBTYPE_OBJECT, FIELD_ATTR_OBJECT_REF, stripPackage, refMatchesObject, } from "@metaobjectsdev/metadata";
+import { FIELD_SUBTYPE_OBJECT, FIELD_ATTR_OBJECT_REF, stripPackage, resolveObjectRef, } from "@metaobjectsdev/metadata";
 import { isFieldRequired, neutralTypeStr } from "./docs-data-builder.js";
-// ADR-0041: FQN-exact object resolution — a "::"-qualified @objectRef binds the exact
+// ADR-0041/0042: FQN-exact object resolution — a "::"-qualified @objectRef binds the exact
 // package (never a bare-tail fallback), so a same-named object.value in another package
-// can't be wrongly bound (which would attach the wrong owner/type/link to a doc node).
+// can't be wrongly bound (which would attach the wrong owner/type/link to a doc node); a
+// bare ref binds the referrer's package FIRST, else a root-level object.
 // Mirrors render-helper.ts's findObject + the CLI payload-field-tree resolver.
-function findObject(root, ref) {
-    return root.children().find((c) => c.type === TYPE_OBJECT && refMatchesObject(c, ref));
+function findObject(root, ref, referrerPkg = "") {
+    return resolveObjectRef(root, ref, referrerPkg).node;
 }
 /**
  * Walk the payload VO `voName` into an enriched `AnnotatePayloadField[]`. Each
@@ -37,13 +38,17 @@ function findObject(root, ref) {
  * Returns `[]` when the VO can't be resolved — the annotator then leaves the
  * referencing variables unresolved (flagged "not on payload"), never throws.
  */
-export function buildEnrichedPayloadTree(root, voName, seen = new Set()) {
+export function buildEnrichedPayloadTree(root, voName, referrerPkg = "", seen = new Set()) {
     if (seen.has(voName))
         return [];
-    const vo = findObject(root, voName);
+    const vo = findObject(root, voName, referrerPkg);
     if (vo === undefined)
         return [];
     const owner = stripPackage(vo.name);
+    // ADR-0042: a nested @objectRef resolves in the FIELD's own declaring package
+    // (fallback below), which differs from this VO's when the field is inherited via
+    // extends from an abstract VO in another package (the bare ref was authored there).
+    const voPkg = vo.package ?? vo.fileDefaultPackage ?? "";
     const nextSeen = new Set(seen).add(voName);
     const out = [];
     for (const f of vo.fields()) {
@@ -58,8 +63,10 @@ export function buildEnrichedPayloadTree(root, voName, seen = new Set()) {
             if (typeof ref === "string" && ref.length > 0) {
                 // Owner switches to the nested VO for its fields (the recursion below
                 // re-derives `owner` from the resolved VO's own name). Pass the FULL ref
-                // (not stripPackage) so findObject resolves it FQN-exact (ADR-0041).
-                node.fields = buildEnrichedPayloadTree(root, ref, nextSeen);
+                // (not stripPackage), resolved package-locally against the FIELD's declaring
+                // package (ADR-0042 — the bare ref was authored there, not on the concrete VO).
+                const fieldPkg = f.parent?.package ?? f.parent?.fileDefaultPackage ?? voPkg;
+                node.fields = buildEnrichedPayloadTree(root, ref, fieldPkg, nextSeen);
             }
         }
         out.push(node);

package/dist/generators/template-payload-tree.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"template-payload-tree.js","sourceRoot":"","sources":["../../src/generators/template-payload-tree.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,yCAAyC;AACzC,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,+EAA+E;AAC/E,gFAAgF;AAChF,uDAAuD;AACvD,EAAE;AACF,iFAAiF;AACjF,gFAAgF;AAChF,+EAA+E;AAC/E,iFAAiF;AACjF,6EAA6E;AAC7E,EAAE;AACF,+BAA+B;AAC/B,iFAAiF;AACjF,2EAA2E;AAC3E,mBAAmB;AAEnB,OAAO,EAGL,~~WAAW,EACX,~~oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGzE,~~sFAAsF~~;~~AACtF~~,wFAAwF;AACxF,~~uFAAuF~~;~~AACvF~~,+EAA+E;AAC/E,SAAS,UAAU,CAAC,IAAc,EAAE,GAAW~~;IAC7C~~,~~OAAO~~,~~IAAI~~,~~CAAC~~,~~QAAQ,~~EAAE,~~CAAC~~,~~IAAI~~,CAAC,~~CAAC~~,~~CAAC,~~EAAE,EAAE,~~CAAC,CAAC,CAAC,IAAI,KAAK,~~WAAW,~~IAAI,gBAAgB,~~CAAC,CAAC,~~EAAE~~,~~GAAG,~~CAAC~~,CAExE,CAAC~~;~~AAChB~~,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,wBAAwB,CACtC,IAAc,EACd,MAAc,EACd,OAA4B,IAAI,GAAG,EAAE;IAErC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,EAAE,GAA2B,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;~~IAC5D~~,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAyB;YACjC,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK;YACL,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YACvB,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;SAC7B,CAAC;QACF,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,sEAAsE;gBACtE,yEAAyE;gBACzE,~~qEAAqE~~;~~gBACrE~~,IAAI,CAAC,MAAM,GAAG,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;~~YAC9D~~,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"template-payload-tree.js","sourceRoot":"","sources":["../../src/generators/template-payload-tree.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,yCAAyC;AACzC,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,+EAA+E;AAC/E,gFAAgF;AAChF,uDAAuD;AACvD,EAAE;AACF,iFAAiF;AACjF,gFAAgF;AAChF,+EAA+E;AAC/E,iFAAiF;AACjF,6EAA6E;AAC7E,EAAE;AACF,+BAA+B;AAC/B,iFAAiF;AACjF,2EAA2E;AAC3E,mBAAmB;AAEnB,OAAO,EAGL,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGzE,2FAA2F;AAC3F,wFAAwF;AACxF,yFAAyF;AACzF,yEAAyE;AACzE,+EAA+E;AAC/E,SAAS,UAAU,CAAC,IAAc,EAAE,GAAW,EAAE,WAAW,GAAG,EAAE;IAC/D,OAAO,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,IAA8B,CAAC;AACjF,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,wBAAwB,CACtC,IAAc,EACd,MAAc,EACd,WAAW,GAAG,EAAE,EAChB,OAA4B,IAAI,GAAG,EAAE;IAErC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,EAAE,GAA2B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACzE,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACpC,8EAA8E;IAC9E,iFAAiF;IACjF,oFAAoF;IACpF,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,kBAAkB,IAAI,EAAE,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAyB;YACjC,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK;YACL,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YACvB,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;SAC7B,CAAC;QACF,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,sEAAsE;gBACtE,yEAAyE;gBACzE,6EAA6E;gBAC7E,gFAAgF;gBAChF,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,CAAC,MAAM,EAAE,kBAAkB,IAAI,KAAK,CAAC;gBAC5E,IAAI,CAAC,MAAM,GAAG,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/generators/trace-helper-file.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"trace-helper-file.d.ts","sourceRoot":"","sources":["../../src/generators/trace-helper-file.ts"],"names":[],"mappings":"AA6BA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAQzB,MAAM,WAAW,eAAe;IAC9B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAiBD,eAAO,MAAM,eAAe,~~EAkPvB~~,gBAAgB,CAAC,eAAe,CAAC,CAAC"}
1	+ {"version":3,"file":"trace-helper-file.d.ts","sourceRoot":"","sources":["../../src/generators/trace-helper-file.ts"],"names":[],"mappings":"AA6BA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAQzB,MAAM,WAAW,eAAe;IAC9B,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAiBD,eAAO,MAAM,eAAe,EAuPvB,gBAAgB,CAAC,eAAe,CAAC,CAAC"}

package/dist/generators/trace-helper-file.js CHANGED Viewed

@@ -92,8 +92,9 @@ export const traceHelperFile = function traceHelperFile(opts) {
                 ? "Format.XML"
                 : "Format.JSON";
             // Collect VO names for interface emission (dedupe via batch emitter).
-            // Both refs are guaranteed strings by the guards above.
-            const interfaces = generatePayloadInterfacesBatch(ctx.loadedRoot, [payloadRef, responseRef]);
+            // Both refs are guaranteed strings by the guards above. ADR-0042: a bare
+            // ref resolves in the prompt's package.
+            const interfaces = generatePayloadInterfacesBatch(ctx.loadedRoot, [payloadRef, responseRef], prompt.package ?? prompt.fileDefaultPackage ?? "");
             const requestType = payloadRef;
             // A renderable prompt (carries @textRef) gets an additional call<Entity> helper
             // that renders the prompt text, calls the LLM, then parses + persists a trace row.

package/dist/generators/trace-helper-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"trace-helper-file.js","sourceRoot":"","sources":["../../src/generators/trace-helper-file.ts"],"names":[],"mappings":"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~~wDAAwD~~;~~YACxD~~,MAAM,UAAU,GAAG,8BAA8B,~~CAAC~~,GAAG,CAAC,UAAU,~~EAAE~~,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;~~YAE7F~~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"}
1	+ {"version":3,"file":"trace-helper-file.js","sourceRoot":"","sources":["../../src/generators/trace-helper-file.ts"],"names":[],"mappings":"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"}

package/dist/payload-codegen.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { type MetaData } from "@metaobjectsdev/metadata";
-/** Emit the payload `interface` (+ nested element interfaces) for an object.value view-object. */
-export declare function generatePayloadInterfaces(root: MetaData, voName: string): string;
+/** Emit the payload `interface` (+ nested element interfaces) for an object.value view-object.
+ *  `referrerPkg` (ADR-0042) is the package a bare `voName` resolves in; pass an FQN and it is ignored. */
+export declare function generatePayloadInterfaces(root: MetaData, voName: string, referrerPkg?: string): string;
 /**
  * Emit interfaces for several payloads at once, using a single shared dedupe
  * set so nested types (e.g. lens projections referenced by multiple payloads)
@@ -8,7 +9,7 @@ export declare function generatePayloadInterfaces(root: MetaData, voName: string
  *
  * Returns the empty string when `voNames` is empty.
  */
-export declare function generatePayloadInterfacesBatch(root: MetaData, voNames: readonly string[]): string;
+export declare function generatePayloadInterfacesBatch(root: MetaData, voNames: readonly string[], referrerPkg?: string): string;
 /** Emit a typed render handle binding a template's @textRef + @format and typing its payload. */
 export declare function generateRenderHandle(root: MetaData, templateName: string): string;
 //# sourceMappingURL=payload-codegen.d.ts.map

package/dist/payload-codegen.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"payload-codegen.d.ts","sourceRoot":"","sources":["../src/payload-codegen.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,QAAQ,~~EAcd~~,MAAM,0BAA0B,CAAC;~~AAyHlC,kGAAkG~~;~~AAClG~~,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,~~CAIhF~~;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,~~CAAC~~,IAAI,EAAE,QAAQ,~~EAAE~~,OAAO,EAAE,SAAS,MAAM,EAAE,~~GAAG~~,MAAM,~~CASjG~~;AAMD,iGAAiG;AACjG,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAyBjF"}
1	+ {"version":3,"file":"payload-codegen.d.ts","sourceRoot":"","sources":["../src/payload-codegen.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,QAAQ,EAad,MAAM,0BAA0B,CAAC;AAgIlC;0GAC0G;AAC1G,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,SAAK,GAAG,MAAM,CAIlG;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,WAAW,SAAK,GACf,MAAM,CASR;AAMD,iGAAiG;AACjG,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAyBjF"}

package/dist/payload-codegen.js CHANGED Viewed

@@ -9,7 +9,7 @@
 // should reuse codegen-ts's canonical field mapping + ts-poet emit + the
 // Generator/runner integration. Assembler (RDB materialization + host overlay)
 // is out of scope — this only emits the contract.
-import { TYPE_OBJECT, TYPE_FIELD, TYPE_TEMPLATE, FIELD_SUBTYPE_OBJECT, FIELD_SUBTYPE_ENUM, FIELD_ATTR_OBJECT_REF, FIELD_ATTR_REQUIRED, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_TEXT_REF, TEMPLATE_ATTR_FORMAT, refMatchesObject, stripPackage, } from "@metaobjectsdev/metadata";
+import { TYPE_FIELD, TYPE_TEMPLATE, FIELD_SUBTYPE_OBJECT, FIELD_SUBTYPE_ENUM, FIELD_ATTR_OBJECT_REF, FIELD_ATTR_REQUIRED, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_TEXT_REF, TEMPLATE_ATTR_FORMAT, resolveObjectRef, stripPackage, } from "@metaobjectsdev/metadata";
 import { enumValues } from "./enum-meta.js";
 import { enumUnionAliasName, enumUnionString } from "./templates/inferred-types.js";
 const SCALAR_TS = {
@@ -29,10 +29,9 @@ const SCALAR_TS = {
     timestamp: "string",
 };
 // ADR-0039: resolving — root has no super (children()==ownChildren()); a top-level object/template may itself extend, so resolve rather than work-by-accident.
-function findObject(root, name) {
-    // FR-032 — @payloadRef/@responseRef are FQN after the desugar/sweep; match on
-    // the effective FQN resolution key (with bare back-compat).
-    return root.children().find((c) => c.type === TYPE_OBJECT && refMatchesObject(c, name));
+// ADR-0042: resolveObjectRef gives package-local-before-root-level precedence for a bare ref, FQN-exact otherwise.
+function findObject(root, name, referrerPkg = "") {
+    return resolveObjectRef(root, name, referrerPkg).node;
 }
 /**
  * Map a payload field to its strict TS type.
@@ -80,10 +79,15 @@ function fieldTsType(field, ownerName) {
 function isFieldRequired(field) {
     return field.attr(FIELD_ATTR_REQUIRED) === true;
 }
-function emitInterface(root, voRef, emitted, out, enumAliases) {
-    const vo = findObject(root, voRef);
+function emitInterface(root, voRef, referrerPkg, emitted, out, enumAliases) {
+    const vo = findObject(root, voRef, referrerPkg);
     if (!vo)
         return;
+    // ADR-0042: a nested @objectRef resolves in the FIELD's OWN declaring package —
+    // which may differ from this resolved VO's package when the field is inherited
+    // via extends from an abstract VO in another package (the bare ref was authored
+    // there). Fall back to this VO's package when a field has no parent package.
+    const voPkg = vo.package ?? vo.fileDefaultPackage ?? "";
     // FR-032/ADR-0041 — voRef may arrive as an FQN (a nested @objectRef); the emitted
     // interface NAME must be the bare, TS-valid name. Dedupe on the bare name too, so a
     // VO reached once by bare name and once by FQN still emits exactly once.
@@ -111,19 +115,22 @@ function emitInterface(root, voRef, emitted, out, enumAliases) {
         const tsType = isRequired ? type : `${type} | null`;
         const optional = isRequired ? "" : "?";
         lines.push(`  ${f.name}${optional}: ${tsType};`);
+        // The nested ref resolves in the FIELD's declaring package (ADR-0042), not the
+        // resolved VO's — they differ when `f` is inherited from an abstract VO elsewhere.
         if (refVo)
-            refs.push(refVo);
+            refs.push({ ref: refVo, pkg: f.parent?.package ?? f.parent?.fileDefaultPackage ?? voPkg });
     }
     lines.push("}");
     const block = aliasLines.length > 0 ? `${aliasLines.join("\n")}\n${lines.join("\n")}` : lines.join("\n");
     out.push(block);
     for (const r of refs)
-        emitInterface(root, r, emitted, out, enumAliases);
+        emitInterface(root, r.ref, r.pkg, emitted, out, enumAliases);
 }
-/** Emit the payload `interface` (+ nested element interfaces) for an object.value view-object. */
-export function generatePayloadInterfaces(root, voName) {
+/** Emit the payload `interface` (+ nested element interfaces) for an object.value view-object.
+ *  `referrerPkg` (ADR-0042) is the package a bare `voName` resolves in; pass an FQN and it is ignored. */
+export function generatePayloadInterfaces(root, voName, referrerPkg = "") {
     const out = [];
-    emitInterface(root, voName, new Set(), out, new Set());
+    emitInterface(root, voName, referrerPkg, new Set(), out, new Set());
     return out.join("\n\n") + "\n";
 }
 /**
@@ -133,14 +140,14 @@ export function generatePayloadInterfaces(root, voName) {
  *
  * Returns the empty string when `voNames` is empty.
  */
-export function generatePayloadInterfacesBatch(root, voNames) {
+export function generatePayloadInterfacesBatch(root, voNames, referrerPkg = "") {
     if (voNames.length === 0)
         return "";
     const out = [];
     const emitted = new Set();
     const enumAliases = new Set();
     for (const name of voNames) {
-        emitInterface(root, name, emitted, out, enumAliases);
+        emitInterface(root, name, referrerPkg, emitted, out, enumAliases);
     }
     return out.length === 0 ? "" : out.join("\n\n") + "\n";
 }