@voxgig/sdkgen 4.21.0 → 4.23.0

package/project/.sdk/src/cmp/php/MainEntity_php.ts

@@ -19,12 +19,6 @@ const MainEntity = cmp(async function MainEntity(props: any) {
   // (below) is unchanged so callers still write $client->${entity.Name}().
   const cls = entityClassName(entity, entityCollection(model))
 
-  // Canonical facade method name is the PascalCase entity Name
-  // (`$client->${entity.Name}()`). PHP method names are case-insensitive, so
-  // the lowercase spelling `$client->${entity.name}()` still resolves here as
-  // a convenience — we declare it ONCE under the PascalCase name. An entity
-  // literally named 'test' would collide (case-insensitively) with the static
-  // `test()` test-mode constructor, so mangle to `<Name>_` in that case.
   const accessor = phpEntityAccessor(entity.Name)
 
   // The backing field is mangled independently of the accessor: the two are

package/project/.sdk/src/cmp/php/Main_php.ts

@@ -48,27 +48,12 @@ const Main = cmp(async function Main(props: any) {
   // Copy tm/php files with replacements
   Copy({
     from: 'tm/' + target.name,
-    // ANCHORED at the template root. Copy's exclude matches the
-    // SOURCE-RELATIVE path, so the old unanchored /src\// also pruned
-    // `feature/secrets/sekreto/src/` - the vendored sekreto core, whose
-    // directory depth is fixed by upstream and by the vendoring guard. The
-    // anchored form prunes the same top-level `tm/php/src/` placeholder
-    // tree (a `src` directory entry matches on the `$` arm, so the whole
-    // subtree is still pruned at the directory) and nothing else.
-    //
-    // pluginExcludes: the generate-time plugin trim (an INACTIVE plugin
-    // group's declared files stay out of the tree - the model's `path`
-    // entries are target-root-relative, which is this Copy's root). With
-    // no active feature declaring a plugin catalogue it is EMPTY, so a
-    // simple SDK's output is unchanged. The FEATURE-level trim for php
-    // stays an add-time concern (vendor-tag rollout, Decision 5).
     exclude: [/^src(\/|$)/, TEST_CONTROL_EXCLUDE, ...pluginExcludes(model)],
     replace: {
       ...props.ctx$.stdrep,
     }
   })
 
-  // Generate main SDK file
   File({ name: model.const.Name.toLowerCase() + '_sdk.' + target.ext }, () => {
 
     Fragment(

package/project/.sdk/src/cmp/php/PrepareAuth_php.ts

@@ -17,38 +17,10 @@ import {
 } from '@voxgig/apidef'
 
 
-// WHERE THE CREDENTIAL GOES IS A FACT ABOUT THE API, so it is generated
-// rather than templated.
-//
-// This was a static file in `tm/php/utility/` that hardcoded an
-// `authorization` HEADER. apidef has always resolved the scheme's `in` and
-// `name` into `main.kit.info.security` — joplin's says
-// `in: "query", name: "token"` — and generation dropped both. The result
-// was an SDK that sent a header the API does not read and never sent the
-// query parameter it does, so it could not authenticate at all. Four repos
-// in the cedar fleet shipped that way: joplin (`token`), pipedrive
-// (`api_token`), trello (`key`), lm-umbrella (`apiKey`).
-//
-// A template cannot fix this, because the three placements need three
-// different bodies and a template has to pick one. A component emits the
-// branch this API actually uses and nothing else — no dead query code in a
-// bearer-token SDK, and no runtime `if` on a value that is fixed at
-// generation time.
-//
-// The php peer of cmp/ts/PrepareAuth_ts.ts.
 const PrepareAuth = cmp(async function PrepareAuth(props: any) {
   const { target } = props
   const { model } = props.ctx$
 
-  // FOLDER NESTING. Main_php opens NO folder around its children — it
-  // writes `<sdk>_sdk.php`, `features.php` and (inside `Folder('.')`)
-  // `config.php` straight into the target root, and each sibling component
-  // opens its own single level (EntityTypes -> `types/`, Entity ->
-  // `entity/`, Test -> `test/`). The template this replaces lived at
-  // `tm/php/utility/PrepareAuth.php` and the blanket Copy puts `tm/php/*`
-  // at the target root, so the generated file belongs at `utility/`, one
-  // folder deep. (This is NOT the ts layout: there Main already opens
-  // `src`, so PrepareAuth_ts must not open a second one.)
   Folder({ name: 'utility' }, () => {
     File({ name: 'PrepareAuth.' + target.ext }, () => {
       Content(render({
@@ -57,9 +29,6 @@ const PrepareAuth = cmp(async function PrepareAuth(props: any) {
         where: resolveAuthIn(model),
         name: resolveAuthName(model),
         basic: isHttpBasicAuth(model),
-        // Read so the resolution is exercised here too, even though the
-        // prefix is a RUNTIME option (`options.auth.prefix`, emitted by
-        // Config_php) rather than something baked into this file.
         prefix: resolveAuthPrefix(model),
       }))
     })
@@ -67,28 +36,6 @@ const PrepareAuth = cmp(async function PrepareAuth(props: any) {
 })
 
 
-// NOT `isAuthActive`, AND THE DIFFERENCE IS LOAD-BEARING (the py port found
-// this first; same reasoning, same fix, and php's own lane proves it here).
-//
-// `isAuthActive` is false whenever the SPEC declares no security scheme
-// (`main.kit.info.auth: false`). That is a statement about the DEFINITION,
-// not a ban on ever sending a credential: apidef writes it for every spec
-// with no securitySchemes block, GitHub's official OpenAPI included, and
-// those SDKs are still expected to honour an `apikey` the caller passes.
-// The template placed the credential unconditionally, so they did.
-//
-// Gating the body on `isAuthActive` therefore does not trim dead code, it
-// deletes working authentication. MEASURED, not assumed: with the wider gate
-// this component emitted the no-op for generatedcompile's own fixture
-// (`main: kit: info: { ... auth: false }`) and the php lane went red —
-//
-//   php: auth null beats an explicit apikey
-//     FAIL: baseline broken: an ordinary apikey was not sent
-//
-// So the no-op is emitted only when the PROJECT says so:
-// `config.auth.active: false`, an explicit per-SDK switch nobody sets by
-// accident. A spec that is merely silent keeps the credential path it has
-// always had.
 function authSwitchedOn(model: any): boolean {
   const auth = getModelPath(model, `main.${KIT}.config.auth`,
     { only_active: false, required: false })
@@ -116,9 +63,6 @@ declare(strict_types=1);
 
 `
 
-  // AUTH SWITCHED OFF BY THE PROJECT (see authSwitchedOn for why only an
-  // EXPLICIT switch counts). The SDK gets a prepare_auth that is honest
-  // about it rather than one that deletes a header nobody set.
   if (!spec.active) {
     return head + `// This SDK is configured with authentication off, so there is no
 // credential to place. The class stays in the pipeline because make_spec
@@ -174,20 +118,12 @@ function bagVar(where: string): string {
 }
 
 
-// The constant holding the credential's NAME, per placement. `HEADER_AUTH`
-// keeps the name the template used, so a header SDK regenerates unchanged.
 function credConst(where: string): string {
   return 'query' === where ? 'QUERY_AUTH' : 'cookie' === where ? 'COOKIE_AUTH' : 'HEADER_AUTH'
 }
 
 
 function constants(spec: AuthSpec): string {
-  // A HEADER NAME GOES IN LOWERCASE, as every target's template has always
-  // written it (`authorization`): request header names are case-insensitive,
-  // and this SDK's own response headers are lowercased by the fetcher, so
-  // lowercasing here keeps one spelling throughout — and keeps the default
-  // byte-identical to the template this replaces. A query parameter and a
-  // cookie name are CASE-SENSITIVE, so those go in verbatim.
   const name = 'header' === spec.where ? spec.name.toLowerCase() : spec.name
 
   const cookieConst = 'cookie' === spec.where ?
@@ -203,8 +139,6 @@ ${secretConst}    private const NOT_FOUND = '__NOTFOUND__';
 }
 
 
-// The `options.auth` block is absent (`auth: null`) — drop any stale
-// credential the caller's own options put in the bag.
 function suppressed(where: string): string {
   if ('cookie' === where) {
     // NOTHING TO CLEAR. The cookie header may carry the caller's own
@@ -260,8 +194,6 @@ function placeBlock(spec: AuthSpec): string {
             || $apikey === null`
 
   if ('cookie' === spec.where) {
-    // A MISSING CREDENTIAL CLEARS NOTHING HERE, for the reason `suppressed`
-    // gives: the cookie header is shared with the caller's own cookies.
     return `
         $missing = ${missing};
 
@@ -309,8 +241,6 @@ function placeBlock(spec: AuthSpec): string {
 }
 
 
-// A PHP single-quoted string literal: only the backslash and the quote
-// itself need escaping, and single quotes never interpolate a `$name`.
 function phpstr(s: string): string {
   return "'" + String(s).replace(/\\/g, '\\\\').replace(/'/g, "\\'") + "'"
 }
@@ -318,8 +248,5 @@ function phpstr(s: string): string {
 
 export {
   PrepareAuth,
-  // Exported so the emitted PHP can be exercised directly (tests, and a
-  // one-line check of what a given placement renders) without standing up a
-  // full generation run.
   render,
 }

package/project/.sdk/src/cmp/php/ReadmeEntity_php.ts

@@ -53,8 +53,7 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
 
   publishedEntities.map((entity: any) => {
     const opnames = Object.keys(entity.op || {})
-    const fields = entity.fields || []
-    // Model-driven id key: null when this entity has no id-like field.
+    const fields = Object.values(entity.fields || {})
     const idF = entityIdField(entity)
 
     Content(`
@@ -98,8 +97,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} |
 `)
       })
 
@@ -108,9 +107,6 @@ const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
     }
 
     if (opnames.includes('load')) {
-      // The id key plus every REQUIRED match key (parent path params like
-      // page_id) — the same shape the runtime resolves path params from, so
-      // the example always works.
       const loadItems = opRequestShape(entity, 'load').items
         .filter((it: any) => !it.optional || it.name === idF)
         .sort((a: any, b: any) =>

package/project/.sdk/src/cmp/php/ReadmeExamplesTest_php.ts

@@ -7,39 +7,6 @@ import {
 } from '@voxgig/apidef'
 
 
-// Emits test/ReadmeExamplesTest.php — a PHPUnit COMPLETENESS GATE that
-// guarantees every fenced php code example in the package docs is unit-tested.
-// It reads ALL THREE docs — the root (multi-language) ../../README.md, the
-// PHP-specific ../README.md, and ../REFERENCE.md — extracts every fenced php
-// block (tagged by source doc + index) and enforces four properties:
-//
-//   1. SYNTAX — `php -l` on every block (a leading <?php is prepended when the
-//      snippet omits one). Every documented example must parse.
-//   2. RUN — every RUNNABLE block (one that constructs the SDK, drives
-//      $client->, or performs an entity op) is EXECUTED offline in seeded test
-//      mode against the real SDK. The captured stdout+stderr is scanned for
-//      FATAL programming-error markers REGARDLESS of exit code, so a bug that a
-//      documented try/catch swallows and echoes via getMessage() is still
-//      caught. Only a not-found / domain error is tolerated.
-//   3. COMPLETENESS — every block is partitioned into exactly one of
-//      {executed, syntaxchecked-nonrunnable, illustration} and the counts must
-//      sum to the total. "illustration" is a NARROW explicit class (a
-//      signature / method-table block that names the SDK class or a documented
-//      method but never uses a live client) — never a catch-all. A
-//      runnable-looking block that was NOT executed lands in neither bucket and
-//      FAILS the gate: no runnable example can be silently skipped.
-//   4. A per-doc summary (total / executed / syntaxchecked / illustration) is
-//      printed to STDERR.
-//
-// A runnable block is rewritten so its client is a test-mode client
-// (<Sdk>SDK::test) seeded with an in-memory fixture for every entity it
-// references; any real constructor is rewritten and the doc's own require of
-// the SDK file is stripped (we require it by absolute path). A block that only
-// *uses* $client (constructed in an earlier fenced block) gets a test client
-// prepended.
-//
-// The emitted PHP builds the ``` fence via chr(96) so this generator string
-// contains no backticks of its own.
 const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(props: any) {
   const { target } = props
   const { model } = props.ctx$

package/project/.sdk/src/cmp/php/ReadmeHowto_php.ts

@@ -4,7 +4,6 @@ import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, entityId
 import { KIT, getModelPath, nom } from '@voxgig/apidef'
 
 
-// A type-correct PHP literal for a field's canonical type.
 function phpLit(type: any): string {
   const k = canonScalarKey(type)
   if ('INTEGER' === k || 'NUMBER' === k) return '1'

package/project/.sdk/src/cmp/php/ReadmeModel_php.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/php/ReadmeQuick_php.ts

@@ -15,9 +15,6 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
 
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 
-  // Find a nested entity if available: one with a parent chain
-  // (relations.ancestors), an active load op, and a required non-id load
-  // param to demonstrate (the parent key, e.g. page_id).
   const nestedEntity = Object.values(entity).find((e: any) =>
     e.active !== false &&
     e.relations && e.relations.ancestors && 0 < e.relations.ancestors.length &&
@@ -67,13 +64,13 @@ $client = ${ctor};
     // Model-driven display field: the entity's first non-id string field
     // (falling back to any non-id field), so the list example prints a real
     // column instead of a hardcoded "name" the entity may not have.
-    const fields = exampleEntity.fields || []
+    const fields: any[] = Object.values(exampleEntity.fields || {})
     const displayField =
-      fields.find((f: any) => f && f.name !== 'id' && f.type === '$STRING') ||
-      fields.find((f: any) => f && f.name !== 'id') ||
+      fields.find((f: any) => f && f.n !== 'id' && f.t === '$STRING') ||
+      fields.find((f: any) => f && f.n !== 'id') ||
       null
     const idCol = dataIdF ? `$item[${JSON.stringify(dataIdF)}]` : null
-    const dispCol = displayField ? `$item[${JSON.stringify(displayField.name)}]` : null
+    const dispCol = displayField ? `$item[${JSON.stringify(displayField.n)}]` : null
     const itemPrint = [idCol, dispCol].filter(Boolean).join(' . " " . ') || 'json_encode($item)'
 
     if (opnames.includes('list')) {
@@ -132,9 +129,6 @@ try {
 `)
     }
     else if (opnames.includes('load')) {
-      // Every REQUIRED load-match key (id first, then parent path params like
-      // page_id) — the same shape the runtime resolves path params from, so
-      // the example always works.
       const loadRequired = opRequestShape(exampleEntity, 'load').items
         .filter((it: any) => !it.optional || it.name === idF)
         .sort((a: any, b: any) =>
@@ -160,29 +154,18 @@ try {
 `)
     }
 
-    // Model-driven example fields: derive the create/update body from the op
-    // shape (opRequestShape) so the docs reference REAL writable fields, not a
-    // hardcoded "name" the entity may not have. Literals are PHP-typed by the
-    // field's canonical type. ids are rendered separately as the match key for
-    // update/remove; a REQUIRED create id stays (the call is invalid without
-    // it).
     const examplePairs = (opname: string): string[] => {
       const items = opRequestShape(exampleEntity, opname).items
         .filter((it: any) => (it.name !== idF && it.name !== 'id') ||
           ('create' === opname && !it.optional))
       const required = items.filter((it: any) => !it.optional)
       const optional = items.filter((it: any) => it.optional)
-      // create needs ALL required fields; update is a patch, so the required
-      // members plus a sample optional field or two suffice.
       const chosen = 'create' === opname
         ? (required.length ? required : items.slice(0, 2))
         : required.concat(optional).slice(0, Math.max(2, required.length))
       return chosen.map((it: any) => `"${it.name}" => ${phpLit(it.type, 'example_' + it.name)}`)
     }
 
-    // The id VALUE for an update/remove match: off the returned `$created`
-    // record only when its data type carries the id AND a create ran, else a
-    // type-correct literal.
     const idParamType = (opname: string): any => {
       const it = opRequestShape(exampleEntity, opname).items.find((x: any) => x.name === idF)
       return it && it.type
@@ -211,8 +194,6 @@ $client->${phpEntityAccessor(eName)}()->update([${updatePairs.join(', ')}]);
 `)
       }
       if (opnames.includes('remove')) {
-        // Every REQUIRED remove-match key: the id (off the created record
-        // when possible) plus parent keys like page_id.
         const removePairs = opRequestShape(exampleEntity, 'remove').items
           .filter((it: any) => !it.optional || it.name === idF)
           .sort((a: any, b: any) =>

package/project/.sdk/src/cmp/php/ReadmeRef_php.ts

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, canonKey, canonScalarKey, File, isAuthActive, entityIdField, opRequestShape, phpEntityAccessor } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, canonKey, canonScalarKey, File, isAuthActive, entityIdField, opRequestShape, phpEntityAccessor , targetFeatures } from '@voxgig/sdkgen'
 import { ReadmeRefFeatures } from '@voxgig/sdkgen'
 
 import {
@@ -55,7 +55,7 @@ const ReadmeRef = cmp(function ReadmeRef(props: any) {
   const { model } = props.ctx$
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  const feature = targetFeatures(model, target)
 
   const publishedEntities = each(entity).filter((e: any) => e.active !== false)
 
@@ -168,7 +168,7 @@ Prepare a fetch definition without sending the request. Returns the
     // 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, in
       // which case load/remove match on no argument and update omits the id.
       const idF = entityIdField(ent)
@@ -193,7 +193,6 @@ $${ent.name} = $client->${phpEntityAccessor(ent.Name)}();
 `)
 
 
-      // Field schema
       if (fields.length > 0) {
         Content(`### Fields
 
@@ -201,9 +200,9 @@ $${ent.name} = $client->${phpEntityAccessor(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} |
 `)
         })
 
@@ -230,7 +229,7 @@ $${ent.name} = $client->${phpEntityAccessor(ent.Name)}();
               if (fop.active === false) return '-'
               return 'Yes'
             })
-            Content(`| \`${field.name}\` | ${cols.join(' | ')} |
+            Content(`| \`${field.n}\` | ${cols.join(' | ')} |
 `)
           })
 
@@ -256,7 +255,6 @@ ${info.desc}
 
 `)
 
-          // Show example
           if ('load' === opname || 'remove' === opname) {
             // The id key plus every REQUIRED match key (parent path params
             // like page_id) — the same shape the runtime resolves path
@@ -391,9 +389,6 @@ $client = new ${model.const.Name}SDK([
 \`\`\`
 
 `)
-      // The shared feature reference: options, defaults, usage and the
-      // considerations. Model facts, identical in every target, so they are
-      // written once in cmp/ReadmeRefFeatures.ts rather than here.
       ReadmeRefFeatures({ target })
     }
 

package/project/.sdk/src/cmp/php/Schema_php.ts

@@ -13,21 +13,6 @@ import {
 } from '@voxgig/apidef'
 
 
-// THE GENERATED SCHEMA MODULE: the model's schemas, as data the SDK can run.
-//
-// The php peer of src/cmp/ts/Schema_ts.ts. Same two exports, same source —
-// OPTSPEC from `main.kit.optspec` plus each feature's own `config.options`,
-// ENTITYSPEC from the entity field sentinels — built by the shared helpers,
-// so what php validates against and what ts validates against cannot drift.
-//
-// EMBEDDED AS JSON, DECODED ON FIRST USE, the mechanism config.php already
-// uses for the model above the size threshold, and SINGLE-quoted for the
-// reason recorded there: a double-quoted php string would interpolate a `$`,
-// and the spec is made almost entirely of `$SENTINEL` strings.
-//
-// The round-trip is exact because the spec holds only strings and booleans —
-// pinned by "strings and booleans only, so the JSON round-trip is lossless"
-// in ts/test/optspec.test.ts.
 const Schema = cmp(async function Schema(props: any) {
   const ctx$ = props.ctx$
   const target = props.target
@@ -44,7 +29,7 @@ declare(strict_types=1);
 // ${model.const.Name} ${target.Name} SDK: generated schemas. Do not edit.
 //
 // Generated from the model: \`main.kit.optspec\` and each feature's
-// \`config.options\` for OPTSPEC; entity \`fields[].type\` for ENTITYSPEC.
+// \`config.options\` for OPTSPEC; entity \`fields{}.type\` for ENTITYSPEC.
 
 class ${model.const.Name}Schema
 {

package/project/.sdk/src/cmp/php/TestDirect_php.ts

@@ -33,10 +33,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 + '}'
 
       if (rename) {
         for (const [origCamel, renamedTo] of Object.entries(rename)) {
@@ -44,10 +44,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 + '}'
           }
         }
       }
@@ -100,8 +100,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
-  const allLoadParams = loadPoint?.args?.params || []
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.g?.params || [], loadPoint?.r?.param) : ''
+  const allLoadParams = loadPoint?.g?.params || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
   // actually appear in the URL template should drive direct-test path-param
@@ -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,25 +122,25 @@ const TestDirect = cmp(function TestDirect(props: any) {
     }
   }
   const loadParams = allLoadParams.filter((p: any) =>
-    _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
+    _renamedPlaceholders.has(p.n) || _renamedPlaceholders.has(p.or))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
-  const listParams = listPoint?.args?.params || []
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.g?.params || [], listPoint?.r?.param) : ''
+  const listParams = listPoint?.g?.params || []
 
   // 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}"] = ${JSON.stringify(q.example)};`)
+    .map((q: any) => `            $query["${q.n}"] = ${JSON.stringify(q.ex)};`)
     .join('\n')
 
   const loadAllHaveExamples =
     loadParams.length > 0 &&
-    loadParams.every((p: any) => undefined !== p.example && null !== p.example)
+    loadParams.every((p: any) => undefined !== p.ex && null !== p.ex)
   const loadExampleLines = loadAllHaveExamples
-    ? loadParams.map((p: any) => `            $params["${p.name}"] = ${JSON.stringify(p.example)};`).join('\n')
+    ? loadParams.map((p: any) => `            $params["${p.n}"] = ${JSON.stringify(p.ex)};`).join('\n')
     : ''
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
@@ -163,9 +163,9 @@ class ${entity.Name}DirectTest extends TestCase
 
     if (hasList && listPoint) {
       const listLiveIdKeys: string[] = listParams.map((lp: any) => {
-        return lp.name === 'id'
+        return lp.n === 'id'
           ? entity.name + '01'
-          : lp.name.replace(/_id$/, '') + '01'
+          : lp.n.replace(/_id$/, '') + '01'
       })
       const listSkipBlock = listLiveIdKeys.length > 0
         ? `        if ($setup["live"]) {
@@ -197,13 +197,13 @@ ${listSkipBlock}        $client = $setup["client"];
         Content(`        $params = [];
 `)
         for (const lp of listParams) {
-          const key = lp.name === 'id'
+          const key = lp.n === 'id'
             ? entity.name + '01'
-            : lp.name.replace(/_id$/, '') + '01'
+            : lp.n.replace(/_id$/, '') + '01'
           Content(`        if ($setup["live"]) {
-            $params["${lp.name}"] = $setup["idmap"]["${key}"];
+            $params["${lp.n}"] = $setup["idmap"]["${key}"];
         } else {
-            $params["${lp.name}"] = "direct01";
+            $params["${lp.n}"] = "direct01";
         }
 `)
         }
@@ -289,7 +289,7 @@ ${loadSkipBlock}        $client = $setup["client"];
           Content(`        } else {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`            $params["${loadParams[i].name}"] = "direct0${i + 1}";
+            Content(`            $params["${loadParams[i].n}"] = "direct0${i + 1}";
 `)
           }
           Content(`        }
@@ -304,7 +304,7 @@ ${loadLiveQueryLines}
           Content(`        if (!$setup["live"]) {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`            $params["${loadParams[i].name}"] = "direct0${i + 1}";
+            Content(`            $params["${loadParams[i].n}"] = "direct0${i + 1}";
 `)
           }
           Content(`        }