@voxgig/sdkgen 4.22.0 → 4.23.0

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

@@ -180,8 +180,8 @@ function generateDirectGraphql(
   point: any,
   strict: boolean,
 ) {
-  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 varLine = (target: string, key: string, v: any) =>
     `      ${target}[${JSON.stringify(v.name)}] = ${key}`
@@ -275,8 +275,8 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
     return
   }
 
-  const allLoadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(pointParts(loadPoint), allLoadParams, loadPoint.rename?.param)
+  const allLoadParams = loadPoint.g?.params || []
+  const loadPath = normalizePathParams(pointParts(loadPoint), allLoadParams, loadPoint.r?.param)
 
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -289,7 +289,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
       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)
@@ -298,42 +298,42 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
     }
   }
   const loadParams = allLoadParams.filter((p: any) =>
-    renamedPlaceholders.has(p.name) || renamedPlaceholders.has(p.orig))
+    renamedPlaceholders.has(p.n) || renamedPlaceholders.has(p.or))
 
   // Required query params that the spec advertises an example value for.
   // Live mode needs these on the request or the API returns 4xx; mock mode
   // ignores them. Optional query params (e.g. `app`, `version`) are skipped
   // even when they have examples — only the strictly required ones are
   // necessary to satisfy the contract.
-  const loadQuery = loadPoint.args?.query || []
+  const loadQuery = loadPoint.g?.query || []
   const liveQueryEntries = loadQuery
-    .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
+    .filter((q: any) => q.r && undefined !== q.ex && null !== q.ex)
   const hasLiveQuery = liveQueryEntries.length > 0
   const liveQueryLines = liveQueryEntries
-    .map((q: any) => `      ${jsProp('query', q.name)} = ${JSON.stringify(q.example)}`)
+    .map((q: any) => `      ${jsProp('query', q.n)} = ${JSON.stringify(q.ex)}`)
     .join('\n')
 
   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
 
-  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('')
 
   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 }
   })
 
   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 }
   })
 
   const liveQueryPrefix = liveQueryLines ? liveQueryLines + '\n' : ''
@@ -344,7 +344,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   // so they avoid the brittleness of mapping list-response field names
   // back to load path-param names.
   const liveExampleParams = loadParams.filter(
-    (p: any) => undefined !== p.example && null !== p.example
+    (p: any) => undefined !== p.ex && null !== p.ex
   )
   const allLoadParamsHaveExamples =
     loadParams.length > 0 && liveExampleParams.length === loadParams.length
@@ -354,12 +354,12 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   let liveParamsBlock = ''
   if (allLoadParamsHaveExamples) {
     const exampleLines = loadParams.map(
-      (p: any) => `      ${jsProp('params', p.name)} = ${JSON.stringify(p.example)}`
+      (p: any) => `      ${jsProp('params', p.n)} = ${JSON.stringify(p.ex)}`
     ).join('\n')
     liveParamsBlock = `    if (setup.live) {
 ${liveQueryPrefix}${exampleLines}
     } 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 if (hasList) {
@@ -372,9 +372,9 @@ ${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'di
       `        ${lp.name}: setup.idmap['${lp.key}'],`).join('\n')
     const ancestorParamLines = liveAncestorParams.map((lp: any) =>
       `      ${jsProp('params', lp.name)} = setup.idmap['${lp.key}']`).join('\n')
-    const idParamName = loadParams.find((p: any) => p.name === 'id')
+    const idParamName = loadParams.find((p: any) => p.n === 'id')
       ? 'id'
-      : (loadParams[0]?.name ?? 'id')
+      : (loadParams[0]?.n ?? 'id')
 
     liveParamsBlock = `    if (setup.live) {
 ${liveQueryPrefix}      const listResult: any = await client.direct({
@@ -397,7 +397,7 @@ ${listParamLines}
       ${jsProp('params', idParamName)} = candidateId
 ${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 if (hasLiveQuery || loadParams.length > 0) {
     // Synthetic-only fallback: if there are load params with no examples
@@ -405,12 +405,12 @@ ${loadParams.map((p: any, i: number) => `      ${jsProp('params', p.name)} = 'di
     // undefined values. Mark the path-param keys so the test skips when
     // ENTID overrides aren't supplied.
     if (loadParams.length > 0) {
-      liveIdKeys = loadParams.map((p: any) => p.name + '01')
+      liveIdKeys = loadParams.map((p: any) => p.n + '01')
     }
     liveParamsBlock = `    if (setup.live) {
 ${liveQueryPrefix.replace(/\n$/, '')}
     } 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 = ''
@@ -496,20 +496,20 @@ function generateDirectList(model: Model, entity: ModelEntity, strict: boolean)
     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)
 
-  const listQuery = listPoint.args?.query || []
+  const listQuery = listPoint.g?.query || []
   const liveQueryLines = listQuery
-    .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
-    .map((q: any) => `      ${jsProp('query', q.name)} = ${JSON.stringify(q.example)}`)
+    .filter((q: any) => q.r && undefined !== q.ex && null !== q.ex)
+    .map((q: any) => `      ${jsProp('query', q.n)} = ${JSON.stringify(q.ex)}`)
     .join('\n')
 
   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) =>
@@ -523,7 +523,7 @@ function generateDirectList(model: Model, entity: ModelEntity, strict: boolean)
         `      ${jsProp('params', lp.name)} = setup.idmap['${lp.key}']`).join('\n'),
     ].filter(Boolean).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: any = {}
     const query: any = {}
@@ -620,10 +620,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"),
@@ -634,10 +634,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/ts/TestEntity_ts.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'
 
@@ -105,6 +108,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;
@@ -112,15 +117,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(`
@@ -208,8 +205,8 @@ function basicSetup(extra?: any) {
 
 
         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'
           )
 
           // The basic test exercises a flow with one or more ops (load,
@@ -218,7 +215,7 @@ function basicSetup(extra?: any) {
           // dependent (e.g. update needs prior load), skipping ANY op the
           // flow exercises skips the whole basic test.
           const flowOps = Array.from(new Set(
-            (basicflow.step as any[]).map((s: any) => s.op).filter(Boolean)
+            (flowSteps(basicflow) as any[]).map((s: any) => s.o).filter(Boolean)
           ))
           const flowOpsLiteral = '[' + flowOps.map((o: any) => `'${o}'`).join(', ') + ']'
 
@@ -231,7 +228,7 @@ function basicSetup(extra?: any) {
     ${hasLiveScenarios(model) ? `if (live) { 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
@@ -253,16 +250,16 @@ function basicSetup(extra?: any) {
           const genCtx: GenCtx = {
             model, entity, flow: basicflow, PROJUPPER: PROJENVNAME,
           }
-          each(basicflow.step, (step: ModelEntityFlowStep, index: number) => {
+          each(flowSteps(basicflow), (step: ModelEntityFlowStep, index: number) => {
             // Never emit a REMOVE (or its removed-item verify LIST) without a
             // preceding CREATE: a coherent CRUD flow only removes what it made,
             // so a create-less remove would mutate pre-existing (live) data.
             if (!flowHasCreate) {
-              if ('remove' === step.op) { return }
-              if ('list' === step.op &&
-                (step.valid || []).some((v: any) => 'ItemNotExists' === v.apply)) { return }
+              if ('remove' === step.o) { return }
+              if ('list' === step.o &&
+                (step.v || []).some((v: any) => 'ItemNotExists' === v.apply)) { return }
             }
-            const opgen = GENERATE_OP[step.op]
+            const opgen = GENERATE_OP[step.o]
             if (null != opgen) {
               opgen(genCtx, step, index)
               Content('\n')
@@ -277,18 +274,18 @@ function basicSetup(extra?: any) {
 
 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
@@ -309,7 +306,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$}']
 `)
   })
@@ -333,14 +330,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
@@ -352,7 +349,7 @@ const generateList: OpGen = (ctx, step, index) => {
   Content(`    const ${matchvar}: any = {}
 `)
 
-  each(step.match, (mi: any) => {
+  each(step.m, (mi: any) => {
     Content(`    ${matchvar}['${mi.key$}'] = setup.idmap['${mi.val$}']
 `)
   })
@@ -360,12 +357,12 @@ const generateList: OpGen = (ctx, step, index) => {
   Content(`
     const ${listvar} = (await ${entvar}.list(${matchvar})).map((e: any) => 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(`
@@ -383,16 +380,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
 
@@ -410,7 +407,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$}']
 `)
@@ -418,10 +415,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 }
@@ -442,9 +439,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} as any)[${markdefvar}.name] === ${markdefvar}.value)
 `)
@@ -456,25 +453,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
@@ -484,8 +481,8 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
   const loadOp = entity.op?.load
   const loadPoint = loadOp?.points?.[0]
-  const loadPathParams = loadPoint?.args?.params || []
-  const loadHasRequiredParams = loadPathParams.some((p: any) => p.reqd !== false)
+  const loadPathParams = loadPoint?.g?.params || []
+  const loadHasRequiredParams = loadPathParams.some((p: any) => p.r !== false)
   if (!hasEntId && loadHasRequiredParams) {
     if (!hasEntVar) {
       Content(`
@@ -526,14 +523,14 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 const generateRemove: 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 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))
 
   // "Remove what you created" needs the created record's id. An entity with
   // no DATA id field (entityDataIdField null — e.g. Multichannel's Template)

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

@@ -16,10 +16,10 @@ const TestLive = cmp(function TestLive(props: any) {
           securitySource: all.securitySource,
           responses: all.responses,
         }
-        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.method + ' ' + point.orig, contractVersion: 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.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/ts/utility_ts.ts

@@ -17,19 +17,19 @@ 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 and the generated match type is `Partial<Entity>`). 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/zig/ReadmeEntity_zig.ts

@@ -66,7 +66,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)
     const eVar = zigVarName(entity.name)
     const method = zigVarName(entity.name)
@@ -115,8 +115,8 @@ carries the result \`Value\`, \`.err => |e|\` carries the branded error.
 `)
 
       each(fields, (field: any) => {
-        const desc = field.short || ''
-        Content(`| \`${field.name}\` | \`${zigType(field.type)}\` | ${desc} |
+        const desc = field.sh || ''
+        Content(`| \`${field.n}\` | \`${zigType(field.t)}\` | ${desc} |
 `)
       })
 

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

@@ -118,13 +118,13 @@ On error, \`ok\` is \`false\` and \`err\` carries the error message.
 
 `)
   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}
 
@@ -132,7 +132,7 @@ On error, \`ok\` is \`false\` and \`err\` carries the error message.
 | --- | --- |
 `)
     each(fields, (field: any) => {
-      Content(`| \`${field.name}\` | ${field.short || ''} |
+      Content(`| \`${field.n}\` | ${field.sh || ''} |
 `)
     })
 

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

@@ -175,7 +175,7 @@ Prepare a fetch definition without sending. Returns the fetchdef (use
     // Entity reference sections
     publishedEntities.map((ent: any) => {
       const opnames = Object.keys(ent.op || {})
-      const fields = ent.fields || []
+      const fields = Object.values(ent.fields || {})
       const idF = entityIdField(ent)
       const eVar = zigVarName(ent.name)
       const method = zigVarName(ent.name)
@@ -208,9 +208,9 @@ const ${eVar} = client.${method}(h.vnull());
 | --- | --- | --- | --- |
 `)
         each(fields, (field: any) => {
-          const req = field.req ? 'Yes' : 'No'
-          const desc = field.short || ''
-          Content(`| \`${field.name}\` | \`${zigType(field.type)}\` | ${req} | ${desc} |
+          const req = field.r ? 'Yes' : 'No'
+          const desc = field.sh || ''
+          Content(`| \`${field.n}\` | \`${zigType(field.t)}\` | ${req} | ${desc} |
 `)
         })
 
@@ -235,7 +235,7 @@ const ${eVar} = client.${method}(h.vnull());
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

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

@@ -28,7 +28,7 @@ const Schema = cmp(async function Schema(props: any) {
     Content(`// ${model.const.Name} SDK: generated schemas. Do not edit.
 //
 // Built 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.
 
 const h = @import("helpers.zig");