@voxgig/sdkgen 1.3.14 → 1.3.18

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

@@ -1,6 +1,6 @@
 
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -14,13 +14,15 @@ const MainEntity = cmp(async function MainEntity(props: any) {
 
   // Return the collision-free class TYPE (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(`
   // Entity access: \`client.${entity.Name}().list()\` / \`client.${entity.Name}().load({ id })\`.
-  ${entity.Name}(data?: any) {
+  // The argument is the entity OPTIONS object (passed to the entity
+  // constructor as entopts), not initial entity data.
+  ${entity.Name}(entopts?: Record<string, any>) {
     const self = this
-    return new ${cls}(self,data)
+    return new ${cls}(self, entopts)
   }
 
 `)

package/project/.sdk/src/cmp/ts/Main_ts.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'
 
 
@@ -57,7 +57,7 @@ const Main = cmp(async function Main(props: any) {
       Line(`// ${model.const.Name} ${target.Name} SDK\n`)
 
       List({ item: entity }, ({ item }: any) => {
-        const cls = entityClassName(item, entity)
+        const cls = entityClassName(item, entityCollection(model))
         return Line(`import { ${cls} } from './entity/${cls}'`)
       })
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, entityIdField, opRequestShape, safeVarName } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, entityIdField, opRequestShape, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -46,7 +46,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
     // Model-driven id key: null when this entity has no id-like field.
     const idF = entityIdField(entity)
     // Variable-safe lowercase name (a `Delete` entity must not bind `delete`).
-    const eVar = safeVarName(entity.name, target.name)
+    const eVar = exampleVarName(entity.name, target.name)
 
     Content(`
 ### ${entity.Name}
@@ -108,7 +108,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       const loadArg = 0 < loadItems.length
         ? `{ ${loadItems.map((it: any) =>
-          `${it.name}: ${exampleValue(entity, entity.op && entity.op.load, it.name,
+          `${jsKey(it.name)}: ${exampleValue(entity, entity.op && entity.op.load, it.name,
             it.name === idF ? entity.name + '_id' : it.name)}`).join(', ')} }`
         : ''
       Content(`#### Example: Load
@@ -143,7 +143,7 @@ const ${eVar}s = await client.${entity.Name}().list()
 const ${eVar} = await client.${entity.Name}().create({
 `)
       createItems.map((it: any) => {
-        Content(`  ${it.name}: ${exampleValue(entity, entity.op && entity.op.create, it.name, 'example_' + it.name)},
+        Content(`  ${jsKey(it.name)}: ${exampleValue(entity, entity.op && entity.op.create, it.name, 'example_' + it.name)},
 `)
       })
       Content(`})

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, entityIdField, entityDataIdField, pickExampleEntity, opRequestShape, safeVarName } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, entityIdField, entityDataIdField, pickExampleEntity, opRequestShape, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -20,7 +20,7 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
   const { entity: exampleEntity, primaryOp } = pickExampleEntity(entity)
   const eName = exampleEntity ? nom(exampleEntity, 'Name') : 'Entity'
   // Variable-safe lowercase name (a `Delete` entity must not bind `delete`).
-  const eVar = safeVarName(eName.toLowerCase(), 'ts')
+  const eVar = exampleVarName(eName.toLowerCase(), 'ts')
 
   const primaryOpDef = exampleEntity && primaryOp && exampleEntity.op && exampleEntity.op[primaryOp]
   const isMatchOp = 'load' === primaryOp || 'remove' === primaryOp
@@ -35,7 +35,17 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
     if (!exampleEntity || !primaryOp) return ''
     if ('list' === primaryOp) return ''
     if (isMatchOp) {
-      return idF ? `{ ${idF}: ${exampleValue(exampleEntity, primaryOpDef, idF, idPlaceholder)} }` : ''
+      // Every REQUIRED match key (id first), not just idF — a composite-match
+      // entity (e.g. Umbrella's FlatPermission, database_id + id) needs them all
+      // to satisfy the typed <Name>LoadMatch. Mirrors ReadmeTopTest.
+      const items = opRequestShape(exampleEntity, primaryOp).items
+        .filter((it: any) => !it.optional || it.name === idF)
+        .sort((a: any, b: any) => (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
+      if (0 === items.length) return ''
+      const pairs = items.map((it: any) =>
+        `${jsKey(it.name)}: ${exampleValue(exampleEntity, primaryOpDef, it.name,
+          it.name === idF ? idPlaceholder : 'example_' + it.name)}`)
+      return `{ ${pairs.join(', ')} }`
     }
     // create / update: a body of the required writable fields.
     const items = opRequestShape(exampleEntity, primaryOp).items
@@ -43,7 +53,7 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
     const required = items.filter((it: any) => !it.optional)
     const chosen = required.length ? required : items.slice(0, 3)
     const pairs = chosen.map((it: any) =>
-      `${it.name}: ${exampleValue(exampleEntity, primaryOpDef, it.name, 'example_' + it.name)}`)
+      `${jsKey(it.name)}: ${exampleValue(exampleEntity, primaryOpDef, it.name, 'example_' + it.name)}`)
     return `{ ${pairs.join(', ')} }`
   }
   const testCallArg = primaryArg('test01')

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, isAuthActive, packageName, envName, opRequestShape, entityIdField, entityDataIdField, entityOps, safeVarName } from '@voxgig/sdkgen'
+import { cmp, each, Content, isAuthActive, packageName, envName, opRequestShape, entityIdField, entityDataIdField, entityOps, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -48,7 +48,7 @@ const client = ${ctor}
     const eName = nom(exampleEntity, 'Name')
     // Variable-safe lowercase name — a `Delete`/`Class` entity must not bind a
     // reserved word (`const delete = ...` is a TS1109 syntax error).
-    const eVar = safeVarName(eName.toLowerCase(), 'ts')
+    const eVar = exampleVarName(eName.toLowerCase(), 'ts')
     const article = /^[aeiou]/i.test(eName) ? 'an' : 'a'
     const opnames = entityOps(exampleEntity)
     // Model-driven id key: `idF` is the entity's id-like MATCH field name, or
@@ -78,7 +78,7 @@ for (const ${eVar} of ${eVar}s) {
 
     if (nestedEntity) {
       const neName = nom(nestedEntity, 'Name')
-      const neVar = safeVarName(neName.toLowerCase(), 'ts')
+      const neVar = exampleVarName(neName.toLowerCase(), 'ts')
       const neArticle = /^[aeiou]/i.test(neName) ? 'an' : 'a'
       const loadOp = nestedEntity.op && nestedEntity.op.load
 
@@ -94,7 +94,7 @@ for (const ${eVar} of ${eVar}s) {
       const parentParam = parentItem && parentItem.name
       const parentName = parentParam ? parentParam.replace(/_id$/, '') : 'its parent'
       const neMatchLines = neRequired.map((it: any) =>
-        `    ${it.name}: ${exampleValue(nestedEntity, loadOp, it.name,
+        `    ${jsKey(it.name)}: ${exampleValue(nestedEntity, loadOp, it.name,
           it.name === neIdF ? 'example_id' : 'example_' + it.name)},`)
 
       Content(`### 3. Load ${neArticle} ${neName.toLowerCase()}
@@ -124,7 +124,7 @@ ${neMatchLines.join('\n')}
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       const loadArg = 0 < loadRequired.length
         ? `{ ${loadRequired.map((it: any) =>
-          `${it.name}: ${exampleValue(exampleEntity, exampleEntity.op && exampleEntity.op.load, it.name,
+          `${jsKey(it.name)}: ${exampleValue(exampleEntity, exampleEntity.op && exampleEntity.op.load, it.name,
             it.name === idF ? 'example_id' : 'example_' + it.name)}`).join(', ')} }`
         : ''
 
@@ -169,15 +169,33 @@ try {
           ? (required.length ? required : items.slice(0, 2))
           : required.concat(optional).slice(0, Math.max(2, required.length))
         return chosen.map((it: any) =>
-          `  ${it.name}: ${exampleValue(exampleEntity, exampleEntity.op[opname], it.name, 'example_' + it.name)},`)
+          `  ${jsKey(it.name)}: ${exampleValue(exampleEntity, exampleEntity.op[opname], it.name, 'example_' + it.name)},`)
       }
 
       // The id VALUE for an update/remove match. When the entity's DATA type
       // carries the id (dataIdF) AND a `created` record exists, take it off the
       // returned record; otherwise use a type-correct literal — reading
       // `created.id` off an id-less data type is a TS2339.
-      const canUseCreatedId = null != dataIdF && opnames.includes('create')
-      const idValueFor = (opname: string): string => canUseCreatedId
+      // Type of the data field we would read off `created` (e.g. number for an
+      // integer id). null when unknown.
+      const dataFields: any[] = exampleEntity.fields ? each(exampleEntity.fields) : []
+      const dataIdType = dataIdF
+        ? (dataFields.find((f: any) => f && f.name === dataIdF) || {}).type
+        : null
+      // `created.<dataIdF>` is only usable as an op's id-match value when its
+      // type matches that op's id PARAM type. An id that is integer in the data
+      // type but string in the match path (a spec quirk seen on management
+      // APIs) would be a TS2322 otherwise — fall back to a type-correct literal.
+      const usesCreatedId = (opname: string): boolean => {
+        if (null == dataIdF || !opnames.includes('create')) {
+          return false
+        }
+        const matchItem = opRequestShape(exampleEntity, opname).items
+          .find((it: any) => it.name === idF)
+        const matchType = matchItem ? matchItem.type : null
+        return null == matchType || null == dataIdType || matchType === dataIdType
+      }
+      const idValueFor = (opname: string): string => usesCreatedId(opname)
         ? `created.${dataIdF}!`
         : exampleValue(exampleEntity, exampleEntity.op[opname], idF as string, 'example_id')
 
@@ -198,7 +216,7 @@ const created = await client.${eName}().create({${createBody}})
         // type carries one, else a literal), plus a couple of patch fields.
         const updateLines = (idF ? [`  ${idF}: ${idValueFor('update')},`] : []).concat(exampleFields('update'))
         const updateBody = updateLines.length ? '\n' + updateLines.join('\n') + '\n' : ''
-        Content(`// Update${canUseCreatedId ? ' — the id comes straight off the returned entity' : ''}
+        Content(`// Update${usesCreatedId('update') ? ' — the id comes straight off the returned entity' : ''}
 const updated = await client.${eName}().update({${updateBody}})
 
 `)
@@ -211,8 +229,8 @@ const updated = await client.${eName}().update({${updateBody}})
           .sort((a: any, b: any) =>
             (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
           .map((it: any) => it.name === idF
-            ? `  ${it.name}: ${idValueFor('remove')},`
-            : `  ${it.name}: ${exampleValue(exampleEntity, exampleEntity.op.remove, it.name, 'example_' + it.name)},`)
+            ? `  ${jsKey(it.name)}: ${idValueFor('remove')},`
+            : `  ${jsKey(it.name)}: ${exampleValue(exampleEntity, exampleEntity.op.remove, it.name, 'example_' + it.name)},`)
         Content(`// Remove
 await client.${eName}().remove(${removeLines.length ? `{\n${removeLines.join('\n')}\n}` : ''})
 `)

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, File, isAuthActive, entityIdField, opRequestShape, safeVarName } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, File, isAuthActive, entityIdField, opRequestShape, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -185,7 +185,7 @@ Alias for \`${model.Name}SDK.test()\`.
       // which case load/remove match on no argument and update omits the id.
       const idF = entityIdField(ent)
       // Variable-safe lowercase name (a `Delete` entity must not bind `delete`).
-      const eVar = safeVarName(ent.name, target.name)
+      const eVar = exampleVarName(ent.name, target.name)
 
       Content(`
 ---
@@ -281,7 +281,7 @@ ${info.desc}
                 (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
             const arg = 0 < matchItems.length
               ? `{ ${matchItems.map((it: any) =>
-                `${it.name}: ${exampleValue(ent, ent.op && ent.op[opname], it.name,
+                `${jsKey(it.name)}: ${exampleValue(ent, ent.op && ent.op[opname], it.name,
                   it.name === idF ? ent.name + '_id' : it.name)}`).join(', ')} }`
               : ''
             Content(`\`\`\`ts
@@ -308,7 +308,7 @@ const results = await client.${ent.Name}().${opname}()
 const result = await client.${ent.Name}().create({
 `)
             createItems.map((it: any) => {
-              Content(`  ${it.name}: ${exampleValue(ent, ent.op && ent.op.create, it.name, 'example_' + it.name)},
+              Content(`  ${jsKey(it.name)}: ${exampleValue(ent, ent.op && ent.op.create, it.name, 'example_' + it.name)},
 `)
             })
             Content(`})
@@ -324,7 +324,7 @@ const result = await client.${ent.Name}().create({
               .sort((a: any, b: any) =>
                 (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
             const updateLines = updateItems.map((it: any) =>
-              `  ${it.name}: ${exampleValue(ent, ent.op && ent.op.update, it.name,
+              `  ${jsKey(it.name)}: ${exampleValue(ent, ent.op && ent.op.update, it.name,
                 it.name === idF ? ent.name + '_id' : it.name)},\n`).join('')
             Content(`\`\`\`ts
 const result = await client.${ent.Name}().update({

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, packageName, envName, entityIdField, entityOps, opRequestShape, safeVarName } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, packageName, envName, entityIdField, entityOps, opRequestShape, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -30,7 +30,7 @@ const client = ${ctor}
 
   if (exampleEntity) {
     const eName = nom(exampleEntity, 'Name')
-    const eVar = safeVarName(eName.toLowerCase(), 'ts')
+    const eVar = exampleVarName(eName.toLowerCase(), 'ts')
     const opnames = entityOps(exampleEntity)
 
     let hasCall = false
@@ -58,7 +58,7 @@ for (const ${eVar} of ${eVar}s) {
 
     if (nestedEntity) {
       const neName = nom(nestedEntity, 'Name')
-      const neVar = safeVarName(neName.toLowerCase(), 'ts')
+      const neVar = exampleVarName(neName.toLowerCase(), 'ts')
       const loadOp = nestedEntity.op && nestedEntity.op.load
 
       // Every REQUIRED load-match key (parent keys first, own id last) — the
@@ -70,7 +70,7 @@ for (const ${eVar} of ${eVar}s) {
         .sort((a: any, b: any) =>
           (a.name === neIdF ? 1 : 0) - (b.name === neIdF ? 1 : 0))
         .map((it: any) =>
-          `  ${it.name}: ${exampleValue(nestedEntity, loadOp, it.name,
+          `  ${jsKey(it.name)}: ${exampleValue(nestedEntity, loadOp, it.name,
             it.name === neIdF ? 'example_id' : 'example_' + it.name)},`)
 
       Content(`

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, entityIdField, pickExampleEntity, opRequestShape, safeVarName } from '@voxgig/sdkgen'
+import { cmp, Content, entityIdField, pickExampleEntity, opRequestShape, safeVarName, exampleVarName, jsKey } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -25,7 +25,7 @@ const client = ${model.const.Name}SDK.test()
   if (exampleEntity && primaryOp) {
     const eName = nom(exampleEntity, 'Name')
     // A list() result is an array — name the variable accordingly.
-    const eVar = safeVarName(eName.toLowerCase(), 'ts') +
+    const eVar = exampleVarName(eName.toLowerCase(), 'ts') +
       ('list' === primaryOp ? 's' : '')
     const primaryOpDef = exampleEntity.op && exampleEntity.op[primaryOp]
     const idF = entityIdField(exampleEntity)
@@ -39,7 +39,7 @@ const client = ${model.const.Name}SDK.test()
           (a.name === idF ? 0 : 1) - (b.name === idF ? 0 : 1))
       arg = 0 < items.length
         ? `{ ${items.map((it: any) =>
-          `${it.name}: ${exampleValue(exampleEntity, primaryOpDef, it.name,
+          `${jsKey(it.name)}: ${exampleValue(exampleEntity, primaryOpDef, it.name,
             it.name === idF ? 'test01' : 'example_' + it.name)}`).join(', ')} }`
         : ''
     } else if ('create' === primaryOp || 'update' === primaryOp) {
@@ -48,7 +48,7 @@ const client = ${model.const.Name}SDK.test()
       const required = items.filter((it: any) => !it.optional)
       const chosen = required.length ? required : items.slice(0, 3)
       arg = `{ ${chosen.map((it: any) =>
-        `${it.name}: ${exampleValue(exampleEntity, primaryOpDef, it.name, 'example_' + it.name)}`).join(', ')} }`
+        `${jsKey(it.name)}: ${exampleValue(exampleEntity, primaryOpDef, it.name, 'example_' + it.name)}`).join(', ')} }`
     }
     Content(`const ${eVar} = await client.${eName}().${primaryOp}(${arg})
 // ${eVar} is ${'list' === primaryOp ? `an array of bare ${eName} records` : `a bare ${eName}`} populated with mock data

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

@@ -17,6 +17,8 @@ import {
   cmp,
   snakify,
   isAuthActive,
+  jsProp,
+  jsOptProp,
 } from '@voxgig/sdkgen'
 
 
@@ -47,7 +49,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
       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')
 
@@ -149,7 +151,7 @@ function unwrapListData(data: any): any[] | null {
 
 
 function generateDirectLoad(model: Model, entity: ModelEntity) {
-  const loadOp = entity.op.load
+  const loadOp = entity.op?.load
   const loadPoint: ModelPoint | undefined = loadOp?.points?.[0]
 
   if (null == loadPoint) {
@@ -192,11 +194,11 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
     .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
   const hasLiveQuery = liveQueryEntries.length > 0
   const liveQueryLines = liveQueryEntries
-    .map((q: any) => `      query.${q.name} = ${JSON.stringify(q.example)}`)
+    .map((q: any) => `      ${jsProp('query', q.name)} = ${JSON.stringify(q.example)}`)
     .join('\n')
 
   // Get list info for live mode bootstrapping
-  const listOp = entity.op.list
+  const listOp = entity.op?.list
   const listPoint = listOp?.points?.[0]
   const listParams = listPoint?.args?.params || []
   const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param) : ''
@@ -245,12 +247,12 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
   let liveParamsBlock = ''
   if (allLoadParamsHaveExamples) {
     const exampleLines = loadParams.map(
-      (p: any) => `      params.${p.name} = ${JSON.stringify(p.example)}`
+      (p: any) => `      ${jsProp('params', p.name)} = ${JSON.stringify(p.example)}`
     ).join('\n')
     liveParamsBlock = `    if (setup.live) {
 ${liveQueryPrefix}${exampleLines}
     } else {
-${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i + 1}'`).join('\n')}
+${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')}
     }`
   }
   else if (hasList) {
@@ -262,7 +264,7 @@ ${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i +
     const listParamLines = liveListParams.map((lp: any) =>
       `        ${lp.name}: setup.idmap['${lp.key}'],`).join('\n')
     const ancestorParamLines = liveAncestorParams.map((lp: any) =>
-      `      params.${lp.name} = setup.idmap['${lp.key}']`).join('\n')
+      `      ${jsProp('params', lp.name)} = setup.idmap['${lp.key}']`).join('\n')
     // Try every load-path param name as the candidate field on listData[0].
     // Some APIs name the path param differently from the response field
     // (e.g. path uses {id} while response has mal_id), so we attempt the
@@ -286,14 +288,14 @@ ${listParamLines}
       if (null == listArr || listArr.length === 0) {
         return // skip: no entities to load in live mode
       }
-      const candidateId = listArr[0]?.${idParamName} ?? listArr[0]?.id
+      const candidateId = ${jsOptProp('listArr[0]', idParamName)} ?? listArr[0]?.id
       if (null == candidateId) {
         return // skip: list response shape does not expose load identifier
       }
-      params.${idParamName} = candidateId
+      ${jsProp('params', idParamName)} = candidateId
 ${ancestorParamLines}
     } else {
-${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i + 1}'`).join('\n')}
+${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')}
     }`
   } else if (hasLiveQuery || loadParams.length > 0) {
     // Synthetic-only fallback: if there are load params with no examples
@@ -306,7 +308,7 @@ ${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i +
     liveParamsBlock = `    if (setup.live) {
 ${liveQueryPrefix.replace(/\n$/, '')}
     } else {
-${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i + 1}'`).join('\n')}
+${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')}
     }`
   } else {
     liveParamsBlock = ''
@@ -354,7 +356,7 @@ ${paramAsserts}    }
 
 
 function generateDirectList(model: Model, entity: ModelEntity) {
-  const listOp = entity.op.list
+  const listOp = entity.op?.list
   const listPoint: ModelPoint | undefined = listOp?.points?.[0]
 
   if (null == listPoint) {
@@ -369,7 +371,7 @@ function generateDirectList(model: Model, entity: ModelEntity) {
   const listQuery = listPoint.args?.query || []
   const liveQueryLines = listQuery
     .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
-    .map((q: any) => `      query.${q.name} = ${JSON.stringify(q.example)}`)
+    .map((q: any) => `      ${jsProp('query', q.name)} = ${JSON.stringify(q.example)}`)
     .join('\n')
 
   // Build live params
@@ -388,10 +390,10 @@ function generateDirectList(model: Model, entity: ModelEntity) {
     const liveLines = [
       liveQueryLines,
       liveParams.map((lp: any) =>
-        `      params.${lp.name} = setup.idmap['${lp.key}']`).join('\n'),
+        `      ${jsProp('params', lp.name)} = setup.idmap['${lp.key}']`).join('\n'),
     ].filter(Boolean).join('\n')
     const mockLines = listParams.map((p: any, i: number) =>
-      `      params.${p.name} = 'direct0${i + 1}'`).join('\n')
+      `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')
 
     paramsBlock = `    const params: any = {}
     const query: any = {}

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

@@ -30,6 +30,7 @@ import {
   cmp,
   each,
   isAuthActive,
+  entityDataIdField,
 } from '@voxgig/sdkgen'
 
 
@@ -314,6 +315,7 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
+  const hasDataId = null != entityDataIdField(entity)
   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 ?? ''))
@@ -348,12 +350,18 @@ const generateList: OpGen = (ctx, step, index) => {
     const hasRefData = validRef && allSteps.some(s => 'create' === s.op &&
       ((s.input.ref ?? entity.name + '_ref01') === validRef))
 
-    if ('ItemExists' === validator.apply && hasRefData) {
+    // Guard on a DATA id field (entityDataIdField), NOT entity.id (the load-MATCH
+    // key): an entity can have a match id in its path while its RESPONSE record
+    // has no `id` field (e.g. Multichannel's Template — data fields meta/status/…,
+    // no id). Then `${validRef}_data.id` is undefined and select(list, { id:
+    // undefined }) spuriously matches id-less records, so ItemExists/ItemNotExists
+    // are meaningless. Emit them only when `.id` is a real data field.
+    if ('ItemExists' === validator.apply && hasRefData && hasDataId) {
       Content(`
     assert(!isempty(select(${listvar}, { id: ${validRef}_data.id })))
 `)
     }
-    else if ('ItemNotExists' === validator.apply && hasRefData) {
+    else if ('ItemNotExists' === validator.apply && hasRefData && hasDataId) {
       Content(`
     assert(isempty(select(${listvar}, { id: ${validRef}_data.id })))
 `)
@@ -524,6 +532,14 @@ const generateRemove: OpGen = (ctx, step, index) => {
   const needsEnt = !priorSteps.some(s =>
     ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
 
+  // "Remove what you created" needs the created record's id. An entity with
+  // no DATA id field (entityDataIdField null — e.g. Multichannel's Template)
+  // returns records without `.id`, so `${srcdatavar}.id` is absent (a py
+  // KeyError; a silent nil elsewhere). Skip the flow-remove step for those —
+  // the remove op is still exercised by the direct() test.
+  if (null == entityDataIdField(entity)) {
+    return
+  }
   Content(`
     // REMOVE
 `)

package/project/.sdk/src/cmp/zig/Config_zig.ts

@@ -93,14 +93,32 @@ pub fn make_config() Value {
 pub fn make_feature(name: []const u8) Feature {
 `)
 
+    // The factory must be able to instantiate any built-in feature by name,
+    // not just the ones the current API model configures — a caller can enable
+    // a shipped feature (e.g. netsim) purely through runtime options even when
+    // the API def does not list it. The built-in set mirrors the feature
+    // templates in tm/zig/feature/ (excluding `base`, the fallback, and
+    // `support`, a helper module). Any model feature not already built in is
+    // appended so bespoke features still resolve.
+    const builtinFeatures = [
+      'audit', 'cache', 'clienttrack', 'debug', 'idempotency', 'log',
+      'metrics', 'netsim', 'paging', 'proxy', 'ratelimit', 'rbac',
+      'retry', 'streaming', 'telemetry', 'test', 'timeout',
+    ]
+
+    const featureNames: string[] = [...builtinFeatures]
     each(feature, (f: any) => {
-      const fname = f.name.charAt(0).toUpperCase() + f.name.slice(1)
-      if (f.name !== 'base') {
-        Content(`    if (std.mem.eql(u8, name, "${f.name}")) return @import("../feature/${f.name}.zig").${fname}Feature.make();
-`)
+      if (f.name !== 'base' && !featureNames.includes(f.name)) {
+        featureNames.push(f.name)
       }
     })
 
+    featureNames.forEach((name: string) => {
+      const fname = name.charAt(0).toUpperCase() + name.slice(1)
+      Content(`    if (std.mem.eql(u8, name, "${name}")) return @import("../feature/${name}.zig").${fname}Feature.make();
+`)
+    })
+
     Content(`    return @import("../feature/base.zig").BaseFeature.make();
 }
 `)

package/project/.sdk/src/cmp/zig/Entity_zig.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 {
@@ -20,7 +20,7 @@ const Entity = cmp(function Entity(props: any) {
   const { model, stdrep } = props.ctx$
   const { target, entity } = props
 
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -34,7 +34,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: zigVarName(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 returning the unsupported_op
@@ -48,7 +48,7 @@ const Entity = cmp(function Entity(props: any) {
               ({ indent }: any) => {
                 const arg = ('create' === opname || 'update' === opname) ?
                   'reqdata' : 'reqmatch'
-                Content({ indent }, `pub fn ${opname}(self: *EntyClass, _${arg}: Value, _ctrl: Value) OpResult {
+                Content({ indent }, `pub fn ${opname}(self: *${cls}, _${arg}: Value, _ctrl: Value) OpResult {
     _ = _${arg};
     _ = _ctrl;
     return .{ .err = h.unsupported_op("${opname}", self.name) };

package/project/.sdk/src/cmp/zig/MainEntity_zig.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -16,7 +16,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 = zigVarName(entity.name)
   const mod = zigVarName(entity.name)

package/project/.sdk/src/cmp/zig/Main_zig.ts

@@ -21,6 +21,7 @@ import {
 import { Config } from './Config_zig'
 import { Gitignore } from './Gitignore_zig'
 import { MainEntity } from './MainEntity_zig'
+import { Package } from './Package_zig'
 
 
 const Main = cmp(async function Main(props: any) {
@@ -30,16 +31,21 @@ const Main = cmp(async function Main(props: any) {
 
   const entity: ModelEntity = getModelPath(model, `main.${KIT}.entity`)
 
+  // build.zig.zon — the package manifest, stamped with the model package name.
+  Package({ target })
+
   Gitignore({})
 
   // Copy tm/zig files with replacements. The tm src/ subtree only stages the
   // per-feature custom-source dirs (target add), so it is excluded here
-  // exactly like the go/rust targets. The SDK source lives at the tree root
-  // (core/, feature/, utility/, entity/, test/) — Zig's idiomatic src/ is not
-  // used, to keep the exclude rule identical to the reference targets.
+  // exactly like the go/rust targets. build.zig.zon is generated by Package
+  // (above), so it is excluded from the verbatim copy. The SDK source lives at
+  // the tree root (core/, feature/, utility/, entity/, test/) — Zig's
+  // idiomatic src/ is not used, to keep the exclude rule identical to the
+  // reference targets.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, /build\.zig\.zon$/],
     replace: {
       ...props.ctx$.stdrep,
     }