npm - @voxgig/sdkgen - Versions diffs - 1.3.17 → 1.3.18 - Mend

@voxgig/sdkgen 1.3.17 → 1.3.18

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 (220) hide show

package/bin/voxgig-sdkgen CHANGED Viewed

@@ -8,7 +8,7 @@ const { Shape, One } = require('shape')
 const { SdkGen } = require('../dist/sdkgen.js')
-const VERSION = '1.3.17'
+const VERSION = '1.3.18'
 const KONSOLE = console

package/dist/cmp/Entity.js CHANGED Viewed

@@ -10,8 +10,12 @@ const Entity = (0, jostraca_1.cmp)(function Entity(props) {
     const entitySDK = (0, types_1.getModelPath)(ctx$.model, `main.${types_1.KIT}.entity.${entity.name}`);
     const Entity_sdk = (0, utility_1.requirePath)(ctx$, `./cmp/${target.name}/Entity_${target.name}`);
     Entity_sdk['Entity']({ target, entity, entitySDK });
+    // Log identifiers, not the model subtrees. `target` and `entity` are large
+    // aontu nodes and this fires once per entity per target (thousands of times
+    // for a big API x 22 targets), so passing them serialised the whole model
+    // fragment each time at default log level.
     log.info({
-        point: 'generate-entity', target, entity,
+        point: 'generate-entity', target: target.name, entity: entity.name,
         note: 'target:' + target.name + ', ' + 'entity: ' + entity.name
     });
 });

package/dist/cmp/Entity.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAEiB;AAEjB,wCAAwC;AAGxC,oCAGiB;AAGjB,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACtC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,WAAG,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE/E,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,SAAS,MAAM,CAAC,IAAI,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;IAEnD,GAAG,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;~~QACxC~~,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI;KAChE,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;QAIA,MAAM"}
1	+ {"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAEiB;AAEjB,wCAAwC;AAGxC,oCAGiB;AAGjB,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACtC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,WAAG,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE/E,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,SAAS,MAAM,CAAC,IAAI,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;IAEnD,2EAA2E;IAC3E,4EAA4E;IAC5E,0EAA0E;IAC1E,2CAA2C;IAC3C,GAAG,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI;QAClE,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI;KAChE,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;QAIA,MAAM"}

package/dist/cmp/Feature.js CHANGED Viewed

@@ -18,7 +18,8 @@ const Feature = (0, jostraca_1.cmp)(function Feature(props) {
         });
     }
     log.info({
-        point: 'generate-feature', target, feature,
+        // Identifiers only — see the note in Entity.ts.
+        point: 'generate-feature', target: target.name, feature: feature.name,
         note: 'target:' + target.name + ', ' + 'feature: ' + feature.name
     });
 });

package/dist/cmp/Feature.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Feature.js","sourceRoot":"","sources":["../../src/cmp/Feature.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAE5C,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,SAAS,OAAO,CAAC,KAAU;IAC7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,IAAI,KAAK,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;QAChC,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YACnD,gDAAgD;YAChD,IAAA,eAAI,EAAC;gBACH,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI;gBAC1D,OAAO,EAAE;oBACP,eAAe,EAAE,OAAO,CAAC,OAAO;oBAChC,YAAY,EAAE,OAAO,CAAC,IAAI;iBAC3B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO;~~QAC1C~~,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI;KAClE,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;QAIA,OAAO"}
1	+ {"version":3,"file":"Feature.js","sourceRoot":"","sources":["../../src/cmp/Feature.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAE5C,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,SAAS,OAAO,CAAC,KAAU;IAC7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,IAAI,KAAK,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;QAChC,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YACnD,gDAAgD;YAChD,IAAA,eAAI,EAAC;gBACH,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI;gBAC1D,OAAO,EAAE;oBACP,eAAe,EAAE,OAAO,CAAC,OAAO;oBAChC,YAAY,EAAE,OAAO,CAAC,IAAI;iBAC3B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,IAAI,CAAC;QACP,gDAAgD;QAChD,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI;QACrE,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI;KAClE,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;QAIA,OAAO"}

package/dist/helpers/canonType.js CHANGED Viewed

@@ -15,9 +15,14 @@
 // the SINGLE mapping per language: components must not keep local copies.
 //
 // Kept as a small mirror here (rather than importing VALID_CANON at runtime)
-// because apidef is a peer dependency and the table is the INVERSE direction;
-// `ts/test/canontype.test.ts` asserts this table covers apidef's exported
-// sentinel vocabulary whenever apidef is installed, so drift fails the suite.
+// because apidef is a peer dependency and the table is the INVERSE direction.
+//
+// `ts/test/canonsync.test.ts` guards it two ways: the vocabulary and every
+// language column are pinned LOCALLY (that check always runs), and the table
+// is cross-checked against apidef's exported VALID_CANON/CANON_ONE when the
+// installed apidef exports them. Note that the currently published apidef
+// (6.3.1) does NOT export them, so the cross-check skips — do not rely on it
+// alone; add a new sentinel to the local list in the same change.
 //
 // KNOWN GAPS (papered over sanely, documented for the port):
 //  - Unknown / missing sentinel  -> the language's "any" (never throws).

package/dist/helpers/canonType.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"canonType.js","sourceRoot":"","sources":["../../src/helpers/canonType.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,EAAE;AACF,wEAAwE;AACxE,4EAA4E;AAC5E,8EAA8E;AAC9E,iFAAiF;AACjF,4EAA4E;AAC5E,gEAAgE;AAChE,EAAE;AACF,6EAA6E;AAC7E,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,0EAA0E;AAC1E,EAAE;AACF,6EAA6E;AAC7E,8EAA8E;AAC9E,0EAA0E;AAC1E,~~8EAA8E~~;~~AAC9E~~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"}
1	+ {"version":3,"file":"canonType.js","sourceRoot":"","sources":["../../src/helpers/canonType.ts"],"names":[],"mappings":"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"}

package/dist/helpers/collectDeps.d.ts CHANGED Viewed

@@ -5,6 +5,6 @@ type DepEntry = {
     source: 'feature' | 'target';
     raw: ModelDep;
 };
-declare function collectDeps(model: SdkModel, targetName: string, targetDeps: Record<string, ModelDep> | undefined): DepEntry[];
+declare function collectDeps(model: SdkModel, targetName: string, targetDeps: Record<string, ModelDep> | undefined, log?: any): DepEntry[];
 export type { DepEntry, };
 export { collectDeps, };

package/dist/helpers/collectDeps.js CHANGED Viewed

@@ -15,33 +15,56 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectDeps = collectDeps;
 const jostraca_1 = require("jostraca");
 const apidef_1 = require("@voxgig/apidef");
-function collectDeps(model, targetName, targetDeps) {
+function collectDeps(model, targetName, targetDeps, log) {
     const out = [];
     const feature = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.feature`);
+    // Deduplicate by package name. Two features can require the same package
+    // (or a feature and the target itself can), and every Package_<lang>.ts
+    // renders one manifest line per entry — a duplicate key is a hard parse
+    // error in go.mod and Cargo.toml, and silently last-wins in package.json.
+    // FIRST occurrence wins, so the deterministic (sorted-key) feature order
+    // decides; a conflicting version is reported rather than silently dropped.
+    const seen = {};
+    const add = (dep, source, owner) => {
+        const name = dep.key$;
+        if (null == name)
+            return;
+        const prev = seen[name];
+        if (null != prev) {
+            if (log?.warn && prev.version !== dep.version) {
+                log.warn({
+                    point: 'dep-version-conflict', target: targetName, dep: name,
+                    kept: prev.version, dropped: dep.version, from: owner,
+                    note: `${targetName}: dependency ${name} declared twice with ` +
+                        `different versions — keeping ${prev.version} (${prev.source}), ` +
+                        `ignoring ${dep.version} (${source} ${owner})`,
+                });
+            }
+            return;
+        }
+        const entry = {
+            name,
+            version: dep.version,
+            source,
+            raw: dep,
+        };
+        seen[name] = entry;
+        out.push(entry);
+    };
     (0, jostraca_1.each)(feature, (f) => {
         const langDeps = f?.deps?.[targetName];
         if (!langDeps)
             return;
         (0, jostraca_1.each)(langDeps, (dep) => {
             if (dep?.active) {
-                out.push({
-                    name: dep.key$,
-                    version: dep.version,
-                    source: 'feature',
-                    raw: dep,
-                });
+                add(dep, 'feature', f.name);
             }
         });
     });
     if (targetDeps) {
         (0, jostraca_1.each)(targetDeps, (dep) => {
             if (dep?.active !== false) {
-                out.push({
-                    name: dep.key$,
-                    version: dep.version,
-                    source: 'target',
-                    raw: dep,
-                });
+                add(dep, 'target', targetName);
             }
         });
     }

package/dist/helpers/collectDeps.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collectDeps.js","sourceRoot":"","sources":["../../src/helpers/collectDeps.ts"],"names":[],"mappings":";AAAA,2EAA2E;AAC3E,+EAA+E;AAC/E,yCAAyC;AACzC,EAAE;AACF,yEAAyE;AACzE,wEAAwE;AACxE,EAAE;AACF,0EAA0E;AAC1E,wEAAwE;AACxE,8EAA8E;AAC9E,yEAAyE;AACzE,8BAA8B;;~~QA2D5B~~,WAAW;~~AAzDb~~,uCAA+B;AAC/B,2CAAkD;AAWlD,SAAS,WAAW,CAClB,KAAe,EACf,UAAkB,EAClB,UAAgD;~~IAEhD~~,MAAM,GAAG,GAAe,EAAE,CAAA;IAC1B,MAAM,OAAO,GAAG,IAAA,qBAAY,EAAC,KAAK,EAAE,QAAQ,YAAG,UAAU,CAAC,CAAA;IAE1D,~~IAAA~~,~~eAAI~~,~~EAAC~~,~~OAAO~~,~~EAAE~~,~~CAAC~~,~~CAAM~~,EAAE,~~EAAE~~;~~QACvB~~,MAAM,~~QAAQ~~,GAAG,CAAC,EAAE,~~IAAI~~,EAAE,~~CAAC~~,~~UAAU~~,CAAC,CAAA;~~QACtC~~,IAAI,~~CAAC~~,~~QAAQ~~;YAAE,OAAM;~~QACrB~~,~~IAAA~~,~~eAAI~~,~~EAAC~~,~~QAAQ~~,~~EAAE~~,CAAC,~~GAAQ~~,EAAE,~~EAAE~~;~~YAC1B~~,IAAI,GAAG,EAAE,~~MAAM~~,EAAE,CAAC;~~gBAChB~~,GAAG,CAAC,IAAI,CAAC;oBACP,~~IAAI~~,EAAE,GAAG,~~CAAC~~,IAAI;~~oBACd~~,OAAO,EAAE,GAAG,CAAC,OAAO;~~oBACpB~~,~~MAAM~~,EAAE,~~SAAS~~;~~oBACjB~~,GAAG,~~EAAE~~,GAAG;~~iBACT~~,CAAC,CAAA;YACJ,CAAC;~~QACH~~,CAAC,CAAC,CAAA;~~IACJ~~,CAAC,CAAC,CAAA;~~IAEF~~,IAAI,~~UAAU~~,~~EAAE~~,CAAC;~~QACf~~,IAAA,eAAI,EAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,EAAE;~~YAC5B~~,IAAI,GAAG,EAAE,MAAM,~~KAAK,KAAK,~~EAAE,CAAC;~~gBAC1B~~,GAAG,CAAC,IAAI,CAAC;~~oBACP~~,~~IAAI~~,~~EAAE~~,~~GAAG~~,CAAC,IAAI;~~oBACd~~,~~OAAO~~,EAAE,~~GAAG,~~CAAC,~~OAAO~~;~~oBACpB~~,MAAM,EAAE,~~QAAQ~~;~~oBAChB~~,GAAG,~~EAAE~~,GAAG~~;iBACT~~,CAAC,CAAA;~~YACJ~~,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}
1	+ {"version":3,"file":"collectDeps.js","sourceRoot":"","sources":["../../src/helpers/collectDeps.ts"],"names":[],"mappings":";AAAA,2EAA2E;AAC3E,+EAA+E;AAC/E,yCAAyC;AACzC,EAAE;AACF,yEAAyE;AACzE,wEAAwE;AACxE,EAAE;AACF,0EAA0E;AAC1E,wEAAwE;AACxE,8EAA8E;AAC9E,yEAAyE;AACzE,8BAA8B;;QAsF5B,WAAW;AApFb,uCAA+B;AAC/B,2CAAkD;AAWlD,SAAS,WAAW,CAClB,KAAe,EACf,UAAkB,EAClB,UAAgD,EAChD,GAAS;IAET,MAAM,GAAG,GAAe,EAAE,CAAA;IAC1B,MAAM,OAAO,GAAG,IAAA,qBAAY,EAAC,KAAK,EAAE,QAAQ,YAAG,UAAU,CAAC,CAAA;IAE1D,yEAAyE;IACzE,wEAAwE;IACxE,wEAAwE;IACxE,0EAA0E;IAC1E,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,IAAI,GAA6B,EAAE,CAAA;IAEzC,MAAM,GAAG,GAAG,CAAC,GAAQ,EAAE,MAA4B,EAAE,KAAa,EAAE,EAAE;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACrB,IAAI,IAAI,IAAI,IAAI;YAAE,OAAM;QAExB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,IAAI,GAAG,EAAE,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC9C,GAAG,CAAC,IAAI,CAAC;oBACP,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI;oBAC5D,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK;oBACrD,IAAI,EAAE,GAAG,UAAU,gBAAgB,IAAI,uBAAuB;wBAC5D,gCAAgC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,KAAK;wBACjE,YAAY,GAAG,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,GAAG;iBACjD,CAAC,CAAA;YACJ,CAAC;YACD,OAAM;QACR,CAAC;QAED,MAAM,KAAK,GAAa;YACtB,IAAI;YACJ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM;YACN,GAAG,EAAE,GAAG;SACT,CAAA;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QAClB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACjB,CAAC,CAAA;IAED,IAAA,eAAI,EAAC,OAAO,EAAE,CAAC,CAAM,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,CAAA;QACtC,IAAI,CAAC,QAAQ;YAAE,OAAM;QACrB,IAAA,eAAI,EAAC,QAAQ,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC1B,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;gBAChB,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;YAC7B,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,UAAU,EAAE,CAAC;QACf,IAAA,eAAI,EAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC5B,IAAI,GAAG,EAAE,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC1B,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;YAChC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/dist/helpers/naming.d.ts CHANGED Viewed

@@ -1,7 +1,9 @@
+declare function isRbCoreConstant(Name: string): boolean;
+declare function rbSafeTypeName(Name: string): string;
 declare function isReservedName(name: string, lang: string): boolean;
 declare function safeVarName(name: string, lang: string): string;
 declare function exampleVarName(name: string, lang: string): string;
 declare function jsProp(obj: string, name: string): string;
 declare function jsKey(name: string): string;
 declare function jsOptProp(obj: string, name: string): string;
-export { isReservedName, safeVarName, exampleVarName, jsProp, jsOptProp, jsKey, };
+export { isReservedName, safeVarName, exampleVarName, isRbCoreConstant, rbSafeTypeName, jsProp, jsOptProp, jsKey, };

package/dist/helpers/naming.js CHANGED Viewed

@@ -21,6 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isReservedName = isReservedName;
 exports.safeVarName = safeVarName;
 exports.exampleVarName = exampleVarName;
+exports.isRbCoreConstant = isRbCoreConstant;
+exports.rbSafeTypeName = rbSafeTypeName;
 exports.jsProp = jsProp;
 exports.jsOptProp = jsOptProp;
 exports.jsKey = jsKey;
@@ -69,6 +71,57 @@ const RESERVED = {
     py: PY_RESERVED,
     lua: LUA_RESERVED,
 };
+// Ruby CORE CONSTANTS — a different hazard from the keyword sets above.
+//
+// The keyword sets guard local-variable BINDINGS. This set guards generated
+// top-level CONSTANTS. Ruby constants share one namespace with the core
+// classes, and reassigning one is not an error — it silently replaces it:
+//
+//   File = Struct.new(:name)     # ::File is now a Struct
+//   File.join('a', 'b')          # NoMethodError — every later caller breaks
+//
+// The typed model emits `<Name> = Struct.new(...)` per entity, so an API with
+// a `/files` collection (entity `File`) used to clobber Ruby's File class and
+// take the whole SDK down with it — the generated test runner calls
+// `File.join` to locate `.env.local`, so `rb` failed at require time.
+//
+// Only names Ruby itself defines at top level are listed: reassigning any of
+// them breaks working code somewhere. Names that merely LOOK builtin but are
+// not core constants (e.g. `Response`, `Record`) are safe and stay untouched,
+// which keeps the rename off every SDK that does not actually collide.
+const RB_CORE_CONSTANTS = new Set([
+    // classes an entity name plausibly lands on
+    'Array', 'Binding', 'Class', 'Comparable', 'Complex', 'Data', 'Dir',
+    'Encoding', 'Enumerator', 'Exception', 'Fiber', 'File', 'Float', 'Hash',
+    'IO', 'Integer', 'Method', 'Module', 'Mutex', 'Numeric', 'Object', 'Proc',
+    'Queue', 'Random', 'Range', 'Rational', 'Regexp', 'Set', 'Signal', 'String',
+    'Struct', 'Symbol', 'Thread', 'Time', 'UnboundMethod',
+    // modules / singletons
+    'Enumerable', 'GC', 'Kernel', 'Marshal', 'Math', 'ObjectSpace', 'Process',
+    'Warning',
+    // the rest of the exception hierarchy an API might name an entity after
+    'ArgumentError', 'IndexError', 'IOError', 'KeyError', 'NameError',
+    'NotImplementedError', 'RangeError', 'RuntimeError', 'StandardError',
+    'StopIteration', 'SystemExit', 'TypeError', 'ZeroDivisionError',
+    // literal singletons
+    'FalseClass', 'NilClass', 'TrueClass',
+]);
+// Is `Name` a constant Ruby already defines at top level?
+function isRbCoreConstant(Name) {
+    return RB_CORE_CONSTANTS.has(Name);
+}
+// A top-level-safe Ruby constant name for a generated type: the name
+// unchanged, unless Ruby core already owns it, in which case `Type` is
+// appended (`File` -> `FileType`). Applied ONLY to the bare entity data type
+// — the per-op type names always carry a suffix (`FileCreateData`,
+// `FileLoadMatch`), which no core constant matches.
+//
+// The entity ACCESSOR keeps its original name (`client.File(...)`): methods
+// and constants live in separate namespaces in Ruby, so the accessor never
+// collided and the public surface is unchanged.
+function rbSafeTypeName(Name) {
+    return isRbCoreConstant(Name) ? Name + 'Type' : Name;
+}
 // Is `name` a reserved word (an illegal identifier) in the target language?
 function isReservedName(name, lang) {
     const set = RESERVED[lang];

package/dist/helpers/naming.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"naming.js","sourceRoot":"","sources":["../../src/helpers/naming.ts"],"names":[],"mappings":";AAAA,oEAAoE;AACpE,EAAE;AACF,wEAAwE;AACxE,4EAA4E;AAC5E,oEAAoE;AACpE,0EAA0E;AAC1E,wDAAwD;AACxD,EAAE;AACF,8EAA8E;AAC9E,0EAA0E;AAC1E,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,2EAA2E;AAC3E,0EAA0E;AAC1E,8EAA8E;AAC9E,yEAAyE;AACzE,kDAAkD;;~~QAgHhD~~,cAAc;QACd,WAAW;QACX,cAAc;QACd,MAAM;QACN,SAAS;QACT,KAAK;~~AAnHP~~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"}
1	+ {"version":3,"file":"naming.js","sourceRoot":"","sources":["../../src/helpers/naming.ts"],"names":[],"mappings":"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"}

package/dist/helpers/opShape.d.ts CHANGED Viewed

@@ -1,3 +1,5 @@
+declare function entityCollection(model: any): any;
+declare function deriveEntityNames(entityColl: any): any[];
 declare const OP_SUFFIX: Record<string, 'Match' | 'Data'>;
 declare function opTypeName(Name: string, opname: string): string;
 type OpShapeItem = {
@@ -21,5 +23,5 @@ declare function pickExampleEntity(entity: any): {
     primaryOp: string | null;
 };
 declare function entityDataIdField(ent: any): string | null;
-export { OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, };
+export { OP_SUFFIX, deriveEntityNames, entityCollection, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, };
 export type { OpShapeItem, };

package/dist/helpers/opShape.js CHANGED Viewed

@@ -28,6 +28,8 @@
 // syntax; the policy itself is language-neutral and tested in isolation.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OP_SUFFIX = void 0;
+exports.deriveEntityNames = deriveEntityNames;
+exports.entityCollection = entityCollection;
 exports.opTypeName = opTypeName;
 exports.opParams = opParams;
 exports.opRequestShape = opRequestShape;
@@ -40,6 +42,54 @@ exports.entityClassName = entityClassName;
 exports.entityTypeCollisions = entityTypeCollisions;
 exports.warnEntityTypeCollisions = warnEntityTypeCollisions;
 const jostraca_1 = require("jostraca");
+const apidef_1 = require("@voxgig/apidef");
+// THE entity collection for a model — resolved once, with a stable identity.
+//
+// Two problems this solves, both caused by every component calling
+// `getModelPath(model, 'main.<KIT>.entity')` for itself:
+//
+//   * CORRECTNESS. getModelPath drops `active: false` entries by default, but
+//     the consumer scaffold (create-sdkgen Root.ts) generates entity code for
+//     EVERY entity and every EntityTypes_<lang> emits data types with
+//     `only_active: false`. Class-name assignment done against the filtered
+//     view cannot see the inactive entities whose data types it must avoid.
+//     This resolver always returns the unfiltered collection.
+//
+//   * PERFORMANCE. getModelPath REBUILDS the container object on every call
+//     when filtering, so the WeakMap memos below never hit across callers —
+//     the O(n·ops) class-name assignment re-ran per entity per target. At 500
+//     entities x 22 targets that was ~15s of pure recomputation; caching the
+//     resolved collection on the model makes it ~3ms.
+const _entityCollCache = new WeakMap();
+function entityCollection(model) {
+    if (null == model || 'object' !== typeof model) {
+        return {};
+    }
+    const cached = _entityCollCache.get(model);
+    if (null != cached) {
+        return cached;
+    }
+    const coll = (0, apidef_1.getModelPath)(model, `main.${apidef_1.KIT}.entity`, { only_active: false, required: false }) || {};
+    deriveEntityNames(coll);
+    _entityCollCache.set(model, coll);
+    return coll;
+}
+// Derive the PascalCase `Name` on every entity in a collection.
+//
+// `Name` is injected LAZILY by jostraca's names(), historically by whichever
+// component happened to run first (create-sdkgen Root.ts, or an EntityTypes
+// emitter). Anything reading `e.Name` before that ran saw `undefined` — and
+// because the helpers below MEMOISE, one early read poisoned the result for
+// the whole run (`undefinedEntity` class names; a permanently empty collision
+// list). The helpers therefore derive `Name` themselves, up front, so they
+// never depend on component ordering. Idempotent: names() is only called for
+// an entity that lacks `Name`.
+function deriveEntityNames(entityColl) {
+    const ents = (0, jostraca_1.each)(entityColl).filter((e) => e && null != e.name);
+    ents.forEach((e) => { if (null == e.Name)
+        (0, jostraca_1.names)(e, e.name); });
+    return ents;
+}
 // The five ops, and whether their request payload is a `Match` (query/id) or
 // `Data` (body) — this fixes the generated type-name suffix per op.
 const OP_SUFFIX = {
@@ -138,8 +188,20 @@ function opRequestShape(ent, opname) {
     if (null == op) {
         return { items: [], fromParams: false };
     }
+    // Ops that carry a BODY are the exception to "op-declared params win":
+    // their request payload is BOTH. `PUT /v1/todo/item/{id}` declares the path
+    // param `id`, which the SDK resolves out of reqdata (see the param
+    // utility's reqmatch -> match -> reqdata search), while the fields the
+    // caller wants to change come from the entity. Params alone produced
+    // `<Name>UpdateData = { id }` — no way to send anything to update.
+    //
+    // The param stays in the payload because the path needs it; keeping it out
+    // of the request BODY is the model's job, via the op's `transform.req`
+    // (@voxgig/apidef restricts the body to a closed request schema's declared
+    // properties).
+    const isbodyop = 'create' === opname || 'update' === opname || 'patch' === opname;
     const params = opParams(op);
-    if (0 < params.length) {
+    if (0 < params.length && !isbodyop) {
         const items = params.map((p) => ({
             name: p.name,
             type: p.type,
@@ -147,14 +209,22 @@ function opRequestShape(ent, opname) {
         }));
         return { items, fromParams: true };
     }
+    const paramItems = isbodyop ? params.map((p) => ({
+        name: p.name,
+        type: p.type,
+        optional: false === p.reqd,
+    })) : [];
+    const paramNames = new Set(paramItems.map((p) => p.name));
     const fields = (ent.fields ? (0, jostraca_1.each)(ent.fields) : [])
         .filter((f) => f.active !== false)
         .filter((f) => fieldInOp(f, opname));
-    const items = fields.map((f) => ({
+    const items = paramItems.concat(fields
+        .filter((f) => !paramNames.has(f.name))
+        .map((f) => ({
         name: f.name,
         type: f.type,
         optional: fieldOptional(f, opname),
-    }));
+    })));
     return { items, fromParams: false };
 }
 // The entity's id-like key field, or null when it has none. Used by the doc
@@ -220,6 +290,16 @@ function entityPrimaryOp(ent) {
 // … The DATA type keeps its canonical `<Name>` — only the suffixed class
 // yields. Deterministic (sorted-key iteration) and stable across runs.
 //
+// Covers EVERY entity, active or not: the consumer scaffold (create-sdkgen
+// Root.ts) iterates the RAW entity collection, and every EntityTypes_<lang>
+// emits with `only_active: false`, so an inactive entity still contributes a
+// generated data type AND still needs a class name. Filtering to actives here
+// left inactive entities on the un-deduped `<Name>Entity` fallback and left
+// their data types out of `taken` — so an ACTIVE entity's class could collide
+// with an INACTIVE entity's emitted data type (e.g. active `project` ->
+// class `ProjectEntity` vs inactive `project-entity` -> type `ProjectEntity`,
+// a redeclaration in Go).
+//
 // Memoised per entity-collection object so the O(n) assignment runs once.
 const _classNameCache = new WeakMap();
 function entityClassNames(entityColl) {
@@ -227,7 +307,7 @@ function entityClassNames(entityColl) {
     if (null != cached) {
         return cached;
     }
-    const ents = (0, jostraca_1.each)(entityColl).filter((e) => e && e.active !== false);
+    const ents = deriveEntityNames(entityColl);
     // 1. Every top-level DATA-type name the target emits.
     const taken = {};
     ents.forEach((e) => {
@@ -275,8 +355,8 @@ function entityClassName(ent, entityColl) {
 // merging in ts. The names cannot be auto-renamed here — the generated
 // entity classes and op fragments reference them by token — so the guard
 // surfaces the collision loudly instead. Returns the sorted duplicate names
-// (empty when clean). Callers must have derived `Name` on each entity
-// (every EntityTypes emitter does).
+// (empty when clean). `Name` is derived here (deriveEntityNames), so the
+// guard cannot be silently disabled by running before an emitter.
 //
 // Memoised per entity-collection object, like entityClassNames.
 const _typeCollisionCache = new WeakMap();
@@ -287,8 +367,7 @@ function entityTypeCollisions(entityColl) {
     }
     const counts = {};
     const bump = (n) => { counts[n] = (counts[n] || 0) + 1; };
-    (0, jostraca_1.each)(entityColl)
-        .filter((e) => e && null != e.name && null != e.Name)
+    deriveEntityNames(entityColl)
         .forEach((e) => {
         bump(e.Name);
         for (const op of ['load', 'list', 'create', 'update', 'remove']) {

package/dist/helpers/opShape.js.map CHANGED Viewed

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

package/dist/sdkgen.d.ts CHANGED Viewed

@@ -30,8 +30,8 @@ import { getMatchEntries } from './helpers/getMatchEntries';
 import { collectDeps } from './helpers/collectDeps';
 import type { DepEntry } from './helpers/collectDeps';
 import { canonToType, canonKey } from './helpers/canonType';
-import { OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions } from './helpers/opShape';
-import { isReservedName, safeVarName, exampleVarName, jsProp, jsOptProp, jsKey } from './helpers/naming';
+import { OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection } from './helpers/opShape';
+import { isReservedName, safeVarName, exampleVarName, isRbCoreConstant, rbSafeTypeName, jsProp, jsOptProp, jsKey } from './helpers/naming';
 import { packageName, installCommand, registryState, isPublished, registryName, vendorCommand, pkgDescription, nonAffiliation, keywords, envName, repoInfo, apiName, langLabel, PUBLISHER, PUBLISHER_URL, SECURITY_EMAIL, GENERATOR_URL } from './helpers/packageMeta';
 type SdkGenOptions = {
     folder: string;
@@ -99,4 +99,4 @@ export declare const Inject: Component;
 export declare const Line: Component;
 export declare const Slot: Component;
 export declare const List: Component;
-export { Main, Deploy, License, Security, Changelog, Entity, Feature, Test, Readme, ReadmeTop, AgentGuideTop, AgentGuide, AgentGuideFeature, ReadmeInstall, ReadmeQuick, ReadmeErrors, ReadmeIntro, ReadmeModel, ReadmeOptions, ReadmeEntity, ReadmeHowto, ReadmeExplanation, ReadmeRef, FeatureHook, Jostraca, SdkGen, requirePath, isAuthActive, resolveAuthPrefix, buildIdNames, getMatchEntries, collectDeps, canonToType, canonKey, OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, isReservedName, safeVarName, exampleVarName, jsProp, jsOptProp, jsKey, packageName, installCommand, registryState, isPublished, registryName, vendorCommand, pkgDescription, nonAffiliation, keywords, envName, repoInfo, apiName, langLabel, PUBLISHER, PUBLISHER_URL, SECURITY_EMAIL, GENERATOR_URL, };
+export { Main, Deploy, License, Security, Changelog, Entity, Feature, Test, Readme, ReadmeTop, AgentGuideTop, AgentGuide, AgentGuideFeature, ReadmeInstall, ReadmeQuick, ReadmeErrors, ReadmeIntro, ReadmeModel, ReadmeOptions, ReadmeEntity, ReadmeHowto, ReadmeExplanation, ReadmeRef, FeatureHook, Jostraca, SdkGen, requirePath, isAuthActive, resolveAuthPrefix, buildIdNames, getMatchEntries, collectDeps, canonToType, canonKey, OP_SUFFIX, opTypeName, opParams, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection, isReservedName, safeVarName, exampleVarName, isRbCoreConstant, rbSafeTypeName, jsProp, jsOptProp, jsKey, packageName, installCommand, registryState, isPublished, registryName, vendorCommand, pkgDescription, nonAffiliation, keywords, envName, repoInfo, apiName, langLabel, PUBLISHER, PUBLISHER_URL, SECURITY_EMAIL, GENERATOR_URL, };

package/dist/sdkgen.js CHANGED Viewed

@@ -38,12 +38,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requirePath = exports.Jostraca = exports.FeatureHook = exports.ReadmeRef = exports.ReadmeExplanation = exports.ReadmeHowto = exports.ReadmeEntity = exports.ReadmeOptions = exports.ReadmeModel = exports.ReadmeIntro = exports.ReadmeErrors = exports.ReadmeQuick = exports.ReadmeInstall = exports.AgentGuideFeature = exports.AgentGuide = exports.AgentGuideTop = exports.ReadmeTop = exports.Readme = exports.Test = exports.Feature = exports.Entity = exports.Changelog = exports.Security = exports.License = exports.Deploy = exports.Main = exports.List = exports.Slot = exports.Line = exports.Inject = exports.Fragment = exports.Copy = exports.Content = exports.File = exports.Folder = exports.Project = exports.omap = exports.deep = exports.indent = exports.template = exports.getx = exports.get = exports.vmap = exports.cmap = exports.kebabify = exports.camelify = exports.snakify = exports.each = exports.names = exports.cmp = void 0;
-exports.GENERATOR_URL = exports.SECURITY_EMAIL = exports.PUBLISHER_URL = exports.PUBLISHER = exports.langLabel = exports.apiName = exports.repoInfo = exports.envName = exports.keywords = exports.nonAffiliation = exports.pkgDescription = exports.vendorCommand = exports.registryName = exports.isPublished = exports.registryState = exports.installCommand = exports.packageName = exports.jsKey = exports.jsOptProp = exports.jsProp = exports.exampleVarName = exports.safeVarName = exports.isReservedName = exports.warnEntityTypeCollisions = exports.entityTypeCollisions = exports.entityClassName = exports.pickExampleEntity = exports.entityPrimaryOp = exports.entityOps = exports.entityDataIdField = exports.entityIdField = exports.opRequestShape = exports.opParams = exports.opTypeName = exports.OP_SUFFIX = exports.canonKey = exports.canonToType = exports.collectDeps = exports.getMatchEntries = exports.buildIdNames = exports.resolveAuthPrefix = exports.isAuthActive = void 0;
+exports.GENERATOR_URL = exports.SECURITY_EMAIL = exports.PUBLISHER_URL = exports.PUBLISHER = exports.langLabel = exports.apiName = exports.repoInfo = exports.envName = exports.keywords = exports.nonAffiliation = exports.pkgDescription = exports.vendorCommand = exports.registryName = exports.isPublished = exports.registryState = exports.installCommand = exports.packageName = exports.jsKey = exports.jsOptProp = exports.jsProp = exports.rbSafeTypeName = exports.isRbCoreConstant = exports.exampleVarName = exports.safeVarName = exports.isReservedName = exports.entityCollection = exports.deriveEntityNames = exports.warnEntityTypeCollisions = exports.entityTypeCollisions = exports.entityClassName = exports.pickExampleEntity = exports.entityPrimaryOp = exports.entityOps = exports.entityDataIdField = exports.entityIdField = exports.opRequestShape = exports.opParams = exports.opTypeName = exports.OP_SUFFIX = exports.canonKey = exports.canonToType = exports.collectDeps = exports.getMatchEntries = exports.buildIdNames = exports.resolveAuthPrefix = exports.isAuthActive = void 0;
 exports.SdkGen = SdkGen;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const util_1 = require("@voxgig/util");
-const jsonic_1 = require("jsonic");
+const jsonic_1 = require("@tabnas/jsonic");
 const JostracaModule = __importStar(require("jostraca"));
 const aontu_1 = require("aontu");
 const util_2 = require("@voxgig/util");
@@ -121,10 +121,14 @@ Object.defineProperty(exports, "pickExampleEntity", { enumerable: true, get: fun
 Object.defineProperty(exports, "entityClassName", { enumerable: true, get: function () { return opShape_1.entityClassName; } });
 Object.defineProperty(exports, "entityTypeCollisions", { enumerable: true, get: function () { return opShape_1.entityTypeCollisions; } });
 Object.defineProperty(exports, "warnEntityTypeCollisions", { enumerable: true, get: function () { return opShape_1.warnEntityTypeCollisions; } });
+Object.defineProperty(exports, "deriveEntityNames", { enumerable: true, get: function () { return opShape_1.deriveEntityNames; } });
+Object.defineProperty(exports, "entityCollection", { enumerable: true, get: function () { return opShape_1.entityCollection; } });
 const naming_1 = require("./helpers/naming");
 Object.defineProperty(exports, "isReservedName", { enumerable: true, get: function () { return naming_1.isReservedName; } });
 Object.defineProperty(exports, "safeVarName", { enumerable: true, get: function () { return naming_1.safeVarName; } });
 Object.defineProperty(exports, "exampleVarName", { enumerable: true, get: function () { return naming_1.exampleVarName; } });
+Object.defineProperty(exports, "isRbCoreConstant", { enumerable: true, get: function () { return naming_1.isRbCoreConstant; } });
+Object.defineProperty(exports, "rbSafeTypeName", { enumerable: true, get: function () { return naming_1.rbSafeTypeName; } });
 Object.defineProperty(exports, "jsProp", { enumerable: true, get: function () { return naming_1.jsProp; } });
 Object.defineProperty(exports, "jsOptProp", { enumerable: true, get: function () { return naming_1.jsOptProp; } });
 Object.defineProperty(exports, "jsKey", { enumerable: true, get: function () { return naming_1.jsKey; } });