@voxgig/sdkgen 4.6.0 → 4.8.0

package/project/.sdk/src/cmp/perl/TestEntity_perl.ts

@@ -17,9 +17,13 @@ import {
   each,
   buildIdNames,
   getMatchEntries,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
+import { perlStringLiteral } from './utility_perl'
+
 
 // See TestEntity_ts.ts for the GenCtx/OpGen contract. Flow-step variables
 // are held in a single declared perl hash (%V) so generated steps never
@@ -54,12 +58,25 @@ 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)}' => ${perlStringLiteral(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+        'server' => {${svars
+      .map((v: any) => `
+          '${v.name}' => $env->{'${serverVarEnv(PROJUPPER, v.name)}'},`).join('')}
+        },`
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `'${n}'`).join(', ')
 
@@ -193,7 +210,7 @@ BASIC_FLOW: {
   my $env = ${N}TestRunner::env_override({
     '${ENTIDVAR}' => $idmap,
     '${PROJUPPER}_TEST_LIVE' => 'FALSE',
-    '${PROJUPPER}_TEST_EXPLAIN' => 'FALSE',${apikeyEnvEntry}
+    '${PROJUPPER}_TEST_EXPLAIN' => 'FALSE',${apikeyEnvEntry}${serverEnvEntry}
   });
 
   my $idmap_resolved = ${N}Helpers::to_map($env->{'${ENTIDVAR}'});
@@ -213,7 +230,10 @@ BASIC_FLOW: {
     Content(`
   if ((($env->{'${PROJUPPER}_TEST_LIVE'}) || '') eq 'TRUE') {
     my $merged_opts = Voxgig::Struct::merge([
-      {${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.
+      ${N}TestRunner::live_client_options(),
+      {${apikeyLiveField}${serverLiveField}
       },
       (Voxgig::Struct::ismap($extra) ? $extra : {}),
     ]);

package/project/.sdk/src/cmp/perl/Test_perl.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_perl'
@@ -17,6 +18,9 @@ const Test = cmp(function Test(props: any) {
 
   Folder({ name: 't' }, () => {
 
+    // Write-once: a project's edited control file survives regeneration.
+    TestControl({ target, dir: 't' })
+
     // Generate exists test
     File({ name: 'exists.t' }, () => {
       Content(`#!perl

package/project/.sdk/src/cmp/perl/utility_perl.ts

@@ -75,7 +75,17 @@ function clean(o: any, dropDefaults?: boolean): any {
 }
 
 
+// A Perl SINGLE-quoted string literal. Single quotes do not interpolate, so a
+// spec-derived value containing $foo or @foo survives verbatim; only the
+// backslash and the quote itself need escaping. A double-quoted literal (what
+// JSON.stringify emits) would interpolate them.
+function perlStringLiteral(val: string): string {
+  return "'" + String(val).replace(/\\/g, '\\\\').replace(/'/g, "\\'") + "'"
+}
+
+
 export {
+  perlStringLiteral,
   clean,
   projectPath,
 }

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

@@ -29,7 +29,6 @@ import {
 
 
 import {
-  clean,
   formatPhpArray,
 } from './utility_php'
 
@@ -239,12 +238,7 @@ ${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers,
     Content(`                ],
             ],
             "entity" => ${formatPhpArray(
-      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), {}), 3)},
+configDef.entity, 3)},
         ];
 `)
     }

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

@@ -5,6 +5,7 @@ import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -44,7 +45,7 @@ const Main = cmp(async function Main(props: any) {
   // Copy tm/php files with replacements
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
     }

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

@@ -11,9 +11,14 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
+import { formatPhpValue } from './utility_php'
+
 
 function normalizePathParams(
   parts: string[],
@@ -64,12 +69,25 @@ 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)}" => ${formatPhpValue(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+            "server" => [${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')
@@ -82,7 +100,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   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 || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -90,7 +108,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))
     }
@@ -107,7 +125,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   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.
@@ -356,14 +374,16 @@ function ${entity.name}_direct_setup($mockres)
 
     $env = Runner::env_override([
         "${entidEnvVar}" => [],
-        "${PROJECTNAME}_TEST_LIVE" => "FALSE",${apikeyEnvEntry}
+        "${PROJECTNAME}_TEST_LIVE" => "FALSE",${apikeyEnvEntry}${serverEnvEntry}
     ]);
 
     $live = $env["${PROJECTNAME}_TEST_LIVE"] === "TRUE";
 
     if ($live) {
-        $merged_opts = [${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.
+        $merged_opts = array_merge(Runner::live_client_options(), [${apikeyLiveField}${serverLiveField}
+        ]);
         $client = new ${model.const.Name}SDK($merged_opts);
         return [
             "client" => $client,

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

@@ -24,10 +24,14 @@ import {
   buildIdNames,
   getMatchEntries,
   isAuthActive,
+  serverVarEnv,
+  serverVariables,
   entityDataIdField, envName, envToken,
   phpEntityAccessor,
 } from '@voxgig/sdkgen'
 
+import { formatPhpValue } from './utility_php'
+
 
 // PHP's GenCtx mirrors the shared shape (see TestEntity_ts.ts) plus an
 // `accessor` slot used to mangle the entity factory name when it collides
@@ -75,12 +79,25 @@ 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)}" => ${formatPhpValue(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+                "server" => [${svars
+      .map((v: any) => `
+                    "${v.name}" => $env["${serverVarEnv(PROJUPPER, v.name)}"],`).join('')}
+                ],`
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
@@ -246,7 +263,7 @@ ${hasList ? `
     $env = Runner::env_override([
         "${PROJUPPER}_TEST_${envToken(entity.name)}_ENTID" => $idmap,
         "${PROJUPPER}_TEST_LIVE" => "FALSE",
-        "${PROJUPPER}_TEST_EXPLAIN" => "FALSE",${apikeyEnvEntry}
+        "${PROJUPPER}_TEST_EXPLAIN" => "FALSE",${apikeyEnvEntry}${serverEnvEntry}
     ]);
 
     $idmap_resolved = Helpers::to_map(
@@ -267,9 +284,16 @@ ${hasList ? `
     Content(`
     if ($env["${PROJUPPER}_TEST_LIVE"] === "TRUE") {
         $merged_opts = Vs::merge([
-            [${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.
+            Runner::live_client_options(),
+            [${apikeyLiveField}${serverLiveField}
             ],
-            $extra ?? [],
+            // ismap, not a plain "?? []" default: an empty PHP array is a
+            // LIST, and a non-map later entry REPLACES the accumulated map in
+            // merge - so the no-extras call discarded live_client_options()
+            // and the apikey/server map above it.
+            Vs::ismap($extra) ? $extra : new \\stdClass(),
         ]);
         $client = new ${model.const.Name}SDK(Helpers::to_map($merged_opts));
     }

package/project/.sdk/src/cmp/php/Test_php.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_php'
@@ -17,6 +18,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
     File({ name: 'ExistsTest.' + target.ext }, () => {
       Content(`<?php

package/project/.sdk/src/cmp/py/Config_py.ts

@@ -28,7 +28,6 @@ import {
 
 
 import {
-  clean,
   formatPyDict,
 } from './utility_py'
 
@@ -180,12 +179,7 @@ ${serverBlock}${authBlock}            "headers": ${formatPyDict(headers, 3)},
     Content(`            },
         },
         "entity": ${formatPyDict(
-      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/py/Main_py.ts

@@ -6,6 +6,7 @@ import {
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   entityClassName, entityCollection,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -50,7 +51,7 @@ const Main = cmp(async function Main(props: any) {
   // below.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//, /pkg\//],
+    exclude: [/src\//, /pkg\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
     }

package/project/.sdk/src/cmp/py/TestDirect_py.ts

@@ -13,7 +13,8 @@ import {
   snakify,
   isAuthActive,
   serverVarEnv,
-  serverVariables, envName, envToken
+  serverVariables, envName, envToken,
+  pointParts,
 } from '@voxgig/sdkgen'
 
 
@@ -98,7 +99,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   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 || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -106,7 +107,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))
     }
@@ -123,7 +124,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   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/py/Test_py.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_py'
@@ -17,6 +18,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 __init__.py for test package
     File({ name: '__init__.' + target.ext }, () => {
       Content(``)

package/project/.sdk/src/cmp/rb/Config_rb.ts

@@ -29,7 +29,6 @@ import {
 
 
 import {
-  clean,
   formatRubyHash,
 } from './utility_rb'
 
@@ -165,12 +164,7 @@ ${serverBlock}${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
     Content(`        },
       },
       "entity" => ${formatRubyHash(
-      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), {}), 3)},
+configDef.entity, 3)},
     }
   end
 `)

package/project/.sdk/src/cmp/rb/Main_rb.ts

@@ -5,6 +5,7 @@ import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -44,7 +45,7 @@ const Main = cmp(async function Main(props: any) {
   // Copy tm/rb files with replacements
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
     }

package/project/.sdk/src/cmp/rb/TestDirect_rb.ts

@@ -11,9 +11,14 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive, envName, envToken,
+  serverVarEnv,
+  serverVariables,
+  pointParts,
 } from '@voxgig/sdkgen'
 
+import { formatRubyValue } from './utility_rb'
+
 
 function normalizePathParams(
   parts: string[],
@@ -64,12 +69,25 @@ 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)}" => ${formatRubyValue(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+      "server" => {${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')
@@ -82,7 +100,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   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 || []
   // Some upstream OpenAPI specs declare a parameter as `in: path` even when
   // that path has no `{name}` placeholder for it. Only path params that
@@ -90,7 +108,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))
     }
@@ -107,7 +125,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
 
   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.
@@ -349,14 +367,16 @@ def ${entity.name}_direct_setup(mockres)
 
   env = Runner.env_override({
     "${entidEnvVar}" => {},
-    "${PROJECTNAME}_TEST_LIVE" => "FALSE",${apikeyEnvEntry}
+    "${PROJECTNAME}_TEST_LIVE" => "FALSE",${apikeyEnvEntry}${serverEnvEntry}
   })
 
   live = env["${PROJECTNAME}_TEST_LIVE"] == "TRUE"
 
   if live
-    merged_opts = {${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.
+    merged_opts = Runner.live_client_options.merge({${apikeyLiveField}${serverLiveField}
+    })
     client = ${model.const.Name}SDK.new(merged_opts)
     return {
       client: client,

package/project/.sdk/src/cmp/rb/TestEntity_rb.ts

@@ -24,9 +24,13 @@ import {
   buildIdNames,
   getMatchEntries,
   isAuthActive,
-  entityDataIdField, envName, envToken
+  entityDataIdField, envName, envToken,
+  serverVarEnv,
+  serverVariables
 } from '@voxgig/sdkgen'
 
+import { formatRubyValue } from './utility_rb'
+
 
 // See TestEntity_ts.ts for the GenCtx/OpGen contract.
 type GenCtx = {
@@ -62,12 +66,25 @@ 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)}" => ${formatRubyValue(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' : `
+        "server" => {${svars
+      .map((v: any) => `
+          "${v.name}" => env["${serverVarEnv(PROJUPPER, v.name)}"],`).join('')}
+        },`
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
@@ -227,7 +244,7 @@ end
   env = Runner.env_override({
     "${PROJUPPER}_TEST_${envToken(entity.name)}_ENTID" => idmap,
     "${PROJUPPER}_TEST_LIVE" => "FALSE",
-    "${PROJUPPER}_TEST_EXPLAIN" => "FALSE",${apikeyEnvEntry}
+    "${PROJUPPER}_TEST_EXPLAIN" => "FALSE",${apikeyEnvEntry}${serverEnvEntry}
   })
 
   idmap_resolved = Helpers.to_map(
@@ -248,7 +265,10 @@ end
     Content(`
   if env["${PROJUPPER}_TEST_LIVE"] == "TRUE"
     merged_opts = Vs.merge([
-      {${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.
+      Runner.live_client_options,
+      {${apikeyLiveField}${serverLiveField}
       },
       extra || {},
     ])

package/project/.sdk/src/cmp/rb/Test_rb.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_rb'
@@ -17,6 +18,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
     File({ name: 'exists_test.' + target.ext }, () => {
       Content(`# ${model.const.Name} SDK exists test

package/project/.sdk/src/cmp/rb/utility_rb.ts

@@ -48,7 +48,9 @@ function formatRubyValue(val: any, indent: number = 0): string {
     return 'nil'
   }
   if (typeof val === 'string') {
-    return `"${val.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`
+    // `#` is escaped only where it OPENS an interpolation (#{, #$, #@), so
+    // this changes output solely for values that would otherwise interpolate.
+    return `"${val.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/#(?=[{$@])/g, '\\#')}"`
   }
   if (typeof val === 'number') {
     return String(val)

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

@@ -6,6 +6,7 @@ import {
   File, Content, Copy, Folder, Fragment,
   entityClassName,
   targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -54,7 +55,7 @@ const Main = cmp(async function Main(props: any) {
   // here exactly like the go target.
   Copy({
     from: 'tm/' + target.name,
-    exclude: [/src\//],
+    exclude: [/src\//, TEST_CONTROL_EXCLUDE],
     replace: {
       ...props.ctx$.stdrep,
       RUSTCRATE: rustcrate,