@voxgig/sdkgen 0.39.1 → 0.40.2

package/project/.sdk/src/cmp/py/Package_py.ts

@@ -3,14 +3,12 @@ import {
   Content,
   File,
   cmp,
-  each,
+  collectDeps,
 } from '@voxgig/sdkgen'
 
 
-import {
-  KIT,
+import type {
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
@@ -20,12 +18,10 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  const feature = getModelPath(model, `main.${KIT}.feature`)
-
   File({ name: 'pyproject.toml' }, () => {
     Content(`[build-system]
 requires = ["setuptools>=61.0"]
-build-backend = "setuptools.backends._legacy:_Backend"
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "${model.name}-sdk"
@@ -37,34 +33,21 @@ dependencies = [
     "requests>=2.33",
 `)
 
-    // Collect dependencies from features
-    each(feature, (f: any) => {
-      const pyDeps = f.deps?.py
-      if (pyDeps) {
-        each(pyDeps, (dep: any) => {
-          if (dep.active) {
-            Content(`    "${dep.key$}>=${dep.version}",
+    for (const d of collectDeps(model, target.name, target.deps)) {
+      const v = d.source === 'target' ? (d.version || '0.0') : d.version
+      Content(`    "${d.name}>=${v}",
 `)
-          }
-        })
-      }
-    })
-
-    // Add target-level deps
-    const targetDeps = target.deps
-    if (targetDeps) {
-      each(targetDeps, (dep: any) => {
-        if (dep.active !== false) {
-          Content(`    "${dep.key$}>=${dep.version || '0.0'}",
-`)
-        }
-      })
     }
 
     Content(`]
 
 [project.urls]
 Homepage = "https://github.com/voxgig/${model.name}-sdk"
+
+# Explicit package list — setuptools auto-discovery refuses to pick when
+# multiple top-level dirs (core/entity/feature/utility) are present.
+[tool.setuptools.packages.find]
+include = ["core*", "entity*", "feature*", "utility*"]
 `)
   })
 })

package/project/.sdk/src/cmp/py/TestDirect_py.ts

@@ -20,10 +20,13 @@ function normalizePathParams(
     return part.replace(/\{([^}]+)\}/g, (match: string, rawName: string) => {
       const snaked = snakify(rawName)
       const depluralized = depluralize(snaked)
+      // Prefer exact name match — orig matches can collide when one param's
+      // original name was renamed to another param's current name (e.g. badge
+      // load: param 'group_id' has orig 'id', and another param has name 'id').
       const param = params.find((p: any) =>
-        p.orig === snaked || p.name === snaked ||
-        p.orig === depluralized || p.name === depluralized
-      )
+          p.name === snaked || p.name === depluralized) ||
+        params.find((p: any) =>
+          p.orig === snaked || p.orig === depluralized)
       if (param) return '{' + param.name + '}'
 
       if (rename) {
@@ -95,7 +98,7 @@ class Test${entity.Name}Direct:
 
     if (hasList && listPoint) {
       Content(`    def test_should_direct_list_${entity.name}(self):
-        setup = ${entity.name}_direct_setup([
+        setup = _${entity.name}_direct_setup([
             {"id": "direct01"},
             {"id": "direct02"},
         ])
@@ -147,7 +150,7 @@ class Test${entity.Name}Direct:
 
     if (hasLoad && loadPoint) {
       Content(`    def test_should_direct_load_${entity.name}(self):
-        setup = ${entity.name}_direct_setup({"id": "direct01"})
+        setup = _${entity.name}_direct_setup({"id": "direct01"})
         client = setup["client"]
 
 `)
@@ -190,7 +193,7 @@ class Test${entity.Name}Direct:
 
     Content(`
 
-def ${entity.name}_direct_setup(mockres):
+def _${entity.name}_direct_setup(mockres):
     runner.load_env_local()
 
     calls = []

package/project/.sdk/src/cmp/py/TestEntity_py.ts

@@ -16,6 +16,8 @@ import {
   File,
   cmp,
   each,
+  buildIdNames,
+  getMatchEntries,
 } from '@voxgig/sdkgen'
 
 
@@ -45,15 +47,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const PROJUPPER = model.const.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
 
-  const ancestors = (entity.relations?.ancestors || []).flat()
-
-  // Build idmap names
-  const idnames: string[] = []
-  for (let i = 1; i <= 3; i++) idnames.push(`${entity.name}0${i}`)
-  for (const anc of ancestors) {
-    for (let i = 1; i <= 3; i++) idnames.push(`${anc}0${i}`)
-  }
-
+  const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
   const allSteps = Object.values(basicflow.step) as any[]
@@ -91,7 +85,7 @@ class Test${entity.Name}Entity:
         assert ent is not None
 
     def test_should_run_basic_flow(self):
-        setup = ${entity.name}_basic_setup(None)
+        setup = _${entity.name}_basic_setup(None)
         client = setup["client"]
 
 `)
@@ -101,7 +95,7 @@ class Test${entity.Name}Entity:
     if (!flowHasCreate) {
       Content(`        # Bootstrap entity data from existing test data.
         ${entity.name}_ref01_data_raw = vs.items(helpers.to_map(
-            vs.getprop(setup["data"], "existing.${entity.name}")))
+            vs.getpath(setup["data"], "existing.${entity.name}")))
         ${entity.name}_ref01_data = None
         if len(${entity.name}_ref01_data_raw) > 0:
             ${entity.name}_ref01_data = helpers.to_map(${entity.name}_ref01_data_raw[0][1])
@@ -120,7 +114,7 @@ class Test${entity.Name}Entity:
 
     Content(`
 
-def ${entity.name}_basic_setup(extra):
+def _${entity.name}_basic_setup(extra):
     runner.load_env_local()
 
     entity_data_file = os.path.join(_TEST_DIR, "../../.sdk/test/entity/${entity.name}/${entity.Name}TestData.json")
@@ -193,12 +187,6 @@ def ${entity.name}_basic_setup(extra):
 })
 
 
-function getMatchEntries(step: any): [string, any][] {
-  if (!step?.match) return []
-  return Object.entries(step.match).filter(([k]: any) => !k.endsWith('$'))
-}
-
-
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
@@ -419,7 +407,7 @@ const generateLoad: OpGen = (ctx, step, index) => {
   }
   if (!hasSrcData) {
     Content(`        ${srcdatavar}_raw = vs.items(helpers.to_map(
-            vs.getprop(setup["data"], "existing.${entity.name}")))
+            vs.getpath(setup["data"], "existing.${entity.name}")))
         ${srcdatavar} = None
         if len(${srcdatavar}_raw) > 0:
             ${srcdatavar} = helpers.to_map(${srcdatavar}_raw[0][1])

package/project/.sdk/src/cmp/rb/Package_rb.ts

@@ -3,14 +3,12 @@ import {
   Content,
   File,
   cmp,
-  each,
+  collectDeps,
 } from '@voxgig/sdkgen'
 
 
-import {
-  KIT,
+import type {
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
@@ -20,7 +18,8 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  const versionOf = (d: { version: string; source: 'feature' | 'target' }) =>
+    d.source === 'target' ? (d.version || '0.0') : d.version
 
   // Generate Gemfile
   File({ name: 'Gemfile' }, () => {
@@ -30,28 +29,9 @@ gemspec
 
 `)
 
-    // Collect dependencies from features
-    each(feature, (f: any) => {
-      const rbDeps = f.deps?.rb
-      if (rbDeps) {
-        each(rbDeps, (dep: any) => {
-          if (dep.active) {
-            Content(`gem "${dep.key$}", "~> ${dep.version}"
-`)
-          }
-        })
-      }
-    })
-
-    // Add target-level deps
-    const targetDeps = target.deps
-    if (targetDeps) {
-      each(targetDeps, (dep: any) => {
-        if (dep.active !== false) {
-          Content(`gem "${dep.key$}", "~> ${dep.version || '0.0'}"
+    for (const d of collectDeps(model, target.name, target.deps)) {
+      Content(`gem "${d.name}", "~> ${versionOf(d)}"
 `)
-        }
-      })
     }
   })
 
@@ -73,28 +53,9 @@ gemspec
   spec.add_dependency "json"
 `)
 
-    // Collect dependencies from features
-    each(feature, (f: any) => {
-      const rbDeps = f.deps?.rb
-      if (rbDeps) {
-        each(rbDeps, (dep: any) => {
-          if (dep.active) {
-            Content(`  spec.add_dependency "${dep.key$}", "~> ${dep.version}"
-`)
-          }
-        })
-      }
-    })
-
-    // Add target-level deps
-    const targetDeps = target.deps
-    if (targetDeps) {
-      each(targetDeps, (dep: any) => {
-        if (dep.active !== false) {
-          Content(`  spec.add_dependency "${dep.key$}", "~> ${dep.version || '0.0'}"
+    for (const d of collectDeps(model, target.name, target.deps)) {
+      Content(`  spec.add_dependency "${d.name}", "~> ${versionOf(d)}"
 `)
-        }
-      })
     }
 
     Content(`

package/project/.sdk/src/cmp/rb/TestDirect_rb.ts

@@ -20,10 +20,13 @@ function normalizePathParams(
     return part.replace(/\{([^}]+)\}/g, (match: string, rawName: string) => {
       const snaked = snakify(rawName)
       const depluralized = depluralize(snaked)
+      // Prefer exact name match — orig matches can collide when one param's
+      // original name was renamed to another param's current name (e.g. badge
+      // load: param 'group_id' has orig 'id', and another param has name 'id').
       const param = params.find((p: any) =>
-        p.orig === snaked || p.name === snaked ||
-        p.orig === depluralized || p.name === depluralized
-      )
+          p.name === snaked || p.name === depluralized) ||
+        params.find((p: any) =>
+          p.orig === snaked || p.orig === depluralized)
       if (param) return '{' + param.name + '}'
 
       if (rename) {

package/project/.sdk/src/cmp/rb/TestEntity_rb.ts

@@ -16,6 +16,8 @@ import {
   File,
   cmp,
   each,
+  buildIdNames,
+  getMatchEntries,
 } from '@voxgig/sdkgen'
 
 
@@ -45,15 +47,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const PROJUPPER = model.const.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
 
-  const ancestors = (entity.relations?.ancestors || []).flat()
-
-  // Build idmap names
-  const idnames: string[] = []
-  for (let i = 1; i <= 3; i++) idnames.push(`${entity.name}0${i}`)
-  for (const anc of ancestors) {
-    for (let i = 1; i <= 3; i++) idnames.push(`${anc}0${i}`)
-  }
-
+  const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
   const allSteps = Object.values(basicflow.step) as any[]
@@ -92,7 +86,7 @@ class ${entity.Name}EntityTest < Minitest::Test
     if (!flowHasCreate) {
       Content(`    # Bootstrap entity data from existing test data.
     ${entity.name}_ref01_data_raw = Vs.items(Helpers.to_map(
-      Vs.getprop(setup[:data], "existing.${entity.name}")))
+      Vs.getpath(setup[:data], "existing.${entity.name}")))
     ${entity.name}_ref01_data = nil
     if ${entity.name}_ref01_data_raw.length > 0
       ${entity.name}_ref01_data = Helpers.to_map(${entity.name}_ref01_data_raw[0][1])
@@ -191,12 +185,6 @@ end
 })
 
 
-function getMatchEntries(step: any): [string, any][] {
-  if (!step?.match) return []
-  return Object.entries(step.match).filter(([k]: any) => !k.endsWith('$'))
-}
-
-
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
@@ -417,7 +405,7 @@ const generateLoad: OpGen = (ctx, step, index) => {
   }
   if (!hasSrcData) {
     Content(`    ${srcdatavar}_raw = Vs.items(Helpers.to_map(
-      Vs.getprop(setup[:data], "existing.${entity.name}")))
+      Vs.getpath(setup[:data], "existing.${entity.name}")))
     ${srcdatavar} = nil
     if ${srcdatavar}_raw.length > 0
       ${srcdatavar} = Helpers.to_map(${srcdatavar}_raw[0][1])

package/project/.sdk/src/cmp/ts/TestDirect_ts.ts

@@ -302,10 +302,13 @@ function normalizePathParams(
     return part.replace(/\{([^}]+)\}/g, (match: string, rawName: string) => {
       const snaked = snakify(rawName)
       const depluralized = depluralize(snaked)
+      // Prefer exact name match — orig matches can collide when one param's
+      // original name was renamed to another param's current name (e.g. badge
+      // load: param 'group_id' has orig 'id', and another param has name 'id').
       const param = params.find((p: any) =>
-        p.orig === snaked || p.name === snaked ||
-        p.orig === depluralized || p.name === depluralized
-      )
+          p.name === snaked || p.name === depluralized) ||
+        params.find((p: any) =>
+          p.orig === snaked || p.orig === depluralized)
       if (param) return '{' + param.name + '}'
 
       // Reverse-lookup through rename mapping: if rawName is a renamed value

package/project/.sdk/tm/go/core/helpers.go

@@ -1,5 +1,15 @@
 package core
 
+import "fmt"
+
+// UnsupportedOp is returned by entity stub methods for operations the
+// underlying API spec doesn't define. The static ProjectNameEntity interface
+// requires every CRUD method on every entity, so absent ops must still be
+// callable — they error at runtime instead of failing to compile.
+func UnsupportedOp(opname, entityname string) (any, error) {
+	return nil, fmt.Errorf("operation '%s' not supported by entity '%s'", opname, entityname)
+}
+
 func ToMapAny(v any) map[string]any {
 	if v == nil {
 		return nil

package/project/.sdk/tm/lua/Makefile

@@ -1,7 +1,7 @@
 .PHONY: test build clean
 
 test:
-	busted test/
+	busted -p _test test/
 
 build:
 	@echo "No build step for Lua"

package/project/.sdk/tm/php/Makefile

@@ -1,7 +1,7 @@
 .PHONY: test build clean
 
 test:
-	./vendor/bin/phpunit
+	./vendor/bin/phpunit test
 
 build:
 	@echo "No build step for PHP"

package/src/action/target.ts

@@ -91,7 +91,13 @@ async function target_add(targets: string[], actx: ActionContext): Promise<Actio
 
   showChanges(opts.log, 'target-result', jres)
 
-  const features = Object.keys(actx.model.main[KIT].feature)
+  // The `test` feature is required by every generated target (SDK.test()
+  // depends on it), so ensure it is added even if the model does not yet
+  // declare it.
+  const features = Array.from(new Set([
+    'test',
+    ...Object.keys(actx.model.main[KIT].feature),
+  ]))
   await feature_add(features, actx)
 
   opts.log.info({

package/src/helpers/buildIdNames.ts

@@ -0,0 +1,70 @@
+// Build the list of placeholder ID names that the test setup populates into
+// `setup.idmap`. The set is the union of:
+//   - the entity's own ids (`<entity>01..03`)
+//   - every ancestor entity's ids (`<anc>01..03`)
+//   - every literal string value referenced by `step.match` across the flow
+//     (e.g. path-parameter aliases like `year01` for `/{year}/domain` — apidef
+//     doesn't always populate `relations.ancestors` when the parent in the
+//     path is a bare parameter rather than an entity, so we have to mine the
+//     flow steps directly to avoid KeyError-ing the idmap from generated test
+//     code)
+//
+// Identical helper was previously inlined in TestEntity_{go,py,lua,rb,php}.ts.
+
+const COUNT = 3 // 3 ids per name: <name>01, <name>02, <name>03
+
+type FlowLike = {
+  step?: Record<string, any> | any[]
+}
+
+type EntityLike = {
+  name: string
+  relations?: {
+    ancestors?: any
+  }
+}
+
+function buildIdNames(entity: EntityLike, flow: FlowLike): string[] {
+  const idnames: string[] = []
+  const seen = new Set<string>()
+  const push = (n: string) => {
+    if (!seen.has(n)) {
+      seen.add(n)
+      idnames.push(n)
+    }
+  }
+
+  for (let i = 1; i <= COUNT; i++) push(`${entity.name}0${i}`)
+
+  const ancestors: string[] = (entity.relations?.ancestors || []).flat()
+  for (const anc of ancestors) {
+    for (let i = 1; i <= COUNT; i++) push(`${anc}0${i}`)
+  }
+
+  const steps = Array.isArray(flow?.step)
+    ? flow.step
+    : Object.values(flow?.step || {})
+  for (const step of steps) {
+    if (step?.match) {
+      for (const v of Object.values(step.match)) {
+        if (typeof v === 'string' && v && !v.endsWith('$')) push(v)
+      }
+    }
+    // step.data values can also be aliased via setup (e.g. update step.data
+    // = {data_type_id: 'data_type01'} → setup adds idmap[data_type_id] =
+    // idmap[data_type01]). The right-hand side `data_type01` must be in the
+    // idmap or the alias resolves to undefined.
+    if (step?.data) {
+      for (const v of Object.values(step.data)) {
+        if (typeof v === 'string' && v && !v.endsWith('$')) push(v)
+      }
+    }
+  }
+
+  return idnames
+}
+
+
+export {
+  buildIdNames,
+}

package/src/helpers/collectDeps.ts

@@ -0,0 +1,70 @@
+// Collect target-language dependencies from features and from the target's
+// own `deps` block, applying the active-flag semantics that every Package_*.ts
+// template was hand-rolling identically:
+//
+//   - feature deps  : included when `dep.active === true`  (default off)
+//   - target  deps  : included when `dep.active !== false` (default on)
+//
+// The two sources are kept distinct via the `source` field so callers can
+// apply their own version defaults / formatting (e.g. go uses `v0.0.0`,
+// python `0.0`). The original dep object is exposed as `raw` for callers that
+// need extra fields like `dep.replace` (go module replace directives) or
+// `dep.kind` (prod/dev/peer).
+
+import { each } from 'jostraca'
+import { KIT, getModelPath } from '@voxgig/apidef'
+
+type DepEntry = {
+  name: string
+  version: string
+  source: 'feature' | 'target'
+  raw: any
+}
+
+function collectDeps(
+  model: any,
+  targetName: string,
+  targetDeps: any,
+): DepEntry[] {
+  const out: DepEntry[] = []
+  const feature = getModelPath(model, `main.${KIT}.feature`)
+
+  each(feature, (f: any) => {
+    const langDeps = f?.deps?.[targetName]
+    if (!langDeps) return
+    each(langDeps, (dep: any) => {
+      if (dep?.active) {
+        out.push({
+          name: dep.key$,
+          version: dep.version,
+          source: 'feature',
+          raw: dep,
+        })
+      }
+    })
+  })
+
+  if (targetDeps) {
+    each(targetDeps, (dep: any) => {
+      if (dep?.active !== false) {
+        out.push({
+          name: dep.key$,
+          version: dep.version,
+          source: 'target',
+          raw: dep,
+        })
+      }
+    })
+  }
+
+  return out
+}
+
+
+export type {
+  DepEntry,
+}
+
+export {
+  collectDeps,
+}

package/src/helpers/getMatchEntries.ts

@@ -0,0 +1,14 @@
+// Return the user-facing entries of a flow step's `match` object. Keys ending
+// in `$` are jostraca/aontu metadata sentinels and are skipped.
+//
+// Identical helper was previously inlined in TestEntity_*.ts and TestDirect_*.ts.
+
+function getMatchEntries(step: any): [string, any][] {
+  if (!step?.match) return []
+  return Object.entries(step.match).filter(([k]: any) => !k.endsWith('$'))
+}
+
+
+export {
+  getMatchEntries,
+}

package/src/sdkgen.ts

@@ -38,6 +38,11 @@ import { ReadmeExplanation } from './cmp/ReadmeExplanation'
 import { ReadmeRef } from './cmp/ReadmeRef'
 import { FeatureHook } from './cmp/FeatureHook'
 
+import { buildIdNames } from './helpers/buildIdNames'
+import { getMatchEntries } from './helpers/getMatchEntries'
+import { collectDeps } from './helpers/collectDeps'
+import type { DepEntry } from './helpers/collectDeps'
+
 
 import {
   action_target,
@@ -90,7 +95,7 @@ const ACTION_MAP: any = {
 const dlog = getdlog('sdkgen', __filename)
 
 
-const aontu = new Aontu()
+let aontu: any = null
 
 
 function SdkGen(opts: SdkGenOptions) {
@@ -195,6 +200,17 @@ function SdkGen(opts: SdkGenOptions) {
   function resolveModel() {
     const path = './model/sdk.jsonic'
     const errs: any[] = []
+
+    if (null == aontu) {
+      aontu = new Aontu({
+        preload: {
+          folders: ['./model'],
+          ext: ['.jsonic', '.json'],
+          recursive: true,
+        }
+      })
+    }
+
     const aopts = { path, errs }
     const src = fs.readFileSync(path, 'utf8')
 
@@ -319,6 +335,7 @@ function clear(path: string) {
 
 export type {
   SdkGenOptions,
+  DepEntry,
 }
 
 
@@ -378,4 +395,8 @@ export {
   SdkGen,
 
   requirePath,
+
+  buildIdNames,
+  getMatchEntries,
+  collectDeps,
 }