@voxgig/sdkgen 4.5.3 → 4.7.0

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

@@ -11,7 +11,9 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
 import { formatCsValue } from './utility_csharp'
@@ -67,12 +69,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
     ? `\n                ["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)}"] = ${JSON.stringify(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+                ["server"] = new Dictionary<string, object?>
+                {${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')
@@ -475,16 +491,24 @@ ${loadSkipBlock}        var client = setup.Client;
         var env = TestRunner.EnvOverride(new Dictionary<string, object?>
         {
             ["${entidEnvVar}"] = new Dictionary<string, object?>(),
-            ["${PROJECTNAME}_TEST_LIVE"] = "FALSE",${apikeyEnvEntry}
+            ["${PROJECTNAME}_TEST_LIVE"] = "FALSE",${apikeyEnvEntry}${serverEnvEntry}
         });
 
         var live = Equals(env["${PROJECTNAME}_TEST_LIVE"], "TRUE");
 
         if (live)
         {
-            var liveClient = new ${Name}SDK(new Dictionary<string, object?>
-            {${apikeyLiveField}
-            });
+            // sdk-test-control.json's test.client.options goes UNDER the
+            // generated fields: it adds to the live client, it does not
+            // redirect it, so the generated entries overwrite it here.
+            var liveOpts = TestRunner.LiveClientOptions();
+            foreach (var _kv in new Dictionary<string, object?>
+            {${apikeyLiveField}${serverLiveField}
+            })
+            {
+                liveOpts[_kv.Key] = _kv.Value;
+            }
+            var liveClient = new ${Name}SDK(liveOpts);
 
             var idmap = new Dictionary<string, object?>();
             var entidRaw = env["${entidEnvVar}"];

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

@@ -17,7 +17,9 @@ import {
   each,
   buildIdNames,
   getMatchEntries,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
 
@@ -59,12 +61,26 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n            ["${PROJUPPER}_APIKEY"] = "NONE",`
+    ? `\n            ["${PROJUPPER}_APIKEY"] = "",`
     : ''
   const apikeyLiveField = authActive
     ? `\n                    ["apikey"] = 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.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n            ["${serverVarEnv(PROJUPPER, v.name)}"] = ${JSON.stringify(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+                    ["server"] = new Dictionary<string, object?>
+                    {${svars
+      .map((v: any) => `
+                        ["${v.name}"] = env["${serverVarEnv(PROJUPPER, v.name)}"],`).join('')}
+                    },`
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
@@ -266,7 +282,7 @@ ${allSteps.length > 0 ? '        var client = setup.Client;\n\n' : ''}`)
         {
             ["${PROJUPPER}_TEST_${ENTUPPER}_ENTID"] = idmap,
             ["${PROJUPPER}_TEST_LIVE"] = "FALSE",
-            ["${PROJUPPER}_TEST_EXPLAIN"] = "FALSE",${apikeyEnvEntry}
+            ["${PROJUPPER}_TEST_EXPLAIN"] = "FALSE",${apikeyEnvEntry}${serverEnvEntry}
         });
 
         var idmapResolved = Helpers.ToMapAny(env["${PROJUPPER}_TEST_${ENTUPPER}_ENTID"])
@@ -288,12 +304,20 @@ ${allSteps.length > 0 ? '        var client = setup.Client;\n\n' : ''}`)
     Content(`
         if (Equals(env["${PROJUPPER}_TEST_LIVE"], "TRUE"))
         {
+            // 'extra ?? new ...', 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.
+            var extraOpts = extra ?? new Dictionary<string, object?>();
             var mergedOpts = StructUtils.Merge(new List<object?>
             {
+                // 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.
+                TestRunner.LiveClientOptions(),
                 new Dictionary<string, object?>
-                {${apikeyLiveField}
+                {${apikeyLiveField}${serverLiveField}
                 },
-                extra,
+                extraOpts,
             });
             client = new ${Name}SDK(Helpers.ToMapAny(mergedOpts));
         }

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

@@ -13,6 +13,7 @@ import {
   isConfigData,
   isAuthActive,
   resolveAuthPrefix,
+  targetFeatures,
 } from '@voxgig/sdkgen'
 
 
@@ -38,7 +39,10 @@ const Config = cmp(async function Config(props: any) {
   const model: Model = ctx$.model
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // 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.
+  const feature = targetFeatures(model, target)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/dart/fragment/')
 

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,15 @@ import {
   Slot,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
 
 import {
   projectPath,
-  dartValue,
-} from './utility_dart'
+  dartValue, dartStringLiteral} from './utility_dart'
 
 
 const TestDirect = cmp(function TestDirect(props: any) {
@@ -40,13 +41,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 +92,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}'];

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

@@ -10,6 +10,7 @@ import {
   isAuthActive,
   isConfigData,
   resolveAuthPrefix,
+  targetFeatures,
 } from '@voxgig/sdkgen'
 
 
@@ -35,7 +36,10 @@ const Config = cmp(async function Config(props: any) {
   const Name = model.const.Name
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // 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.
+  const feature = targetFeatures(model, target)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 

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

@@ -4,6 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each,
   File, Folder, Content, Copy, Fragment,
+  targetFeatures,
 } from '@voxgig/sdkgen'
 
 
@@ -38,7 +39,10 @@ const Main = cmp(async function Main(props: any) {
 
   const Name = model.const.Name
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // 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.
+  const feature = targetFeatures(model, target)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/elixir/fragment/')
 

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

@@ -16,6 +16,7 @@ import {
   isConfigData,
   resolveAuthPrefix,
   serverVariables,
+  targetFeatures,
 } from '@voxgig/sdkgen'
 
 
@@ -40,7 +41,10 @@ const Config = cmp(async function Config(props: any) {
   const model: Model = ctx$.model
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // 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.
+  const feature = targetFeatures(model, target)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 

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

@@ -4,7 +4,9 @@ import * as Path from 'node:path'
 import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
-  entityClassName, entityCollection, goModule, goPackageIdent
+  entityClassName, entityCollection, goModule, goPackageIdent,
+  targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -33,7 +35,10 @@ const Main = cmp(async function Main(props: any) {
   const { model } = props.ctx$
 
   const entity: ModelEntity = getModelPath(model, `main.${KIT}.entity`)
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // 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.
+  const feature = targetFeatures(model, target)
 
   // Go module path == the repo path on GitHub (org from model.origin),
   // e.g. github.com/voxgig-sdk/<slug>-sdk. Used in go.mod and every import.
@@ -55,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/ReadmeQuick_go.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, opRequestShape, entityIdField, entityOps, goModule } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, opRequestShape, entityIdField, entityOps, goModule , serverVariables} from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -25,9 +25,22 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 
   const authActive = isAuthActive(model)
+  
+  // Server variables (a templated server URL) are REQUIRED at construction
+  // - the SDK refuses rather than request a URL with a literal
+  // {account_id} in it - so a quickstart that omits them is a quickstart
+  // that fails on its first line.
+  const svars = serverVariables(model)
+  const goServerField = 0 === svars.length ? '' :
+    `\n    "server": map[string]any{` +
+    svars.map((v: any) => `\n        "${v.name}": "<${v.name}>",`).join('') +
+    `\n    },`
+
   const ctor = authActive
-    ? `sdk.New${model.const.Name}SDK(map[string]any{\n        "apikey": os.Getenv("${envName(model)}_APIKEY"),\n    })`
-    : `sdk.New()`
+    ? `sdk.New${model.const.Name}SDK(map[string]any{\n        "apikey": os.Getenv("${envName(model)}_APIKEY"),${goServerField}\n    })`
+    : ('' === goServerField
+      ? `sdk.New()`
+      : `sdk.New${model.const.Name}SDK(map[string]any{${goServerField}\n    })`)
 
   // Build the body of main() from the operations the example entity
   // supports. Each op names a fresh value var, so `:=` always declares a

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, entityIdField, entityOps, opRequestShape, goModule } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, entityIdField, entityOps, opRequestShape, goModule , serverVariables} from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -20,9 +20,22 @@ const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 
   const authActive = isAuthActive(model)
+  
+  // Server variables (a templated server URL) are REQUIRED at construction
+  // - the SDK refuses rather than request a URL with a literal
+  // {account_id} in it - so a quickstart that omits them is a quickstart
+  // that fails on its first line.
+  const svars = serverVariables(model)
+  const goServerField = 0 === svars.length ? '' :
+    `\n    "server": map[string]any{` +
+    svars.map((v: any) => `\n        "${v.name}": "<${v.name}>",`).join('') +
+    `\n    },`
+
   const ctor = authActive
-    ? `sdk.New${model.const.Name}SDK(map[string]any{\n    "apikey": os.Getenv("${envName(model)}_APIKEY"),\n})`
-    : `sdk.New()`
+    ? `sdk.New${model.const.Name}SDK(map[string]any{\n    "apikey": os.Getenv("${envName(model)}_APIKEY"),${goServerField}\n})`
+    : ('' === goServerField
+      ? `sdk.New()`
+      : `sdk.New${model.const.Name}SDK(map[string]any{${goServerField}\n})`)
 
   Content(`\`\`\`go
 import sdk "${gomodule}"

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

@@ -11,7 +11,9 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken, liveStrict
+  isAuthActive,
+  serverVarEnv,
+  serverVariables, envName, envToken, liveStrict
 } from '@voxgig/sdkgen'
 
 
@@ -73,12 +75,26 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n\t\t"${PROJECTNAME}_APIKEY":       "NONE",`
+    ? `\n\t\t"${PROJECTNAME}_APIKEY":       "",`
     : ''
   const apikeyLiveField = authActive
     ? `\n\t\t\t"apikey": env["${PROJECTNAME}_APIKEY"],`
     : ''
 
+  // A templated server URL (OpenAPI server variables) makes a LIVE client
+  // impossible to construct without values: makeOptions refuses rather than
+  // request a URL with a literal `{account_id}` in it. Taken from the
+  // environment, the same way the apikey is.
+  const svars = serverVariables(model)
+  const serverEnvEntry = svars
+    .map((v: any) => `\n\t\t"${serverVarEnv(PROJECTNAME, v.name)}": ${JSON.stringify(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' :
+    `\n\t\t"server": map[string]any{` +
+    svars.map((v: any) =>
+      `\n\t\t\t"${v.name}": env["${serverVarEnv(PROJECTNAME, v.name)}"],`).join('') +
+    `\n\t\t},`
+
+
   const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
@@ -559,13 +575,21 @@ func ${entity.name}DirectSetup(mockres any) *${entity.name}DirectSetupResult {
 
 	env := envOverride(map[string]any{
 		"${entidEnvVar}": map[string]any{},
-		"${PROJECTNAME}_TEST_LIVE":    "FALSE",${apikeyEnvEntry}
+		"${PROJECTNAME}_TEST_LIVE":    "FALSE",${apikeyEnvEntry}${serverEnvEntry}
 	})
 
 	live := env["${PROJECTNAME}_TEST_LIVE"] == "TRUE"
 
 	if live {
-		mergedOpts := map[string]any{${apikeyLiveField}
+		// sdk-test-control.json's test.client.options seeds the live
+		// client; the generated fields below overwrite anything they name.
+		mergedOpts := map[string]any{}
+		for k, v := range liveClientOptions() {
+			mergedOpts[k] = v
+		}
+		for k, v := range map[string]any{${apikeyLiveField}${serverLiveField}
+		} {
+			mergedOpts[k] = v
 		}
 		client := sdk.New${model.const.Name}SDK(mergedOpts)