@voxgig/sdkgen 1.3.18 → 1.4.0

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

@@ -16,18 +16,32 @@ import {
 } from '@voxgig/apidef'
 
 
-// Published aql/eng/go version. Tagged at aql-lang/aql under
-// eng/go/v<X.Y.Z>. Bump here when adopting a newer engine.
-const AQL_ENG_VERSION = 'v0.0.1'
-
-// go.sum entries for AQL_ENG_VERSION and its transitive deps. The sibling
+// Published boru/eng/go version. The engine module
+// github.com/boru-lang/boru/eng/go is not yet tagged under the boru path (the
+// eng/go/v0.0.1 tag predates the aql->boru rename and still declares the old
+// aql-lang/aql module path), so we pin a commit pseudo-version. Bump here —
+// to a real eng/go/v<X.Y.Z> once one is published, or a newer pseudo-version —
+// when adopting a newer engine.
+const BORU_ENG_VERSION = 'v0.0.2-0.20260804163932-0d66b55c5110'
+
+// go.sum entries for BORU_ENG_VERSION and its transitive deps. The sibling
 // SDK dep needs no entry (path replace). Deterministic because the version
 // is pinned above — regenerate with `go mod tidy` and update BOTH constants
-// together when bumping AQL_ENG_VERSION.
-const AQL_ENG_GOSUM = `github.com/aql-lang/aql/eng/go v0.0.1 h1:qvopmpIX5xL6cpAC4otSUO7fUDA46x/y+2lT2zoxTaA=
-github.com/aql-lang/aql/eng/go v0.0.1/go.mod h1:7LmNG+pASY2jlPZB0iFAt/ZNdmc8qxvaf+njVmaSFks=
-github.com/jsonicjs/jsonic/go v0.1.6 h1:oUw4vxCK6tqa7SGN87vjCtx3sCpeHXdqfl25hx5LKP0=
-github.com/jsonicjs/jsonic/go v0.1.6/go.mod h1:ObNKlCG7esWoi4AHCpdgkILvPINV8bpvkbCd4llGGUg=
+// together when bumping BORU_ENG_VERSION.
+const BORU_ENG_GOSUM = `github.com/boru-lang/boru/eng/go v0.0.2-0.20260804163932-0d66b55c5110 h1:iwMbEPhByhVhJgt6xhyhT+jXMiARvbG4wHIrc4OPcvU=
+github.com/boru-lang/boru/eng/go v0.0.2-0.20260804163932-0d66b55c5110/go.mod h1:KQLjjCq4QVAfdSuhmQ58ZFA9JK7LV2+A/aLRb3m4s5k=
+github.com/cockroachdb/apd/v3 v3.2.3 h1:4Zx+I3R35bFXMnltzmjP79i2cravE4jTRL6ps9Aux80=
+github.com/cockroachdb/apd/v3 v3.2.3/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/tabnas/debug/go v0.2.3 h1:cptiwHcHKw+lqtZuKp6gX7yY1NunJLS5PHD7ykVcIvM=
+github.com/tabnas/debug/go v0.2.3/go.mod h1:EXSNFdN6Ct9pcAUk8ZGozNbIltb3Hw0wcne+5vWQyns=
+github.com/tabnas/json/go v0.4.0 h1:1BxLHyCullkKXkvui/SuZ4s6OMrFVDuEB13IX/5S1eM=
+github.com/tabnas/json/go v0.4.0/go.mod h1:MJzyziKcvZk3OZCaSDxhMdf/Wkq2UJ0uLGWFtp9zsJs=
+github.com/tabnas/jsonic/go v0.4.0 h1:y5k/P21C3q3jWaA+VxEhXxzZ8xJgpgAehMBEseDN31g=
+github.com/tabnas/jsonic/go v0.4.0/go.mod h1:eDpkddhkuTFuIXMkSqTZl7cU7M23swbMpkXR1W5bApQ=
+github.com/tabnas/parser/go v0.4.0 h1:M8+qRT4KaCtr4OCpg9NDNUXJIdbbweqeqbpEpVGNEqU=
+github.com/tabnas/parser/go v0.4.0/go.mod h1:WrlfEVyZ1QjEIowWiyEu3K1iHj7wxuPut5zoH9Trehk=
 `
 
 
@@ -64,7 +78,7 @@ const Main = cmp(function Main(props: any) {
   // EVERYTHING here is MODEL-DRIVEN: verbs, examples and how-to sections are
   // gated on whether an active entity actually exposes that op
   // (op.<name>.active !== false) — never document an operation no entity
-  // supports. The CLI implements three AQL words (list / load / update; see
+  // supports. The CLI implements three boru words (list / load / update; see
   // words.fragment.go + runOp).
   // ==========================================================================
   const bin = `${model.name}-cli`
@@ -129,7 +143,7 @@ const Main = cmp(function Main(props: any) {
   ex.push('# 3. Provide credentials once, via the environment')
   ex.push(`export ${apiKeyEnv}=sk_live_xxx`)
   ex.push('')
-  ex.push('# 4. Each command line is ONE AQL expression, run against the API:')
+  ex.push('# 4. Each command line is ONE boru expression, run against the API:')
   if (firstHas('list')) ex.push(`./${bin} list ${firstEntity}`)
   if (firstHas('load')) {
     ex.push(`./${bin} load 1 ${firstEntity}            # {id:1} shorthand`)
@@ -158,7 +172,7 @@ const Main = cmp(function Main(props: any) {
 \`\`\`
 
 \`list <entity>\` returns the first page of records. \`<entity>\` is a bareword —
-it is auto-quoted as an AQL atom, so no quotes are needed.`)
+it is auto-quoted as an boru atom, so no quotes are needed.`)
 
   if (firstHas('load')) howtos.push(`### Load a single record
 
@@ -194,7 +208,7 @@ Both are injectable by a secrets vault, so the key never has to be typed inline.
   howtos.push(`### Explore interactively with the REPL
 
 Run with no arguments to open a REPL (prompt \`${model.name}>\`). Each line is
-evaluated as its own AQL expression:
+evaluated as its own boru expression:
 
 \`\`\`text
 $ ./${bin}
@@ -218,10 +232,10 @@ below — this SDK exposes ${entityCount} ${entityNoun}.`)
 
   File({ name: 'README.md' }, () => Content(`# ${model.name}-cli
 
-AQL-driven command-line client **and** interactive REPL for the ${model.Name}
-SDK. Each command line is parsed as a single [AQL](https://github.com/aql-lang/aql)
+boru-driven command-line client **and** interactive REPL for the ${model.Name}
+SDK. Each command line is parsed as a single [boru](https://github.com/boru-lang/boru)
 expression and evaluated against the live API; run it with no arguments to drop
-into a REPL. Built on \`github.com/aql-lang/aql/eng/go\` and the sibling Go SDK
+into a REPL. Built on \`github.com/boru-lang/boru/eng/go\` and the sibling Go SDK
 at \`../go\`.
 
 ## Examples
@@ -248,7 +262,7 @@ ${exampleBlock}
    export ${apiKeyEnv}=sk_live_xxx
    \`\`\`
 
-3. **Run a query.** Evaluate an AQL expression against the API (or run with no
+3. **Run a query.** Evaluate an boru expression against the API (or run with no
    arguments to open the REPL):
 
    \`\`\`sh
@@ -258,7 +272,7 @@ ${exampleBlock}
 4. **Go interactive.** Run the binary with no arguments to open the REPL, then
    type \`/help\` for the word and entity lists and \`/quit\` to leave.
 
-That is the whole loop: *build → set key → evaluate AQL expressions*.
+That is the whole loop: *build → set key → evaluate boru expressions*.
 
 ## How-to guides
 
@@ -268,13 +282,13 @@ ${howtoBlock}
 
 ### Words
 
-The CLI registers these AQL words, each bound to the SDK:
+The CLI registers these boru words, each bound to the SDK:
 
 | Word     | Signatures                                    | Returns                        |
 |----------|-----------------------------------------------|--------------------------------|
 ${verbRows}
 
-- \`<entity>\` is a bareword, auto-quoted as an AQL atom (e.g. \`${firstEntity}\`).
+- \`<entity>\` is a bareword, auto-quoted as an boru atom (e.g. \`${firstEntity}\`).
 - \`<query>\` is either a **Map** (\`{id:1}\`) or a **Scalar** (\`1\`, treated as
   \`{id:1}\`). A scalar is always wrapped as \`{id:<value>}\`.
 
@@ -293,7 +307,7 @@ Unset variables fall back to the SDK's built-in defaults.
 
 ### REPL commands
 
-Meta-commands use the \`/\` prefix (everything else on a line is evaluated as AQL):
+Meta-commands use the \`/\` prefix (everything else on a line is evaluated as boru):
 
 - \`/quit\` / \`/q\` / \`/exit\` — exit the REPL
 - \`/help\` / \`/h\` / \`/?\`     — show the word list, entity list and meta commands
@@ -321,25 +335,25 @@ ${entityList}
 
 ## Explanation
 
-### Why AQL?
+### Why boru?
 
-The whole command line is one [AQL](https://github.com/aql-lang/aql) expression,
+The whole command line is one [boru](https://github.com/boru-lang/boru) expression,
 not a fixed \`verb --flag\` grammar. That means the same binary works one-shot
 (\`./${bin} <expr>\`) and interactively (the REPL), and expressions compose the
-same way in both. \`list\` / \`load\` / \`update\` are ordinary AQL *words* bound to
+same way in both. \`list\` / \`load\` / \`update\` are ordinary boru *words* bound to
 the SDK — adding SDK operations is adding words, not re-parsing flags.
 
 ### How it is wired
 
 \`main.go\` builds the SDK client (configured from the environment), creates an
-AQL registry, and \`words.go\` registers \`list\` / \`load\` / \`update\` as native
+boru registry, and \`words.go\` registers \`list\` / \`load\` / \`update\` as native
 words that dispatch on the entity atom and call the sibling Go SDK at \`../go\`.
 Results are unwrapped from their \`Entity\` wrappers to plain data before being
 printed.
 
 ### Output format
 
-Each result value is printed as its AQL string form (a JSON-like rendering of
+Each result value is printed as its boru string form (a JSON-like rendering of
 the record or list of records). One-shot mode prints to stdout; errors go to
 stderr with a non-zero exit code.
 
@@ -350,25 +364,30 @@ this repo, or upstream at
 \`github.com/voxgig/sdkgen/project/.sdk/src/cmp/go-cli/\`.
 `))
 
-  // go.mod — sibling SDK via relative replace; aql/eng/go from the
-  // public Go module proxy. The go directive must be >= aql/eng/go's own
-  // (go 1.24.7 at eng/go/v0.0.1) — keep in step with AQL_ENG_VERSION.
+  // go.mod — sibling SDK via relative replace; boru/eng/go from the
+  // public Go module proxy. The go directive must be >= boru/eng/go's own
+  // (go 1.24.7) — keep in step with BORU_ENG_VERSION.
   File({ name: 'go.mod' }, () => Content(`module ${cliModule}
 
 go 1.24.7
 
 require ${sdkModule} v0.0.0
-require github.com/aql-lang/aql/eng/go ${AQL_ENG_VERSION}
+require github.com/boru-lang/boru/eng/go ${BORU_ENG_VERSION}
 
-require github.com/jsonicjs/jsonic/go v0.1.6 // indirect
+require (
+	github.com/cockroachdb/apd/v3 v3.2.3 // indirect
+	github.com/tabnas/json/go v0.4.0 // indirect
+	github.com/tabnas/jsonic/go v0.4.0 // indirect
+	github.com/tabnas/parser/go v0.4.0 // indirect
+)
 
 replace ${sdkModule} => ../go
 `))
 
-  // go.sum — required for `go build` to accept the aql/eng/go dependency
+  // go.sum — required for `go build` to accept the boru/eng/go dependency
   // (the path-replaced sibling SDK needs no entry). Pinned alongside
-  // AQL_ENG_VERSION above.
-  File({ name: 'go.sum' }, () => Content(AQL_ENG_GOSUM))
+  // BORU_ENG_VERSION above.
+  File({ name: 'go.sum' }, () => Content(BORU_ENG_GOSUM))
 
   // Makefile — `make build` for the current machine, `make build-all` to
   // cross-compile for the three desktop OSes (linux, darwin, windows) on

package/project/.sdk/src/cmp/go-cli/fragment/main.fragment.go

@@ -1,6 +1,6 @@
 // Command ProjectName-cli is a CLI + REPL for the ProjectName SDK,
-// built on the AQL engine. Positional arguments are joined into a
-// single AQL expression and evaluated; with no arguments, falls into
+// built on the boru engine. Positional arguments are joined into a
+// single boru expression and evaluated; with no arguments, falls into
 // a REPL. Generated by sdkgen go-cli target.
 package main
 
@@ -11,8 +11,8 @@ import (
 	"os"
 	"strings"
 
-	eng "github.com/aql-lang/aql/eng/go"
-	"github.com/aql-lang/aql/eng/go/parser"
+	eng "github.com/boru-lang/boru/eng/go"
+	"github.com/boru-lang/boru/eng/go/parser"
 	sdk "GOMODULE"
 )
 
@@ -28,10 +28,10 @@ func main() {
 
 // usage prints the CLI help (for --help / -h). No client or network setup.
 func usage(out io.Writer) {
-	fmt.Fprintf(out, "%s-cli — AQL-driven CLI + REPL for the %s SDK\n\n", prompt, prompt)
+	fmt.Fprintf(out, "%s-cli — boru-driven CLI + REPL for the %s SDK\n\n", prompt, prompt)
 	fmt.Fprintln(out, "Usage:")
-	fmt.Fprintf(out, "  %s-cli [--help] [<AQL expression>]\n\n", prompt)
-	fmt.Fprintln(out, "With arguments, they are joined into a single AQL expression and")
+	fmt.Fprintf(out, "  %s-cli [--help] [<boru expression>]\n\n", prompt)
+	fmt.Fprintln(out, "With arguments, they are joined into a single boru expression and")
 	fmt.Fprintln(out, "evaluated against the API. With no arguments, starts an interactive REPL.")
 	fmt.Fprintln(out)
 	fmt.Fprintln(out, "Words:    list / load / update <query?> <entity>")

package/project/.sdk/src/cmp/go-cli/fragment/words.fragment.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"strings"
 
-	eng "github.com/aql-lang/aql/eng/go"
+	eng "github.com/boru-lang/boru/eng/go"
 	sdk "GOMODULE"
 )
 
-// registerSDKWords installs three native AQL words bound to the SDK:
+// registerSDKWords installs three native boru words bound to the SDK:
 // list / load / update. Each is declared with two overloads matching
 // the signature  [query?:(Node or Scalar) entity:atom]:
 //
@@ -18,31 +18,34 @@ import (
 //                              `load {id:1} book`, `load 1 book`)
 //
 // The entity slot is /q-quoted so a bareword `book` parses as the
-// Atom "book" rather than dispatching as an undefined word.
+// Atom "book" rather than dispatching as an undefined word. Both
+// overloads are all-forward (BarrierAllForward), so args are collected
+// from the tokens following the word.
 func registerSDKWords(r *eng.Registry, client *sdk.ProjectNameSDK) {
 	for _, op := range []string{"list", "load", "update"} {
 		op := op
-		single := eng.NativeSig{
+		single := eng.Signature{
 			Args:      []*eng.Type{eng.TAtom},
 			QuoteArgs: map[int]bool{0: true},
-			Handler: func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
+			Impl: eng.Go(func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
 				return runOp(client, op, nil, args[0])
-			},
-			Returns: []*eng.Type{eng.TAny},
+			}),
+			Returns:    []*eng.Type{eng.TAny},
+			BarrierPos: eng.BarrierAllForward,
 		}
-		dual := eng.NativeSig{
+		dual := eng.Signature{
 			Args:      []*eng.Type{eng.TAny, eng.TAtom},
 			QuoteArgs: map[int]bool{1: true},
-			Handler: func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
+			Impl: eng.Go(func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
 				q := args[0]
 				return runOp(client, op, &q, args[1])
-			},
-			Returns: []*eng.Type{eng.TAny},
+			}),
+			Returns:    []*eng.Type{eng.TAny},
+			BarrierPos: eng.BarrierAllForward,
 		}
 		r.RegisterNativeFunc(eng.NativeFunc{
-			Name:        op,
-			ForwardArgs: true,
-			Signatures:  []eng.NativeSig{single, dual},
+			Name:       op,
+			Signatures: []eng.Signature{single, dual},
 		})
 	}
 }
@@ -91,22 +94,22 @@ func entityFor(client *sdk.ProjectNameSDK, name string) (sdk.ProjectNameEntity,
 	return nil, fmt.Errorf("unknown entity %q", name)
 }
 
-// queryToMap converts an AQL Value (Map or Scalar) into the
+// queryToMap converts a boru Value (Map or Scalar) into the
 // `map[string]any` shape the SDK expects. Maps are unwrapped via
 // eng.ToNative. Scalars are wrapped as {"id": <value>} so the
 // shorthand `load 1 book` becomes `load {id:1} book`.
 func queryToMap(v eng.Value) (map[string]any, error) {
-	if v.VType.Matches(eng.TMap) {
+	if v.Parent.ConformsTo(eng.TMap) {
 		m, ok := eng.ToNative(v).(map[string]any)
 		if !ok {
 			return nil, fmt.Errorf("query map could not be unwrapped")
 		}
 		return m, nil
 	}
-	if v.VType.Matches(eng.TScalar) {
+	if v.Parent.ConformsTo(eng.TScalar) {
 		return map[string]any{"id": eng.ToNative(v)}, nil
 	}
-	return nil, fmt.Errorf("query must be a Map or Scalar, got %s", v.VType)
+	return nil, fmt.Errorf("query must be a Map or Scalar, got %s", v.Parent)
 }
 
 // extractData walks an SDK result and replaces any sdk.Entity wrapper

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

@@ -12,6 +12,7 @@ import {
   indent,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -53,6 +54,14 @@ const Config = cmp(async function Config(props: any) {
     `
     : ''
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see makeOptions).
+  const svars = serverVariables(model)
+  const serverBlock = 0 === svars.length ? '' :
+    'server: {\n' +
+    svars.map((v: any) => `      ${JSON.stringify(v.name)}: ${JSON.stringify(v.dflt)},\n`).join('') +
+    '    },\n\n    '
+
   File({ name: 'Config.' + target.ext }, () => {
 
     Fragment({
@@ -60,6 +69,8 @@ const Config = cmp(async function Config(props: any) {
 
       replace: {
 
+        "'SERVERBLOCK'": serverBlock,
+
         "'AUTHBLOCK'": authBlock,
 
         "'HEADERS'": indent(JSON.stringify(headers, null, 2), 4).trim(),

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

@@ -19,7 +19,7 @@ class Config {
 
 
   main = {
-    name: 'ProjectName',
+    name: '$$const.Name$$',
   }
 
 
@@ -31,7 +31,7 @@ class Config {
   options = {
     base: '$$main.kit.info.servers.0.url$$',
 
-    'AUTHBLOCK'headers: 'HEADERS',
+    'SERVERBLOCK''AUTHBLOCK'headers: 'HEADERS',
 
     entity: {
       // #EntityConfigs

package/project/.sdk/src/cmp/js/fragment/Direct.test.fragment.js

@@ -17,6 +17,10 @@ describe('EntityNameDirect', async () => {
 
   test('direct-exists', async () => {
     const sdk = new ProjectNameSDK({
+      // Concrete base: a live construction must satisfy any server
+      // variables a templated base URL declares; overriding base with a
+      // literal (as the direct flow tests do) sidesteps the requirement.
+      base: 'http://localhost:8080',
       system: { fetch: async () => ({}) }
     })
     assert('function' === typeof sdk.direct)

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

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,14 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see make_options).
+  const svars = serverVariables(model)
+  const serverBlock = 0 === svars.length ? '' :
+    '      server = {\n' +
+    svars.map((v: any) => `        [${JSON.stringify(v.name)}] = ${JSON.stringify(v.dflt)},\n`).join('') +
+    '      },\n'
+
   const authBlock = authActive
     ? `      auth = {
         prefix = "${authPrefix}",
@@ -73,7 +82,7 @@ local function make_config()
     Content(`    },
     options = {
       base = "${baseUrl}",
-${authBlock}      headers = ${formatLuaTable(headers, 3)},
+${serverBlock}${authBlock}      headers = ${formatLuaTable(headers, 3)},
       entity = {
 `)
 

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

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,16 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see MakeOptions).
+  // `$` is escaped so a default can never open a PHP interpolation.
+  const svars = serverVariables(model)
+  const phps = (s: string) => JSON.stringify(s).replace(/\$/g, '\\$')
+  const serverBlock = 0 === svars.length ? '' :
+    '                "server" => [\n' +
+    svars.map((v: any) => `                    ${phps(v.name)} => ${phps(v.dflt)},\n`).join('') +
+    '                ],\n'
+
   const authBlock = authActive
     ? `                "auth" => [
                     "prefix" => "${authPrefix}",
@@ -84,7 +95,7 @@ class ${model.const.Name}Config
       Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
+${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => (object)[],
             ],
             "entity" => (object)[],
@@ -94,7 +105,7 @@ ${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
     Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
+${serverBlock}${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => [
 `)
 

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

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,14 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see make_options).
+  const svars = serverVariables(model)
+  const serverBlock = 0 === svars.length ? '' :
+    '            "server": {\n' +
+    svars.map((v: any) => `                ${JSON.stringify(v.name)}: ${JSON.stringify(v.dflt)},\n`).join('') +
+    '            },\n'
+
   const authBlock = authActive
     ? `            "auth": {
                 "prefix": "${authPrefix}",
@@ -74,7 +83,7 @@ def make_config():
     Content(`        },
         "options": {
             "base": "${baseUrl}",
-${authBlock}            "headers": ${formatPyDict(headers, 3)},
+${serverBlock}${authBlock}            "headers": ${formatPyDict(headers, 3)},
             "entity": {
 `)
 

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

@@ -11,6 +11,7 @@ import {
   each,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -46,6 +47,16 @@ const Config = cmp(async function Config(props: any) {
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see make_options).
+  // `#` is escaped so a default can never open a Ruby interpolation.
+  const svars = serverVariables(model)
+  const rbs = (s: string) => JSON.stringify(s).replace(/#/g, '\\#')
+  const serverBlock = 0 === svars.length ? '' :
+    '        "server" => {\n' +
+    svars.map((v: any) => `          ${rbs(v.name)} => ${rbs(v.dflt)},\n`).join('') +
+    '        },\n'
+
   const authBlock = authActive
     ? `        "auth" => {
           "prefix" => "${authPrefix}",
@@ -74,7 +85,7 @@ module ${model.const.Name}Config
     Content(`      },
       "options" => {
         "base" => "${baseUrl}",
-${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
+${serverBlock}${authBlock}        "headers" => ${formatRubyHash(headers, 4)},
         "entity" => {
 `)
 

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

@@ -75,8 +75,30 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const genCtx: GenCtx = { model, entity, rustcrate, flow: basicflow, PROJUPPER }
 
-  const opsList = Array.from(new Set(allSteps.map((s: any) => s.op).filter(Boolean)))
-    .map(o => `"${o}"`).join(', ')
+  const opNames = Array.from(new Set(allSteps.map((s: any) => s.op).filter(Boolean)))
+  const opsList = opNames.map(o => `"${o}"`).join(', ')
+
+  // Same hazard as the csharp target: an entity whose basic flow has no ops
+  // would emit `for op in []`, and rustc cannot infer the element type of an
+  // empty array literal — E0282, type annotations needed. The loop is dead
+  // code in that case, and so is the `mode` binding only it reads (which
+  // would then warn as unused). Emit neither.
+  const skipBlock = 0 === opNames.length ? '' : `    // Per-op sdk-test-control.json skip — the basic test exercises a flow
+    // with multiple ops; skipping any op skips the whole flow.
+    let mode = if setup.live { "live" } else { "unit" };
+    for op in [${opsList}] {
+        let (skip, reason) = is_control_skipped("entityOp", &format!("${entity.name}.{}", op), mode);
+        if skip {
+            let reason = if reason.is_empty() {
+                "skipped via sdk-test-control.json".to_string()
+            } else {
+                reason
+            };
+            eprintln!("skip: {}", reason);
+            return;
+        }
+    }
+`
 
   const method = rustVarName(entity.name)
   const evar = rustVarName(entity.name)
@@ -158,22 +180,7 @@ fn ${evar}_entity_stream() {
 #[test]
 fn ${evar}_entity_basic() {
     let setup = ${evar}_basic_setup(Value::Noval);
-    // Per-op sdk-test-control.json skip — the basic test exercises a flow
-    // with multiple ops; skipping any op skips the whole flow.
-    let mode = if setup.live { "live" } else { "unit" };
-    for op in [${opsList}] {
-        let (skip, reason) = is_control_skipped("entityOp", &format!("${entity.name}.{}", op), mode);
-        if skip {
-            let reason = if reason.is_empty() {
-                "skipped via sdk-test-control.json".to_string()
-            } else {
-                reason
-            };
-            eprintln!("skip: {}", reason);
-            return;
-        }
-    }
-    // The basic flow consumes synthetic IDs from the fixture. In live mode
+${skipBlock}    // The basic flow consumes synthetic IDs from the fixture. In live mode
     // without an *_ENTID env override, those IDs hit the live API and 4xx.
     if setup.synthetic_only {
         eprintln!("skip: live entity test uses synthetic IDs from fixture — set ${PROJUPPER}_TEST_${ENTUPPER}_ENTID JSON to run live");

package/project/.sdk/src/cmp/swift/EntityTypes_swift.ts

@@ -25,7 +25,7 @@ import {
   File, Content, Folder,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames, swiftSafeTypeName } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -114,9 +114,16 @@ import Foundation
               .filter((f: any) => f.active !== false)
 
             // Entity data model: one property per field. req:false -> optional.
+            //
+            // Swift has no intra-module namespacing, so a spec schema named
+            // after one of our own runtime types (e.g. `Response`) would be a
+            // redeclaration and fail the build. swiftSafeTypeName appends
+            // `Type` on collision only — `Response` -> `ResponseType` — so
+            // non-colliding SDKs generate byte-identical output to before.
+            const TypeName = swiftSafeTypeName(Name)
             emitStruct(
-              `/// ${Name} is the typed data model for the ${ent.name} entity.`,
-              Name,
+              `/// ${TypeName} is the typed data model for the ${ent.name} entity.`,
+              TypeName,
               fields.map((f: any) => ({ name: f.name, type: f.type, optional: false === f.req }))
             )
 

package/project/.sdk/src/cmp/ts/Config_ts.ts

@@ -12,6 +12,7 @@ import {
   indent,
   isAuthActive,
   resolveAuthPrefix,
+  serverVariables,
 } from '@voxgig/sdkgen'
 
 
@@ -53,6 +54,14 @@ const Config = cmp(async function Config(props: any) {
     `
     : ''
 
+  // Templated server URL: emit the spec's server-variable defaults so the
+  // runtime can substitute {name} placeholders in base (see makeOptions).
+  const svars = serverVariables(model)
+  const serverBlock = 0 === svars.length ? '' :
+    'server: {\n' +
+    svars.map((v: any) => `      ${JSON.stringify(v.name)}: ${JSON.stringify(v.dflt)},\n`).join('') +
+    '    },\n\n    '
+
   File({ name: 'Config.' + target.ext }, () => {
 
     Fragment({
@@ -60,6 +69,8 @@ const Config = cmp(async function Config(props: any) {
 
       replace: {
 
+        "'SERVERBLOCK'": serverBlock,
+
         "'AUTHBLOCK'": authBlock,
 
         "'HEADERS'": indent(JSON.stringify(headers, null, 2), 4).trim(),