@voxgig/sdkgen 1.3.17 → 1.3.18

package/project/.sdk/src/cmp/lean/Test_lean.ts

@@ -0,0 +1,207 @@
+import {
+  Content,
+  File,
+  Folder,
+  cmp,
+  each,
+} from '@voxgig/sdkgen'
+
+import {
+  KIT,
+  Model,
+  getModelPath,
+} from '@voxgig/apidef'
+
+
+// True when an op has at least one endpoint point that needs no path params
+// (a top-level operation the live smoke test can call without an id).
+function hasParamFreePoint(op: any): boolean {
+  if (null == op) return false
+  const points = op.points || []
+  for (const pt of points) {
+    const params = ((pt.args || {}).params) || []
+    if (params.length === 0) return true
+  }
+  return false
+}
+
+
+// Synthesize a create payload from the entity's required non-id fields.
+function synthData(fields: any): any {
+  const o: any = {}
+  each(fields, (f: any) => {
+    if (f.req && f.name !== 'id') {
+      const t = String(f.type || '').toLowerCase()
+      o[f.name] =
+        (t.includes('number') || t.includes('integer') || t.includes('decimal')) ? 42
+          : t.includes('bool') ? true
+            : 'leantest'
+    }
+  })
+  return o
+}
+
+
+// The generated `test/Runner.lean` exe runs TWO lanes:
+//
+//  - OFFLINE (always): a test-mode client seeded from the entity's generated
+//    `<Entity>TestData.json` answers operations from an in-memory store, so
+//    entity behaviour (list/load/create/load-back/remove) is verified with no
+//    server — the same guarantee the `test` feature gives the other targets.
+//  - LIVE (only when SDK_TEST_BASE is set): the same flow against a real
+//    server, exercising the curl transport end to end.
+const Test = cmp(async function Test(props: any) {
+  const ctx$ = props.ctx$
+  const target = props.target
+  const model: Model = ctx$.model
+
+  const entity = getModelPath(model, `main.${KIT}.entity`)
+
+  // Per-entity OFFLINE (test-mode) blocks: seeded store, no server.
+  let offline = ''
+  each(entity, (e: any) => {
+    const ns = e.name.charAt(0).toUpperCase() + e.name.slice(1)
+    const Name = e.Name || (e.name.charAt(0).toUpperCase() + e.name.slice(1))
+    const ops = e.op || {}
+    if (!ops.list && !ops.load) return
+    offline += `    -- ${e.name}: offline (test-mode) entity behaviour
+    (do
+      let seedPath := "../.sdk/test/entity/${e.name}/${Name}TestData.json"
+      if !(← System.FilePath.pathExists seedPath) then
+        IO.println s!"skip - ${e.name}: no seed at {seedPath}"
+      else do
+        let seed ← SdkJson.jsonRead (← IO.FS.readFile seedPath)
+        let tclient ← Sdk.testSdk0 seed
+        let existing ← SdkRuntime.gp (← SdkRuntime.gp seed "existing") "${e.name}"
+        let ids ← keysof existing
+        -- list returns every seeded entity
+        let items ← ${ns}.list tclient (← emptyMap) (← emptyMap)
+        let n ← (match items with | .list lid => do pure (← listItems lid).size | _ => pure 0)
+        if n == ids.size then pass s!"${e.name}.list offline -> {n} seeded"
+        else fail s!"${e.name}.list offline: got {n}, want {ids.size}"
+        -- load the first seeded entity by id
+        if ids.size > 0 then do
+          let wid := ids[0]!
+          let m ← newMap #[("id", .str wid)]
+          let got ← ${ns}.load tclient m (← emptyMap)
+          let gid ← SdkRuntime.gpS got "id"
+          if gid == wid then pass s!"${e.name}.load offline (id={wid})"
+          else fail s!"${e.name}.load offline: got {gid}, want {wid}"
+        -- create -> load back -> remove, all in the store
+        let newmap ← SdkRuntime.gp (← SdkRuntime.gp seed "new") "${e.name}"
+        let nks ← keysof newmap
+        if nks.size > 0 then do
+          let payload ← SdkRuntime.gp newmap nks[0]!
+          let created ← ${ns}.create tclient payload (← emptyMap)
+          let cid ← SdkRuntime.gpS created "id"
+          if cid == "" then fail "${e.name}.create offline returned no id" else do
+            let m2 ← newMap #[("id", .str cid)]
+            let back ← ${ns}.load tclient m2 (← emptyMap)
+            if (← SdkRuntime.gpS back "id") == cid then
+              pass s!"${e.name}.create/load offline (id={cid})"
+            else fail s!"${e.name}.create/load offline mismatch"
+            let _ ← ${ns}.remove tclient m2 (← emptyMap)
+            let gone ← ${ns}.load tclient m2 (← emptyMap)
+            match gone with
+            | .map _ => fail s!"${e.name}.remove offline: still present"
+            | _ => pass s!"${e.name}.remove offline (id={cid})")
+`
+  })
+
+  // Per-entity LIVE test blocks.
+  let blocks = ''
+  each(entity, (e: any) => {
+    const ns = e.name.charAt(0).toUpperCase() + e.name.slice(1)
+    const listOp = (e.op || {}).list
+    const createOp = (e.op || {}).create
+    const removeOp = (e.op || {}).remove
+
+    if (hasParamFreePoint(listOp)) {
+      blocks += `    -- ${e.name}: list smoke
+    (do
+      let items ← ${ns}.list client (← emptyMap) (← emptyMap)
+      match items with
+      | .list lid => pass s!"${e.name}.list -> {(← listItems lid).size} items"
+      | _ => fail "${e.name}.list did not return a list")
+`
+    }
+
+    // Round-trip when create is param-free (creatable without an id); load and
+    // remove then use the id returned by create.
+    const loadOp = (e.op || {}).load
+    if (hasParamFreePoint(createOp) && loadOp && removeOp) {
+      const data = JSON.stringify(synthData(e.fields))
+      blocks += `    -- ${e.name}: create / load / remove round-trip
+    (do
+      let d ← SdkJson.jsonRead ${JSON.stringify(data)}
+      let created ← ${ns}.create client d (← emptyMap)
+      let nid ← SdkRuntime.gpS created "id"
+      if nid == "" then fail "${e.name}.create returned no id" else do
+        let m ← newMap #[("id", .str nid)]
+        let back ← ${ns}.load client m (← emptyMap)
+        let bid ← SdkRuntime.gpS back "id"
+        if bid == nid then pass s!"${e.name}.create/load round-trip (id={nid})"
+        else fail s!"${e.name}.load mismatch: {bid} != {nid}"
+        let _ ← ${ns}.remove client m (← emptyMap)
+        pass s!"${e.name}.remove (id={nid})")
+`
+    }
+  })
+
+  // The live lane nests two levels deeper than the offline lane.
+  const liveBlocks = blocks.split('\n').map((l) => l ? '  ' + l : l).join('\n')
+
+  Folder({ name: 'test' }, () => {
+  File({ name: 'Runner.' + target.ext }, () => {
+    Content(`-- ${model.const.Name} SDK test runner (generated by @voxgig/sdkgen).
+--
+-- OFFLINE lane (always): a test-mode client seeded from the generated entity
+-- test data answers operations from an in-memory store — no server needed.
+-- LIVE lane (only when SDK_TEST_BASE is set): the same flow over real HTTP.
+
+import VoxgigStruct
+import SdkJson
+import SdkRuntime
+import SdkClient
+
+open VoxgigStruct
+
+initialize npass : IO.Ref Nat ← IO.mkRef 0
+initialize nfail : IO.Ref Nat ← IO.mkRef 0
+
+def pass (msg : String) : SIO Unit := do
+  npass.modify (· + 1)
+  IO.println s!"ok   - {msg}"
+
+def fail (msg : String) : SIO Unit := do
+  nfail.modify (· + 1)
+  IO.println s!"FAIL - {msg}"
+
+def defaultBase : String := "http://localhost:8901"
+
+def main : IO UInt32 := do
+  let liveBase ← IO.getEnv "SDK_TEST_BASE"
+  let ctx ← mkCtx
+  let offline : SIO Unit := do
+${offline}  offline.run ctx
+  match liveBase with
+  | none => IO.println "skip - live lane (set SDK_TEST_BASE to enable)"
+  | some base => do
+    let live : SIO Unit := do
+      let opts ← newMap #[("base", .str base)]
+      let client ← Sdk.newSdk opts
+${liveBlocks}    live.run ctx
+  let p ← npass.get
+  let f ← nfail.get
+  IO.println ""
+  IO.println s!"PASS {p}  FAIL {f}"
+  if f > 0 then return 1 else return 0
+`)
+  })
+  })
+})
+
+
+export {
+  Test
+}

package/project/.sdk/src/cmp/lean/utility_lean.ts

@@ -0,0 +1,78 @@
+import * as Path from 'node:path'
+
+import {
+  clone,
+  walk,
+} from '@voxgig/struct'
+
+
+function projectPath(suffix?: string): string {
+  return Path.normalize(Path.join(__dirname, '../../..', suffix ?? ''))
+}
+
+
+// A Lean 4 string literal. Lean strings are UTF-8, so non-ASCII passes through;
+// only the structural characters need escaping. (Backticks are ordinary in Lean
+// strings, so the config's `body`-style transform exprs embed verbatim.)
+function leanString(s: string): string {
+  let out = '"'
+  for (const ch of String(s)) {
+    if (ch === '"') out += '\\"'
+    else if (ch === '\\') out += '\\\\'
+    else if (ch === '\n') out += '\\n'
+    else if (ch === '\t') out += '\\t'
+    else if (ch === '\r') out += '\\r'
+    else out += ch
+  }
+  return out + '"'
+}
+
+
+// Lean reserved words that cannot be bare identifiers.
+const LEAN_RESERVED = new Set<string>([
+  'do', 'let', 'fun', 'match', 'with', 'if', 'then', 'else', 'by', 'end',
+  'namespace', 'section', 'open', 'import', 'def', 'partial', 'mutual',
+  'structure', 'inductive', 'class', 'instance', 'where', 'deriving', 'return',
+  'try', 'catch', 'for', 'in', 'while', 'have', 'show', 'from', 'set_option',
+])
+
+
+// A collision-free lower-camel Lean identifier for a model name.
+function leanVarName(name: string): string {
+  let s = String(name).replace(/[^a-zA-Z0-9_]/g, '_')
+  if (s.length === 0) {
+    s = 'x'
+  }
+  s = s.charAt(0).toLowerCase() + s.slice(1)
+  if (!/^[a-z_]/.test(s)) {
+    s = 'e_' + s
+  }
+  return LEAN_RESERVED.has(s) ? s + '_' : s
+}
+
+
+// The lowercase-hyphenated package name (used for the lake package + repo).
+function pkgName(model: any): string {
+  const org = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '')
+  return `${org}-${model.name}-sdk`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
+}
+
+
+// Remove `$`-suffixed model annotation keys (so the embedded config is clean).
+function clean(o: any) {
+  return walk(clone(o), (k: any, v: any, p: any) => {
+    if (null != k && k.endsWith('$')) {
+      delete p[k]
+    }
+    return v
+  })
+}
+
+
+export {
+  clean,
+  leanString,
+  leanVarName,
+  pkgName,
+  projectPath,
+}

package/project/.sdk/src/cmp/lua/EntityTypes_lua.ts

@@ -21,7 +21,7 @@ import {
   File, Content,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -53,11 +53,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // filter, so inactive entities still get class files referencing these
   // typed names. Filter on `name` (always present), NOT `active` — parity
   // with the go emitter's fix.
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
+  const entityList = deriveEntityNames(entity)
   // Derive the PascalCase Name up-front — it is set LAZILY by names(), so an
   // entity not yet named (e.g. a fieldless placeholder) would otherwise read
   // `Name = undefined` below. Parity with the go emitter's fix.
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed

package/project/.sdk/src/cmp/lua/Entity_lua.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, camelify, names,
   File, Content, Folder, Fragment, Line, FeatureHook, Slot,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -24,7 +24,7 @@ const Entity = cmp(function Entity(props: any) {
   // data-type name. The class is a module-local table (snake-cased file name),
   // so this is used only for the local identifier — kept uniform with the other
   // languages.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -40,7 +40,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: entity.name + '_entity.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       const opfrags =
         (['load', 'list', 'create', 'update', 'remove']

package/project/.sdk/src/cmp/lua/Package_lua.ts

@@ -57,7 +57,7 @@ dependencies = {
 `)
 
     const seen = new Set<string>(['lua', 'dkjson'])
-    for (const d of collectDeps(model, target.name, target.deps)) {
+    for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
       if (seen.has(d.name)) continue
       seen.add(d.name)
       const v = d.source === 'target' ? (d.version || '0.0') : d.version

package/project/.sdk/src/cmp/lua/TestDirect_lua.ts

@@ -70,7 +70,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     ? `\n      apikey = env["${PROJECTNAME}_APIKEY"],`
     : ''
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
 
@@ -78,8 +78,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = entity.op.load
-  const listOp = entity.op.list
+  const loadOp = entity.op?.load
+  const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''

package/project/.sdk/src/cmp/lua/TestEntity_lua.ts

@@ -50,7 +50,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // it only applies to entities that declare a list op. Others (e.g. Batch =
   // create/load) have no list endpoint — make_point errors and the stream
   // yields nothing — so skip the stream test for them.
-  const hasList = !!(entity.op && (entity.op as any).list)
+  const hasList = !!(entity.op && (entity.op as any)?.list)
 
   const basicflow: ModelEntityFlow | undefined =
     getModelPath(model, `main.${KIT}.flow.Basic${nom(entity, 'Name')}Flow`)

package/project/.sdk/src/cmp/ocaml/ReadmeExamplesTest_ocaml.ts

@@ -45,8 +45,11 @@ let read_file (path : string) : string option =
 
 let split_lines (s : string) : string list = String.split_on_char '\\n' s
 
-(* Extract the body of every \`\`\`ocaml ... \`\`\` fenced block from markdown. *)
-let extract_ocaml_blocks (md : string) : string list =
+(* Extract the body of every \`\`\`ocaml ... \`\`\` fenced block from markdown.
+ * Returns (blocks, unclosed) where unclosed is true when a fence was opened
+ * but never closed before EOF — a malformed doc that must fail rather than
+ * silently drop the unterminated block. *)
+let extract_ocaml_blocks (md : string) : string list * bool =
   let blocks = ref [] in
   let cur = ref [] in
   let in_block = ref false in
@@ -61,23 +64,31 @@ let extract_ocaml_blocks (md : string) : string list =
       end
       else cur := line :: !cur)
     (split_lines md);
-  List.rev !blocks
+  (List.rev !blocks, !in_block)
 
-(* Balanced (), [], {} outside of string literals. Naive quote toggle: the
- * generated snippets never embed an escaped quote inside a string. *)
+(* Balanced (), [], {} outside of string literals, with each closer matching
+ * the most-recent opener (so "([)]" is rejected, not just counted). Naive
+ * quote toggle: the generated snippets never embed an escaped quote inside a
+ * string. *)
 let is_balanced (block : string) : bool =
   let in_str = ref false in
-  let depth = ref 0 in
+  let stack = ref [] in
   let ok = ref true in
   String.iter (fun c ->
-      if c = '"' then in_str := not !in_str
-      else if not !in_str then
-        match c with
-        | '(' | '[' | '{' -> incr depth
-        | ')' | ']' | '}' -> decr depth; if !depth < 0 then ok := false
-        | _ -> ())
+      if !ok then
+        if c = '"' then in_str := not !in_str
+        else if not !in_str then
+          match c with
+          | '(' -> stack := ')' :: !stack
+          | '[' -> stack := ']' :: !stack
+          | '{' -> stack := '}' :: !stack
+          | ')' | ']' | '}' ->
+            (match !stack with
+             | top :: rest when top = c -> stack := rest
+             | _ -> ok := false)
+          | _ -> ())
     block;
-  !ok && !depth = 0 && not !in_str
+  !ok && !stack = [] && not !in_str
 
 let docs = [
   ("root README", "../README.md");
@@ -92,13 +103,17 @@ let () =
           match read_file path with
           | None -> ()   (* doc not generated in this run — tolerate *)
           | Some src ->
+            let (blocks, unclosed) = extract_ocaml_blocks src in
+            (* A fence opened but never closed is a malformed doc — fail
+             * rather than silently skipping the unterminated block. *)
+            check (label ^ " ocaml fence closed") (not unclosed);
             List.iteri (fun i block ->
                 check (label ^ " block " ^ string_of_int (i + 1) ^ " non-empty")
                   (trim block <> "");
                 check (label ^ " block " ^ string_of_int (i + 1) ^ " balanced delimiters")
                   (is_balanced block);
                 incr total)
-              (extract_ocaml_blocks src))
+              blocks)
         docs;
       check "at least one ocaml code block across the docs" (!total > 0))
 `)

package/project/.sdk/src/cmp/perl/Entity_perl.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify, names,
   File, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -22,7 +22,7 @@ const Entity = cmp(function Entity(props: any) {
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, disambiguated when it would clash with another entity's
   // data-type name. The snake-cased source-file name is unaffected.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -38,7 +38,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: entity.name + '_entity.pm' }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       const opfrags =
         (['load', 'list', 'create', 'update', 'remove']

package/project/.sdk/src/cmp/perl/MainEntity_perl.ts

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -14,7 +14,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
 
   // Return the collision-free class (entityClassName); the accessor METHOD
   // name (entity.Name) is unchanged so callers still write $client->{Name}.
-  const cls = entityClassName(entity, getModelPath(model, `main.${KIT}.entity`))
+  const cls = entityClassName(entity, entityCollection(model))
 
   Content(`
 # Canonical facade: $client->${entity.Name}->list / ->load({ 'id' => ... })

package/project/.sdk/src/cmp/perl/Package_perl.ts

@@ -27,7 +27,7 @@ const Package = cmp(async function Package(props: any) {
   // (e.g. "Voxgig::SDK::Solar" -> dist voxgig-sdk-solar).
   const Name = model.const.Name
 
-  const deps = collectDeps(model, target.name, target.deps)
+  const deps = collectDeps(model, target.name, target.deps, ctx$.log)
   const prereq = deps
     .map((d: any) => `        '${d.name}' => '${d.version || '0'}',`)
     .join('\n')

package/project/.sdk/src/cmp/perl/TestDirect_perl.ts

@@ -80,7 +80,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     ? `\n      'apikey' => $env->{'${PROJECTNAME}_APIKEY'},`
     : ''
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
 
@@ -88,8 +88,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = entity.op.load
-  const listOp = entity.op.list
+  const loadOp = entity.op?.load
+  const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''

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

@@ -29,7 +29,7 @@ import {
   File, Content, Folder,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -79,11 +79,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // filter, so inactive entities still get class files referencing these
   // typed names. Filter on `name` (always present), NOT `active` — parity
   // with the go emitter's fix.
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
+  const entityList = deriveEntityNames(entity)
   // Derive the PascalCase Name up-front — it is set LAZILY by names(), so an
   // entity not yet named (e.g. a fieldless placeholder) would otherwise read
   // `Name = undefined` below. Parity with the go emitter's fix.
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, camelify, names,
   File, Content, Folder, Fragment, Line, FeatureHook, Slot,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -22,7 +22,7 @@ const Entity = cmp(function Entity(props: any) {
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, disambiguated when it would clash with another entity's
   // data-type name. The snake-cased source-file name is unaffected.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -38,7 +38,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: entity.name + '_entity.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       const opfrags =
         (['load', 'list', 'create', 'update', 'remove']

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

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -20,7 +20,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
 
   // Collision-free entity CLASS name (entityClassName); the accessor METHOD name
   // (below) is unchanged so callers still write $client->${entity.Name}().
-  const cls = entityClassName(entity, getModelPath(model, `main.${KIT}.entity`))
+  const cls = entityClassName(entity, entityCollection(model))
 
   // Canonical facade method name is the PascalCase entity Name
   // (`$client->${entity.Name}()`). PHP method names are case-insensitive, so

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

@@ -49,7 +49,7 @@ const Package = cmp(async function Package(props: any) {
   "require": {
     "php": ">=8.2"`)
 
-    for (const d of collectDeps(model, target.name, target.deps)) {
+    for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
       const v = d.source === 'target' ? (d.version || '0.0') : d.version
       Content(`,
     "${d.name}": "^${v}"`)

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

@@ -70,7 +70,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     ? `\n            "apikey" => $env["${PROJECTNAME}_APIKEY"],`
     : ''
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
 
@@ -78,8 +78,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = entity.op.load
-  const listOp = entity.op.list
+  const loadOp = entity.op?.load
+  const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''

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

@@ -53,7 +53,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // it only applies to entities that declare a list op. Others (e.g. Batch =
   // create/load) have no list endpoint — make_point errors and the stream
   // yields nothing — so skip the stream test for them.
-  const hasList = !!(entity.op && (entity.op as any).list)
+  const hasList = !!(entity.op && (entity.op as any)?.list)
 
   const basicflow: ModelEntityFlow | undefined =
     getModelPath(model, `main.${KIT}.flow.Basic${nom(entity, 'Name')}Flow`)

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

@@ -36,7 +36,7 @@ import {
   File, Content,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -142,11 +142,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // filter, so inactive entities still get class files referencing these
   // typed names. Filter on `name` (always present), NOT `active` — parity
   // with the go emitter's fix.
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
+  const entityList = deriveEntityNames(entity)
   // Derive the PascalCase Name up-front — it is set LAZILY by names(), so an
   // entity not yet named (e.g. a fieldless placeholder) would otherwise read
   // `Name = undefined` below. Parity with the go emitter's fix.
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed