@voxgig/sdkgen 4.22.0 → 4.24.0

package/project/.sdk/src/cmp/js/TestDirect_js.ts

@@ -164,34 +164,34 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
     return
   }
 
-  const loadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(pointParts(loadPoint), loadParams, loadPoint.rename?.param)
+  const loadParams = loadPoint.g?.params || []
+  const loadPath = normalizePathParams(pointParts(loadPoint), loadParams, loadPoint.r?.param)
 
   // Get list info for live mode bootstrapping
   const listOp = entity.op?.list
   const listPoint = listOp?.points?.[0]
-  const listParams = listPoint?.args?.params || []
-  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param) : ''
+  const listParams = listPoint?.g?.params || []
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listParams, listPoint.r?.param) : ''
   const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
-  const ancestorParams = loadParams.filter((p: any) => p.name !== 'id')
+  const ancestorParams = loadParams.filter((p: any) => p.n !== 'id')
 
   const paramAsserts = loadParams.map((p: any, i: number) =>
     '      assert(calls[0].url.includes(\'direct0' + (i + 1) + '\'))\n').join('')
 
   // Build live list params
   const liveListParams = 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 }
   })
 
   // Build live ancestor params for load
   const liveAncestorParams = ancestorParams.map((p: any) => {
-    const key = p.name.replace(/_id$/, '') + '01'
-    return { name: p.name, key }
+    const key = p.n.replace(/_id$/, '') + '01'
+    return { name: p.n, key }
   })
 
   let liveParamsBlock = ''
@@ -217,11 +217,11 @@ ${listParamLines}
       params.id = listData[0].id
 ${ancestorParamLines}
     } else {
-${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')}
+${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.n)} = 'direct0${i + 1}'`).join('\n')}
     }`
   } else {
     liveParamsBlock = `    if (!setup.live) {
-${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')}
+${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.n)} = 'direct0${i + 1}'`).join('\n')}
     }`
   }
 
@@ -267,15 +267,15 @@ function generateDirectList(model: Model, entity: ModelEntity) {
     return
   }
 
-  const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param)
+  const listParams = listPoint.g?.params || []
+  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.r?.param)
 
   // Build live params
   const liveParams = 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 paramAsserts = listParams.map((p: any, i: number) =>
@@ -286,7 +286,7 @@ function generateDirectList(model: Model, entity: ModelEntity) {
     const liveLines = liveParams.map((lp: any) =>
       `      ${jsProp('params', lp.name)} = setup.idmap['${lp.key}']`).join('\n')
     const mockLines = listParams.map((p: any, i: number) =>
-      `      ${jsProp('params', p.name)} = 'direct0${i + 1}'`).join('\n')
+      `      ${jsProp('params', p.n)} = 'direct0${i + 1}'`).join('\n')
 
     paramsBlock = `    const params = {}
     if (setup.live) {
@@ -328,15 +328,15 @@ ${paramAsserts}    }
 
 
 // GraphQL-backed op needs POST+body, not a REST-shaped GET+params direct()
-// call — reuse apidef's own point.graphql.doc via the SDK's graphql() hatch.
+// call — reuse apidef's own point.gq.doc via the SDK's graphql() hatch.
 // Mirrors TestDirect_ts.ts's generateDirectGraphql.
 function generateDirectGraphqlJs(
   opname: 'load' | 'list',
   entity: ModelEntity,
   point: any,
 ) {
-  const doc: string = point.graphql.doc
-  const vars: any[] = point.graphql.vars || []
+  const doc: string = point.gq.doc
+  const vars: any[] = point.gq.vars || []
 
   const mockVarLines = vars.map((v: any, i: number) =>
     `      variables[${JSON.stringify(v.name)}] = 'direct0${i + 1}'`).join('\n')
@@ -396,10 +396,10 @@ function normalizePathParams(
       // original name was renamed to another param's current name (e.g. badge
       // load: param 'group_id' has orig 'id', and another param has name 'id').
       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 + '}'
 
       // Reverse-lookup through rename mapping: if rawName is a renamed value
       // (e.g. "id"), find the original camelCase key (e.g. "closureId"),
@@ -410,10 +410,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 + '}'
           }
         }
       }

package/project/.sdk/src/cmp/js/TestEntity_js.ts

@@ -1,3 +1,6 @@
+import { pointFacts } from '@voxgig/sdkgen'
+import { buildIdNames } from '@voxgig/sdkgen'
+import { flowSteps } from '@voxgig/sdkgen'
 
 import * as Path from 'node:path'
 
@@ -103,6 +106,8 @@ const TestEntity = cmp(function TestEntity(props: any) {
         const basicflow = getModelPath(model, `main.${KIT}.flow.Basic${nom(entity, 'Name')}Flow`)
 
         const dobasic = basicflow && true === basicflow.active
+        const liveFacts = Object.fromEntries(Object.values(entity.op || {}).flatMap((op: any) =>
+          (op.points || []).map((point: any) => [point.m + ' ' + point.o, pointFacts(ctx$, point)])))
 
         if (!dobasic) {
           return;
@@ -110,15 +115,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
         const indent = 2
 
-        const idlist = flatten([
-          entity.name + '01',
-          entity.name + '02',
-          entity.name + '03',
-          flatten(items(entity.relations.ancestors, (ap: any) =>
-            items(ap[1], (a: any) =>
-              items(['01', '02', '03'], (n: any) =>
-                a[1] + n[1]))), 2)
-        ])
+        const idlist = buildIdNames(entity, basicflow)
 
         Slot({ name: 'basicSetup' }, () => {
           Content(`
@@ -204,15 +201,15 @@ function basicSetup(extra) {
 
 
         Slot({ name: 'basic' }, () => {
-          const flowHasCreate = Object.values(basicflow.step).some(
-            (s: any) => s.op === 'create'
+          const flowHasCreate = Object.values(flowSteps(basicflow)).some(
+            (s: any) => s.o === 'create'
           )
 
           Content(`
     ${hasLiveScenarios(model) ? `if (process.env.${PROJENVNAME}_TEST_LIVE === 'TRUE') { t.skip('Covered by live operation scenarios'); return }` : ''}
     const setup = basicSetup()
     if (setup.live) {
-      return runLiveEntity(setup, ${JSON.stringify(entity)}, ${JSON.stringify(basicflow)}, '${nom(entity, 'Name')}')
+      return runLiveEntity(setup, ${JSON.stringify(entity)}, ${JSON.stringify(basicflow)}, '${nom(entity, 'Name')}', ${JSON.stringify(liveFacts)})
     }
     const client = setup.client
     const struct = setup.struct
@@ -234,8 +231,8 @@ function basicSetup(extra) {
           const genCtx: GenCtx = {
             model, entity, flow: basicflow, PROJUPPER: PROJENVNAME,
           }
-          each(basicflow.step, (step: ModelEntityFlowStep, index: number) => {
-            const opgen = GENERATE_OP[step.op]
+          each(flowSteps(basicflow), (step: ModelEntityFlowStep, index: number) => {
+            const opgen = GENERATE_OP[step.o]
             if (null != opgen) {
               opgen(genCtx, step, index)
               Content('\n')
@@ -250,18 +247,18 @@ function basicSetup(extra) {
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const datavar = step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? ''))
 
-  const priorSteps = flow.step.slice(0, Number(index))
+  const priorSteps = flowSteps(flow).slice(0, Number(index))
   const needsEnt = !priorSteps.some(s =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   const hasDatvar = priorSteps.some(s => {
-    if ('create' === s.op) {
-      const priorRef = s.input.ref ?? entity.name + '_ref01'
-      const priorDatvar = s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? ''))
+    if ('create' === s.o) {
+      const priorRef = s.i.ref ?? entity.name + '_ref01'
+      const priorDatvar = s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? ''))
       return priorDatvar === datavar
     }
     return false
@@ -282,7 +279,7 @@ const generateCreate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  each(step.match, (mi: any) => {
+  each(step.m, (mi: any) => {
     Content(`    ${datavar}['${mi.key$}'] = setup.idmap['${mi.val$}']
 `)
   })
@@ -306,14 +303,14 @@ 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 ?? ''))
-  const listvar = step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const listvar = step.i.listvar ?? (ref + '_list' + (step.i.suffix ?? ''))
 
-  const priorSteps = flow.step.slice(0, Number(index))
+  const priorSteps = flowSteps(flow).slice(0, Number(index))
   const needsEnt = !priorSteps.some(s =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`
     // LIST
@@ -325,7 +322,7 @@ const generateList: OpGen = (ctx, step, index) => {
   Content(`    const ${matchvar} = {}
 `)
 
-  each(step.match, (mi: any) => {
+  each(step.m, (mi: any) => {
     Content(`    ${matchvar}['${mi.key$}'] = setup.idmap['${mi.val$}']
 `)
   })
@@ -333,12 +330,12 @@ const generateList: OpGen = (ctx, step, index) => {
   Content(`
     const ${listvar} = (await ${entvar}.list(${matchvar})).map((e) => e.data())
 `)
-  const allSteps = flow.step
-  for (let vI = 0; vI < step.valid.length; vI++) {
-    const validator = step.valid[vI]
+  const allSteps = flowSteps(flow)
+  for (let vI = 0; vI < step.v.length; vI++) {
+    const validator = step.v[vI]
     const validRef = validator.def?.ref
-    const hasRefData = validRef && allSteps.some(s => 'create' === s.op &&
-      ((s.input.ref ?? entity.name + '_ref01') === validRef))
+    const hasRefData = validRef && allSteps.some(s => 'create' === s.o &&
+      ((s.i.ref ?? entity.name + '_ref01') === validRef))
 
     if ('ItemExists' === validator.apply && hasRefData && hasDataId) {
       Content(`
@@ -356,16 +353,16 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
-  const resdatavar = step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? ''))
-  const markdefvar = step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? ''))
-  const srcdatavar = step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? ''))
-
-  const priorSteps = flow.step.slice(0, Number(index))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const datavar = step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? ''))
+  const resdatavar = step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? ''))
+  const markdefvar = step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? ''))
+  const srcdatavar = step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? ''))
+
+  const priorSteps = flowSteps(flow).slice(0, Number(index))
   const needsEnt = !priorSteps.some(s =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   const hasEntIdU = null != entity.id
 
@@ -383,7 +380,7 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  each(step.data, (mi: any) => {
+  each(step.d, (mi: any) => {
     if ('id' !== mi.key$) {
       Content(`    ${datavar} ['${mi.key$}'] = setup.idmap['${mi.key$}']
 `)
@@ -391,10 +388,10 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   })
 
 
-  for (let sI = 0; sI < step.spec.length; sI++) {
-    const spec = step.spec[sI]
-    if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
-      const fieldname = step.input.textfield
+  for (let sI = 0; sI < step.s.length; sI++) {
+    const spec = step.s[sI]
+    if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
+      const fieldname = step.i.textfield
       const fieldvalue = spec.def.mark
       Content(`
     const ${markdefvar} = { name: '${fieldname}', value: '${fieldvalue}_' + setup.now }
@@ -415,9 +412,9 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  for (let sI = 0; sI < step.spec.length; sI++) {
-    const spec = step.spec[sI]
-    if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
+  for (let sI = 0; sI < step.s.length; sI++) {
+    const spec = step.s[sI]
+    if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
       Content(`
     assert(${resdatavar}[${markdefvar}.name] === ${markdefvar}.value)
 `)
@@ -429,25 +426,25 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  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 ?? ''))
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
-  const srcdatavar = step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const datavar = step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? ''))
+  const srcdatavar = step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? ''))
 
-  const priorSteps = flow.step.slice(0, Number(index))
+  const priorSteps = flowSteps(flow).slice(0, Number(index))
   const hasEntVar = priorSteps.some(s =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   // Check if srcdatavar was declared by a prior create step or by the
   // preamble bootstrap (which runs when the flow has no create step)
-  const flowHasCreate = flow.step.some(s => s.op === 'create')
+  const flowHasCreate = flowSteps(flow).some(s => s.o === 'create')
   const preambleRef = entity.name + '_ref01'
   const hasSrcData = (!flowHasCreate && srcdatavar === preambleRef + '_data') ||
     priorSteps.some(s => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? ''))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? ''))
         return priorDatvar === srcdatavar
       }
       return false
@@ -487,14 +484,14 @@ const generateRemove: OpGen = (ctx, step, index) => {
   if (null == entityDataIdField(entity)) {
     return
   }
-  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 ?? ''))
-  const srcdatavar = step.input.srcdatavar ?? (ref + '_data')
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const srcdatavar = step.i.srcdatavar ?? (ref + '_data')
 
-  const priorSteps = flow.step.slice(0, Number(index))
+  const priorSteps = flowSteps(flow).slice(0, Number(index))
   const needsEnt = !priorSteps.some(s =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   const hasEntIdR = null != entity.id
 

package/project/.sdk/src/cmp/js/TestLive_js.ts

@@ -17,10 +17,10 @@ const TestLive = cmp(function TestLive(props: any) {
           responses: all.responses,
         }
         if (model.main.kit.info?.auth === false) facts.security = []
-        const same = operation.points.filter((p: any) => JSON.stringify(p.select || {}) === JSON.stringify(point.select || {}))
+        const same = operation.points.filter((p: any) => JSON.stringify(p.q || {}) === JSON.stringify(point.q || {}))
         plan.push({ entity: entity.name, accessor: nom(entity, 'Name'), op,
-          id: point.contract?.id || point.method + ' ' + point.orig, contractVersion: point.contract?.version ?? 1, kind: point.kind, graphql: point.graphql, path: point.orig, method: point.method,
-          action: point.select?.$action, rename: point.rename, args: point.args, facts, reachable: same.length === 1 })
+          id: point.co?.id || point.m + ' ' + point.o, contractVersion: 1, kind: point.k, graphql: point.gq, path: point.o, method: point.m,
+          action: point.q?.$action, rename: point.r, args: point.g, facts, reachable: same.length === 1 })
       }
     }
   }

package/project/.sdk/src/cmp/js/utility_js.ts

@@ -17,18 +17,18 @@ import {
 
 
 // The declared canon-type sentinel of a named parameter of an op — looked up
-// in the op's `points[].args.params[]` exactly as the typed-model generator
+// in the op's `points[].g.params[]` exactly as the typed-model generator
 // does. Falls back to the entity field of the same name (used when the op
 // has no params). Returns undefined when neither is present.
 function paramCanonType(entity: any, op: any, paramName: string): unknown {
   const params = op ? each(opParams(op)) : []
-  const found = (params as any[]).find((p: any) => p && p.name === paramName)
+  const found = (params as any[]).find((p: any) => p && p.n === paramName)
   if (found) {
-    return found.type
+    return found.t
   }
   const field = (entity && entity.fields ? each(entity.fields) : [])
-    .find((f: any) => f && f.name === paramName) as any
-  return field && field.type
+    .find((f: any) => f && f.n === paramName) as any
+  return field && field.t
 }
 
 

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

@@ -98,8 +98,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
 // Typed reference 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 (source of truth: @voxgig/apidef VALID_CANON). Do
 // not edit by hand.
 //
@@ -117,10 +117,10 @@ object ${model.const.Name}Types {
     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)
 
       emitRecord(Name, fields.map((f: any) => ({
-        name: f.name, type: f.type,
+        name: f.n, type: f.t,
       })), log)
 
       const ops = ent.op || {}

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

@@ -54,7 +54,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)
     // Sanitise the local variable name — a camelCased Kotlin keyword gets a
@@ -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/kotlin/ReadmeModel_kotlin.ts

@@ -116,13 +116,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}
 
@@ -130,7 +130,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/kotlin/ReadmeRef_kotlin.ts

@@ -170,7 +170,7 @@ Prepare a fetch definition without sending. Returns the \`fetchdef\` and raises
     // 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 — kotlinVarName guards Kotlin keywords.
@@ -205,9 +205,9 @@ val ${eVar} = client.${accessor}(null)
 | --- | --- | --- | --- |
 `)
         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} |
 `)
         })
 
@@ -232,7 +232,7 @@ val ${eVar} = client.${accessor}(null)
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

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

@@ -40,7 +40,7 @@ import ${kotlinpackage}.utility.Json
  * ${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 the option spec; entity \`fields[].type\` for the
+ * \`config.options\` for the option spec; entity \`fields{}.type\` for the
  * entity specs.
  */
 @Suppress("UNCHECKED_CAST")