@voxgig/sdkgen 4.5.3 → 4.7.0

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

@@ -24,6 +24,8 @@ import {
   buildIdNames,
   getMatchEntries,
   isAuthActive,
+  serverVarEnv,
+  serverVariables,
   entityDataIdField, envName, envToken
 } from '@voxgig/sdkgen'
 
@@ -71,12 +73,26 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
-    ? `\n\t\t"${PROJUPPER}_APIKEY":         "NONE",`
+    ? `\n\t\t"${PROJUPPER}_APIKEY":         "",`
     : ''
   const apikeyLiveField = authActive
     ? `\n\t\t\t\t"apikey": env["${PROJUPPER}_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(PROJUPPER, v.name)}": ${JSON.stringify(v.dflt)},`).join('')
+  const serverLiveField = 0 === svars.length ? '' :
+    `\n\t\t\t\t"server": map[string]any{` +
+    svars.map((v: any) =>
+      `\n\t\t\t\t\t"${v.name}": env["${serverVarEnv(PROJUPPER, v.name)}"],`).join('') +
+    `\n\t\t\t\t},`
+
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `"${n}"`).join(', ')
 
@@ -205,7 +221,7 @@ ${allSteps.length > 0 ? '\t\tclient := setup.client\n\n' : ''}`)
       const preambleRef = entity.name + '_ref01'
       const preambleVar = goVar(preambleRef)
       Content(`		// Bootstrap entity data from existing test data (no create step in flow).
-		${preambleVar}DataRaw := vs.Items(core.ToMapAny(vs.GetPath("existing.${entity.name}", setup.data)))
+		${preambleVar}DataRaw := vs.Items(core.ToMapAny(vs.GetPath(setup.data, "existing.${entity.name}")))
 		var ${preambleVar}Data map[string]any
 		if len(${preambleVar}DataRaw) > 0 {
 			${preambleVar}Data = core.ToMapAny(${preambleVar}DataRaw[0][1])
@@ -265,9 +281,14 @@ ${allSteps.length > 0 ? '\t\tclient := setup.client\n\n' : ''}`)
 
 `)
 
-    // Generate idmap via vs.Transform
+    // Generate idmap via vs.Transform.
+    //
+    // The error return Transform gained in struct go 0.1.3 is discarded
+    // deliberately: this transforms the entity's own id names, which the
+    // generator produced, so an error would be a generator bug rather than
+    // anything the generated test can act on.
     Content('\t// Generate idmap via transform, matching TS pattern.\n')
-    Content('\tidmap := vs.Transform(\n')
+    Content('\tidmap, _ := vs.Transform(\n')
     Content('\t\t[]any{' + idnamesStr + '},\n')
     Content('\t\tmap[string]any{\n')
     Content('\t\t\t"`$PACK`": []any{"", map[string]any{\n')
@@ -287,7 +308,7 @@ ${allSteps.length > 0 ? '\t\tclient := setup.client\n\n' : ''}`)
 	env := envOverride(map[string]any{
 		"${PROJUPPER}_TEST_${envToken(entity.name)}_ENTID": idmap,
 		"${PROJUPPER}_TEST_LIVE":      "FALSE",
-		"${PROJUPPER}_TEST_EXPLAIN":   "FALSE",${apikeyEnvEntry}
+		"${PROJUPPER}_TEST_EXPLAIN":   "FALSE",${apikeyEnvEntry}${serverEnvEntry}
 	})
 
 	idmapResolved := core.ToMapAny(env["${PROJUPPER}_TEST_${envToken(entity.name)}_ENTID"])
@@ -307,10 +328,22 @@ ${allSteps.length > 0 ? '\t\tclient := setup.client\n\n' : ''}`)
 
     Content(`
 	if env["${PROJUPPER}_TEST_LIVE"] == "TRUE" {
+		// An empty map, not a nil one: Merge returns nil when its last entry
+		// is nil, and BasicSetup is normally called with no extras - so a
+		// bare nil silently discarded the apikey and server values below.
+		extraOpts := extra
+		if extraOpts == nil {
+			extraOpts = map[string]any{}
+		}
+
 		mergedOpts := vs.Merge([]any{
-			map[string]any{${apikeyLiveField}
+			// liveClientOptions() 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(),
+			map[string]any{${apikeyLiveField}${serverLiveField}
 			},
-			extra,
+			extraOpts,
 		})
 		client = sdk.New${model.const.Name}SDK(core.ToMapAny(mergedOpts))
 	}
@@ -361,11 +394,11 @@ const generateCreate: OpGen = (ctx, step, index) => {
   // Load data from test data file
   if (hasDatvar) {
     Content(`		${datavar} = core.ToMapAny(vs.GetProp(
-			vs.GetPath([]any{"new", "${entity.name}"}, setup.data), "${ref}"))
+			vs.GetPath(setup.data, []any{"new", "${entity.name}"}), "${ref}"))
 `)
   } else {
     Content(`		${datavar} := core.ToMapAny(vs.GetProp(
-			vs.GetPath([]any{"new", "${entity.name}"}, setup.data), "${ref}"))
+			vs.GetPath(setup.data, []any{"new", "${entity.name}"}), "${ref}"))
 `)
   }
 
@@ -606,7 +639,7 @@ const generateLoad: OpGen = (ctx, step, index) => {
 `)
   }
   if (!hasSrcData && hasEntId) {
-    Content(`		${srcdatavar}Raw := vs.Items(core.ToMapAny(vs.GetPath("existing.${entity.name}", setup.data)))
+    Content(`		${srcdatavar}Raw := vs.Items(core.ToMapAny(vs.GetPath(setup.data, "existing.${entity.name}")))
 		var ${srcdatavar} map[string]any
 		if len(${srcdatavar}Raw) > 0 {
 			${srcdatavar} = core.ToMapAny(${srcdatavar}Raw[0][1])

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/go/fragment/Main.fragment.go

@@ -35,7 +35,7 @@ func NewProjectNameSDK(options map[string]any) *ProjectNameSDK {
 
 	sdk.options = sdk.utility.MakeOptions(sdk.rootctx)
 
-	if vs.GetPath([]any{"feature", "test", "active"}, sdk.options) == true {
+	if vs.GetPath(sdk.options, []any{"feature", "test", "active"}) == true {
 		sdk.Mode = "test"
 	}
 
@@ -48,7 +48,7 @@ func NewProjectNameSDK(options map[string]any) *ProjectNameSDK {
 	// must be added before them to sit at the base of the chain.
 	featureOpts := ToMapAny(vs.GetProp(sdk.options, "feature"))
 	if featureOpts != nil {
-		if fo, ok := vs.GetPath([]any{"__derived__", "featureorder"}, sdk.options).([]any); ok {
+		if fo, ok := vs.GetPath(sdk.options, []any{"__derived__", "featureorder"}).([]any); ok {
 			for _, n := range fo {
 				fname, _ := n.(string)
 				fopts := ToMapAny(featureOpts[fname])
@@ -188,12 +188,12 @@ func (sdk *ProjectNameSDK) Direct(fetchargs map[string]any) (map[string]any, err
 
 // Is this raw-access op permitted by the SDK's allow.op option?
 func (sdk *ProjectNameSDK) opAllowed(op string) bool {
-	allowOp, _ := vs.GetPath([]any{"allow", "op"}, sdk.options).(string)
+	allowOp, _ := vs.GetPath(sdk.options, []any{"allow", "op"}).(string)
 	return strings.Contains(allowOp, op)
 }
 
 func (sdk *ProjectNameSDK) opDenied(op string) map[string]any {
-	allowOp, _ := vs.GetPath([]any{"allow", "op"}, sdk.options).(string)
+	allowOp, _ := vs.GetPath(sdk.options, []any{"allow", "op"}).(string)
 	return map[string]any{
 		"ok": false,
 		"err": fmt.Errorf("ProjectNameSDK: %s: operation not allowed by"+
@@ -322,7 +322,7 @@ func (sdk *ProjectNameSDK) Graphql(
 	// body, and the raw path represents a non-2xx as ok:false with no err —
 	// so returning early on status would discard the server's own
 	// diagnostics, which are the only useful part of that response.
-	errors, _ := vs.GetPath([]any{"data", "errors"}, res).([]any)
+	errors, _ := vs.GetPath(res, []any{"data", "errors"}).([]any)
 
 	if 0 < len(errors) {
 		msg, _ := vs.GetProp(errors[0], "message").(string)

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

@@ -7,6 +7,12 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  targetFeatures,
+} from '@voxgig/sdkgen'
+
+
+import {
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -37,7 +43,10 @@ const Config = cmp(async function Config(props: any) {
   const javapackage = javaPackage(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`) || {}
 
@@ -71,6 +80,18 @@ const Config = cmp(async function Config(props: any) {
   const options: Record<string, any> = {
     base: baseUrl,
   }
+
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see MakeOptions).
+  // Without this block the placeholder reaches the wire verbatim — java
+  // shipped `http://host/api/{account_id}/element` as a real URL, which is
+  // worse than the construction error every other target raises.
+  const svars = serverVariables(model)
+  if (0 < svars.length) {
+    options.server = svars.reduce(
+      (a: any, v: any) => (a[v.name] = v.dflt, a), {} as Record<string, string>)
+  }
+
   if (authActive) {
     options.auth = { prefix: authPrefix }
   }

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

@@ -4,6 +4,8 @@ import * as Path from 'node:path'
 import {
   cmp, each,
   File, Content, Copy, Folder, Fragment,
+  targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -34,7 +36,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)
 
   // The Java package root for every runtime piece (like GOMODULE for go):
   // e.g. voxgig.solardemosdk -> voxgig.solardemosdk.core etc.
@@ -48,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/ReadmeQuick_java.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, opRequestShape, entityIdField, entityOps } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, opRequestShape, entityIdField, entityOps , serverVariables} from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -32,6 +32,18 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
 
   const authActive = isAuthActive(model)
 
+  // Server variables (a templated server URL) are REQUIRED at construction
+  // - the SDK throws 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 javaServerLines = 0 === svars.length ? '' :
+    'Map<String, Object> server = new java.util.LinkedHashMap<>();\n' +
+    svars.map((v: any) =>
+      `server.put("${v.name}", "<${v.name}>");\n`).join('') +
+    'options.put("server", server);\n'
+
+
   // A type-correct Java literal for a param — the loose object model means
   // all values live in a Map<String, Object>.
   const javaLit = (type: any, placeholder: string = 'example'): string => {
@@ -52,7 +64,7 @@ import ${javaPackage(model)}.core.${SDK};
 
 Map<String, Object> options = new java.util.LinkedHashMap<>();
 options.put("apikey", System.getenv("${envName(model)}_APIKEY"));
-${SDK} client = new ${SDK}(options);
+${javaServerLines}${SDK} client = new ${SDK}(options);
 \`\`\`
 
 `)
@@ -63,7 +75,9 @@ ${SDK} client = new ${SDK}(options);
 \`\`\`java
 import ${javaPackage(model)}.core.${SDK};
 
-${SDK} client = new ${SDK}();
+${'' === javaServerLines
+      ? `${SDK} client = new ${SDK}();`
+      : `Map<String, Object> options = new java.util.LinkedHashMap<>();\n${javaServerLines}${SDK} client = new ${SDK}(options);`}
 \`\`\`
 
 `)

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, entityIdField, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, canonScalarKey, entityIdField, opRequestShape , serverVariables} from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -35,6 +35,18 @@ const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
 
   const authActive = isAuthActive(model)
 
+  // Server variables (a templated server URL) are REQUIRED at construction
+  // - the SDK throws 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 javaServerLines = 0 === svars.length ? '' :
+    'Map<String, Object> server = new java.util.LinkedHashMap<>();\n' +
+    svars.map((v: any) =>
+      `server.put("${v.name}", "<${v.name}>");\n`).join('') +
+    'options.put("server", server);\n'
+
+
   Content(`\`\`\`java
 import ${javaPackage(model)}.core.${SDK};
 
@@ -43,12 +55,14 @@ import ${javaPackage(model)}.core.${SDK};
   if (authActive) {
     Content(`Map<String, Object> options = new java.util.LinkedHashMap<>();
 options.put("apikey", System.getenv("${envName(model)}_APIKEY"));
-${SDK} client = new ${SDK}(options);
+${javaServerLines}${SDK} client = new ${SDK}(options);
 
 `)
   }
   else {
-    Content(`${SDK} client = new ${SDK}();
+    Content(`${'' === javaServerLines
+      ? `${SDK} client = new ${SDK}();`
+      : `Map<String, Object> options = new java.util.LinkedHashMap<>();\n${javaServerLines}${SDK} client = new ${SDK}(options);`}
 
 `)
   }

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

@@ -11,7 +11,9 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive, envName, envToken
+  isAuthActive,
+  serverVarEnv,
+  serverVariables, envName, envToken
 } from '@voxgig/sdkgen'
 
 
@@ -87,6 +89,20 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
 
+
+  // A templated server URL (OpenAPI server variables) makes a LIVE client
+  // impossible to construct without values: MakeOptions throws 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) => `    envm.put("${serverVarEnv(PROJECTNAME, v.name)}", ${JSON.stringify(v.dflt)});\n`).join('')
+  const serverLiveField = 0 === svars.length ? '' :
+    `      Map<String, Object> serveropt = new LinkedHashMap<>();\n` +
+    svars.map((v: any) =>
+      `      serveropt.put("${v.name}", env.get("${serverVarEnv(PROJECTNAME, v.name)}"));\n`).join('') +
+    `      mergedOpts.put("server", serveropt);\n`
+
   const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
@@ -465,7 +481,7 @@ ${loadSkipBlock}    ${SDK} client = setup.client;
     Map<String, Object> envm = new LinkedHashMap<>();
     envm.put("${entidEnvVar}", new LinkedHashMap<>());
     envm.put("${PROJECTNAME}_TEST_LIVE", "FALSE");
-${authActive ? `    envm.put("${PROJECTNAME}_APIKEY", "NONE");\n` : ''}    Map<String, Object> env = RunnerSupport.envOverride(envm);
+${authActive ? `    envm.put("${PROJECTNAME}_APIKEY", "");\n` : ''}${serverEnvEntry}    Map<String, Object> env = RunnerSupport.envOverride(envm);
 
     boolean live = "TRUE".equals(env.get("${PROJECTNAME}_TEST_LIVE"));
 
@@ -473,8 +489,11 @@ ${authActive ? `    envm.put("${PROJECTNAME}_APIKEY", "NONE");\n` : ''}    Map<S
     setup.calls = calls;
 
     if (live) {
-      Map<String, Object> mergedOpts = new LinkedHashMap<>();
-${authActive ? `      mergedOpts.put("apikey", env.get("${PROJECTNAME}_APIKEY"));\n` : ''}      setup.client = new ${SDK}(mergedOpts);
+      // sdk-test-control.json's test.client.options seeds the live
+      // client; the generated fields below overwrite anything they name.
+      Map<String, Object> mergedOpts =
+          new LinkedHashMap<>(RunnerSupport.liveClientOptions());
+${authActive ? `      mergedOpts.put("apikey", env.get("${PROJECTNAME}_APIKEY"));\n` : ''}${serverLiveField}      setup.client = new ${SDK}(mergedOpts);
       setup.live = true;
 
       Map<String, Object> idmap = new LinkedHashMap<>();

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

@@ -17,7 +17,9 @@ import {
   each,
   buildIdNames,
   getMatchEntries,
-  isAuthActive, envName, envToken
+  isAuthActive,
+  serverVarEnv,
+  serverVariables, envName, envToken
 } from '@voxgig/sdkgen'
 
 
@@ -67,6 +69,20 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const authActive = isAuthActive(model)
 
+
+  // A templated server URL (OpenAPI server variables) makes a LIVE client
+  // impossible to construct without values: MakeOptions throws 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) => `    envm.put("${serverVarEnv(PROJUPPER, v.name)}", ${JSON.stringify(v.dflt)});\n`).join('')
+  const serverLiveField = 0 === svars.length ? '' :
+    `      Map<String, Object> serveropt = new LinkedHashMap<>();\n` +
+    svars.map((v: any) =>
+      `      serveropt.put("${v.name}", env.get("${serverVarEnv(PROJUPPER, v.name)}"));\n`).join('') +
+    `      liveOpts.put("server", serveropt);\n`
+
   const idnames = buildIdNames(entity, basicflow)
 
   // Get all update data entries for alias generation
@@ -256,7 +272,7 @@ ${allSteps.length > 0 ? `    ${SDK} client = setup.client;\n\n` : ''}`)
     envm.put("${entidEnvVar}", idmap);
     envm.put("${PROJUPPER}_TEST_LIVE", "FALSE");
     envm.put("${PROJUPPER}_TEST_EXPLAIN", "FALSE");
-${authActive ? `    envm.put("${PROJUPPER}_APIKEY", "NONE");\n` : ''}    Map<String, Object> env = RunnerSupport.envOverride(envm);
+${authActive ? `    envm.put("${PROJUPPER}_APIKEY", "");\n` : ''}${serverEnvEntry}    Map<String, Object> env = RunnerSupport.envOverride(envm);
 
     Map<String, Object> idmapResolved = Helpers.toMapAny(env.get("${entidEnvVar}"));
     if (idmapResolved == null) {
@@ -276,8 +292,17 @@ ${authActive ? `    envm.put("${PROJUPPER}_APIKEY", "NONE");\n` : ''}    Map<Str
     Content(`
     boolean live = "TRUE".equals(env.get("${PROJUPPER}_TEST_LIVE"));
     if (live) {
-      Map<String, Object> liveOpts = new LinkedHashMap<>();
-${authActive ? `      liveOpts.put("apikey", env.get("${PROJUPPER}_APIKEY"));\n` : ''}      Object mergedOpts = Struct.merge(Struct.jt(liveOpts, extra));
+      // sdk-test-control.json's test.client.options seeds the live
+      // client; the generated fields below overwrite anything they name.
+      Map<String, Object> liveOpts =
+          new LinkedHashMap<>(RunnerSupport.liveClientOptions());
+${authActive ? `      liveOpts.put("apikey", env.get("${PROJUPPER}_APIKEY"));\n` : ''}${serverLiveField}      // An empty map, not a null one: merge answers null when its last
+      // entry is null, and basicSetup is normally called with no extras -
+      // so a bare null silently discarded the apikey and server values
+      // above.
+      Map<String, Object> extraOpts =
+          extra == null ? new LinkedHashMap<>() : extra;
+      Object mergedOpts = Struct.merge(Struct.jt(liveOpts, extraOpts));
       client = new ${SDK}(Helpers.toMapAny(mergedOpts));
     }
 

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

@@ -17,6 +17,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 ff = Path.normalize(__dirname + '/../../../src/cmp/js/fragment/')
 

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

@@ -5,6 +5,8 @@ import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
   entityClassName, entityCollection, srcFeatureExcludes, stationLibrary,
+  targetFeatures,
+  TEST_CONTROL_EXCLUDE
 } from '@voxgig/sdkgen'
 
 
@@ -35,7 +37,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)
 
   Package({ target })
 
@@ -45,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/Package_js.ts

@@ -13,6 +13,7 @@ import {
   PUBLISHER_URL,
   packageVersion,
   authorInfo,
+  targetFeatures,
 } from '@voxgig/sdkgen'
 
 
@@ -36,7 +37,9 @@ const Package = cmp(async function Package(props: any) {
   // constant here did.
   const author = authorInfo(model, target.name)
 
-  const feature = getModelPath(model, `main.${KIT}.feature`)
+  // Gated by applicability: a feature that does not apply to this
+  // target must not inject its deps into the generated manifest.
+  const feature = targetFeatures(model, target)
 
   const only = (kind: string, deps: any) =>
     omap(deps, ([k, v]: any) => [v.active && kind === v.kind ? k : undefined, v.version])

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

@@ -17,7 +17,10 @@ import {
   cmp,
   snakify,
   isAuthActive,
-  jsProp, envName, envToken
+  serverVarEnv,
+  serverVariables,
+  jsProp, envName, envToken,
+  jsKey
 } from '@voxgig/sdkgen'
 
 
@@ -41,13 +44,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 +100,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('{')) {