@voxgig/sdkgen 4.6.0 → 4.8.0

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

@@ -11,7 +11,10 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -67,12 +70,28 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n        ("${PROJECTNAME}_APIKEY", Value::str("NONE")),`
+    ? `\n        ("${PROJECTNAME}_APIKEY", Value::str("")),`
     : ''
   const apikeyLiveField = authActive
     ? `("apikey", getp(&env, "${PROJECTNAME}_APIKEY"))`
     : ''
 
+  // A templated server URL (OpenAPI server variables) makes a LIVE client
+  // impossible to construct without values: makeOptions raises rather than
+  // request a URL with a literal `{account_id}` in it. So the live suite
+  // takes them from the environment the same way it takes the apikey.
+  //
+  // Emitted as a jo() tuple entry, so it carries its own leading comma only
+  // when an apikey entry precedes it - otherwise `jo(vec![, ...])`.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n        ("${serverVarEnv(PROJECTNAME, v.name)}", Value::str(${JSON.stringify(v.dflt)})),`).join('')
+  const serverLiveEntry = 0 === svars.length ? '' :
+    `("server", jo(vec![${svars
+      .map((v: any) => `("${v.name}", getp(&env, "${serverVarEnv(PROJECTNAME, v.name)}"))`).join(', ')}]))`
+  const serverLiveField = '' === serverLiveEntry ? '' :
+    ('' === apikeyLiveField ? serverLiveEntry : ', ' + serverLiveEntry)
+
   const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
@@ -86,12 +105,12 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // Load point info.
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
   const allLoadParams = loadPoint?.args?.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>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -109,7 +128,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // List point info.
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
   const listParams = listPoint?.args?.params || []
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
@@ -148,13 +167,22 @@ fn ${evar}_direct_setup(mockres: Value) -> ${entity.Name}DirectSetup {
 
     let env = env_override(jo(vec![
         ("${entidEnvVar}", Value::empty_map()),
-        ("${PROJECTNAME}_TEST_LIVE", Value::str("FALSE")),${apikeyEnvEntry}
+        ("${PROJECTNAME}_TEST_LIVE", Value::str("FALSE")),${apikeyEnvEntry}${serverEnvEntry}
     ]));
 
     let live = getp(&env, "${PROJECTNAME}_TEST_LIVE") == Value::str("TRUE");
 
     if live {
-        let client = ${model.const.Name}SDK::new(jo(vec![${apikeyLiveField}]));
+        // live_client_options() FIRST, so the generated entries below win:
+        // sdk-test-control.json's test.client.options adds to the live
+        // client, it does not redirect it.
+        let client = ${model.const.Name}SDK::new(to_map(&vs::merge(
+            &ja(vec![
+                live_client_options(),
+                jo(vec![${apikeyLiveField}${serverLiveField}]),
+            ]),
+            None,
+        )));
         let idmap = match to_map(&getp(&env, "${entidEnvVar}")) {
             Value::Map(m) => Value::Map(m),
             _ => Value::empty_map(),

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

@@ -17,7 +17,9 @@ import {
   each,
   buildIdNames,
   getMatchEntries,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
 
@@ -56,12 +58,28 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n        ("${PROJUPPER}_APIKEY", Value::str("NONE")),`
+    ? `\n        ("${PROJUPPER}_APIKEY", Value::str("")),`
     : ''
   const apikeyLiveField = authActive
     ? `("apikey", getp(&env, "${PROJUPPER}_APIKEY"))`
     : ''
 
+  // A templated server URL (OpenAPI server variables) makes a LIVE client
+  // impossible to construct without values: makeOptions raises rather than
+  // request a URL with a literal `{account_id}` in it. So the live suite
+  // takes them from the environment the same way it takes the apikey.
+  //
+  // Emitted as a jo() tuple entry, so it carries its own leading comma only
+  // when an apikey entry precedes it - otherwise `jo(vec![, ...])`.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n        ("${serverVarEnv(PROJUPPER, v.name)}", Value::str(${JSON.stringify(v.dflt)})),`).join('')
+  const serverLiveEntry = 0 === svars.length ? '' :
+    `("server", jo(vec![${svars
+      .map((v: any) => `("${v.name}", getp(&env, "${serverVarEnv(PROJUPPER, v.name)}"))`).join(', ')}]))`
+  const serverLiveField = '' === serverLiveEntry ? '' :
+    ('' === apikeyLiveField ? serverLiveEntry : ', ' + serverLiveEntry)
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `Value::str("${n}")`).join(', ')
 
@@ -268,7 +286,7 @@ ${allSteps.length > 0 ? '    let client = setup.client.clone();\n' : ''}`)
     let env = env_override(jo(vec![
         ("${PROJUPPER}_TEST_${ENTUPPER}_ENTID", idmap.clone()),
         ("${PROJUPPER}_TEST_LIVE", Value::str("FALSE")),
-        ("${PROJUPPER}_TEST_EXPLAIN", Value::str("FALSE")),${apikeyEnvEntry}
+        ("${PROJUPPER}_TEST_EXPLAIN", Value::str("FALSE")),${apikeyEnvEntry}${serverEnvEntry}
     ]));
 
     let idmap_resolved = match to_map(&getp(&env, "${PROJUPPER}_TEST_${ENTUPPER}_ENTID")) {
@@ -293,7 +311,22 @@ ${allSteps.length > 0 ? '    let client = setup.client.clone();\n' : ''}`)
 
     let client = if live {
         let merged = vs::merge(
-            &ja(vec![jo(vec![${apikeyLiveField}]), extra]),
+            // live_client_options() FIRST, so the generated entries below win:
+            // sdk-test-control.json's test.client.options adds to the live
+            // client, it does not redirect it.
+            &ja(vec![
+                live_client_options(),
+                jo(vec![${apikeyLiveField}${serverLiveField}]),
+                // A NON-NODE later entry REPLACES the accumulated map in
+                // vs::merge, and the normal call passes Value::Noval - so a
+                // a bare extra discarded live_client_options() and the
+                // apikey/server map above it, and the live client was
+                // constructed with nothing.
+                match extra {
+                    Value::Map(m) => Value::Map(m),
+                    _ => Value::empty_map(),
+                },
+            ]),
             None,
         );
         ${model.const.Name}SDK::new(to_map(&merged))

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

@@ -3,7 +3,8 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, entityCollection,
+  TestControl } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_rust'
@@ -20,6 +21,9 @@ const Test = cmp(function Test(props: any) {
 
   Folder({ name: 'tests' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'tests' })
+
     // exists test — the SDK constructs in test mode.
     File({ name: 'exists_test.' + target.ext }, () => {
       Content(`// Generated existence test: the SDK constructs in test mode.

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

@@ -7,6 +7,7 @@ import {
   isAuthActive,
   resolveAuthPrefix,
   targetFeatures,
+  configDefinition,
 } from '@voxgig/sdkgen'
 
 
@@ -36,6 +37,7 @@ const Config = cmp(async function Config(props: any) {
   const scalapackage = scalaPackage(model)
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
+  const { def: configDef } = configDefinition(model, target.name)
   // Gated by the applicability tags, so this target never imports or
   // registers a feature it has no source for. One rule, one place:
   // helpers/applicability.
@@ -68,13 +70,13 @@ const Config = cmp(async function Config(props: any) {
   options.headers = headers
   options.entity = optionsEntity
 
-  const entityConfig = Object.values(entity).reduce((a: any, n: any) => (
-    a[n.name] = cleanModel({
-      fields: n.fields,
-      name: n.name,
-      op: n.op,
-      relations: n.relations,
-    }, true), a), {})
+  // configDefinition's `def.entity` verbatim, NOT rebuilt here. This reduce
+  // was one of fourteen copies of that function's entityDefs loop, and when
+  // configDefinition started reconstructing a point's `parts` from apidef's
+  // segment vector (its ADR-003), only the copies that read `configDef` got
+  // it — this target's literal config emitted paths with no parts at all
+  // while its data config had them. One rule, one place.
+  const entityConfig = configDef.entity
 
   const config = {
     main: { name: model.const.Name },

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

@@ -5,6 +5,7 @@ import {
   cmp, each,
   File, Content, Copy, Folder, Fragment,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -51,7 +52,7 @@ const Main = cmp(async function Main(props: any) {
   // ProjectName carries the SDK name into vendored template strings.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
       ProjectName: model.const.Name,

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

@@ -11,6 +11,7 @@ import {
   File,
   cmp,
   snakify,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -79,13 +80,13 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // Load point info.
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint
-    ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param)
+    ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param)
     : ''
   const allLoadParams = loadPoint?.args?.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>()
-  for (const part of (loadPoint?.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
@@ -104,7 +105,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // List point info.
   const listPoint = listOp?.points?.[0]
   const listPath = listPoint
-    ? normalizePathParams(listPoint.parts || [], listPoint?.args?.params || [], listPoint?.rename?.param)
+    ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param)
     : ''
   const listParams = listPoint?.args?.params || []
 

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

@@ -9,7 +9,8 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, entityCollection,
+  TestControl } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_scala'
@@ -31,6 +32,9 @@ const Test = cmp(function Test(props: any) {
   // template, and are driven by the generated SdkEntityTestMain aggregator.
   Folder({ name: 'sdktest' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'sdktest' })
+
     const entities: { Name: string; entity: boolean; direct: boolean }[] = []
 
     const entity = each(entityCollection(model))

package/project/.sdk/src/cmp/seneca-provider/Extras_seneca-provider.ts

@@ -2,6 +2,7 @@ import {
   cmp, each,
   File, Content, Folder,
   jsKey, jsProp,
+  pointSegments,
 } from '@voxgig/sdkgen'
 
 
@@ -22,7 +23,8 @@ import {
 function loadHasKey(ent: any): boolean {
   const point = (ent.op && ent.op.load && ent.op.load.points || [])[0]
   if (null == point) return false
-  const hasPathParam = (point.parts || []).some((p: string) => p.startsWith('{'))
+  // apidef states which segments are variables (its ADR-003) — no brace test.
+  const hasPathParam = pointSegments(point).some((seg: any) => null != seg.var)
   const hasQueryParam = (point.args && point.args.query || [])
     .some((q: any) => false !== q.reqd)
   return hasPathParam || hasQueryParam

package/project/.sdk/src/cmp/seneca-provider/Main_seneca-provider.ts

@@ -7,6 +7,7 @@ import {
   authorInfo, contributorList, isAuthActive, isHttpBasicAuth, jsKey, jsProp,
   SdkGenError,
   PUBLISHER, PUBLISHER_URL,
+  pointSegments,
 } from '@voxgig/sdkgen'
 
 import {
@@ -102,11 +103,14 @@ function recordKey(ent: any): string {
     const canonical = op.points.filter((pt: any) =>
       null == (pt && pt.select && pt.select['$action']))
     const point = ownPoint(0 < canonical.length ? canonical : op.points)
-    const parts: string[] = (point && point.parts) || []
-    const lastParam = [...parts].reverse().find((p: string) => p.startsWith('{'))
-
-    if (null != lastParam) {
-      return lastParam.slice(1, -1)
+    // The LAST variable segment names the record's key. apidef states which
+    // segments are variables (its ADR-003), so this reads the name off the
+    // vector rather than finding a `{` and slicing the braces back off.
+    const vars = pointSegments(point)
+      .filter((seg: any) => null != seg.var)
+
+    if (0 < vars.length) {
+      return String(vars[vars.length - 1].var)
     }
 
     // No path param at all (e.g. GET /scan/async/result?trace_id=...): the

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

@@ -8,7 +8,6 @@ import {
   Fragment,
   Line,
   cmp,
-  clean,
   configDefinition,
   configReprSetting,
   each,
@@ -99,10 +98,13 @@ const Config = cmp(async function Config(props: any) {
 
         replace: {
 
-          '// #ImportFeatures': () => each(feature, (f: any) => {
-            Line(`import { ${nom(f, 'Name')}Feature } from ` +
-              `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
-          }),
+          '// #ImportFeatures': () => {
+            each(feature, (f: any) => {
+              Line(`import { ${nom(f, 'Name')}Feature } from ` +
+                `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
+            })
+            pluginImports(feature)
+          },
 
           '// #FeatureClasses': () => each(feature, (f: any) => {
             Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
@@ -130,10 +132,13 @@ const Config = cmp(async function Config(props: any) {
 
         "'HEADERS'": indent(JSON.stringify(headers, null, 2), 4).trim(),
 
-        '// #ImportFeatures': () => each(feature, (f: any) => {
-          Line(`import { ${nom(f, 'Name')}Feature } from ` +
-            `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
-        }),
+        '// #ImportFeatures': () => {
+          each(feature, (f: any) => {
+            Line(`import { ${nom(f, 'Name')}Feature } from ` +
+              `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
+          })
+          pluginImports(feature)
+        },
 
         // Values from configDefinition's def, not re-derived here, so the
         // literal rep and the data rep cannot disagree on identity.
@@ -164,19 +169,55 @@ const Config = cmp(async function Config(props: any) {
 `)
         }),
 
-        "'ENTITYMAP'": formatJson(Object.values(entity)
-          .reduce((a: any, n: any) => (a[n.name] = clean({
-            fields: n.fields,
-            name: n.name,
-            op: n.op,
-            relations: n.relations,
-          }, true), a), {}), { margin: 2 }).trim(),
+        // configDefinition's `def.entity` verbatim, NOT rebuilt here. This
+        // reduce was a second copy of that function's entityDefs loop, and
+        // when configDefinition started reconstructing a point's `parts`
+        // from apidef's segment vector (its ADR-003), only the data
+        // representation got it — the literal one emitted empty paths. The
+        // config-repr equivalence test caught it, which is what it is for.
+        "'ENTITYMAP'": formatJson(configDef.entity, { margin: 2 }).trim(),
       }
     })
   })
 })
 
 
+
+// PLUGIN REGISTRATION IMPORTS.
+//
+// A sekreto provider module registers itself when it is imported, and
+// nothing else imports it: the core surface deliberately does not reach a
+// platform-dependent provider, and the full-set barrel — the file whose
+// job was to reach all of them — is not vendored into an SDK at all.
+//
+// So without these lines an SDK generates `provider/dotenv.ts`, never
+// imports it, and throws `unknown provider kind: dotenv` the first time a
+// chain names it. Emitted here because Config already imports every active
+// feature from the model, and this is the same list one level down.
+//
+// Import for SIDE EFFECT only — `import '...'`, no bindings. The module's
+// top-level `register()` call is the whole point.
+function pluginImports(feature: any) {
+  each(feature, (f: any) => {
+    each(f.plugin, (plugin: any) => {
+      // Filter on `active` HERE rather than trusting the feature object to
+      // arrive filtered. Whether a model path was read with `only_active`
+      // varies by call site, and getting it wrong in this direction emits
+      // an import for a module the trim just deleted — an SDK that does
+      // not compile, rather than one that merely carries too much.
+      if (false === plugin.active || null == plugin.active) return
+
+      for (const one of (plugin.path || [])) {
+        const path = String(one)
+        // Only a provider MODULE registers a kind; a plugin may own other
+        // files (Sigv4.ts is signing support, not a provider).
+        if (!/\/provider\/[^/]+\.ts$/.test(path)) continue
+        Line(`import '${'./' + path.replace(/^src\//, '').replace(/\.ts$/, '')}'`)
+      }
+    })
+  })
+}
+
 export {
   Config
 }

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

@@ -4,8 +4,10 @@ import * as Path from 'node:path'
 import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
-  entityClassName, entityCollection, srcFeatureExcludes, stationLibrary,
+  entityClassName, entityCollection, srcFeatureExcludes, pluginExcludes,
+  stationLibrary,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -53,7 +55,13 @@ const Main = cmp(async function Main(props: any) {
     from: 'tm/' + target.name,
     // Root copies src/feature/<name>/ per ACTIVE feature; keep this blanket
     // copy from restoring one that was switched off after `target add`.
-    exclude: srcFeatureExcludes(model),
+    // A feature's inactive plugins go too - same rule, one level
+    // deeper. See helpers/featureSource.pluginExcludes.
+    exclude: [
+      ...srcFeatureExcludes(model),
+      ...pluginExcludes(model),
+      TEST_CONTROL_EXCLUDE,
+    ],
     replace: {
       ...props.ctx$.stdrep,
     }

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

@@ -21,7 +21,9 @@ import {
   serverVariables,
   isHttpBasicAuth,
   jsProp,
-  jsOptProp, envName, envToken, liveStrict
+  jsOptProp, envName, envToken, liveStrict,
+  jsKey,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -49,7 +51,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const authActive = isAuthActive(model)
   const authBasic = authActive && isHttpBasicAuth(model)
   const apikeyEnvEntry = authActive
-    ? `\n    '${PROJECTNAME}_APIKEY': '',${authBasic ? `\n    '${PROJECTNAME}_SECRET': 'NONE',` : ''}`
+    ? `\n    '${PROJECTNAME}_APIKEY': '',${authBasic ? `\n    '${PROJECTNAME}_SECRET': '',` : ''}`
     : ''
   const apikeyLiveField = authActive
     ? `
@@ -61,13 +63,19 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // impossible to construct without values: makeOptions raises rather than
   // request a URL with a literal `{account_id}` in it. Taken from the
   // environment, the same way the apikey is.
+  //
+  // Keys are quoted and the env read is bracketed via jsKey/jsProp: a server
+  // variable name is spec-derived and need not be a JS identifier — the URL
+  // grammar admits a leading digit ({2fa}), and a declared-but-unreferenced
+  // variable ({edge-zone}) is not constrained at all. Bare `name:` and
+  // `env.PROJ_SERVER_EDGE-ZONE` are both syntax errors.
   const svars = serverVariables(model)
   const serverEnvEntry = svars
     .map((v: any) => `\n    '${serverVarEnv(PROJECTNAME, v.name)}': ${JSON.stringify(v.dflt)},`).join('')
   const serverLiveField = 0 === svars.length ? '' : `
       server: {${svars
       .map((v: any) => `
-        ${v.name}: env.${serverVarEnv(PROJECTNAME, v.name)},`).join('')}
+        ${jsKey(v.name)}: ${jsProp('env', serverVarEnv(PROJECTNAME, v.name))},`).join('')}
       },`
 
   const opnames = Object.keys(entity.op || {})
@@ -288,7 +296,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   }
 
   const allLoadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(loadPoint.parts || [], allLoadParams, loadPoint.rename?.param)
+  const loadPath = normalizePathParams(pointParts(loadPoint), allLoadParams, loadPoint.rename?.param)
 
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -296,7 +304,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   // setup and URL-substitution asserts; otherwise the SDK silently drops
   // them and the URL-includes assert fails.
   const pathPlaceholders = new Set<string>()
-  for (const part of (loadPoint.parts || [])) {
+  for (const part of pointParts(loadPoint)) {
     if (typeof part === 'string' && part.startsWith('{') && part.endsWith('}')) {
       pathPlaceholders.add(part.slice(1, -1))
     }
@@ -330,7 +338,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity, strict: boolean)
   const listOp = entity.op?.list
   const listPoint = listOp?.points?.[0]
   const listParams = listPoint?.args?.params || []
-  const listPath = listPoint ? normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param) : ''
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param) : ''
   const hasList = null != listPoint
 
   // Ancestor params (not 'id') for live mode
@@ -523,7 +531,7 @@ function generateDirectList(model: Model, entity: ModelEntity, strict: boolean)
   }
 
   const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param)
+  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param)
 
   // Required query params with spec-provided examples — needed to satisfy
   // the API contract in live mode (see generateDirectLoad for rationale).

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

@@ -33,7 +33,9 @@ import {
   serverVarEnv,
   serverVariables,
   isHttpBasicAuth,
-  entityDataIdField, envName, envToken
+  entityDataIdField, envName, envToken,
+  jsKey,
+  jsProp
 } from '@voxgig/sdkgen'
 
 
@@ -69,7 +71,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   const authActive = isAuthActive(model)
   const authBasic = authActive && isHttpBasicAuth(model)
   const apikeyEnvEntry = authActive
-    ? `\n    '${PROJENVNAME}_APIKEY': '',${authBasic ? `\n    '${PROJENVNAME}_SECRET': 'NONE',` : ''}`
+    ? `\n    '${PROJENVNAME}_APIKEY': '',${authBasic ? `\n    '${PROJENVNAME}_SECRET': '',` : ''}`
     : ''
   const apikeyLiveField = authActive
     ? `
@@ -81,13 +83,19 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // impossible to construct without values: makeOptions raises rather than
   // request a URL with a literal `{account_id}` in it. So the live suite
   // takes them from the environment the same way it takes the apikey.
+  //
+  // Keys are quoted and the env read is bracketed via jsKey/jsProp: a server
+  // variable name is spec-derived and need not be a JS identifier — the URL
+  // grammar admits a leading digit ({2fa}), and a declared-but-unreferenced
+  // variable ({edge-zone}) is not constrained at all. Bare `name:` and
+  // `env.PROJ_SERVER_EDGE-ZONE` are both syntax errors.
   const svars = serverVariables(model)
   const serverEnvEntry = svars
     .map((v: any) => `\n    '${serverVarEnv(PROJENVNAME, v.name)}': ${JSON.stringify(v.dflt)},`).join('')
   const serverLiveField = 0 === svars.length ? '' : `
         server: {${svars
       .map((v: any) => `
-          ${v.name}: env.${serverVarEnv(PROJENVNAME, v.name)},`).join('')}
+          ${jsKey(v.name)}: ${jsProp('env', serverVarEnv(PROJENVNAME, v.name))},`).join('')}
         },`
 
   // TODO: should be a utility function

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

@@ -3,7 +3,8 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, entityCollection } from '@voxgig/sdkgen'
+import { cmp, each, Folder, entityCollection,
+  TestControl } from '@voxgig/sdkgen'
 
 
 // import { Quick } from './Quick_ts'
@@ -19,6 +20,9 @@ const Test = cmp(function Test(props: any) {
   const { target } = props
 
   Folder({ name: 'test' }, () => {
+
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'test' })
     // Quick({ target })
     // TestMain({ target })