@voxgig/sdkgen 4.22.0 → 4.23.0

package/project/.sdk/src/cmp/rust/TestEntity_rust.ts

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -75,16 +76,16 @@ const TestEntity = cmp(function TestEntity(props: any) {
   const idnamesStr = idnames.map(n => `Value::str("${n}")`).join(', ')
 
   // All update data entries for alias generation.
-  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, rustcrate, flow: basicflow, PROJUPPER }
 
-  const opNames = Array.from(new Set(allSteps.map((s: any) => s.op).filter(Boolean)))
+  const opNames = Array.from(new Set(allSteps.map((s: any) => s.o).filter(Boolean)))
   const opsList = opNames.map(o => `"${o}"`).join(', ')
 
   // Same hazard as the csharp target: an entity whose basic flow has no ops
@@ -140,7 +141,7 @@ fn ${evar}_entity_instance() {
     // The stream test drives the list op; only emit it when the entity has a
     // list op (a create/load-only entity has no list endpoint, so
     // stream("list") panics with point_no_points).
-    const flowHasList = allSteps.some((s: any) => 'list' === s.op)
+    const flowHasList = allSteps.some((s: any) => 'list' === s.o)
     if (flowHasList) {
       Content(`
 #[test]
@@ -198,7 +199,7 @@ ${skipBlock}    // The basic flow consumes synthetic IDs from the fixture. In li
 ${allSteps.length > 0 ? '    let client = setup.client.clone();\n' : ''}`)
 
     // No create step: bootstrap entity data from existing fixture data.
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     if (!flowHasCreate) {
       const preambleVar = rustVarName(entity.name + '_ref01')
       Content(`
@@ -213,8 +214,8 @@ ${allSteps.length > 0 ? '    let client = setup.client.clone();\n' : ''}`)
     }
 
     // Model-driven step iteration.
-    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')
@@ -343,13 +344,13 @@ ${allSteps.length > 0 ? '    let client = setup.client.clone();\n' : ''}`)
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = rustVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = rustVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = rustVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = rustVarName(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
 `)
@@ -393,14 +394,14 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = rustVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = rustVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const listvar = rustVarName(step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = rustVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = rustVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const listvar = rustVarName(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
 `)
@@ -432,13 +433,13 @@ const generateList: OpGen = (ctx, step, index) => {
     let ${listvar} = ja(${listvar}.iter().map(|e| e.data(None)).collect::<Vec<Value>>());
 `)
 
-  // Validators from step.valid.
-  const allSteps = Object.values(flow.step) as any[]
-  if (step.valid) {
-    for (const validator of (step as any).valid) {
+  // Validators from step.v.
+  const allSteps = Object.values(flowSteps(flow)) as any[]
+  if (step.v) {
+    for (const validator of (step as any).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 = rustVarName(validRef + '_data')
@@ -472,16 +473,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 = rustVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = rustVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const resdatavar = rustVarName(step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? '')))
-  const markdefvar = rustVarName(step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? '')))
-  const srcdatavar = rustVarName(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 = rustVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = rustVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const resdatavar = rustVarName(step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? '')))
+  const markdefvar = rustVarName(step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? '')))
+  const srcdatavar = rustVarName(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
 
@@ -498,9 +499,9 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  // Data entries from step.data.
-  if (step.data) {
-    const dataEntries = Object.entries(step.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
+  // Data entries from step.d.
+  if (step.d) {
+    const dataEntries = Object.entries(step.d).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
     for (const [key] of dataEntries) {
       Content(`    setp(&${datavar}_up, "${key}", getp(&setup.idmap, "${key}"));
 `)
@@ -508,10 +509,10 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   }
 
   // TextFieldMark spec.
-  if (step.spec) {
-    for (const spec of (step as any).spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
-        const fieldname = step.input.textfield
+  if (step.s) {
+    for (const spec of (step as any).s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
+        const fieldname = step.i.textfield
         const fieldvalue = spec.def?.mark ?? `Mark01-${ref}`
         Content(`
     let ${markdefvar}_name = "${fieldname}";
@@ -546,9 +547,9 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   }
 
   // Assert TextFieldMark.
-  if (step.spec) {
-    for (const spec of (step as any).spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
+  if (step.s) {
+    for (const spec of (step as any).s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
         Content(`    assert_eq!(
         getp(&${resdatavar}, ${markdefvar}_name),
         Value::str(${markdefvar}_value.clone()),
@@ -564,24 +565,24 @@ 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 = rustVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = rustVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const datavar = rustVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const srcdatavar = rustVarName(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = rustVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = rustVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const datavar = rustVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const srcdatavar = rustVarName(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))
 
   // Was srcdatavar declared by a prior create step or the preamble?
-  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 === rustVarName(preambleRef + '_data')) ||
     priorSteps.some((s: any) => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = rustVarName(s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? '')))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = rustVarName(s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? '')))
         return priorDatvar === srcdatavar
       }
       return false
@@ -638,14 +639,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 = rustVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = rustVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const srcdatavar = rustVarName(step.input.srcdatavar ?? (ref + '_data'))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = rustVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = rustVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const srcdatavar = rustVarName(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/scala/EntityTypes_scala.ts

@@ -101,8 +101,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.
 //
@@ -120,10 +120,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)
 
       emitCaseClass(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/scala/ReadmeEntity_scala.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 Scala 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/scala/ReadmeModel_scala.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/scala/ReadmeRef_scala.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 — scalaVarName guards Scala 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/scala/Schema_scala.ts

@@ -41,7 +41,7 @@ import ${scalapackage}.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.
 object Schema {
 

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

@@ -29,10 +29,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)) {
@@ -40,10 +40,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 + '}'
           }
         }
       }
@@ -80,9 +80,9 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // Load point info.
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint
-    ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param)
+    ? normalizePathParams(pointParts(loadPoint), loadPoint?.g?.params || [], loadPoint?.r?.param)
     : ''
-  const allLoadParams = loadPoint?.args?.params || []
+  const allLoadParams = loadPoint?.g?.params || []
   // Only path params that actually appear in the URL template drive the
   // direct-test path-param setup and URL-substitution asserts.
   const _pathPlaceholders = new Set<string>()
@@ -91,7 +91,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
       _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)
@@ -100,14 +100,14 @@ 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))
 
   // List point info.
   const listPoint = listOp?.points?.[0]
   const listPath = listPoint
-    ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param)
+    ? normalizePathParams(pointParts(listPoint), listPoint?.g?.params || [], listPoint?.r?.param)
     : ''
-  const listParams = listPoint?.args?.params || []
+  const listParams = listPoint?.g?.params || []
 
   File({ name: EntityName + 'DirectTest.' + target.ext }, () => {
 
@@ -158,7 +158,7 @@ object ${EntityName}DirectTest {
       val params = new LinkedHashMap[String, Object]()
 `)
       listParams.forEach((p: any, i: number) => {
-        Content(`      params.put("${p.name}", "direct0${i + 1}")
+        Content(`      params.put("${p.n}", "direct0${i + 1}")
 `)
       })
       Content(`      val result = client.direct(SdkTestSupport.om(
@@ -195,7 +195,7 @@ object ${EntityName}DirectTest {
       val params = new LinkedHashMap[String, Object]()
 `)
       loadParams.forEach((p: any, i: number) => {
-        Content(`      params.put("${p.name}", "direct0${i + 1}")
+        Content(`      params.put("${p.n}", "direct0${i + 1}")
 `)
       })
       Content(`      val result = client.direct(SdkTestSupport.om(