@voxgig/sdkgen 1.3.17 → 1.3.18

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/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|

package/project/.sdk/src/cmp/rb/TestDirect_rb.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/rb/TestEntity_rb.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/rust/EntityBase_rust.ts

@@ -5,7 +5,7 @@ import {
   Folder,
   cmp,
   each,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 
@@ -27,7 +27,7 @@ const EntityBase = cmp(async function EntityBase(props: any) {
   const { model } = props.ctx$
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const entityColl = entity
+  const entityColl = entityCollection(model)
 
   Folder({ name: 'entity' }, () => {
     File({ name: 'mod.' + target.ext }, () => {

package/project/.sdk/src/cmp/rust/EntityTypes_rust.ts

@@ -25,11 +25,11 @@
 //     types yet (parity intent, not dead-code churn).
 
 import {
-  cmp, each, names,
+  cmp, each,
   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,
@@ -85,8 +85,7 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // Emit for every entity that gets an entity file (filter on `name`, always
   // present; derive `Name` here so the struct set is deterministic — parity
   // with the go emitter's fix).
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
+  const entityList = deriveEntityNames(entity)
 
   // 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/rust/Entity_rust.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify,
   File, Content, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -23,7 +23,7 @@ const Entity = cmp(function Entity(props: any) {
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, but disambiguated when it would clash with another
   // entity's data-type name.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -37,7 +37,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: rustVarName(entity.name) + '.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       // For each CRUD op: if the spec defines it, splice in the real
       // implementation. Otherwise emit a stub that satisfies the static

package/project/.sdk/src/cmp/rust/MainEntity_rust.ts

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -17,7 +17,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
   const { entity } = props
   const { model } = props.ctx$
 
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
   const method = rustVarName(entity.name)
   const mod = rustVarName(entity.name)

package/project/.sdk/src/cmp/rust/Package_rust.ts

@@ -43,7 +43,7 @@ path = "lib.rs"
 
     const prod: Record<string, string> = {}
     const dev: Record<string, string> = {}
-    for (const d of collectDeps(model, target.name, target.deps)) {
+    for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
       // Target-level deps default to '*' when version is absent; feature
       // deps require an explicit version.
       const version = d.source === 'target' ? (d.version || '*') : d.version

package/project/.sdk/src/cmp/rust/ReadmeExamplesTest_rust.ts

@@ -33,7 +33,10 @@ use std::fs;
 use std::path::PathBuf;
 
 // Extract the body of every \`\`\`rust ... \`\`\` fenced block from markdown.
-fn extract_rust_blocks(md: &str) -> Vec<String> {
+// Returns the blocks plus a flag that is true when the scan reached EOF with a
+// fence still open (an unterminated \`\`\`rust block) — the caller fails on it
+// rather than silently dropping the malformed block.
+fn extract_rust_blocks(md: &str) -> (Vec<String>, bool) {
     let mut blocks: Vec<String> = Vec::new();
     let mut in_block = false;
     let mut cur: Vec<&str> = Vec::new();
@@ -53,14 +56,15 @@ fn extract_rust_blocks(md: &str) -> Vec<String> {
         }
         cur.push(line);
     }
-    blocks
+    (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.
 fn is_balanced(block: &str) -> bool {
     let mut in_str = false;
-    let mut depth: i32 = 0;
+    let mut stack: Vec<char> = Vec::new();
     for c in block.chars() {
         if c == '"' {
             in_str = !in_str;
@@ -70,17 +74,18 @@ fn is_balanced(block: &str) -> bool {
             continue;
         }
         match c {
-            '(' | '[' | '{' => depth += 1,
+            '(' => stack.push(')'),
+            '[' => stack.push(']'),
+            '{' => stack.push('}'),
             ')' | ']' | '}' => {
-                depth -= 1;
-                if depth < 0 {
+                if stack.pop() != Some(c) {
                     return false;
                 }
             }
             _ => {}
         }
     }
-    depth == 0 && !in_str
+    stack.is_empty() && !in_str
 }
 
 #[test]
@@ -98,7 +103,14 @@ fn readme_rust_snippets_wellformed() {
             Ok(s) => s,
             Err(_) => continue, // doc not generated in this run — tolerate
         };
-        let blocks = extract_rust_blocks(&src);
+        let (blocks, unterminated) = extract_rust_blocks(&src);
+        // A fence opened but never closed is a malformed doc — fail rather than
+        // silently skipping the unterminated block.
+        assert!(
+            !unterminated,
+            "{}: unterminated \`\`\`rust fence (block never closed)",
+            label
+        );
         for (i, block) in blocks.iter().enumerate() {
             assert!(
                 !block.trim().is_empty(),

package/project/.sdk/src/cmp/rust/TestDirect_rust.ts

@@ -73,7 +73,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     ? `("apikey", getp(&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')
 
@@ -81,8 +81,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = (entity.op as any).load
-  const listOp = (entity.op as any).list
+  const loadOp = (entity.op as any)?.load
+  const listOp = (entity.op as any)?.list
 
   // Load point info.
   const loadPoint = loadOp?.points?.[0]

package/project/.sdk/src/cmp/scala/EntityTypes_scala.ts

@@ -38,7 +38,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,
@@ -133,11 +133,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/py/java/csharp 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/scala/Entity_scala.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify, names,
   File, Content, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -23,7 +23,7 @@ const Entity = cmp(function Entity(props: any) {
   const scalapackage = scalaPackage(model)
 
   // Collision-free entity CLASS name.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -39,7 +39,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: cls + '.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       // For each CRUD op: if the spec defines it, splice in the real
       // implementation. Otherwise emit a stub that satisfies the SdkEntity

package/project/.sdk/src/cmp/scala/MainEntity_scala.ts

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -18,7 +18,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
   const { model } = props.ctx$
 
   const scalapackage = scalaPackage(model)
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
   const accessor = scalaVarName(entity.name)
 

package/project/.sdk/src/cmp/scala/ReadmeExamplesTest_scala.ts

@@ -43,8 +43,11 @@ const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(props: any) {
 //
 // Checks, PER DOCUMENT:
 //   1. PRESENCE: the doc exists and holds at least one scala block.
-//   2. STRUCTURE: every scala block's braces / parens / brackets balance, so a
-//      truncated or malformed generated snippet fails loudly.
+//   2. STRUCTURE: every fence is closed (an odd number of triple-backtick
+//      markers means a fence was opened but never closed — the doc is truncated
+//      and split-based extraction would mis-segment the tail), AND every scala
+//      block's braces / parens / brackets balance, so a truncated or malformed
+//      generated snippet fails loudly.
 //
 // GENERATED by @voxgig/sdkgen — do not edit by hand.
 
@@ -85,6 +88,17 @@ object ReadmeExamplesTest {
   private def readDoc(path: Path): String =
     new String(Files.readAllBytes(path), "UTF-8")
 
+  // True when every triple-backtick fence in the document is paired. split(-1)
+  // yields (fenceCount + 1) parts, so an even fence count (all fences closed)
+  // gives an odd number of parts. An odd fence count means a fence was opened
+  // but never closed: the block-extraction above would then treat everything
+  // after it as one big "block", and a truncated snippet that happens to
+  // balance would pass silently. Detecting it here lets the gate fail loudly.
+  private def fencesClosed(text: String): Boolean = {
+    val fence = 96.toChar.toString.repeat(3)
+    text.split(java.util.regex.Pattern.quote(fence), -1).length % 2 == 1
+  }
+
   // True when every open/close delimiter balances (ignores the subtlety of
   // delimiters inside string literals — a generated snippet never nests an
   // unbalanced delimiter in a string, and this catches truncation).
@@ -135,7 +149,12 @@ object ReadmeExamplesTest {
         val label = ds(dj)(0)
         val path = Paths.get(ds(dj)(1))
         if (Files.exists(path)) {
-          val blocks = scalaBlocks(readDoc(path))
+          val text = readDoc(path)
+          // A fence opened but never closed leaves an odd number of fence
+          // markers; fail loudly rather than trusting the mis-segmented tail.
+          if (!fencesClosed(text))
+            failures.add(label + " has an unclosed scala code fence")
+          val blocks = scalaBlocks(text)
           var balancedCount = 0
           var bi = 0
           while (bi < blocks.size()) {

package/project/.sdk/src/cmp/scala/TestDirect_scala.ts

@@ -65,7 +65,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const EntityName = nom(entity, 'Name')
   const ENTLOWER = entity.name
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
 
@@ -73,8 +73,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = (entity.op as any).load
-  const listOp = (entity.op as any).list
+  const loadOp = (entity.op as any)?.load
+  const listOp = (entity.op as any)?.list
 
   // Load point info.
   const loadPoint = loadOp?.points?.[0]

package/project/.sdk/src/cmp/scala/Test_scala.ts

@@ -40,7 +40,7 @@ const Test = cmp(function Test(props: any) {
         getModelPath(model, `main.${KIT}.flow.Basic${EntityName}Flow`)
       const hasEntity = null != basicflow && true === basicflow.active
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
       const hasDirect = opnames.includes('load') || opnames.includes('list')
 
       if (hasEntity) {

package/project/.sdk/src/cmp/swift/EntityTypes_swift.ts

@@ -21,11 +21,11 @@
 //     the runtime's open shape.
 
 import {
-  cmp, each, names,
+  cmp, each,
   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,
@@ -81,8 +81,7 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // Emit for every entity that gets an entity file (filter on `name`, always
   // present; derive `Name` here so the struct set is deterministic — parity
   // with the rust/go emitter's fix).
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
+  const entityList = deriveEntityNames(entity)
 
   // 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/swift/Entity_swift.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify, names,
   Content, File, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -20,7 +20,7 @@ const Entity = cmp(function Entity(props: any) {
   const { target, entity } = props
 
   // Collision-free entity CLASS name (see entityClassName).
-  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: cls + '.' + target.ext }, () => {
 
-          const opnames = Object.keys(entity.op)
+          const opnames = Object.keys(entity.op || {})
 
           // For each CRUD op: if the spec defines it, splice in the real
           // implementation (an override). Otherwise leave the base-class