@voxgig/sdkgen 3.6.0 → 3.7.0

package/project/.sdk/src/cmp/c/Config_c.ts

@@ -31,6 +31,7 @@ import {
 // instantiate features named in the options (mirrors Config_rust).
 const Config = cmp(async function Config(props: any) {
   const ctx$ = props.ctx$
+  const target = props.target
 
   const model: Model = ctx$.model
 
@@ -72,20 +73,25 @@ const Config = cmp(async function Config(props: any) {
       relations: n.relations,
     }, true), a), {})
 
+  // 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 the same
+  // config by construction. The JSON is what the threshold is measured on -
+  // emitted source size varies by language, the model does not. Passing
+  // target.name opts this target into the main slug/version/target identity
+  // fields (read by station's descriptor - see configDefinition).
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
+  const asData = isConfigData(configJson, configReprSetting(model))
+
   const config = {
-    main: { name: model.const.Name },
+    // main from configDefinition's def, not re-derived here, so the literal
+    // rep and the data rep cannot disagree on identity (the Config_ts
+    // #MainMeta discipline): name plus slug/version/target.
+    main: configDef.main,
     feature: featureConfig,
     options,
     entity: entityConfig,
   }
 
-  // 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 the same
-  // config by construction. The JSON is what the threshold is measured on -
-  // emitted source size varies by language, the model does not.
-  const { json: configJson } = configDefinition(model)
-  const asData = isConfigData(configJson, configReprSetting(model))
-
   File({ name: 'config.c' }, () => {
 
     // ABOVE THE THRESHOLD: emit the model as DATA.
@@ -137,8 +143,6 @@ voxgig_value* shared_config(void) {
   }
   return shared_config_val;
 }
-
-Feature* make_feature(const char* name) {
 `)
     }
     else {
@@ -174,8 +178,6 @@ voxgig_value* shared_config(void) {
   }
   return shared_config_val;
 }
-
-Feature* make_feature(const char* name) {
 `)
     }
 
@@ -192,7 +194,26 @@ Feature* make_feature(const char* name) {
     each(feature, (f: any) => {
       if (f.name && f.name !== 'base') featureNames.add(f.name)
     })
-    for (const fname of Array.from(featureNames).sort()) {
+    const sortedNames = Array.from(featureNames).sort()
+
+    // Constructor prototypes for every declared feature. sdk.h declares the
+    // BUNDLED set, but an externally-installed feature (e.g. station, whose
+    // source arrives by package overlay) is not in sdk.h — and without a
+    // prototype its make_feature arm is an implicit int-returning
+    // declaration: a warning that happens to link on gcc 13, a hard error on
+    // gcc 14+/clang 15+. Redeclaring the bundled ones is identical-prototype
+    // C, which is legal and keeps this a single sorted list.
+    Content(`
+`)
+    for (const fname of sortedNames) {
+      Content(`Feature* feature_${fname}_new(void);
+`)
+    }
+
+    Content(`
+Feature* make_feature(const char* name) {
+`)
+    for (const fname of sortedNames) {
       Content(`  if (strcmp(name, "${fname}") == 0) return feature_${fname}_new();
 `)
     }

package/project/.sdk/src/cmp/cpp/Config_cpp.ts

@@ -3,9 +3,8 @@ import {
   Content,
   File,
   cmp,
+  configDefinition,
   each,
-  isAuthActive,
-  resolveAuthPrefix,
 } from '@voxgig/sdkgen'
 
 
@@ -17,7 +16,6 @@ import {
 
 
 import {
-  cleanModel,
   cppConfigLiterals,
 } from './utility_cpp'
 
@@ -32,50 +30,15 @@ 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`)
 
-  const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
-
-  const authActive = isAuthActive(model)
-  const authPrefix = resolveAuthPrefix(model)
-
-  let baseUrl = ''
-  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
-
-  const featureConfig: Record<string, any> = {}
-  each(feature, (f: any) => {
-    featureConfig[f.name] = cleanModel(f.config || {})
-  })
-
-  const optionsEntity: Record<string, any> = {}
-  each(entity, (ent: any) => {
-    optionsEntity[ent.name] = {}
-  })
-
-  const options: Record<string, any> = {
-    base: baseUrl,
-  }
-  if (authActive) {
-    options.auth = { prefix: authPrefix }
-  }
-  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), {})
-
-  const config = {
-    main: { name: model.const.Name },
-    feature: featureConfig,
-    options,
-    entity: entityConfig,
-  }
+  // The embedded config, built by the shared helper so this target's shapes
+  // and identity fields stay in step with the ts reference by construction.
+  // Passing target.name opts cpp into main.slug/version/target (the station
+  // descriptor identity, ts/src/utility.ts configDefinition) - cpp has only
+  // the data rep (one chunked JSON literal), so this is the whole #MainMeta
+  // story for this target.
+  const { def: configDef } = configDefinition(model, target.name)
 
   File({ name: 'config.' + target.ext }, () => {
 
@@ -104,7 +67,7 @@ namespace sdk {
 
 inline const char* config_json() {
   return
-${cppConfigLiterals(config)};
+${cppConfigLiterals(configDef)};
 }
 
 inline Value makeConfig() { return vs::parse_json(config_json()); }

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

@@ -39,7 +39,13 @@ const Config = cmp(async function Config(props: any) {
   // literal and the data that replaces it above the threshold are the same
   // config by construction. The JSON is what the threshold is measured on -
   // emitted source size varies by language, the model does not.
-  const { def: configDef, json: configJson } = configDefinition(model)
+  //
+  // Passing target.name opts this target into main.slug / main.version /
+  // main.target (the three station descriptor fields, station design §4):
+  // both reps flow from this one call - the literal via formatCsMap(configDef)
+  // and the data rep via csStringLiteral(configJson) - so they cannot
+  // disagree on identity (mirrors Config_ts's #MainMeta block).
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'Config.' + target.ext }, () => {

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

@@ -71,8 +71,10 @@ const Config = cmp(async function Config(props: any) {
   // 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 the same
   // config by construction. The JSON is what the threshold is measured on -
-  // emitted source size varies by language, the model does not.
-  const { def: configDef, json: configJson } = configDefinition(model)
+  // emitted source size varies by language, the model does not. Passing
+  // target.name opts this target into the main slug/version/target identity
+  // fields (read by station's descriptor - see configDefinition).
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'Config.' + target.ext }, () => {
@@ -115,6 +117,16 @@ const Config = cmp(async function Config(props: any) {
         // these; this one did not.
         ...ctx$.stdrep,
 
+        // Identity beyond the camel Name: slug/version/target (station
+        // descriptor inputs). Values from configDefinition's def, not
+        // re-derived here, so the literal rep and the data rep cannot
+        // disagree (the Config_ts #MainMeta discipline).
+        '// #MainMeta': () => {
+          Line(`    'slug': ${dartValue(configDef.main.slug)},`)
+          Line(`    'version': ${dartValue(configDef.main.version)},`)
+          Line(`    'target': ${dartValue(configDef.main.target)},`)
+        },
+
         // The whole options map from the canonical definition. Assembling it
         // slot by slot lost `options.server` entirely, so a spec with a
         // templated server URL described a different config either side of the

package/project/.sdk/src/cmp/dart/fragment/Config.data.fragment.dart

@@ -52,6 +52,11 @@ class Config {
     return fc();
   }
 
+  // False for a feature added at runtime via options.extend (station's
+  // adopt path) - the constructor uses this to skip makeFeature for names
+  // no generated class backs.
+  bool hasFeature(String fn) => null != FEATURE_CLASS[fn];
+
   // The same fields the literal declares - same names, same types, same
   // finalness - so callers cannot tell which representation they were given.
   final Map<String, dynamic> main;

package/project/.sdk/src/cmp/dart/fragment/Config.fragment.dart

@@ -16,8 +16,14 @@ class Config {
     return fc();
   }
 
+  // False for a feature added at runtime via options.extend (station's
+  // adopt path) - the constructor uses this to skip makeFeature for names
+  // no generated class backs.
+  bool hasFeature(String fn) => null != FEATURE_CLASS[fn];
+
   final Map<String, dynamic> main = <String, dynamic>{
     'name': 'ProjectName',
+    // #MainMeta
   };
 
   final Map<String, dynamic> feature = <String, dynamic>{

package/project/.sdk/src/cmp/dart/fragment/Main.fragment.dart

@@ -69,19 +69,28 @@ class ProjectNameSDK {
     // `test` feature installs the base mock transport and the transport
     // features (retry/cache/netsim/proxy/ratelimit) wrap whatever is current,
     // so `test` must be added before them to sit at the base of the chain.
+    final List extendList =
+        _options['extend'] is List ? _options['extend'] : [];
+
     final featureorder =
         struct.getpath(_options, '__derived__.featureorder') ?? [];
     for (final fname in featureorder) {
       final fopts = _options['feature'][fname];
       if (fopts is Map && true == fopts['active']) {
+        // An active name with no generated class is legal when an
+        // extend-supplied instance carries that name (station's adopt
+        // path): the instance is added below, positioned by its own
+        // __after__ entry, so skip it here rather than fail construction.
+        if (!config.hasFeature(fname.toString()) &&
+            extendList.any((f) => fname.toString() == f.name.toString())) {
+          continue;
+        }
         featureAdd(rootctx, config.makeFeature(fname.toString()));
       }
     }
 
-    if (null != _options['extend']) {
-      for (final f in _options['extend']) {
-        featureAdd(rootctx, f);
-      }
+    for (final f in extendList) {
+      featureAdd(rootctx, f);
     }
 
     for (final f in features) {

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

@@ -29,6 +29,7 @@ import {
 
 const Config = cmp(async function Config(props: any) {
   const ctx$ = props.ctx$
+  const target = props.target
   const model: Model = ctx$.model
 
   const Name = model.const.Name
@@ -60,7 +61,11 @@ const Config = cmp(async function Config(props: any) {
     // target's literal and the data that replaces it above the threshold are
     // the same config by construction. The JSON is what the threshold is
     // measured on - emitted source size varies by language, the model does not.
-    const { def: configDef, json: configJson } = configDefinition(model)
+    // Passing target.name opts in to the main slug/version/target identity
+    // fields (station descriptor input, mirrors Config_ts) - both reps below
+    // render from this same def, so the data and literal branches pick the
+    // fields up together.
+    const { def: configDef, json: configJson } = configDefinition(model, target.name)
     const asData = isConfigData(configJson, configReprSetting(model))
 
     File({ name: 'config.ex' }, () => {
@@ -159,7 +164,12 @@ end
 defmodule ${Name}.Config do
   def make_config do
     ${Name}.Helpers.deep(%{
-      "main" => %{"name" => ${elixirString(Name)}},
+      "main" => %{
+        "name" => ${elixirString(Name)},
+        "slug" => ${elixirString(String(configDef.main.slug))},
+        "version" => ${elixirString(String(configDef.main.version))},
+        "target" => ${elixirString(String(configDef.main.target))}
+      },
       "feature" => %{
 `)
 

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

@@ -3,6 +3,7 @@ import {
   Content,
   File,
   cmp,
+  collectDeps,
   pkgDescription,
   repoInfo,
   packageVersion,
@@ -15,7 +16,11 @@ import type {
 
 
 // Generate mix.exs for the Elixir SDK. The vendored struct library has zero
-// third-party runtime deps, so the SDK ships with none either.
+// third-party runtime deps, so a bare SDK ships with none - but dependencies
+// declared by the model DO flow: the target's own `deps` block plus any
+// feature-declared elixir deps (e.g. the station feature's voxgig_station),
+// via the shared collectDeps helper, exactly like rust/dart/go. A model with
+// no deps emits the byte-identical `defp deps, do: []` it always has.
 const Package = cmp(async function Package(props: any) {
   const ctx$ = props.ctx$
   const target = props.target
@@ -27,6 +32,31 @@ const Package = cmp(async function Package(props: any) {
   const app = String(model.const.name).replace(/-/g, '_')
   const { repoUrl } = repoInfo(model)
 
+  // Render one mix deps entry per collected dependency. Hex package names
+  // share the atom alphabet, but a hyphen in a model dep name is mapped to
+  // '_' rather than emitted broken. Version -> Mix requirement: an explicit
+  // operator is kept (spaced, the mix convention: '>=0.0.1' -> '>= 0.0.1');
+  // a bare version gets hex's customary '~>'; a target dep with no version
+  // accepts anything. kind: 'dev' scopes to [:dev, :test]; 'peer'/'prod'
+  // (and anything else) are runtime deps - mix has no peer notion.
+  const entries: string[] = []
+  for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
+    const atom = String(d.name).replace(/-/g, '_')
+    const version = null == d.version || '' === String(d.version).trim()
+      ? '>= 0.0.0'
+      : mixRequirement(String(d.version).trim())
+    const scope = 'dev' === (d.raw as any)?.kind ? ', only: [:dev, :test]' : ''
+    entries.push(`{:${atom}, ${JSON.stringify(version)}${scope}}`)
+  }
+
+  const depsBlock = 0 === entries.length
+    ? `  defp deps, do: []`
+    : `  defp deps do
+    [
+      ${entries.join(',\n      ')}
+    ]
+  end`
+
   File({ name: 'mix.exs' }, () => {
     Content(`defmodule ${Name}.MixProject do
   use Mix.Project
@@ -46,7 +76,7 @@ const Package = cmp(async function Package(props: any) {
 
   def application, do: [extra_applications: [:inets, :ssl]]
 
-  defp deps, do: []
+${depsBlock}
 
   defp elixirc_paths(:test), do: ["lib", "test/support"]
   defp elixirc_paths(_), do: ["lib"]
@@ -63,6 +93,15 @@ end
 })
 
 
+function mixRequirement(version: string): string {
+  const m = version.match(/^(>=|<=|~>|==|!=|>|<)\s*(.+)$/)
+  if (null != m) {
+    return m[1] + ' ' + m[2]
+  }
+  return '~> ' + version
+}
+
+
 export {
   Package
 }

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

@@ -69,7 +69,7 @@ const Config = cmp(async function Config(props: any) {
   // literal and the data that replaces it above the threshold are the same
   // config by construction. The JSON is what the threshold is measured on -
   // emitted source size varies by language, the model does not.
-  const { json: configJson } = configDefinition(model)
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'config.' + target.ext }, () => {
@@ -154,6 +154,10 @@ import (
 
 `)
 
+    // main slug/version/target come from configDefinition's def, not
+    // re-derived here, so the literal rep and the data rep cannot disagree
+    // on identity (mirrors Config_ts's #MainMeta block; station's
+    // descriptor reads all three).
     Content(`// MakeConfig builds a fresh, fully materialised config map. Every call
 // rebuilds the whole structure, so prefer SharedConfig unless you need a
 // private copy you intend to mutate.
@@ -161,6 +165,9 @@ func MakeConfig() map[string]any {
 	return map[string]any{
 		"main": map[string]any{
 			"name": "${model.const.Name}",
+			"slug": ${JSON.stringify(configDef.main.slug)},
+			"version": ${JSON.stringify(configDef.main.version)},
+			"target": ${JSON.stringify(configDef.main.target)},
 		},
 		"feature": map[string]any{
 `)

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

@@ -3,6 +3,7 @@ import {
   Content,
   File,
   cmp,
+  configDefinition,
   each,
   isAuthActive,
   resolveAuthPrefix,
@@ -75,8 +76,14 @@ const Config = cmp(async function Config(props: any) {
       relations: n.relations,
     }, true), a), {})
 
+  // Identity comes from configDefinition's def, not re-derived here, so
+  // this target cannot disagree with the shared emitter on main.slug /
+  // main.version / main.target (the three station descriptor fields,
+  // station design §4) — passing target.name is what opts this target in.
+  const { def: configDef } = configDefinition(model, target.name)
+
   const config = {
-    main: { name: model.const.Name },
+    main: configDef.main,
     feature: featureConfig,
     options,
     entity: entityConfig,

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

@@ -81,7 +81,7 @@ const Config = cmp(async function Config(props: any) {
   // literal and the data that replaces it above the threshold are the same
   // config by construction. The JSON is what the threshold is measured on -
   // emitted source size varies by language, the model does not.
-  const { json: configJson } = configDefinition(model)
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'Config.' + target.ext }, () => {
@@ -128,6 +128,14 @@ const Config = cmp(async function Config(props: any) {
             `require('./feature/${f.name}/${nom(f, 'Name')}Feature')`)
         }),
 
+        // Values from configDefinition's def, not re-derived here, so the
+        // literal rep and the data rep cannot disagree on identity.
+        '// #MainMeta': () => {
+          Line(`    slug: ${JSON.stringify(configDef.main.slug)},`)
+          Line(`    version: ${JSON.stringify(configDef.main.version)},`)
+          Line(`    target: ${JSON.stringify(configDef.main.target)},`)
+        },
+
         '// #FeatureClasses': () => each(feature, (f: any) => {
           // Trailing comma: the map has one entry per feature, so entries
           // must be comma-separated (a single feature hid this until now).

package/project/.sdk/src/cmp/js/fragment/Config.data.fragment.js

@@ -34,6 +34,13 @@ class Config {
     return fi
   }
 
+  // False for a feature added at runtime via options.extend (station's
+  // adopt path) - the constructor uses this to skip makeFeature for names
+  // no generated class backs.
+  hasFeature(fn) {
+    return null != FEATURE_CLASS[fn]
+  }
+
 }
 
 

package/project/.sdk/src/cmp/js/fragment/Config.fragment.js

@@ -17,9 +17,17 @@ class Config {
     return fi
   }
 
+  // False for a feature added at runtime via options.extend (station's
+  // adopt path) - the constructor uses this to skip makeFeature for names
+  // no generated class backs.
+  hasFeature(fn) {
+    return null != FEATURE_CLASS[fn]
+  }
+
 
   main = {
     name: '$$const.Name$$',
+    // #MainMeta
   }
 
 

package/project/.sdk/src/cmp/js/fragment/Main.fragment.js

@@ -50,18 +50,26 @@ class ProjectNameSDK {
     // the `test` feature installs the base mock transport and the transport
     // features (retry/cache/netsim/proxy/ratelimit) wrap whatever is current,
     // so `test` must be added before them to sit at the base of the chain.
+    const extend = this._options.extend || []
+
     const featureorder = getpath(this._options, '__derived__.featureorder') || []
     for (const fname of featureorder) {
       const fopts = this._options.feature[fname] || {}
       if (fopts.active) {
+        // An active name with no generated class is legal when an
+        // extend-supplied instance carries that name (station's adopt
+        // path): the instance is added below, positioned by its own
+        // __after__ entry, so skip it here rather than fail construction.
+        if (!this._rootctx.config.hasFeature(fname) &&
+          extend.some((f) => fname === f.name)) {
+          continue
+        }
         featureAdd(this._rootctx, this._rootctx.config.makeFeature(fname))
       }
     }
 
-    if (null != this._options.extend) {
-      for (let f of this._options.extend) {
-        featureAdd(this._rootctx, f)
-      }
+    for (let f of extend) {
+      featureAdd(this._rootctx, f)
     }
 
     for (let f of this._features) {
@@ -185,7 +193,27 @@ class ProjectNameSDK {
       }
 
       const status = fetched.status
-      const json = 'function' === typeof fetched.json ? await fetched.json() : fetched.json
+
+      // No body responses (204 No Content, 304 Not Modified) and explicit
+      // zero content-length must skip JSON parsing — fetched.json() would
+      // throw `Unexpected end of JSON input` on an empty body.
+      const headers = fetched.headers
+      const contentLength = headers && 'function' === typeof headers.get
+        ? headers.get('content-length')
+        : (headers || {})['content-length']
+      const noBody = 204 === status || 304 === status || '0' === String(contentLength)
+
+      let json = undefined
+      if (!noBody) {
+        try {
+          json = 'function' === typeof fetched.json ? await fetched.json() : fetched.json
+        }
+        catch (parseErr) {
+          // Body wasn't valid JSON — surface the raw response rather than
+          // throwing. data stays undefined; callers can inspect status/headers.
+          json = undefined
+        }
+      }
 
       return {
         ok: status >= 200 && status < 300,

package/project/.sdk/src/cmp/kotlin/Config_kotlin.ts

@@ -3,6 +3,7 @@ import {
   Content,
   File,
   cmp,
+  configDefinition,
   each,
   isAuthActive,
   resolveAuthPrefix,
@@ -72,8 +73,14 @@ const Config = cmp(async function Config(props: any) {
       relations: n.relations,
     }, true), a), {})
 
+  // Identity comes from configDefinition's def, not re-derived here, so
+  // this target cannot disagree with the shared emitter on main.slug /
+  // main.version / main.target (the three station descriptor fields,
+  // station design §4) — passing target.name is what opts this target in.
+  const { def: configDef } = configDefinition(model, target.name)
+
   const config = {
-    main: { name: model.const.Name },
+    main: configDef.main,
     feature: featureConfig,
     options,
     entity: entityConfig,

package/project/.sdk/src/cmp/lua/Config_lua.ts

@@ -68,8 +68,11 @@ const Config = cmp(async function Config(props: any) {
   // 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 the same
   // config by construction. The JSON is what the threshold is measured on -
-  // emitted source size varies by language, the model does not.
-  const { json: configJson } = configDefinition(model)
+  // emitted source size varies by language, the model does not. Passing the
+  // target name opts this target into the main slug/version/target identity
+  // fields (station descriptor v1 reads all three) - the literal branch
+  // below emits them too, so the two representations cannot diverge.
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'config.' + target.ext }, () => {
@@ -112,6 +115,9 @@ end
     }
     else {
 
+    // Identity values from configDefinition's def, not re-derived here, so
+    // the literal rep and the data rep cannot disagree (the ts #MainMeta
+    // discipline).
     Content(`-- Build a fresh, fully materialised config table. Every call rebuilds the
 -- whole structure, so prefer require("config_shared") unless you need a
 -- private copy you intend to mutate.
@@ -119,6 +125,9 @@ local function make_config()
   return {
     main = {
       name = "${model.const.Name}",
+      slug = ${JSON.stringify(configDef.main.slug)},
+      version = ${JSON.stringify(configDef.main.version)},
+      target = ${JSON.stringify(configDef.main.target)},
     },
     feature = {
 `)