@voxgig/sdkgen 1.3.17 → 1.3.19

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/Config_php.ts

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,16 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see MakeOptions).
+  // `$` is escaped so a default can never open a PHP interpolation.
+  const svars = serverVariables(model)
+  const phps = (s: string) => JSON.stringify(s).replace(/\$/g, '\\$')
+  const serverBlock = 0 === svars.length ? '' :
+    '                "server" => [\n' +
+    svars.map((v: any) => `                    ${phps(v.name)} => ${phps(v.dflt)},\n`).join('') +
+    '                ],\n'
+
   const authBlock = authActive
     ? `                "auth" => [
                     "prefix" => "${authPrefix}",
@@ -84,7 +95,7 @@ class ${model.const.Name}Config
       Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
+${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => (object)[],
             ],
             "entity" => (object)[],
@@ -94,7 +105,7 @@ ${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
     Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
+${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => [
 `)
 

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/Config_py.ts

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,14 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see make_options).
+  const svars = serverVariables(model)
+  const serverBlock = 0 === svars.length ? '' :
+    '            "server": {\n' +
+    svars.map((v: any) => `                ${JSON.stringify(v.name)}: ${JSON.stringify(v.dflt)},\n`).join('') +
+    '            },\n'
+
   const authBlock = authActive
     ? `            "auth": {
                 "prefix": "${authPrefix}",
@@ -74,7 +83,7 @@ def make_config():
     Content(`        },
         "options": {
             "base": "${baseUrl}",
-${authBlock}            "headers": ${formatPyDict(headers, 3)},
+${serverBlock}${authBlock}            "headers": ${formatPyDict(headers, 3)},
             "entity": {
 `)
 

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

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, camelify, names,
   File, Content, Folder, Fragment, Line, FeatureHook, Slot,
-  entityClassName, opTypeName,
+  entityClassName, entityCollection, opTypeName,
 } from '@voxgig/sdkgen'
 
 import {
@@ -23,7 +23,7 @@ const Entity = cmp(function Entity(props: any) {
   // `<Name>Entity`, disambiguated when it would clash with another entity's
   // data-type name. The DATA type stays `<Name>`. The snake-cased source-file
   // name is unaffected; only the class identifier changes.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -53,7 +53,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/py/MainEntity_py.ts

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -15,7 +15,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>(). The
   // source module is snake-cased, so only the imported class identifier changes.
-  const cls = entityClassName(entity, getModelPath(model, `main.${KIT}.entity`))
+  const cls = entityClassName(entity, entityCollection(model))
 
   Content(`
     def ${entity.Name}(self, data=None) -> "${cls}":

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 
@@ -94,7 +94,7 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
 `)
       each(entity, (ent: any) => {
-        Content(`    from entity.${ent.name}_entity import ${entityClassName(ent, entity)}
+        Content(`    from entity.${ent.name}_entity import ${entityClassName(ent, entityCollection(model))}
 `)
       })
     }

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

@@ -47,7 +47,7 @@ dependencies = [
 `)
 
     const seen = new Set<string>()
-    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/py/TestDirect_py.ts

@@ -70,7 +70,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     ? `\n            "apikey": env.get("${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/py/TestEntity_py.ts

@@ -82,7 +82,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // it only applies to entities that actually declare a `list` op. Others
   // (e.g. Batch = create/load) have no list endpoint — make_point would error
   // and the stream would yield nothing — so skip the test for them.
-  const hasList = !!(entity.op && (entity.op as any).list)
+  const hasList = !!(entity.op && (entity.op as any)?.list)
 
   File({ name: 'test_' + entity.name + '_entity.' + target.ext }, () => {
 

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

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,16 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see make_options).
+  // `#` is escaped so a default can never open a Ruby interpolation.
+  const svars = serverVariables(model)
+  const rbs = (s: string) => JSON.stringify(s).replace(/#/g, '\\#')
+  const serverBlock = 0 === svars.length ? '' :
+    '        "server" => {\n' +
+    svars.map((v: any) => `          ${rbs(v.name)} => ${rbs(v.dflt)},\n`).join('') +
+    '        },\n'
+
   const authBlock = authActive
     ? `        "auth" => {
           "prefix" => "${authPrefix}",
@@ -74,7 +85,7 @@ module ${model.const.Name}Config
     Content(`      },
       "options" => {
         "base" => "${baseUrl}",
-${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
+${serverBlock}${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
         "entity" => {
 `)
 

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

@@ -12,7 +12,10 @@
 //   $STRING -> String, $INTEGER -> Integer, $NUMBER -> Float, $BOOLEAN -> Boolean,
 //   $OBJECT -> Hash, $ARRAY -> Array, unknown -> Object.
 //
-// Type-name scheme (IDENTICAL to TS): data type = <Name>; per-op request
+// Type-name scheme (as TS, with one Ruby-only guard): data type = <Name>,
+// except where Ruby core already owns that constant — `File`, `Time`, `Data`,
+// … — which would be silently REPLACED by the assignment; those become
+// <Name>Type (see rbSafeTypeName). Per-op request
 // <Name>LoadMatch / <Name>ListMatch / <Name>RemoveMatch (query/id ops),
 // <Name>CreateData / <Name>UpdateData (body ops). An op WITH params -> a Struct of
 // those params (reqd:false -> annotated `[Type, nil]`). An op WITHOUT params -> a
@@ -27,7 +30,7 @@ import {
   File, Content,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames, rbSafeTypeName } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -89,11 +92,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
@@ -116,12 +118,20 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
     entityList.forEach((ent: any) => {
       const Name = ent.Name
+      // Ruby constants share ONE namespace with the core classes, and
+      // assigning one silently replaces it — an entity named `File` emitting
+      // `File = Struct.new(...)` clobbers ::File and every later `File.join`
+      // raises NoMethodError. Only the bare data-type constant needs the
+      // guard; the per-op names below always carry a suffix that no core
+      // constant matches. The `client.File(...)` accessor is a METHOD, a
+      // separate namespace, so the public surface is unchanged.
+      const TypeName = rbSafeTypeName(Name)
       const fields = (ent.fields ? each(ent.fields) : [])
         .filter((f: any) => f.active !== false)
 
       // Entity data model: one member per field (`req:false` -> nilable).
       emitStruct(
-        Name,
+        TypeName,
         `${Name} entity data model.`,
         fields.map((f: any) => ({ name: f.name, type: f.type, optional: false === f.req })),
       )

package/project/.sdk/src/cmp/rb/Entity_rb.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/rb/MainEntity_rb.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 / client.${entity.Name}.load({ "id" => ... })

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

@@ -39,7 +39,7 @@ gemspec
 
 `)
 
-    for (const d of collectDeps(model, target.name, target.deps)) {
+    for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
       Content(`gem "${d.name}", "~> ${versionOf(d)}"
 `)
     }
@@ -51,7 +51,7 @@ gemspec
     // twice (Gem::InvalidSpecificationException at `gem build`), so the
     // unconstrained json fallback is only emitted when the model's own
     // dependency list doesn't already declare json.
-    const deps = collectDeps(model, target.name, target.deps)
+    const deps = collectDeps(model, target.name, target.deps, ctx$.log)
     const hasJson = deps.some((d: any) => 'json' === d.name)
 
     Content(`Gem::Specification.new do |spec|