@voxgig/sdkgen 0.40.1 → 0.41.0

package/project/.sdk/src/cmp/js/TestDirect_js.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/src/cmp/lua/Package_lua.ts

@@ -3,14 +3,12 @@ import {
   Content,
   File,
   cmp,
-  each,
+  collectDeps,
 } from '@voxgig/sdkgen'
 
 
-import {
-  KIT,
+import type {
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
@@ -20,8 +18,6 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  const feature = getModelPath(model, `main.${KIT}.feature`)
-
   File({ name: model.name + '.rockspec' }, () => {
     Content(`package = "${model.name}-sdk"
 version = "0.0-1"
@@ -37,28 +33,10 @@ dependencies = {
   "dkjson >= 2.5",
 `)
 
-    // Collect dependencies from features
-    each(feature, (f: any) => {
-      const luaDeps = f.deps?.lua
-      if (luaDeps) {
-        each(luaDeps, (dep: any) => {
-          if (dep.active) {
-            Content(`  "${dep.key$} >= ${dep.version}",
-`)
-          }
-        })
-      }
-    })
-
-    // 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'}",
+    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}",
 `)
-        }
-      })
     }
 
     Content(`}

package/project/.sdk/src/cmp/lua/TestDirect_lua.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/lua/TestEntity_lua.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[]
@@ -95,7 +89,7 @@ describe("${entity.Name}Entity", function()
     if (!flowHasCreate) {
       Content(`    -- Bootstrap entity data from existing test data.
     local ${entity.name}_ref01_data_raw = vs.items(helpers.to_map(
-      vs.getprop(setup.data, "existing.${entity.name}")))
+      vs.getpath(setup.data, "existing.${entity.name}")))
     local ${entity.name}_ref01_data = nil
     if #${entity.name}_ref01_data_raw > 0 then
       ${entity.name}_ref01_data = helpers.to_map(${entity.name}_ref01_data_raw[1][2])
@@ -200,12 +194,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'
@@ -426,7 +414,7 @@ const generateLoad: OpGen = (ctx, step, index) => {
   }
   if (!hasSrcData) {
     Content(`    local ${srcdatavar}_raw = vs.items(helpers.to_map(
-      vs.getprop(setup.data, "existing.${entity.name}")))
+      vs.getpath(setup.data, "existing.${entity.name}")))
     local ${srcdatavar} = nil
     if #${srcdatavar}_raw > 0 then
       ${srcdatavar} = helpers.to_map(${srcdatavar}_raw[1][2])

package/project/.sdk/src/cmp/php/Config_php.ts

@@ -67,6 +67,24 @@ class ${model.const.Name}Config
 `)
     })
 
+    // PHP can't distinguish empty list from empty map; the SDK runtime
+    // validator wants an object for `entity` and `feature.test.entity`. Use
+    // `(object)[]` when the map is empty so the merge preserves map shape.
+    const entityIsEmpty = Object.keys(entity || {}).length === 0
+    if (entityIsEmpty) {
+      Content(`            ],
+            "options" => [
+                "base" => "${baseUrl}",
+                "auth" => [
+                    "prefix" => "${authPrefix}",
+                ],
+                "headers" => ${formatPhpArray(headers, 4)},
+                "entity" => (object)[],
+            ],
+            "entity" => (object)[],
+        ];
+`)
+    } else {
     Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
@@ -92,8 +110,11 @@ class ${model.const.Name}Config
         relations: n.relations,
       }), a), {}), 3)},
         ];
+`)
     }
 
+    Content(`    }
+
 
     public static function make_feature(string $name)
     {

package/project/.sdk/src/cmp/php/MainEntity_php.ts

@@ -3,12 +3,22 @@
 import { cmp, Content } from '@voxgig/sdkgen'
 
 
+// Reserved PHP method names on the SDK class that an entity accessor must
+// not collide with. PHP method names are case-insensitive at declaration
+// time, so an entity literally named 'test' would collide with the static
+// `test()` test-mode constructor. Mangle to `<Name>_` in that case.
+const PHP_RESERVED_LOWER = new Set(['test'])
+
 const MainEntity = cmp(async function MainEntity(props: any) {
   const { entity } = props
   const { model } = props.ctx$
 
+  const accessor = PHP_RESERVED_LOWER.has(entity.Name.toLowerCase())
+    ? entity.Name + '_'
+    : entity.Name
+
   Content(`
-    public function ${entity.Name}($data = null)
+    public function ${accessor}($data = null)
     {
         require_once __DIR__ . '/entity/${entity.name}_entity.php';
         return new ${entity.Name}Entity($this, $data);

package/project/.sdk/src/cmp/php/Package_php.ts

@@ -3,14 +3,12 @@ import {
   Content,
   File,
   cmp,
-  each,
+  collectDeps,
 } from '@voxgig/sdkgen'
 
 
-import {
-  KIT,
+import type {
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
@@ -20,8 +18,6 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  const feature = getModelPath(model, `main.${KIT}.feature`)
-
   // Generate composer.json
   File({ name: 'composer.json' }, () => {
     Content(`{
@@ -33,32 +29,10 @@ const Package = cmp(async function Package(props: any) {
   "require": {
     "php": ">=8.2"`)
 
-    // Collect dependencies from features
-    const deps: { name: string, version: string }[] = []
-    each(feature, (f: any) => {
-      const phpDeps = f.deps?.php
-      if (phpDeps) {
-        each(phpDeps, (dep: any) => {
-          if (dep.active) {
-            deps.push({ name: dep.key$, version: dep.version })
-          }
-        })
-      }
-    })
-
-    // Add target-level deps
-    const targetDeps = target.deps
-    if (targetDeps) {
-      each(targetDeps, (dep: any) => {
-        if (dep.active !== false) {
-          deps.push({ name: dep.key$, version: dep.version || '0.0' })
-        }
-      })
-    }
-
-    for (const dep of deps) {
+    for (const d of collectDeps(model, target.name, target.deps)) {
+      const v = d.source === 'target' ? (d.version || '0.0') : d.version
       Content(`,
-    "${dep.name}": "^${dep.version}"`)
+    "${d.name}": "^${v}"`)
     }
 
     Content(`

package/project/.sdk/src/cmp/php/TestDirect_php.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/php/TestEntity_php.ts

@@ -16,6 +16,8 @@ import {
   File,
   cmp,
   each,
+  buildIdNames,
+  getMatchEntries,
 } from '@voxgig/sdkgen'
 
 
@@ -26,6 +28,7 @@ type GenCtx = {
   entity: any
   flow: any
   PROJUPPER: string
+  accessor: string
 }
 
 
@@ -43,17 +46,16 @@ const TestEntity = cmp(function TestEntity(props: any) {
     return
   }
 
-  const PROJUPPER = model.const.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
-
-  const ancestors = (entity.relations?.ancestors || []).flat()
+  // PHP method names are case-insensitive — an entity literally named 'test'
+  // collides with the static `test()` test-mode constructor on the SDK class.
+  // Mirror the mangling done in MainEntity_php.ts.
+  const accessor = 'test' === entity.Name.toLowerCase()
+    ? entity.Name + '_'
+    : entity.Name
 
-  // 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 PROJUPPER = model.const.Name.toUpperCase().replace(/[^A-Z_]/g, '_')
 
+  const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
   const allSteps = Object.values(basicflow.step) as any[]
@@ -63,7 +65,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
     : []
   const aliases = updateData.map(([k, v]: any) => [k, v])
 
-  const genCtx: GenCtx = { model, entity, flow: basicflow, PROJUPPER }
+  const genCtx: GenCtx = { model, entity, flow: basicflow, PROJUPPER, accessor }
 
   File({ name: entity.Name + 'EntityTest.' + target.ext }, () => {
 
@@ -83,7 +85,7 @@ class ${entity.Name}EntityTest extends TestCase
     public function test_create_instance(): void
     {
         $testsdk = ${model.const.Name}SDK::test(null, null);
-        $ent = $testsdk->${entity.Name}(null);
+        $ent = $testsdk->${accessor}(null);
         $this->assertNotNull($ent);
     }
 
@@ -99,7 +101,7 @@ class ${entity.Name}EntityTest extends TestCase
     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 = null;
         if (count($${entity.name}_ref01_data_raw) > 0) {
             $${entity.name}_ref01_data = Helpers::to_map($${entity.name}_ref01_data_raw[0][1]);
@@ -194,14 +196,8 @@ class ${entity.Name}EntityTest extends TestCase
 })
 
 
-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 { entity, flow, accessor } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
   const entvar = step.input?.entvar ?? ref + '_ent'
   const datavar = step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? ''))
@@ -222,7 +218,7 @@ const generateCreate: OpGen = (ctx, step, index) => {
   Content(`        // CREATE
 `)
   if (needsEnt) {
-    Content(`        $${entvar} = $client->${entity.Name}(null);
+    Content(`        $${entvar} = $client->${accessor}(null);
 `)
   }
 
@@ -253,7 +249,7 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 
 const generateList: OpGen = (ctx, step, index) => {
-  const { entity, flow } = ctx
+  const { entity, flow, accessor } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
   const entvar = step.input?.entvar ?? ref + '_ent'
   const matchvar = step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? ''))
@@ -266,7 +262,7 @@ const generateList: OpGen = (ctx, step, index) => {
   Content(`        // LIST
 `)
   if (needsEnt) {
-    Content(`        $${entvar} = $client->${entity.Name}(null);
+    Content(`        $${entvar} = $client->${accessor}(null);
 `)
   }
 
@@ -322,7 +318,7 @@ const generateList: OpGen = (ctx, step, index) => {
 
 
 const generateUpdate: OpGen = (ctx, step, index) => {
-  const { entity, flow } = ctx
+  const { entity, flow, accessor } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
   const entvar = step.input?.entvar ?? ref + '_ent'
   const datavar = step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? ''))
@@ -337,7 +333,7 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   Content(`        // UPDATE
 `)
   if (needsEnt) {
-    Content(`        $${entvar} = $client->${entity.Name}(null);
+    Content(`        $${entvar} = $client->${accessor}(null);
 `)
   }
   Content(`        $${datavar}_up = [
@@ -389,7 +385,7 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 
 const generateLoad: OpGen = (ctx, step, index) => {
-  const { entity, flow } = ctx
+  const { entity, flow, accessor } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
   const entvar = step.input?.entvar ?? ref + '_ent'
   const matchvar = step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? ''))
@@ -415,12 +411,12 @@ const generateLoad: OpGen = (ctx, step, index) => {
   Content(`        // LOAD
 `)
   if (!hasEntVar) {
-    Content(`        $${entvar} = $client->${entity.Name}(null);
+    Content(`        $${entvar} = $client->${accessor}(null);
 `)
   }
   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} = null;
         if (count($${srcdatavar}_raw) > 0) {
             $${srcdatavar} = Helpers::to_map($${srcdatavar}_raw[0][1]);
@@ -440,7 +436,7 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 
 const generateRemove: OpGen = (ctx, step, index) => {
-  const { entity, flow } = ctx
+  const { entity, flow, accessor } = ctx
   const ref = step.input?.ref ?? entity.name + '_ref01'
   const entvar = step.input?.entvar ?? ref + '_ent'
   const matchvar = step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? ''))
@@ -453,7 +449,7 @@ const generateRemove: OpGen = (ctx, step, index) => {
   Content(`        // REMOVE
 `)
   if (needsEnt) {
-    Content(`        $${entvar} = $client->${entity.Name}(null);
+    Content(`        $${entvar} = $client->${accessor}(null);
 `)
   }
   Content(`        $${matchvar} = [

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

@@ -119,11 +119,11 @@ def _make_feature(name):
 `)
   })
 
-  // Generate __init__.py files for packages
-  File({ name: '__init__.' + target.ext }, () => {
-    Content(``)
-  })
-
+  // Generate __init__.py files for sub-packages.
+  // NOTE: deliberately omit __init__.py at the language-root (py/) level —
+  // making py/ a package collides with the third-party `py` module on PyPI
+  // (a single-file `py.py`), which causes pytest to construct test module
+  // paths as `py.test.<file>` and fail with "'py' is not a package".
   Folder({ name: 'core' }, () => {
     File({ name: '__init__.' + target.ext }, () => {
       Content(``)

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])