@voxgig/sdkgen 4.6.0 → 4.8.0

package/project/.sdk/src/cmp/csharp/Test_csharp.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 { TestEntity } from './TestEntity_csharp'
@@ -21,6 +22,9 @@ const Test = cmp(function Test(props: any) {
   // tests are generated here.
   Folder({ name: 'test' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'test' })
+
     const entity = each(entityCollection(model))
       .filter((e: any) => false !== e.active)
 

package/project/.sdk/src/cmp/dart/Config_dart.ts

@@ -26,7 +26,6 @@ import {
 
 
 import {
-  clean,
   dartStringLiteral,
   dartValue,
 } from './utility_dart'
@@ -159,13 +158,13 @@ const Config = cmp(async function Config(props: any) {
           Line(`      '${entity.name}': <String, dynamic>{},`)
         }),
 
-        "'ENTITYMAP'": dartValue(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), {}), 1),
+        // 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'": dartValue(configDef.entity, 1),
       }
     })
   })

package/project/.sdk/src/cmp/dart/Main_dart.ts

@@ -5,6 +5,7 @@ import {
   cmp, each,
   List, File, Copy, Folder, Fragment, Line,
   entityClassName, entityCollection,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -45,7 +46,7 @@ const Main = cmp(async function Main(props: any) {
   // lib/feature/), so they are excluded from the generated package.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
     }

package/project/.sdk/src/cmp/dart/TestDirect_dart.ts

@@ -16,14 +16,16 @@ import {
   Slot,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
 import {
   projectPath,
-  dartValue,
-} from './utility_dart'
+  dartValue, dartStringLiteral} from './utility_dart'
 
 
 const TestDirect = cmp(function TestDirect(props: any) {
@@ -40,13 +42,26 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n    '${PROJECTNAME}_APIKEY': 'NONE',`
+    ? `\n    '${PROJECTNAME}_APIKEY': '',`
     : ''
   const apikeyLiveField = authActive
     ? `
       'apikey': 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.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n    '${serverVarEnv(PROJECTNAME, v.name)}': ${dartStringLiteral(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+      'server': <String, dynamic>{${svars
+      .map((v: any) => `
+        '${v.name}': env['${serverVarEnv(PROJECTNAME, v.name)}'],`).join('')}
+      },`
+
   const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
@@ -78,13 +93,16 @@ Map<String, dynamic> directSetup([dynamic mockres]) {
 
   final env = envOverride({
     '${entidEnvVar}': <String, dynamic>{},
-    '${PROJECTNAME}_TEST_LIVE': 'FALSE',${apikeyEnvEntry}
+    '${PROJECTNAME}_TEST_LIVE': 'FALSE',${apikeyEnvEntry}${serverEnvEntry}
   });
 
   final live = 'TRUE' == env['${PROJECTNAME}_TEST_LIVE'];
 
   if (live) {
-    final client = ${nom(model.const, 'Name')}SDK({${apikeyLiveField}
+    // Spread FIRST, so the generated fields below win: sdk-test-control.json's
+    // test.client.options adds to the live client, it does not redirect it.
+    final client = ${nom(model.const, 'Name')}SDK(<String, dynamic>{
+      ...liveClientOptions(),${apikeyLiveField}${serverLiveField}
     });
 
     dynamic idmap = env['${entidEnvVar}'];
@@ -165,12 +183,12 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
   }
 
   const allLoadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(loadPoint.parts || [], allLoadParams, loadPoint.rename?.param)
+  const loadPath = normalizePathParams(pointParts(loadPoint), allLoadParams, loadPoint.rename?.param)
 
   // 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))
     }
@@ -200,7 +218,7 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
   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
@@ -358,7 +376,7 @@ function generateDirectList(model: Model, entity: ModelEntity) {
   }
 
   const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param)
+  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param)
 
   const listQuery = listPoint.args?.query || []
   const liveQueryLines = listQuery

package/project/.sdk/src/cmp/dart/TestEntity_dart.ts

@@ -23,13 +23,14 @@ import {
   Slot,
   cmp,
   each,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
 
 import {
-  projectPath
-} from './utility_dart'
+  projectPath, dartStringLiteral} from './utility_dart'
 
 
 // GenCtx is the per-language generation context passed to every OpGen.
@@ -54,13 +55,26 @@ const TestEntity = cmp(function TestEntity(props: any) {
   const ENTENVNAME = envToken(entity.name)
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n    '${PROJENVNAME}_APIKEY': 'NONE',`
+    ? `\n    '${PROJENVNAME}_APIKEY': '',`
     : ''
   const apikeyLiveField = authActive
     ? `
         'apikey': env['${PROJENVNAME}_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.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n    '${serverVarEnv(PROJENVNAME, v.name)}': ${dartStringLiteral(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+        'server': <String, dynamic>{${svars
+      .map((v: any) => `
+          '${v.name}': env['${serverVarEnv(PROJENVNAME, v.name)}'],`).join('')}
+        },`
+
   const ff = projectPath('src/cmp/dart/fragment/')
 
   Folder({ name: entity.name }, () => {
@@ -191,7 +205,7 @@ Map<String, dynamic> basicSetup([dynamic extra]) {
   final env = envOverride({
     '${PROJENVNAME}_TEST_${ENTENVNAME}_ENTID': idmap,
     '${PROJENVNAME}_TEST_LIVE': 'FALSE',
-    '${PROJENVNAME}_TEST_EXPLAIN': 'FALSE',${apikeyEnvEntry}
+    '${PROJENVNAME}_TEST_EXPLAIN': 'FALSE',${apikeyEnvEntry}${serverEnvEntry}
   });
 
   idmap = env['${PROJENVNAME}_TEST_${ENTENVNAME}_ENTID'];
@@ -200,9 +214,16 @@ Map<String, dynamic> basicSetup([dynamic extra]) {
 
   if (live) {
     client = ${model.Name}SDK(merge([
-      <String, dynamic>{${apikeyLiveField}
+      // FIRST, so the generated fields below win: sdk-test-control.json's
+      // test.client.options adds to the live client, it does not redirect it.
+      liveClientOptions(),
+      <String, dynamic>{${apikeyLiveField}${serverLiveField}
       },
-      extra
+      // 'extra ?? {}', not a bare 'extra': merge returns null when the last
+      // entry is null, and basicSetup is normally called with no argument at
+      // all - so a bare 'extra' silently discarded the apikey and server
+      // values above and handed the SDK null.
+      extra ?? <String, dynamic>{}
     ]));
   }
 

package/project/.sdk/src/cmp/dart/Test_dart.ts

@@ -7,7 +7,8 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, snakify, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
+import { cmp, each, snakify, Folder, File, Content, entityCollection,
+  TestControl } from '@voxgig/sdkgen'
 
 
 import { TestDirect } from './TestDirect_dart'
@@ -24,6 +25,9 @@ const Test = cmp(function Test(props: any) {
 
   Folder({ name: 'test' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'test' })
+
     // Suite entry: registers every static suite plus the generated
     // per-entity suites, then runs them (Makefile: dart run test/main.dart).
     File({ name: 'main.' + target.ext }, () => {

package/project/.sdk/src/cmp/elixir/Config_elixir.ts

@@ -22,7 +22,6 @@ import {
 
 
 import {
-  clean,
   formatElixir,
   elixirString,
 } from './utility_elixir'
@@ -53,13 +52,6 @@ const Config = cmp(async function Config(props: any) {
     ? `        "auth" => %{"prefix" => ${elixirString(authPrefix)}},\n`
     : ''
 
-  const entityClean = 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), {})
-
   Folder({ name: 'lib' }, () => {
     // The same config as an OBJECT, built by the shared helper so this
     // target's literal and the data that replaces it above the threshold are
@@ -72,6 +64,15 @@ const Config = cmp(async function Config(props: any) {
     const { def: configDef, json: configJson } = configDefinition(model, target.name)
     const asData = isConfigData(configJson, configReprSetting(model))
 
+    // configDefinition's `def.entity` verbatim, NOT rebuilt here. The reduce
+    // this replaces 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 entityClean = configDef.entity
+
     File({ name: 'config.ex' }, () => {
 
       // ABOVE THE THRESHOLD: emit the model as DATA.

package/project/.sdk/src/cmp/go/Config_go.ts

@@ -9,7 +9,6 @@ import {
   Line,
   cmp,
   each,
-  clean,
   configDefinition,
   configReprSetting,
   isAuthActive,
@@ -200,12 +199,7 @@ ${serverBlock}${authBlock}			"headers": ${formatGoMap(headers, 3)},
     Content(`			},
 		},
 		"entity": ${formatGoMap(
-      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), {}), 2)},
+configDef.entity, 2)},
 	}
 }
 `)

package/project/.sdk/src/cmp/go/Main_go.ts

@@ -6,6 +6,7 @@ import {
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   entityClassName, entityCollection, goModule, goPackageIdent,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -59,7 +60,7 @@ const Main = cmp(async function Main(props: any) {
   // downstream consumers.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//, /utility\/struct\/go\.mod$/],
+    exclude: [/src\//, /utility\/struct\/go\.mod$/, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
       GOMODULE: gomodule,

package/project/.sdk/src/cmp/go/TestDirect_go.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive,
   serverVarEnv,
-  serverVariables, envName, envToken, liveStrict
+  serverVariables, envName, envToken, liveStrict,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -109,7 +110,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // Get load point info
   const loadPoint = loadOp?.points?.[0]
   const loadIsGraphql = 'graphql' === (loadPoint as any)?.kind
-  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 || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -117,7 +118,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // 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))
     }
@@ -136,7 +137,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   // Get list point info
   const listPoint = listOp?.points?.[0]
   const listIsGraphql = 'graphql' === (listPoint as any)?.kind
-  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 || []
 
   // Required query params with spec-provided examples — needed in live mode

package/project/.sdk/src/cmp/go/Test_go.ts

@@ -3,7 +3,8 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content, goModule, entityCollection } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, goModule, entityCollection,
+  TestControl } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_go'
@@ -21,6 +22,9 @@ const Test = cmp(function Test(props: any) {
 
   Folder({ name: 'test' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'test' })
+
     // Generate exists_test.go programmatically to avoid duplication
     // with any scaffolded test file (e.g. projectname_sdk_test.go).
     File({ name: 'exists_test.' + target.ext }, () => {

package/project/.sdk/src/cmp/java/Config_java.ts

@@ -98,13 +98,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: configDef.main,

package/project/.sdk/src/cmp/java/Main_java.ts

@@ -5,6 +5,7 @@ import {
   cmp, each,
   File, Content, Copy, Folder, Fragment,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -52,7 +53,7 @@ const Main = cmp(async function Main(props: any) {
   // token used throughout the templates (package/import statements).
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
       JAVAPACKAGE: javapackage,

package/project/.sdk/src/cmp/java/TestDirect_java.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive,
   serverVarEnv,
-  serverVariables, envName, envToken
+  serverVariables, envName, envToken,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -116,12 +117,12 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // Get 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
   // 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))
     }
@@ -139,7 +140,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   // Get 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 || []
 
   // Required query params with spec-provided examples — needed in live mode.

package/project/.sdk/src/cmp/java/Test_java.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 { TestEntity } from './TestEntity_java'
@@ -20,6 +21,9 @@ const Test = cmp(function Test(props: any) {
 
   Folder({ name: 'test' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 'test' })
+
     // The shared test infrastructure (RunnerSupport, FeatureHarness,
     // PipelineTest, FeatureTest, NetsimTest, PrimaryUtilityTest,
     // CustomUtilityTest, StructRunner/StructCorpusTest, ExistsTest and

package/project/.sdk/src/cmp/js/Config_js.ts

@@ -8,7 +8,6 @@ import {
   Fragment,
   Line,
   cmp,
-  clean,
   configDefinition,
   configReprSetting,
   each,
@@ -161,13 +160,13 @@ 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(),
       }
     })
   })

package/project/.sdk/src/cmp/js/Main_js.ts

@@ -6,6 +6,7 @@ import {
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   entityClassName, entityCollection, srcFeatureExcludes, stationLibrary,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -49,7 +50,7 @@ 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),
+    exclude: [...srcFeatureExcludes(model), TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
     }

package/project/.sdk/src/cmp/js/TestDirect_js.ts

@@ -17,7 +17,11 @@ import {
   cmp,
   snakify,
   isAuthActive,
-  jsProp, envName, envToken
+  serverVarEnv,
+  serverVariables,
+  jsProp, envName, envToken,
+  jsKey,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -41,13 +45,32 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n    '${PROJECTNAME}_APIKEY': 'NONE',`
+    ? `\n    '${PROJECTNAME}_APIKEY': '',`
     : ''
   const apikeyLiveField = authActive
     ? `
       apikey: 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. 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) => `
+        ${jsKey(v.name)}: ${jsProp('env', serverVarEnv(PROJECTNAME, v.name))},`).join('')}
+      },`
+
   const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
@@ -78,14 +101,17 @@ function directSetup(mockres) {
 
   const env = envOverride({
     '${entidEnvVar}': {},
-    '${PROJECTNAME}_TEST_LIVE': 'FALSE',${apikeyEnvEntry}
+    '${PROJECTNAME}_TEST_LIVE': 'FALSE',${apikeyEnvEntry}${serverEnvEntry}
   })
 
   const live = 'TRUE' === env.${PROJECTNAME}_TEST_LIVE
 
   if (live) {
-    const client = new ${nom(model.const, 'Name')}SDK({${apikeyLiveField}
-    })
+    // Merged so the generated fields win: sdk-test-control.json's
+    // test.client.options adds to the live client, it does not redirect it.
+    const client = new ${nom(model.const, 'Name')}SDK(
+      Object.assign({}, liveClientOptions(), {${apikeyLiveField}${serverLiveField}
+      }))
 
     let idmap = env['${entidEnvVar}']
     if ('string' === typeof idmap && idmap.startsWith('{')) {
@@ -147,13 +173,13 @@ function generateDirectLoad(model: Model, entity: ModelEntity) {
   }
 
   const loadParams = loadPoint.args?.params || []
-  const loadPath = normalizePathParams(loadPoint.parts || [], loadParams, loadPoint.rename?.param)
+  const loadPath = normalizePathParams(pointParts(loadPoint), loadParams, loadPoint.rename?.param)
 
   // Get list info for live mode bootstrapping
   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
@@ -249,7 +275,7 @@ function generateDirectList(model: Model, entity: ModelEntity) {
   }
 
   const listParams = listPoint.args?.params || []
-  const listPath = normalizePathParams(listPoint.parts || [], listParams, listPoint.rename?.param)
+  const listPath = normalizePathParams(pointParts(listPoint), listParams, listPoint.rename?.param)
 
   // Build live params
   const liveParams = listParams.map((p: any) => {