@voxgig/sdkgen 4.22.0 → 4.24.0

package/project/.sdk/src/cmp/cpp/TestEntity_cpp.ts

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -54,16 +55,16 @@ const TestEntity = cmp(function TestEntity(props: any) {
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `Value("${n}")`).join(', ')
 
-  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, flow: basicflow }
 
-  const opsList = Array.from(new Set(allSteps.map((s: any) => s.op).filter(Boolean)))
+  const opsList = Array.from(new Set(allSteps.map((s: any) => s.o).filter(Boolean)))
     .map(o => `"${o}"`).join(', ')
 
   const method = cppVarName(entity.name)
@@ -133,7 +134,7 @@ static ${entity.Name}Setup ${evar}_basic_setup(const Value& extra) {
 
   ${entity.Name}Setup s;
   s.client = client;
-  s.data = entity_data;
+  s.d = entity_data;
   s.idmap = idmap_resolved;
   s.env = env;
   s.live = live;
@@ -153,7 +154,7 @@ static void ${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") throws "Operation \"list\" has no endpoint definitions").
-    const flowHasList = allSteps.some((s: any) => 'list' === s.op)
+    const flowHasList = allSteps.some((s: any) => 'list' === s.o)
     if (flowHasList) {
       Content(`
 static void ${evar}_entity_stream() {
@@ -192,7 +193,7 @@ static void ${evar}_entity_basic() {
 `)
 
     // No create step: bootstrap entity data from existing fixtures.
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     if (!flowHasCreate) {
       const preambleVar = cppVarName(entity.name + '_ref01')
       Content(`
@@ -211,8 +212,8 @@ static void ${evar}_entity_basic() {
     }
 
     // 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')
@@ -243,9 +244,9 @@ const declaredVars = new Set<string>()
 
 const generateCreate: OpGen = (ctx, step: any, index) => {
   const { entity } = ctx
-  const ref = step.input?.ref ?? entity.name + '_ref01'
-  const datavar = cppVarName(step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? '')))
-  const entvar = cppVarName(step.input?.entvar ?? ref + '_ent')
+  const ref = step.i?.ref ?? entity.name + '_ref01'
+  const datavar = cppVarName(step.i?.datavar ?? (ref + '_data' + (step.i?.suffix ?? '')))
+  const entvar = cppVarName(step.i?.entvar ?? ref + '_ent')
 
   Content(`  // CREATE
   auto ${entvar} = client->${cppVarName(entity.name)}();
@@ -277,14 +278,14 @@ const generateCreate: OpGen = (ctx, step: any, index) => {
 
 const generateList: OpGen = (ctx, step: any, index) => {
   const { entity, flow } = ctx
-  const ref = step.input?.ref ?? entity.name + '_ref01'
-  const entvar = cppVarName(step.input?.entvar ?? ref + '_ent')
-  const matchvar = cppVarName(step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? '')))
-  const listvar = cppVarName(step.input?.listvar ?? (ref + '_list' + (step.input?.suffix ?? '')))
+  const ref = step.i?.ref ?? entity.name + '_ref01'
+  const entvar = cppVarName(step.i?.entvar ?? ref + '_ent')
+  const matchvar = cppVarName(step.i?.matchvar ?? (ref + '_match' + (step.i?.suffix ?? '')))
+  const listvar = cppVarName(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
 `)
@@ -306,12 +307,12 @@ const generateList: OpGen = (ctx, step: any, index) => {
   ASSERT_TRUE(${listvar}.is_list(), "expected list result to be an array");
 `)
 
-  const allSteps = Object.values(flow.step) as any[]
-  if (step.valid) {
-    for (const validator of (step as any).valid) {
+  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 = cppVarName(validRef + '_data')
         Content(`  {
@@ -334,15 +335,15 @@ const generateList: OpGen = (ctx, step: any, index) => {
 
 const generateUpdate: OpGen = (ctx, step: any, index) => {
   const { entity, flow } = ctx
-  const ref = step.input?.ref ?? entity.name + '_ref01'
-  const entvar = cppVarName(step.input?.entvar ?? ref + '_ent')
-  const datavar = cppVarName(step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? '')))
-  const resdatavar = cppVarName(step.input?.resdatavar ?? (ref + '_resdata' + (step.input?.suffix ?? '')))
-  const srcdatavar = cppVarName(step.input?.srcdatavar ?? (ref + '_data' + (step.input?.suffix ?? '')))
+  const ref = step.i?.ref ?? entity.name + '_ref01'
+  const entvar = cppVarName(step.i?.entvar ?? ref + '_ent')
+  const datavar = cppVarName(step.i?.datavar ?? (ref + '_data' + (step.i?.suffix ?? '')))
+  const resdatavar = cppVarName(step.i?.resdatavar ?? (ref + '_resdata' + (step.i?.suffix ?? '')))
+  const srcdatavar = cppVarName(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 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
 
   Content(`  // UPDATE
@@ -357,8 +358,8 @@ const generateUpdate: OpGen = (ctx, step: any, index) => {
     Content(`  setp(${datavar}_up, "id", getp(${srcdatavar}, "id"));
 `)
   }
-  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(`  setp(${datavar}_up, "${key}", getp(setup.idmap, "${key}"));
 `)
@@ -366,10 +367,10 @@ const generateUpdate: OpGen = (ctx, step: any, index) => {
   }
   let markname = ''
   let markval = ''
-  if (step.spec) {
-    for (const spec of (step as any).spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input?.textfield) {
-        markname = step.input.textfield
+  if (step.s) {
+    for (const spec of (step as any).s) {
+      if ('TextFieldMark' === spec.apply && null != step.i?.textfield) {
+        markname = step.i.textfield
         const fieldvalue = spec.def?.mark ?? `Mark01-${ref}`
         markval = `${fieldvalue}_`
         Content(`  std::string ${datavar}_markval = std::string("${fieldvalue}_") + std::to_string(setup.now);
@@ -396,15 +397,15 @@ const generateUpdate: OpGen = (ctx, step: any, index) => {
 
 const generateLoad: OpGen = (ctx, step: any, index) => {
   const { entity, flow } = ctx
-  const ref = step.input?.ref ?? entity.name + '_ref01'
-  const entvar = cppVarName(step.input?.entvar ?? ref + '_ent')
-  const matchvar = cppVarName(step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? '')))
-  const datavar = cppVarName(step.input?.datavar ?? (ref + '_data' + (step.input?.suffix ?? '')))
-  const srcdatavar = cppVarName(step.input?.srcdatavar ?? (ref + '_data' + (step.input?.suffix ?? '')))
+  const ref = step.i?.ref ?? entity.name + '_ref01'
+  const entvar = cppVarName(step.i?.entvar ?? ref + '_ent')
+  const matchvar = cppVarName(step.i?.matchvar ?? (ref + '_match' + (step.i?.suffix ?? '')))
+  const datavar = cppVarName(step.i?.datavar ?? (ref + '_data' + (step.i?.suffix ?? '')))
+  const srcdatavar = cppVarName(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 hasEntId = null != entity.id
 
   Content(`  // LOAD
@@ -431,14 +432,14 @@ const generateLoad: OpGen = (ctx, step: any, index) => {
 
 const generateRemove: OpGen = (ctx, step: any, index) => {
   const { entity, flow } = ctx
-  const ref = step.input?.ref ?? entity.name + '_ref01'
-  const entvar = cppVarName(step.input?.entvar ?? ref + '_ent')
-  const matchvar = cppVarName(step.input?.matchvar ?? (ref + '_match' + (step.input?.suffix ?? '')))
-  const srcdatavar = cppVarName(step.input?.srcdatavar ?? (ref + '_data'))
+  const ref = step.i?.ref ?? entity.name + '_ref01'
+  const entvar = cppVarName(step.i?.entvar ?? ref + '_ent')
+  const matchvar = cppVarName(step.i?.matchvar ?? (ref + '_match' + (step.i?.suffix ?? '')))
+  const srcdatavar = cppVarName(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/csharp/EntityTypes_csharp.ts

@@ -100,8 +100,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
     Content(`// 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.
 //
@@ -118,10 +118,10 @@ namespace ${model.const.Name}Sdk.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, optional: false === f.req,
+        name: f.n, type: f.t, optional: false === f.r,
       })), log)
 
       const ops = ent.op || {}

package/project/.sdk/src/cmp/csharp/ReadmeEntity_csharp.ts

@@ -55,7 +55,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 
   publishedEntities.map((entity: any) => {
     const opnames = Object.keys(entity.op || {})
-    const fields = entity.fields || []
+    const fields = Object.values(entity.fields || {})
     const idF = entityIdField(entity)
     // Sanitise the local variable name — a camelCased C# keyword gets a
     // trailing underscore (csVarName) so the snippet compiles.
@@ -102,8 +102,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/csharp/ReadmeModel_csharp.ts

@@ -114,13 +114,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}
 
@@ -128,7 +128,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/csharp/ReadmeRef_csharp.ts

@@ -171,7 +171,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 — csVarName guards C# keywords.
@@ -205,9 +205,9 @@ var ${eVar} = client.${ent.Name}();
 | --- | --- | --- | --- |
 `)
         each(fields, (field: any) => {
-          const req = field.req ? 'Yes' : 'No'
-          const desc = field.short || ''
-          Content(`| \`${field.name}\` | \`${canonToType(field.type, target.name)}\` | ${req} | ${desc} |
+          const req = field.r ? 'Yes' : 'No'
+          const desc = field.sh || ''
+          Content(`| \`${field.n}\` | \`${canonToType(field.t, target.name)}\` | ${req} | ${desc} |
 `)
         })
 
@@ -232,7 +232,7 @@ var ${eVar} = client.${ent.Name}();
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 

package/project/.sdk/src/cmp/csharp/Schema_csharp.ts

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

package/project/.sdk/src/cmp/csharp/TestDirect_csharp.ts

@@ -32,10 +32,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)) {
@@ -43,10 +43,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 + '}'
           }
         }
       }
@@ -103,8 +103,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // Get load point info
   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 || []
   // Only path params that actually appear in the URL template drive direct
   // path-param setup and URL-substitution asserts.
   const _pathPlaceholders = new Set<string>()
@@ -113,7 +113,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)
@@ -122,29 +122,29 @@ 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))
 
   // Get list point info
   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 || []
 
   // Required query params with spec-provided examples - needed in live mode.
-  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}"] = ${formatCsValue(q.example)};`)
+    .map((q: any) => `            query["${q.n}"] = ${formatCsValue(q.ex)};`)
     .join('\n')
 
   // Path params with spec-provided examples - when ALL load params have
   // spec examples, prefer them over list-bootstrap in live mode.
   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) =>
-      `            pathParams["${p.name}"] = ${formatCsValue(p.example)};`).join('\n')
+      `            pathParams["${p.n}"] = ${formatCsValue(p.ex)};`).join('\n')
     : ''
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${ENTUPPER}_ENTID`
@@ -168,10 +168,10 @@ public class ${entity.Name}DirectTest
     if (hasList && listPoint) {
       // Build live params for list
       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
@@ -297,18 +297,18 @@ ${listSkipBlock}        var client = setup.Client;
     // Generate load test - in live mode, first list to get a real entity ID
     if (hasLoad && loadPoint) {
       // Identify 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')
 
       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
@@ -362,10 +362,10 @@ ${loadSkipBlock}        var client = setup.Client;
           Content(`            var listParams = new Dictionary<string, object?>();
 `)
           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}"];
 `)
           }
 
@@ -390,8 +390,8 @@ ${loadSkipBlock}        var client = setup.Client;
             pathParams["id"] = firstEnt?["id"];
 `)
           for (const p of ancestorParams) {
-            const key = p.name.replace(/_id$/, '') + '01'
-            Content(`            pathParams["${p.name}"] = setup.Idmap["${key}"];
+            const key = p.n.replace(/_id$/, '') + '01'
+            Content(`            pathParams["${p.n}"] = setup.Idmap["${key}"];
 `)
           }
         }
@@ -402,7 +402,7 @@ ${loadSkipBlock}        var client = setup.Client;
         {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`            pathParams["${loadParams[i].name}"] = "direct0${i + 1}";
+            Content(`            pathParams["${loadParams[i].n}"] = "direct0${i + 1}";
 `)
           }
         }