@voxgig/sdkgen 3.5.1 → 3.7.0

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/kotlin/Test_kotlin.ts

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder } from '@voxgig/sdkgen'
+import { cmp, each, Folder, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_kotlin'
@@ -30,7 +25,9 @@ const Test = cmp(function Test(props: any) {
     // CustomUtilityTest, StructRunner/StructCorpusTest, ExistsTest and
     // sdk-test-control.json) ships as templates in tm/kotlin/test/ and is
     // copied by Main_kotlin. Here we generate only the API-specific tests.
-    each(model.main[KIT].entity, (entity: ModelEntity) => {
+    const entity = each(entityCollection(model))
+      .filter((e: any) => false !== e.active)
+    each(entity, (entity: ModelEntity) => {
       TestEntity({ target, entity, kotlinpackage })
       TestDirect({ target, entity, kotlinpackage })
     })

package/project/.sdk/src/cmp/lean/Test_lean.ts

@@ -4,12 +4,11 @@ import {
   Folder,
   cmp,
   each,
+  entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
-  KIT,
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
@@ -70,7 +69,8 @@ const Test = cmp(async function Test(props: any) {
   const target = props.target
   const model: Model = ctx$.model
 
-  const entity = getModelPath(model, `main.${KIT}.entity`)
+  const entity = each(entityCollection(model))
+    .filter((e: any) => false !== e.active)
 
   // Per-entity OFFLINE (test-mode) blocks: seeded store, no server.
   let offline = ''

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 = {
 `)

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

@@ -4,6 +4,7 @@ import {
   File,
   cmp,
   collectDeps,
+  each,
   pkgDescription,
   keywords,
   repoInfo, packageName,
@@ -11,6 +12,11 @@ import {
 } from '@voxgig/sdkgen'
 
 
+import {
+  KIT,
+  getModelPath,
+} from '@voxgig/apidef'
+
 import type {
   Model,
 } from '@voxgig/apidef'
@@ -27,7 +33,7 @@ const Package = cmp(async function Package(props: any) {
   // (`${model.name}_sdk`) used by `require` is unchanged.
   const ns = model.origin || 'voxgig-sdk'
   const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
-  const rockName = packageName(model, 'lua')
+  const rockName = packageName(model, target.name)
   const { repoUrl, issuesUrl } = repoInfo(model)
   const labels = keywords(model).map((k) => `"${k}"`).join(', ')
 
@@ -46,7 +52,7 @@ source = {
   dir = "${model.name}-sdk/lua"
 }
 description = {
-  summary = "${pkgDescription(model, 'lua')}",
+  summary = "${pkgDescription(model, target.name)}",
   homepage = "${repoUrl}",
   issues_url = "${issuesUrl}",
   license = "MIT",
@@ -66,6 +72,23 @@ dependencies = {
 `)
     }
 
+    // Feature modules must be listed too, or an install-from-rock ships a
+    // features.lua whose requires cannot resolve. Emitted from the model
+    // (each = sorted order, byte-stable), plus the base feature every
+    // factory falls back to. The station feature additionally carries the
+    // VENDORED voxgig_station library beside its adapter (no voxgig-station
+    // rock exists to depend on - station design 9.2's registry-less tier).
+    const feature = getModelPath(model, `main.${KIT}.feature`)
+    let featureModules = `    ["feature.base_feature"] = "feature/base_feature.lua",\n`
+    each(feature, (f: any) => {
+      featureModules +=
+        `    ["feature.${f.name}_feature"] = "feature/${f.name}_feature.lua",\n`
+      if ('station' === f.name) {
+        featureModules +=
+          `    ["feature.station.voxgig_station"] = "feature/station/voxgig_station.lua",\n`
+      }
+    })
+
     Content(`}
 build = {
   type = "builtin",
@@ -74,7 +97,7 @@ build = {
     ["config"] = "config.lua",
     ["config_shared"] = "config_shared.lua",
     ["features"] = "features.lua",
-  }
+${featureModules}  }
 }
 `)
   })

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

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_lua'
@@ -37,7 +32,10 @@ end)
 `)
     })
 
-    each(model.main[KIT].entity, (entity: ModelEntity) => {
+    const entity = each(entityCollection(model))
+      .filter((e: any) => false !== e.active)
+
+    each(entity, (entity: ModelEntity) => {
       TestEntity({ target, entity })
       TestDirect({ target, entity })
     })

package/project/.sdk/src/cmp/ocaml/Test_ocaml.ts

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath,
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder } from '@voxgig/sdkgen'
+import { cmp, each, Folder, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_ocaml'
@@ -20,7 +15,8 @@ const Test = cmp(function Test(props: any) {
   const { model } = props.ctx$
   const { target } = props
 
-  const entity = getModelPath(model, `main.${KIT}.entity`)
+  const entity = each(entityCollection(model))
+    .filter((e: any) => false !== e.active)
 
   Folder({ name: 'test' }, () => {
     each(entity, (entity: ModelEntity) => {

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

@@ -3,24 +3,15 @@ import {
   Content,
   File,
   cmp,
-  each,
-  isAuthActive,
-  resolveAuthPrefix,
+  configDefinition,
 } from '@voxgig/sdkgen'
 
 
 import {
-  KIT,
   Model,
-  getModelPath,
 } from '@voxgig/apidef'
 
 
-import {
-  clean,
-} from './utility_perl'
-
-
 // The config is emitted as a JSON heredoc parsed at load time by the
 // vendored struct utility (Voxgig::Struct::parse_json). This keeps
 // booleans/nulls faithful (Perl has no native boolean scalar) and yields
@@ -32,57 +23,14 @@ 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)
-  // config.auth.prefix override -> spec-derived info.security.prefix -> 'Bearer'
-  const authPrefix = resolveAuthPrefix(model)
-
-  let baseUrl = ''
-  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
-
-  // Build the config structure with deterministic (sorted) key order for
-  // the model-derived collections (each() iterates sorted).
-  const featureBlock: any = {}
-  each(feature, (f: any) => {
-    featureBlock[f.name] = clean(f.config || {})
-  })
-
-  const entityOptions: any = {}
-  each(entity, (ent: any) => {
-    entityOptions[ent.name] = {}
-  })
-
-  const entityBlock: any = {}
-  each(entity, (ent: any) => {
-    entityBlock[ent.name] = clean({
-      fields: ent.fields,
-      name: ent.name,
-      op: ent.op,
-      relations: ent.relations,
-    }, true)
-  })
+  // THE canonical config object, from the shared helper - this component
+  // used to hand-assemble its own (and had already drifted: no server
+  // block, no identity beyond main.name). Passing the target name opts
+  // in to the main slug/version/target identity fields (station
+  // descriptor inputs), matching the ts/js/rb targets.
+  const { def: configDef } = configDefinition(model, target.name)
 
-  const options: any = {
-    base: baseUrl,
-  }
-  if (authActive) {
-    options.auth = { prefix: authPrefix }
-  }
-  options.headers = headers
-  options.entity = entityOptions
-
-  const config = {
-    main: { name: model.const.Name },
-    feature: featureBlock,
-    options,
-    entity: entityBlock,
-  }
-
-  const configJson = JSON.stringify(config, null, 2)
+  const configJson = JSON.stringify(configDef, null, 2)
 
   File({ name: 'config.pm' }, () => {
 

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

@@ -48,7 +48,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     NAME             => '${Name}SDK',
     VERSION_FROM     => 'lib/${Name}SDK.pm',
-    ABSTRACT         => '${pkgDescription(model, 'perl')}',
+    ABSTRACT         => '${pkgDescription(model, target.name)}',
     AUTHOR           => 'Voxgig',
     LICENSE          => 'mit',
     MIN_PERL_VERSION => '5.018',

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

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_perl'
@@ -42,7 +37,10 @@ done_testing();
 `)
     })
 
-    each(model.main[KIT].entity, (entity: ModelEntity) => {
+    const entity = each(entityCollection(model))
+      .filter((e: any) => false !== e.active)
+
+    each(entity, (entity: ModelEntity) => {
       TestEntity({ target, entity })
       TestDirect({ target, entity })
     })

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

@@ -70,8 +70,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 { json: configJson } = configDefinition(model)
+  // emitted source size varies by language, the model does not. Passing the
+  // target name opts in to the main.slug/version/target identity fields -
+  // both representations below carry them, keeping the reps interchangeable.
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'config.' + target.ext }, () => {
@@ -174,6 +176,10 @@ class ${model.const.Name}Config
     }
     else {
 
+    // Identity beyond the camel Name: values from configDefinition's def, not
+    // re-derived here, so the literal rep and the data rep cannot disagree on
+    // identity (the slug is CARRIED, never derived from the camel name -
+    // station's descriptor reads all three; mirrors cmp/ts's #MainMeta).
     Content(`    /**
      * Build a fresh, fully materialised config array. Every call rebuilds the
      * whole structure, so prefer shared_config unless you need a private copy.
@@ -183,6 +189,9 @@ class ${model.const.Name}Config
         return [
             "main" => [
                 "name" => "${model.const.Name}",
+                "slug" => ${phps(configDef.main.slug)},
+                "version" => ${phps(configDef.main.version)},
+                "target" => ${phps(configDef.main.target)},
             ],
             "feature" => [
 `)

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

@@ -29,7 +29,7 @@ import {
   File, Content, Folder,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames, phpSafeTypeName } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -114,9 +114,20 @@ declare(strict_types=1);
         const fields = (ent.fields ? each(ent.fields) : [])
           .filter((f: any) => f.active !== false && validName(f.name))
 
+        // PHP refuses a reserved word where a class name is expected, and the
+        // check is CASE-INSENSITIVE — an entity named `Namespace` emitted
+        // `class Namespace`, which does not parse, and took the whole types
+        // file with it (issue #64). phpSafeTypeName appends `Type` on a real
+        // collision and leaves every other name untouched.
+        //
+        // Only the bare data class needs it: the per-op names below already
+        // carry a suffix no reserved word matches, and the entity accessor is
+        // a method, which PHP resolves separately.
+        const TypeName = phpSafeTypeName(Name)
+
         // Entity data model: one typed property per field (`req:false` -> nullable).
         Content(`/** ${Name} entity data model. */
-class ${Name}
+class ${TypeName}
 {
 `)
         fields.forEach((f: any) => {

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

@@ -130,6 +130,31 @@ class ${model.const.Name}Features
                 return new ${model.const.Name}BaseFeature();
         }
     }
+
+    /**
+     * Does a generated feature class back this name? False for a name only
+     * an options extend instance can supply (the station adopt path) - the
+     * constructor uses this to skip make_feature for such names instead of
+     * adding a stray BaseFeature.
+     */
+    public static function has_feature(string $name): bool
+    {
+        switch ($name) {
+            case "base":
+`)
+
+    each(feature, (feat: any) => {
+      if (feat.name !== 'base') {
+        Content(`            case "${feat.name}":
+`)
+      }
+    })
+
+    Content(`                return true;
+            default:
+                return false;
+        }
+    }
 }
 `)
   })

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

@@ -39,8 +39,8 @@ const Package = cmp(async function Package(props: any) {
   // Generate composer.json
   File({ name: 'composer.json' }, () => {
     Content(`{
-  "name": "${packageName(model, 'php')}",
-  "description": "${pkgDescription(model, 'php')}",
+  "name": "${packageName(model, target.name)}",
+  "description": "${pkgDescription(model, target.name)}",
   "type": "library",
   "keywords": [${kw}],
   "homepage": "${repoUrl}",

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

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_php'
@@ -44,7 +39,10 @@ class ExistsTest extends TestCase
 `)
     })
 
-    each(model.main[KIT].entity, (entity: ModelEntity) => {
+    const entity = each(entityCollection(model))
+      .filter((e: any) => false !== e.active)
+
+    each(entity, (entity: ModelEntity) => {
       TestEntity({ target, entity })
       TestDirect({ target, entity })
     })

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

@@ -58,6 +58,12 @@ class ProjectNameSDK
 
         $this->_rootctx->options = $this->options;
 
+        // Feature INSTANCES supplied at construction (the station adopt
+        // path) are read from the RAW construction options - extend is
+        // consumed exactly once, here; make_options strips it from the
+        // processed map so options_map() stays clean data.
+        $extend_val = is_array($options["extend"] ?? null) ? $options["extend"] : [];
+
         // Add features in the resolved order (make_options puts an explicit
         // list order first, else defaults to test-first). Ordering matters: the
         // `test` feature installs the base mock transport and the transport
@@ -70,6 +76,20 @@ class ProjectNameSDK
                 foreach ($featureorder as $fname) {
                     $fopts = ProjectNameHelpers::to_map($feature_opts[$fname] ?? null);
                     if ($fopts && isset($fopts["active"]) && $fopts["active"] === true) {
+                        // An active name with no generated feature 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 add a BaseFeature stray
+                        // that would silently shift feature positions.
+                        if (!ProjectNameFeatures::has_feature($fname)) {
+                            foreach ($extend_val as $ef) {
+                                if (is_object($ef) && method_exists($ef, 'get_name')
+                                    && $fname === $ef->get_name()) {
+                                    continue 2;
+                                }
+                            }
+                        }
                         ($utility->feature_add)($this->_rootctx, ProjectNameFeatures::make_feature($fname));
                     }
                 }
@@ -77,12 +97,9 @@ class ProjectNameSDK
         }
 
         // Add extension features.
-        $extend_val = Struct::getprop($this->options, "extend");
-        if (is_array($extend_val)) {
-            foreach ($extend_val as $f) {
-                if (is_object($f) && method_exists($f, 'get_name')) {
-                    ($utility->feature_add)($this->_rootctx, $f);
-                }
+        foreach ($extend_val as $f) {
+            if (is_object($f) && method_exists($f, 'get_name')) {
+                ($utility->feature_add)($this->_rootctx, $f);
             }
         }
 

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

@@ -67,8 +67,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 { json: configJson } = configDefinition(model)
+  // emitted source size varies by language, the model does not. Passing the
+  // target name opts in to the main.slug/version/target identity fields -
+  // the literal path below emits them too, keeping the two reps in step.
+  const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   File({ name: 'config.' + target.ext }, () => {
@@ -130,6 +132,10 @@ def make_config():
       return
     }
 
+    // Identity values from configDefinition's def, not re-derived here, so
+    // the literal rep and the data rep cannot disagree on identity (the
+    // slug is CARRIED, never derived from the camel name - station's
+    // descriptor reads all three; see cmp/ts/Config_ts.ts #MainMeta).
     Content(`def make_config():
     """Build a fresh, fully materialised config dict.
 
@@ -139,6 +145,9 @@ def 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": {
 `)