@voxgig/sdkgen 4.22.0 → 4.23.0

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

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -63,10 +64,10 @@ const TestEntity = cmp(function TestEntity(props: any) {
   for (const n of idnames) {
     idmapObj[n] = String(n).toUpperCase()
   }
-  const allSteps = Object.values(basicflow.step) as any[]
-  const updateStep = allSteps.find((s: any) => s.op === 'update')
-  const updateData = updateStep?.data
-    ? Object.entries(updateStep.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
+  const allSteps = Object.values(flowSteps(basicflow)) as any[]
+  const updateStep = allSteps.find((s: any) => s.o === 'update')
+  const updateData = updateStep?.d
+    ? Object.entries(updateStep.d).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
     : []
   for (const [k, v] of updateData as any[]) {
     if (null == idmapObj[k] && null != idmapObj[v as string]) {
@@ -120,10 +121,10 @@ object ${EntityName}EntityTest {
     // that a later load/update/remove reads its id from. Seed it from the
     // shipped "existing" fixtures here, mirroring the ts generator. Guarded on a
     // DATA id field — an entity that carries no id has no `.get("id")` to read.
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     const needsPreambleData = !flowHasCreate &&
       null != entityDataIdField(entity) &&
-      allSteps.some((s: any) => ['load', 'update', 'remove'].includes(s.op))
+      allSteps.some((s: any) => ['load', 'update', 'remove'].includes(s.o))
     if (needsPreambleData) {
       const preambleData = scalaVarName(entity.name + '_ref01_data')
       Content(`      val ${preambleData}Raw = Struct.items(Helpers.toMapAny(
@@ -133,8 +134,8 @@ object ${EntityName}EntityTest {
     }
 
     // Model-driven step iteration (sorted-key order for byte-stable output).
-    each(basicflow.step, (step: any, index: any) => {
-      const opgen: OpGen = GENERATE_OP[step.op]
+    each(flowSteps(basicflow), (step: any, index: any) => {
+      const opgen: OpGen = GENERATE_OP[step.o]
       if (opgen) {
         Content('\n')
         opgen(genCtx, step, index)
@@ -151,13 +152,13 @@ object ${EntityName}EntityTest {
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // CREATE
 `)
@@ -188,14 +189,14 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const listvar = scalaVarName(step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const listvar = scalaVarName(step.i.listvar ?? (ref + '_list' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // LIST
 `)
@@ -213,12 +214,12 @@ const generateList: OpGen = (ctx, step, index) => {
   }
 
   const hasDataId = null != entityDataIdField(entity)
-  const allSteps = Object.values(flow.step) as any[]
-  const listvarUsed = hasDataId && !!step.valid?.some((v: any) => {
+  const allSteps = Object.values(flowSteps(flow)) as any[]
+  const listvarUsed = hasDataId && !!step.v?.some((v: any) => {
     if ('ItemExists' !== v.apply && 'ItemNotExists' !== v.apply) return false
     const validRef = v.def?.ref
-    return validRef && allSteps.some((s: any) => 'create' === s.op &&
-      ((s.input.ref ?? entity.name + '_ref01') === validRef))
+    return validRef && allSteps.some((s: any) => 'create' === s.o &&
+      ((s.i.ref ?? entity.name + '_ref01') === validRef))
   })
 
   Content(`      val ${listvar}Result = ${entvar}.list(${matchvar}, null)
@@ -229,11 +230,11 @@ const generateList: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.valid) {
-    for (const validator of step.valid) {
+  if (step.v) {
+    for (const validator of step.v) {
       const validRef = validator.def?.ref
-      const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.op &&
-        ((s.input.ref ?? entity.name + '_ref01') === validRef))
+      const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.o &&
+        ((s.i.ref ?? entity.name + '_ref01') === validRef))
       const refDataVar = scalaVarName(validRef + '_data')
 
       if ('ItemExists' === validator.apply && hasRefData && hasDataId) {
@@ -254,16 +255,16 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const resdatavar = scalaVarName(step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? '')))
-  const markdefvar = scalaVarName(step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const resdatavar = scalaVarName(step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? '')))
+  const markdefvar = scalaVarName(step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   const hasDataId = null != entityDataIdField(entity)
 
@@ -280,8 +281,8 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.data) {
-    const dataEntries = Object.entries(step.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
+  if (step.d) {
+    const dataEntries = Object.entries(step.d).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
     for (const [key] of dataEntries) {
       Content(`      ${datavar}Up.put("${key}", idmap.get("${key}"))
 `)
@@ -289,10 +290,10 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   }
 
   let hasMark = false
-  if (step.spec) {
-    for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
-        const fieldname = step.input.textfield
+  if (step.s) {
+    for (const spec of step.s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
+        const fieldname = step.i.textfield
         const fieldvalue = spec.def?.mark ?? `Mark01-${ref}`
         hasMark = true
         Content(`      val ${markdefvar}Name = "${fieldname}"
@@ -320,23 +321,23 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const hasEntVar = priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
-  const flowHasCreate = Object.values(flow.step).some((s: any) => (s as any).op === 'create')
+  const flowHasCreate = Object.values(flowSteps(flow)).some((s: any) => (s as any).o === 'create')
   const preambleRef = entity.name + '_ref01'
   const hasSrcData = (!flowHasCreate && srcdatavar === scalaVarName(preambleRef + '_data')) ||
     priorSteps.some((s: any) => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = scalaVarName(s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? '')))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = scalaVarName(s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? '')))
         return priorDatvar === srcdatavar
       }
       return false
@@ -375,10 +376,10 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 const generateRemove: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data'))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data'))
 
   // The remove-by-id match reads ${srcdatavar}.get("id"); skip the whole step
   // when the DATA type has no id field (there is no created id to remove by).
@@ -386,9 +387,9 @@ const generateRemove: OpGen = (ctx, step, index) => {
     return
   }
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // REMOVE
 `)

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

@@ -67,8 +67,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
           Content(`// Typed models for the ${model.const.Name} SDK.
 //
-// GENERATED from the API model: main.${KIT}.entity.<e>.fields[] and per-op
-// params (op.<name>.points[].args.params[]). Field/param types are mapped
+// GENERATED from the API model: main.${KIT}.entity.<e>.fields{} and per-op
+// params (op.<name>.points[].g.params[]). Field/param types are mapped
 // from the canonical type sentinels. Do not edit by hand.
 //
 // These are DOCUMENTARY: the SDK runtime is dynamic (ops take/return the
@@ -82,13 +82,13 @@ import Foundation
           entityList.forEach((ent: any) => {
             const Name = ent.Name
             const fields = (ent.fields ? each(ent.fields) : [])
-              .filter((f: any) => f.active !== false)
+              .filter((f: any) => f.a !== false)
 
             const TypeName = swiftSafeTypeName(Name)
             emitStruct(
               `/// ${TypeName} is the typed data model for the ${ent.name} entity.`,
               TypeName,
-              fields.map((f: any) => ({ name: f.name, type: f.type, optional: false === f.req }))
+              fields.map((f: any) => ({ name: f.n, type: f.t, optional: false === f.r }))
             )
 
             const ops = ent.op || {}

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

@@ -55,7 +55,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 
   publishedEntities.map((entity: any) => {
     const opnames = Object.keys(entity.op || {})
-    const fields = entity.fields || []
+    const fields = Object.values(entity.fields || {})
     const idF = entityIdField(entity)
     // Sanitise the local variable name — a camelCased Swift keyword gets a
     // trailing underscore (swiftVarName) so the snippet compiles.
@@ -103,8 +103,8 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 `)
 
       each(fields, (field: any) => {
-        const desc = field.short || ''
-        Content(`| \`${field.name}\` | \`${canonToType(field.type, target.name)}\` | ${desc} |
+        const desc = field.sh || ''
+        Content(`| \`${field.n}\` | \`${canonToType(field.t, target.name)}\` | ${desc} |
 `)
       })
 

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

@@ -115,13 +115,13 @@ On error, \`ok\` is \`false\` and \`err\` contains the error value.
 
 `)
   each(entityList, (ent: any) => {
-    const fields = ent.fields || []
+    const fields = Object.values(ent.fields || {})
     const opnames = Object.keys(ent.op || {})
     const ops = ent.op || {}
     const points = each(ops).map((op: any) =>
       op.points ? each(op.points) : []
     ).flat()
-    const path = points.length > 0 ? (points[0] as any).orig || '' : ''
+    const path = points.length > 0 ? (points[0] as any).o || '' : ''
 
     Content(`#### ${ent.Name}
 
@@ -129,7 +129,7 @@ On error, \`ok\` is \`false\` and \`err\` contains the error value.
 | --- | --- |
 `)
     each(fields, (field: any) => {
-      Content(`| \`${field.name}\` | ${field.short || ''} |
+      Content(`| \`${field.n}\` | ${field.sh || ''} |
 `)
     })
 

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

@@ -169,7 +169,7 @@ Prepare a fetch definition without sending. Returns the \`fetchdef\` and throws
     // Entity reference sections
     publishedEntities.map((ent: any) => {
       const opnames = Object.keys(ent.op || {})
-      const fields = ent.fields || []
+      const fields = Object.values(ent.fields || {})
       // Model-driven id key: null when this entity has no id-like field.
       const idF = entityIdField(ent)
       // Sanitise the local variable name — swiftVarName guards Swift keywords.
@@ -204,9 +204,9 @@ let ${eVar} = client.${accessor}()
 | --- | --- | --- | --- |
 `)
         each(fields, (field: any) => {
-          const req = field.req ? 'Yes' : 'No'
-          const desc = field.short || ''
-          Content(`| \`${field.name}\` | \`${canonToType(field.type, target.name)}\` | ${req} | ${desc} |
+          const req = field.r ? 'Yes' : 'No'
+          const desc = field.sh || ''
+          Content(`| \`${field.n}\` | \`${canonToType(field.t, target.name)}\` | ${req} | ${desc} |
 `)
         })
 
@@ -231,7 +231,7 @@ let ${eVar} = client.${accessor}()
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

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

@@ -32,7 +32,7 @@ const Schema = cmp(async function Schema(props: any) {
 // do not edit by hand.
 //
 // Built from the model: \`main.kit.optspec\` and each feature's
-// \`config.options\` for optspec; entity \`fields[].type\` for entityspec.
+// \`config.options\` for optspec; entity \`fields{}.type\` for entityspec.
 
 import Foundation
 

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

@@ -42,8 +42,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
     Content(`// Typed models for the ${model.const.Name} SDK.
 //
-// GENERATED from the API model: main.${KIT}.entity.<e>.fields[] and per-op
-// params (op.<name>.points[].args.params[]). Field/param types come from the
+// GENERATED from the API model: main.${KIT}.entity.<e>.fields{} and per-op
+// params (op.<name>.points[].g.params[]). Field/param types come from the
 // canonical type sentinels via @voxgig/sdkgen canonToType (source of truth:
 // @voxgig/apidef VALID_CANON). Do not edit by hand.
 
@@ -53,13 +53,13 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
       const Name = ent.Name
       const TypeName = tsSafeTypeName(Name)
       const fields = (ent.fields ? each(ent.fields) : [])
-        .filter((f: any) => f.active !== false)
+        .filter((f: any) => f.a !== false)
 
       Content(`export interface ${TypeName} {
 `)
       fields.forEach((f: any) => {
-        const opt = false === f.req ? '?' : ''
-        Content(`  ${propKey(f.name)}${opt}: ${canonToType(f.type, LANG)}
+        const opt = false === f.r ? '?' : ''
+        Content(`  ${propKey(f.n)}${opt}: ${canonToType(f.t, LANG)}
 `)
       })
       Content(`}

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

@@ -45,7 +45,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 
   publishedEntities.map((entity: any) => {
     const opnames = Object.keys(entity.op || {})
-    const fields = entity.fields || []
+    const fields = Object.values(entity.fields || {})
     // Model-driven id key: null when this entity has no id-like field.
     const idF = entityIdField(entity)
     const eVar = exampleVarName(entity.name, target.name)
@@ -91,8 +91,8 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 `)
 
       each(fields, (field: any) => {
-        const desc = field.short || ''
-        Content(`| \`${field.name}\` | \`${canonToType(field.type, target.name)}\` | ${desc} |
+        const desc = field.sh || ''
+        Content(`| \`${field.n}\` | \`${canonToType(field.t, target.name)}\` | ${desc} |
 `)
       })
 

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

@@ -175,13 +175,13 @@ The \`prepare()\` method returns:
 `)
 
   each(entityList, (ent: any) => {
-    const fields = ent.fields || []
+    const fields = Object.values(ent.fields || {})
     const opnames = Object.keys(ent.op || {})
     const ops = ent.op || {}
     const points = each(ops).map((op: any) =>
       op.points ? each(op.points) : []
     ).flat()
-    const path = points.length > 0 ? (points[0] as any).orig || '' : ''
+    const path = points.length > 0 ? (points[0] as any).o || '' : ''
 
     Content(`#### ${ent.Name}
 
@@ -189,7 +189,7 @@ The \`prepare()\` method returns:
 | --- | --- |
 `)
     each(fields, (field: any) => {
-      Content(`| \`${field.name}\` | ${field.short || ''} |
+      Content(`| \`${field.n}\` | ${field.sh || ''} |
 `)
     })
 

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

@@ -174,7 +174,7 @@ try {
 
       const dataFields: any[] = exampleEntity.fields ? each(exampleEntity.fields) : []
       const dataIdType = dataIdF
-        ? (dataFields.find((f: any) => f && f.name === dataIdF) || {}).type
+        ? (dataFields.find((f: any) => f && f.n === dataIdF) || {}).type
         : null
       const usesCreatedId = (opname: string): boolean => {
         if (null == dataIdF || !opnames.includes('create')) {

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

@@ -187,7 +187,7 @@ Alias for \`${model.Name}SDK.test()\`.
     // Entity reference sections
     publishedEntities.map((ent: any) => {
       const opnames = Object.keys(ent.op || {})
-      const fields = ent.fields || []
+      const fields = Object.values(ent.fields || {})
       // Model-driven id key: null when this entity has no id-like field, in
       // which case load/remove match on no argument and update omits the id.
       const idF = entityIdField(ent)
@@ -221,9 +221,9 @@ const ${eVar} = client.${ent.Name}()
 | --- | --- | --- | --- |
 `)
         each(fields, (field: any) => {
-          const req = field.req ? 'Yes' : 'No'
-          const desc = field.short || ''
-          Content(`| \`${field.name}\` | \`${canonToType(field.type, target.name)}\` | ${req} | ${desc} |
+          const req = field.r ? 'Yes' : 'No'
+          const desc = field.sh || ''
+          Content(`| \`${field.n}\` | \`${canonToType(field.t, target.name)}\` | ${req} | ${desc} |
 `)
         })
 
@@ -250,7 +250,7 @@ const ${eVar} = client.${ent.Name}()
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

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

@@ -25,7 +25,7 @@ const Schema = cmp(async function Schema(props: any) {
     Content(`// ${model.const.Name} ${target.Name} SDK: generated schemas. Do not edit.
 //
 // Generated from the model: \`main.kit.optspec\` and each feature's
-// \`config.options\` for OPTSPEC; entity \`fields[].type\` for ENTITYSPEC.
+// \`config.options\` for OPTSPEC; entity \`fields{}.type\` for ENTITYSPEC.
 
 const OPTSPEC = ${JSON.stringify(optspec, null, 2)}