@voxgig/sdkgen 4.21.0 → 4.23.0

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

@@ -46,31 +46,6 @@ const Main = cmp(async function Main(props: any) {
   // The Scala package root for every runtime piece (like GOMODULE for go).
   const scalapackage = scalaPackage(model)
 
-  // THE PLUGIN TRIM, over the WHOLE model rather than its active half.
-  //
-  // pluginExcludes(model) walks only the model's ACTIVE features
-  // (helpers/featureSource), which is right for a target whose feature trim
-  // is on: an inactive feature's whole tree is already gone at `target add`,
-  // so it has no plugin files left to exclude. Scala's feature trim is OFF
-  // (see the Copy below), so the opposite holds - an inactive feature's tree
-  // is all still here, and its plugins are the part of it that costs the
-  // most. Before this, a scala SDK whose model never mentioned `secrets`
-  // shipped and compiled all nine vendored provider clients: the one trim
-  // the target has walked straight past the feature that owns them.
-  //
-  // EVERY declared group of an inactive feature goes, not just the groups
-  // marked inactive. A feature that is off has no active plugins whatever
-  // its `plugin` map says - `main: kit: feature: secrets: { active: false
-  // plugin: vault: active: true }` selects nothing, because targetFeatures
-  // drops the feature before Config ever reads a group - so shipping vault's
-  // files for it would leave a provider client in the tree that nothing in
-  // the SDK can reach. That is why this reads the declared paths directly
-  // rather than reusing pluginExcludesFor, whose rule (exclude the groups
-  // marked `active: false`) is the right one only for a LIVE feature.
-  //
-  // Rooting matches pluginExcludes': scala's declared paths are
-  // target-root-relative, which is this Copy's root, and the other targets'
-  // paths in the same list cannot match anything in a scala tree.
   const esc = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
   const allfeature = getModelPath(model, `main.${KIT}.feature`,
     { required: false, only_active: false }) || {}
@@ -88,27 +63,6 @@ const Main = cmp(async function Main(props: any) {
     }
   }
 
-  // THE FEATURE THE MODEL NEVER MENTIONS AT ALL.
-  //
-  // inactivePluginExcludes above walks the model's DECLARED features and skips
-  // the active ones, which covers `secrets: { active: false }`. It cannot cover
-  // the case that actually shipped: a model that does not mention secrets
-  // anywhere. Then `main.kit.feature` has no `secrets` key, the loop never sees
-  // it, nothing is excluded, and all nine provider clients are copied and
-  // compiled — which is what `vocabulary.off.notrimmed` reports, and it failed
-  // on 12 of the 68 cedar SDKs.
-  //
-  // PRECISE, NOT THE WHOLE TREE. The first cut of this excluded
-  // `feature/<inactive>/` wholesale and broke the build: SecretsFeature.scala
-  // ships to every scala SDK regardless (this target's feature trim is off) and
-  // imports `com.voxgig.sekreto` and `voxgig.plugin`, so removing the vendored
-  // cores left it uncompilable — "value voxgig is not a member of com".
-  //
-  // What may go is exactly the nine provider clients under sekreto/plugins.
-  // Httpjson.scala and Sigv4.scala live there too and must STAY: both belong to
-  // no group and are shared, which model/feature/secrets.aon documents at
-  // length after a cloud-only trim once deleted Sigv4 and scalac failed with
-  // four "Not found: uriescape".
   const SHARED_SEKRETO_PLUGINS = ['Httpjson.scala', 'Sigv4.scala']
   const pluginDirExcludes: RegExp[] = []
   if (null == (feature as any).secrets) {
@@ -126,25 +80,6 @@ const Main = cmp(async function Main(props: any) {
   // ProjectName carries the SDK name into vendored template strings.
   Copy({
     from: 'tm/' + target.name,
-    // The generate-time plugin trim, in both halves: pluginExcludes for an
-    // ACTIVE feature's inactive groups, inactivePluginExcludes (above) for
-    // the groups of a feature that is itself off. An inactive group's
-    // declared files stay out of the tree - the model's `path` entries are
-    // target-root-relative, which is this Copy's root.
-    //
-    // Scala's FEATURE-level trim is off (model/target/scala.aon `feature: {
-    // trim: false }`, because the cross-feature tests are fused into one
-    // sdktest/SdkTestMain.scala, which constructs fifteen feature classes by
-    // name), so this is the ONLY trim the target has, and what it does NOT
-    // reach is worth stating rather than leaving to be discovered: every
-    // feature's own source ships to every scala SDK whatever the model says,
-    // secrets included, so a secrets-off SDK still carries SecretsFeature,
-    // the vendored sekreto and voxgig/plugin cores, and the two UNGROUPED
-    // plugin files (plugins/Sigv4.scala's HMAC-SHA256 signer and
-    // plugins/Httpjson.scala's fetch + ProcessBuilder helpers, which belong
-    // to no group because four and eight kinds respectively compile against
-    // them). What it DOES reach is the nine provider clients, and they are
-    // the bulk: measured on a feature-off SDK, 26 files rather than 35.
     exclude: [
       /src\//,
       TEST_CONTROL_EXCLUDE,
@@ -162,20 +97,8 @@ const Main = cmp(async function Main(props: any) {
   // Shared entity runtime (entity/EntityBase.scala).
   EntityBase({ target })
 
-  // utility/PrepareAuth.scala. WHERE the credential goes (header, query or
-  // cookie) and under what name is a fact about THIS API, and
-  // tm/scala/utility/Prepare.scala can only hold one answer - which is why
-  // its `object PrepareAuth` was removed and this generates the object
-  // instead. See PrepareAuth_scala.
-  //
-  // CALLED AT THE TOP LEVEL, NOT INSIDE `Folder({ name: 'core' })` below:
-  // the component opens `utility` itself, reproducing the path the blanket
-  // Copy above gives every other tm/scala/utility file. Nested in core/ it
-  // would write core/utility/PrepareAuth.scala, contradicting its own
-  // package declaration while Register.scala bound nothing.
   PrepareAuth({ target })
 
-  // Generate the client class and config in core/.
   Folder({ name: 'core' }, () => {
 
     File({ name: model.const.Name + 'SDK.' + target.ext }, () => {
@@ -190,7 +113,6 @@ const Main = cmp(async function Main(props: any) {
           }
         },
 
-        // Entities - injected at SLOT
         () => {
           each(entity, (entity: ModelEntity) => {
             const entitySDK = getModelPath(model, `main.${KIT}.entity.${entity.name}`)

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

@@ -15,102 +15,23 @@ import {
 import { scalaPackage } from './utility_scala'
 
 
-// WHERE THE CREDENTIAL GOES IS A FACT ABOUT THE API, so it is generated
-// rather than templated. The scala port of cmp/ts/PrepareAuth_ts.ts; see
-// that file for the full account.
-//
-// scala had no prepare_auth template to delete. The logic was an `object
-// PrepareAuth` EMBEDDED in `tm/scala/utility/Prepare.scala` alongside the
-// six other prepare steps, hardcoding `val HEADER_AUTH = "authorization"`.
-// 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, so the SDK sent a header the API does not
-// read and never sent the query parameter it does.
-//
-// EXTRACTED INTO ITS OWN FILE rather than generating the whole of
-// Prepare.scala. A Scala `object` is not tied to a file name: the compiler
-// resolves `PrepareAuth.prepareAuth` by PACKAGE, and every caller —
-// utility/Register.scala's `u.prepareAuth = (ctx) => PrepareAuth
-// .prepareAuth(ctx)`, which is the only binding — already names it
-// unqualified from inside `package SCALAPACKAGE.utility`. So moving the
-// object into `utility/PrepareAuth.scala` in the same package leaves
-// Register, core/Utility.scala's `var prepareAuth` field, utility/MakeSpec
-// .scala's `utility.prepareAuth(ctx)` and core/SdkClient.scala's call
-// site all resolving exactly as before, with no edit to any of them. The
-// other six objects in Prepare.scala (PreparePath, PrepareMethod,
-// PrepareParams, PrepareQuery, PrepareHeaders, PrepareBody) are placement-
-// independent and stay templated, so the generated surface is exactly the
-// part that varies with the API.
-//
-// 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.
 const PrepareAuth = cmp(async function PrepareAuth(props: any) {
   const { target } = props
   const { model } = props.ctx$
 
   const where = resolveAuthIn(model)
 
-  // LOWERCASED FOR A HEADER, VERBATIM OTHERWISE. apidef writes
-  // `name: "Authorization"`, the deleted `object PrepareAuth` hardcoded
-  // `"authorization"`, and the whole scala runtime reads the lower-case
-  // key: the shared primary corpus asserts
-  // `ctx:spec:headers:authorization`, SecretsFeature.reauth rewrites
-  // `headers.put("authorization", ...)` in place on a token refresh, and
-  // spec.headers is a plain case-sensitive LinkedHashMap. Emitting
-  // `Authorization` verbatim would put the credential under a key nothing
-  // reads. A query parameter and a cookie ARE case-sensitive, so they keep
-  // the spec's spelling exactly.
   const resolved = resolveAuthName(model)
   const name = 'header' === where ? resolved.toLowerCase() : resolved
 
   const basic = isHttpBasicAuth(model)
 
-  // Read so the resolution is visible at generation time even though the
-  // emitted code takes the prefix from options at runtime (the secrets
-  // feature rewrites it there).
   const prefix = resolveAuthPrefix(model)
 
-  // NOT `isAuthActive`, AND THE DIFFERENCE IS LOAD-BEARING. See
-  // isAuthSuppressed in sdkgen's utility.ts: `isAuthActive` is ALSO false
-  // whenever `main.kit.info.auth` is false, which says only that the SPEC
-  // declared no security scheme — such an SDK still carries a credential,
-  // because Make.scala's optspec always declares `apikey` and fills
-  // `options.auth` from its `{ "prefix": "" }` default, so the runtime
-  // `options.get("auth") == null` guard never fires and every such SDK has
-  // always sent `options.apikey`. Emitting a no-op for those would
-  // silently remove working authentication and take the secrets feature
-  // with it (SecretsFeature resolves a secret into options.apikey and
-  // prepareAuth then places nothing).
-  //
-  // `main.kit.config.auth.active: false` is the project saying "this SDK
-  // sends no credential, ever" — the only signal that can honestly be
-  // honoured before runtime, so it is the only one used.
   const active = !isAuthSuppressed(model)
 
   const scalapackage = scalaPackage(model)
 
-  // FOLDER NESTING: exactly one segment, `utility`.
-  //
-  // Worked out from the deleted code's own path and from Main_scala's call
-  // site. Main_scala's blanket `Copy({ from: 'tm/scala' })` runs at the
-  // TARGET ROOT (its excludes and the scala tree are root-relative, and
-  // project.scala/Makefile sit beside core/, utility/, entity/), so
-  // `tm/scala/utility/Prepare.scala` lands at `<root>/utility/Prepare
-  // .scala`. Reproducing that path from Main's TOP LEVEL therefore needs
-  // `utility` and nothing above it — the same one-segment shape
-  // EntityBase_scala uses for `entity`.
-  //
-  // So this component must be invoked from Main_scala's top level and NOT
-  // from inside its `Folder({ name: 'core' })`, where Config and
-  // EntityTypes are written: nested there it would emit
-  // `core/utility/PrepareAuth.scala`, whose `package <pkg>.utility`
-  // declaration contradicts its directory, while Register.scala kept
-  // binding the stale object. There is no `src` folder in a scala SDK at
-  // all, so the ts port's `src/src/utility/` failure has no scala twin —
-  // the scala twin would be `core/`.
   Folder({ name: 'utility' }, () => {
     File({ name: 'PrepareAuth.' + target.ext }, () => {
       Content(render({ scalapackage, active, where, name, prefix, basic }))
@@ -130,19 +51,10 @@ type AuthSpec = {
 
 
 function render(spec: AuthSpec): string {
-  // The package line alone. Each placement emits its OWN import block,
-  // because they need different ones and the scala templates put the
-  // java.* imports first - Prepare.scala, Make.scala and Spec.scala all
-  // read `import java.util...` then the SDK's own packages.
   const head = `package ${spec.scalapackage}.utility
 
 `
 
-  // NO AUTH AT ALL - the project switched it off explicitly (see `active`
-  // above for why only an EXPLICIT switch counts). The SDK gets a
-  // prepareAuth that is honest about it rather than one that removes a
-  // header nobody set; Struct is not imported, because nothing here reads
-  // an option.
   if (!spec.active) {
     return head + `import ${spec.scalapackage}.core.{Context, Spec}
 
@@ -169,12 +81,6 @@ object PrepareAuth {
 }
 
 
-// HEADER. Behaviourally the deleted `object PrepareAuth` when the scheme
-// resolves to the defaults (header / Authorization): the same option names,
-// the same `skip` idiom for a missing credential, the same auth_no_spec
-// error, the same empty-prefix rule. Only the constant's VALUE moves with
-// the model, plus the HTTP Basic block, which is emitted only for a basic
-// scheme.
 function renderHeader(spec: AuthSpec, head: string): string {
   return head + `${spec.basic ? `import java.nio.charset.StandardCharsets
 import java.util.Base64
@@ -266,9 +172,6 @@ function basicBlock(spec: AuthSpec): string {
 }
 
 
-// QUERY. The credential is a query parameter, so it goes in spec.query and
-// the headers are never touched. This is the placement joplin, pipedrive,
-// trello and lm-umbrella declare and no generated SDK ever emitted.
 function renderQuery(spec: AuthSpec, head: string): string {
   return head + `import ${spec.scalapackage}.core.{Context, Spec}
 import ${spec.scalapackage}.utility.struct.Struct
@@ -321,11 +224,6 @@ object PrepareAuth {
 }
 
 
-// COOKIE. A cookie IS a header, so the credential rides the header bag -
-// but the `cookie` header is SHARED with whatever cookies the caller set,
-// so the pair is spliced in and out rather than the header assigned over.
-// Splicing also makes this idempotent: a retried request cannot end up
-// carrying the credential twice.
 function renderCookie(spec: AuthSpec, head: string): string {
   return head + `import java.util.{Map => JMap}
 

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

@@ -11,7 +11,6 @@ import { scalaVarName } from './utility_scala'
 
 // Type names come from the shared canonToType 'scala' column (single source of truth).
 
-// A type-correct Scala literal for a field's canonical type.
 function scalaLit(type: any, placeholder: string = 'example'): string {
   const k = canonScalarKey(type)
   if ('INTEGER' === k) return '1L'
@@ -55,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
@@ -104,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/ReadmeExamplesTest_scala.ts

@@ -2,29 +2,6 @@
 import { cmp, File, Content } from '@voxgig/sdkgen'
 
 
-// Emits sdktest/ReadmeExamplesTest.scala — a PRESENCE + STRUCTURE gate over
-// every scala fenced block in the repository ROOT README.md, the per-language
-// scala/README.md, AND the per-language scala/REFERENCE.md. It is a
-// default-package scala-cli object exposing run(rep) and is driven by the
-// generated SdkEntityTestMain aggregator (mirrors the generated per-entity
-// test objects).
-//
-// SCOPE NOTE (deliberate, documented): the Python/TS/Go equivalents EXECUTE and
-// type-check every documented block. That is infeasible here — the generated
-// Scala SDK compiles with scala-cli only (no in-process Scala compiler wired
-// into the test runtime), so a test cannot compile-and-run arbitrary doc
-// snippets at test time. This gate therefore guarantees the weaker-but-real
-// invariant that keeps the docs honest as the generator evolves:
-//   1. every doc exists and contains at least one scala block (nothing was
-//      dropped);
-//   2. every scala block is structurally well-formed — its braces, parentheses
-//      and brackets balance (catches a truncated or malformed generated
-//      snippet).
-// A per-doc summary line makes the coverage visible in the test output.
-//
-// The emitted Scala is written WITHOUT literal backticks (the fence marker is
-// built at runtime as 96.toChar.toString.repeat(3)) so this TS template literal
-// stays clean.
 const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(props: any) {
   const { target, ctx$: { model } } = props
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, canonKey, canonScalarKey, File, isAuthActive, entityIdField, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, canonKey, canonScalarKey, File, isAuthActive, entityIdField, opRequestShape , targetFeatures } from '@voxgig/sdkgen'
 import { ReadmeRefFeatures } from '@voxgig/sdkgen'
 
 import {
@@ -60,7 +60,7 @@ const ReadmeRef = cmp(function ReadmeRef(props: any) {
   const SDK = model.const.Name + 'SDK'
 
   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)
 
@@ -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(' | ')} |
 `)
           })
 
@@ -378,9 +378,6 @@ val client = new ${SDK}(options)
 \`\`\`
 
 `)
-      // 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/scala/ReadmeTopQuick_scala.ts

@@ -54,15 +54,10 @@ val client = new ${SDK}(options)
   }
 
   if (exampleEntity) {
-    // Sanitise the local variable name — an entity whose camelCased name is a
-    // Scala keyword gets a trailing underscore (scalaVarName) so the snippet
-    // compiles.
     const eVar = scalaVarName(exampleEntity.name)
     const accessor = scalaVarName(exampleEntity.name)
     const eNameLower = nom(exampleEntity, 'Name').toLowerCase()
     const opnames = Object.keys(exampleEntity.op || {})
-    // Model-driven id key: null when the entity has no id-like field, in which
-    // case the load example takes an empty match.
     const idF = entityIdField(exampleEntity)
 
     if (opnames.includes('list')) {

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

@@ -18,25 +18,6 @@ import {
 } from './utility_scala'
 
 
-// THE GENERATED SCHEMA MODULE: the model's schemas, as data the SDK can run.
-//
-// The scala peer of src/cmp/ts/Schema_ts.ts. Same two members, same source:
-// optspec from `main.kit.optspec` plus each feature's own `config.options`,
-// entityspec from the entity field sentinels — both built by the shared
-// helpers, so what scala validates against and what ts validates against
-// cannot drift.
-//
-// EMBEDDED AS JSON, PARSED AT LOAD, where ts emits an object literal: JSON is
-// a subset of TypeScript's own literal syntax and is not a subset of scala's.
-// Chunked StringBuilder appends, exactly as Config.scala carries its config,
-// keep every string constant far below the JVM's 64KB limit no matter how
-// many features or entities the model grows.
-//
-// 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. That is not incidental — Json.parse decodes a
-// JSON number to one scala type and struct reads a spec BY EXAMPLE, so one
-// number in here would mean something different in scala than in ts.
 const Schema = cmp(async function Schema(props: any) {
   const ctx$ = props.ctx$
   const target = props.target
@@ -60,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(