@voxgig/sdkgen 4.22.0 → 4.23.0

package/project/.sdk/src/cmp/kotlin/TestDirect_kotlin.ts

@@ -27,10 +27,10 @@ function normalizePathParams(
       const snaked = snakify(rawName)
       const depluralized = depluralize(snaked)
       const param = params.find((p: any) =>
-          p.name === snaked || p.name === depluralized) ||
+          p.n === snaked || p.n === depluralized) ||
         params.find((p: any) =>
-          p.orig === snaked || p.orig === depluralized)
-      if (param) return '{' + param.name + '}'
+          p.or === snaked || p.or === depluralized)
+      if (param) return '{' + param.n + '}'
 
       if (rename) {
         for (const [origCamel, renamedTo] of Object.entries(rename)) {
@@ -38,10 +38,10 @@ function normalizePathParams(
             const origSnaked = snakify(origCamel)
             const origDepluralized = depluralize(origSnaked)
             const renamedParam = params.find(
-              (p: any) => p.orig === origSnaked || p.name === origSnaked ||
-                p.orig === origDepluralized || p.name === origDepluralized
+              (p: any) => p.or === origSnaked || p.n === origSnaked ||
+                p.or === origDepluralized || p.n === origDepluralized
             )
-            if (renamedParam) return '{' + renamedParam.name + '}'
+            if (renamedParam) return '{' + renamedParam.n + '}'
           }
         }
       }
@@ -85,15 +85,15 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
-  const allLoadParams = loadPoint?.args?.params || []
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.g?.params || [], loadPoint?.r?.param) : ''
+  const allLoadParams = loadPoint?.g?.params || []
   const _pathPlaceholders = new Set<string>()
   for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
   }
-  const _renameMap = (loadPoint?.rename?.param || {}) as Record<string, string>
+  const _renameMap = (loadPoint?.r?.param || {}) as Record<string, string>
   const _renamedPlaceholders = new Set<string>()
   for (const ph of _pathPlaceholders) {
     _renamedPlaceholders.add(ph)
@@ -102,24 +102,24 @@ const TestDirect = cmp(function TestDirect(props: any) {
     }
   }
   const loadParams = allLoadParams.filter((p: any) =>
-    _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
+    _renamedPlaceholders.has(p.n) || _renamedPlaceholders.has(p.or))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
-  const listParams = listPoint?.args?.params || []
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.g?.params || [], listPoint?.r?.param) : ''
+  const listParams = listPoint?.g?.params || []
 
-  const loadQuery = loadPoint?.args?.query || []
+  const loadQuery = loadPoint?.g?.query || []
   const loadLiveQueryEntries = loadQuery
-    .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
+    .filter((q: any) => q.r && undefined !== q.ex && null !== q.ex)
   const loadLiveQueryLines = loadLiveQueryEntries
-    .map((q: any) => `      query["${q.name}"] = ${kotlinLiteral(q.example)}`)
+    .map((q: any) => `      query["${q.n}"] = ${kotlinLiteral(q.ex)}`)
     .join('\n')
 
   const loadAllHaveExamples =
     loadParams.length > 0 &&
-    loadParams.every((p: any) => undefined !== p.example && null !== p.example)
+    loadParams.every((p: any) => undefined !== p.ex && null !== p.ex)
   const loadExampleLines = loadAllHaveExamples
-    ? loadParams.map((p: any) => `      params["${p.name}"] = ${kotlinLiteral(p.example)}`).join('\n')
+    ? loadParams.map((p: any) => `      params["${p.n}"] = ${kotlinLiteral(p.ex)}`).join('\n')
     : ''
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
@@ -148,10 +148,10 @@ class ${entity.Name}DirectTest {
 
     if (hasList && listPoint) {
       const listLiveParams = listParams.map((p: any) => {
-        const key = p.name === 'id'
+        const key = p.n === 'id'
           ? entity.name + '01'
-          : p.name.replace(/_id$/, '') + '01'
-        return { name: p.name, key }
+          : p.n.replace(/_id$/, '') + '01'
+        return { name: p.n, key }
       })
 
       const listLiveIdKeys = listParams.length > 0
@@ -250,18 +250,18 @@ ${listSkipBlock}    val client = setup.client
     }
 
     if (hasLoad && loadPoint) {
-      const ancestorParams = loadParams.filter((p: any) => p.name !== 'id')
+      const ancestorParams = loadParams.filter((p: any) => p.n !== 'id')
 
       let loadLiveIdKeys: string[] = []
       if (loadParams.length > 0 && !loadAllHaveExamples) {
         if (hasList) {
           loadLiveIdKeys = listParams.map((p: any) => {
-            return p.name === 'id'
+            return p.n === 'id'
               ? entity.name + '01'
-              : p.name.replace(/_id$/, '') + '01'
+              : p.n.replace(/_id$/, '') + '01'
           })
         } else {
-          loadLiveIdKeys = loadParams.map((p: any) => p.name + '01')
+          loadLiveIdKeys = loadParams.map((p: any) => p.n + '01')
         }
       }
       const loadSkipBlock = loadLiveIdKeys.length > 0
@@ -306,10 +306,10 @@ ${loadSkipBlock}    val client = setup.client
           Content(`      val listParams = linkedMapOf<String, Any?>()
 `)
           for (const p of listParams) {
-            const key = p.name === 'id'
+            const key = p.n === 'id'
               ? entity.name + '01'
-              : p.name.replace(/_id$/, '') + '01'
-            Content(`      listParams["${p.name}"] = setup.idmap["${key}"]
+              : p.n.replace(/_id$/, '') + '01'
+            Content(`      listParams["${p.n}"] = setup.idmap["${key}"]
 `)
           }
 
@@ -326,8 +326,8 @@ ${loadSkipBlock}    val client = setup.client
       params["id"] = firstEnt["id"]
 `)
           for (const p of ancestorParams) {
-            const key = p.name.replace(/_id$/, '') + '01'
-            Content(`      params["${p.name}"] = setup.idmap["${key}"]
+            const key = p.n.replace(/_id$/, '') + '01'
+            Content(`      params["${p.n}"] = setup.idmap["${key}"]
 `)
           }
         }
@@ -336,7 +336,7 @@ ${loadSkipBlock}    val client = setup.client
           Content(`    } else {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`      params["${loadParams[i].name}"] = "direct0${i + 1}"
+            Content(`      params["${loadParams[i].n}"] = "direct0${i + 1}"
 `)
           }
         }

package/project/.sdk/src/cmp/kotlin/TestEntity_kotlin.ts

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -67,17 +68,17 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const idnames = buildIdNames(entity, basicflow)
 
-  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('$'))
     : []
   const aliases = updateData.map(([k, v]: any) => [k, v])
 
   const genCtx: GenCtx = { model, entity, kotlinpackage, flow: basicflow, PROJUPPER, accessor }
 
   const stepOps = Array.from(new Set(
-    (allSteps as any[]).map((s: any) => s.op).filter(Boolean)))
+    (allSteps as any[]).map((s: any) => s.o).filter(Boolean)))
 
   File({ name: entity.Name + 'EntityTest.' + target.ext }, () => {
 
@@ -127,7 +128,7 @@ class ${entity.Name}EntityTest {
     )
 ${allSteps.length > 0 ? `    val client = setup.client\n\n` : ''}`)
 
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     if (!flowHasCreate) {
       const preambleRef = entity.name + '_ref01'
       const preambleVar = kvar(preambleRef)
@@ -140,8 +141,8 @@ ${allSteps.length > 0 ? `    val client = setup.client\n\n` : ''}`)
 `)
     }
 
-    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) {
         opgen(genCtx, step, index)
         Content('\n')
@@ -152,7 +153,7 @@ ${allSteps.length > 0 ? `    val client = setup.client\n\n` : ''}`)
 
 `)
 
-    const flowHasList = allSteps.some((s: any) => s.op === 'list')
+    const flowHasList = allSteps.some((s: any) => s.o === 'list')
     if (flowHasList) {
       Content(`  @Test
   fun stream() {
@@ -276,18 +277,18 @@ ${authActive ? `        liveOpts["apikey"] = env["${PROJUPPER}_APIKEY"]\n` : ''}
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = kvar(step.input.entvar ?? ref + '_ent')
-  const datavar = kvar(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = kvar(step.i.entvar ?? ref + '_ent')
+  const datavar = kvar(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))
 
   const hasDatvar = priorSteps.some((s: any) => {
-    if ('create' === s.op) {
-      const priorRef = s.input.ref ?? entity.name + '_ref01'
-      const priorDatvar = kvar(s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? '')))
+    if ('create' === s.o) {
+      const priorRef = s.i.ref ?? entity.name + '_ref01'
+      const priorDatvar = kvar(s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? '')))
       return priorDatvar === datavar
     }
     return false
@@ -325,14 +326,14 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = kvar(step.input.entvar ?? ref + '_ent')
-  const matchvar = kvar(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const listvar = kvar(step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = kvar(step.i.entvar ?? ref + '_ent')
+  const matchvar = kvar(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const listvar = kvar(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
 `)
@@ -349,12 +350,12 @@ const generateList: OpGen = (ctx, step, index) => {
 `)
   }
 
-  const allSteps = Object.values(flow.step) as any[]
-  const listvarUsed = !!step.valid?.some((v: any) => {
+  const allSteps = Object.values(flowSteps(flow)) as any[]
+  const listvarUsed = !!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(`
@@ -367,11 +368,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))
 
       if ('ItemExists' === validator.apply && hasRefData) {
         const refDataVar = kvar(validRef + '_data')
@@ -397,16 +398,16 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = kvar(step.input.entvar ?? ref + '_ent')
-  const datavar = kvar(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const resdatavar = kvar(step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? '')))
-  const markdefvar = kvar(step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? '')))
-  const srcdatavar = kvar(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 = kvar(step.i.entvar ?? ref + '_ent')
+  const datavar = kvar(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const resdatavar = kvar(step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? '')))
+  const markdefvar = kvar(step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? '')))
+  const srcdatavar = kvar(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 hasEntIdU = null != entity.id
 
@@ -423,18 +424,18 @@ 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["${key}"] = setup.idmap!!["${key}"]
 `)
     }
   }
 
-  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}`
         Content(`
     val ${markdefvar}Name = "${fieldname}"
@@ -456,9 +457,9 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.spec) {
-    for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
+  if (step.s) {
+    for (const spec of step.s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
         Content(`    assertEquals(${markdefvar}Value, ${resdatavar}[${markdefvar}Name],
         "expected " + ${markdefvar}Name + " to be updated")
 `)
@@ -470,23 +471,23 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = kvar(step.input.entvar ?? ref + '_ent')
-  const matchvar = kvar(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const datavar = kvar(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const srcdatavar = kvar(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = kvar(step.i.entvar ?? ref + '_ent')
+  const matchvar = kvar(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const datavar = kvar(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const srcdatavar = kvar(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 === kvar(preambleRef + '_data')) ||
     priorSteps.some((s: any) => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = kvar(s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? '')))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = kvar(s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? '')))
         return priorDatvar === srcdatavar
       }
       return false
@@ -527,14 +528,14 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 const generateRemove: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = kvar(step.input.entvar ?? ref + '_ent')
-  const matchvar = kvar(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const srcdatavar = kvar(step.input.srcdatavar ?? (ref + '_data'))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = kvar(step.i.entvar ?? ref + '_ent')
+  const matchvar = kvar(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const srcdatavar = kvar(step.i.srcdatavar ?? (ref + '_data'))
 
-  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/lua/EntityTypes_lua.ts

@@ -43,8 +43,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
     Content(`-- Typed models for the ${model.const.Name} SDK (LuaLS annotations).
 --
--- 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). Annotations only — no runtime effect. Do not
 -- edit by hand.
@@ -54,13 +54,13 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
     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)
 
       Content(`---@class ${Name}
 `)
       fields.forEach((f: any) => {
-        const opt = false === f.req ? '?' : ''
-        Content(`---@field ${propKey(f.name)}${opt} ${canonToType(f.type, LANG)}
+        const opt = false === f.r ? '?' : ''
+        Content(`---@field ${propKey(f.n)}${opt} ${canonToType(f.t, LANG)}
 `)
       })
       Content(`

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

@@ -51,7 +51,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 — an entity whose lowercased name is a
     // Lua keyword (e.g. `end`) would otherwise emit uncompilable code.
@@ -98,8 +98,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/lua/ReadmeModel_lua.ts

@@ -131,13 +131,13 @@ Only \`direct()\` returns a response envelope — a \`table\` with \`ok\`,
 
 `)
   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}
 
@@ -145,7 +145,7 @@ Only \`direct()\` returns a response envelope — a \`table\` with \`ok\`,
 | --- | --- |
 `)
     each(fields, (field: any) => {
-      Content(`| \`${field.name}\` | ${field.short || ''} |
+      Content(`| \`${field.n}\` | ${field.sh || ''} |
 `)
     })
 

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

@@ -70,12 +70,12 @@ local client = ${ctor}
     // `id`, matching the load example and the seeded test fixture.
     const idNames = new Set<string>(['id',
       (exampleEntity.id && exampleEntity.id.field) || 'id'])
-    const fields: any[] = Array.isArray(exampleEntity.fields) ? exampleEntity.fields : []
+    const fields: any[] = Object.values(exampleEntity.fields || {})
     const isStringField = (f: any) =>
-      f && typeof f.type === 'string' && /STRING/i.test(f.type)
+      f && typeof f.t === 'string' && /STRING/i.test(f.t)
     const displayFieldObj =
-      fields.find((f: any) => f && !idNames.has(f.name) && isStringField(f)) ||
-      fields.find((f: any) => f && !idNames.has(f.name))
+      fields.find((f: any) => f && !idNames.has(f.n) && isStringField(f)) ||
+      fields.find((f: any) => f && !idNames.has(f.n))
     const displayField = displayFieldObj ? displayFieldObj.name : null
     const idCol = dataIdF ? `item["${dataIdF}"]` : null
     const dispCol = displayField ? `item["${displayField}"]` : null

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

@@ -166,7 +166,7 @@ same parameters as \`direct()\`.
 
     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)
@@ -201,9 +201,9 @@ local ${eVar} = client:${ent.Name}(nil)
 | --- | --- | --- | --- |
 `)
         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} |
 `)
         })
 
@@ -230,7 +230,7 @@ local ${eVar} = client:${ent.Name}(nil)
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

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

@@ -30,7 +30,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.
 
 local json = require("dkjson")