@voxgig/sdkgen 3.5.0 → 3.6.0

package/package.json

@@ -1,12 +1,33 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "engines": {
     "node": ">=24"
   },
   "types": "dist/sdkgen.d.ts",
+  "_no_exports_comment": [
+    "THERE IS DELIBERATELY NO `exports` MAP, and adding one is not a tidy-up.",
+    "",
+    "`@voxgig/sdkgen/testkit` is served by the stub `testkit.js` beside this",
+    "file, resolved by ordinary CommonJS probing — the way subpath entry",
+    "points worked before `exports` existed.",
+    "",
+    "The obvious alternative, an `exports` map naming './testkit', REPLACES",
+    "the deep-import freedom a package has without one. Consumers depend on",
+    "that freedom in places nothing here would notice: every generated model",
+    "file includes '@voxgig/sdkgen/model/sdkgen.aontu', and the scaffold is",
+    "reached as '@voxgig/sdkgen/project/<lang>'.",
+    "",
+    "A './*' catch-all looks like it restores that, and does not: exports",
+    "resolution never falls back to CommonJS extension probing, so",
+    "require('@voxgig/sdkgen/dist/helpers/manifest') maps to an",
+    "extensionless path that does not exist and fails with MODULE_NOT_FOUND.",
+    "An array of probes ('./*', './*.js', ...) does not fix it either —",
+    "measured, not assumed. test/packaging.test.ts resolves the real",
+    "subpaths through a real node_modules to keep this honest."
+  ],
   "description": "Voxgig SDK Generator.",
   "homepage": "https://github.com/voxgig/voxgig-sdkgen",
   "keywords": [
@@ -26,7 +47,7 @@
     "test-some": "node --enable-source-maps --test-name-pattern=\"$npm_config_pattern\" --test dist-test/**/*.test.js",
     "golden": "npm run build && SDKGEN_GOLDEN_UPDATE=1 node --test dist-test/characterize.test.js",
     "watch": "tsc --build src test -w",
-    "build": "tsc --build src test && npm run check-scaffold && npm run stage-scaffold",
+    "build": "tsc --build src test && npm run check-scaffold && npm run check-fixture && npm run stage-scaffold",
     "clean": "rm -rf dist dist-test node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "embed-version": "node build/version.js",
@@ -40,6 +61,7 @@
     "repo-release": "npm run repo-publish && npm run repo-tag",
     "repo-release-dry": "npm run repo-publish-quick-dry && npm run repo-tag-dry",
     "check-scaffold": "tsc -p tsconfig.scaffold.json",
+    "check-fixture": "tsc -p tsconfig.fixture.json",
     "stage-scaffold": "node build/scaffold-stage.js && tsc -p tsconfig.scaffold-emit.json"
   },
   "license": "MIT",
@@ -49,6 +71,8 @@
     "model",
     "src",
     "dist",
+    "testkit.js",
+    "testkit.d.ts",
     "LICENSE"
   ],
   "devDependencies": {
@@ -64,11 +88,11 @@
   "peerDependencies": {
     "@tabnas/jsonic": "0.6.0",
     "@tabnas/parser": "0.8.0",
-    "@voxgig/apidef": ">=0",
-    "@voxgig/struct": ">=0",
-    "@voxgig/util": ">=0",
-    "aontu": ">=0",
-    "jostraca": ">=0",
-    "shape": ">=0"
+    "@voxgig/apidef": ">=7.1",
+    "@voxgig/struct": ">=0.2",
+    "@voxgig/util": ">=0.5",
+    "aontu": ">=0.52",
+    "jostraca": "^0.33.1",
+    "shape": ">=10"
   }
 }

package/project/.sdk/src/cmp/c/Test_c.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_c'
@@ -39,7 +34,10 @@ int main(void) {
 `)
     })
 
-    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/clojure/Test_clojure.ts

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

package/project/.sdk/src/cmp/cpp/Test_cpp.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_cpp'
@@ -24,7 +19,9 @@ const Test = cmp(function Test(props: any) {
   // netsim / struct corpus) ships as tm/cpp/test templates (copied verbatim).
   // Here we generate the per-entity model-driven tests into test/.
   Folder({ name: 'test' }, () => {
-    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/csharp/Package_csharp.ts

@@ -60,7 +60,7 @@ const Package = cmp(async function Package(props: any) {
     <Version>${packageVersion(model, target.name)}</Version>
     <PackageId>${Name}.Sdk</PackageId>
     <Authors>Voxgig</Authors>
-    <Description>${pkgDescription(model, 'csharp')}</Description>
+    <Description>${pkgDescription(model, target.name)}</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>${repoUrl}</RepositoryUrl>
   </PropertyGroup>

package/project/.sdk/src/cmp/csharp/Test_csharp.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_csharp'
@@ -26,7 +21,10 @@ const Test = cmp(function Test(props: any) {
   // tests are generated here.
   Folder({ name: 'test' }, () => {
 
-    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/dart/Test_dart.ts

@@ -1,7 +1,5 @@
 
 import {
-  KIT,
-  getModelPath,
   nom,
 } from '@voxgig/apidef'
 
@@ -9,7 +7,7 @@ import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, snakify, Folder, File, Content } from '@voxgig/sdkgen'
+import { cmp, each, snakify, Folder, File, Content, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestDirect } from './TestDirect_dart'
@@ -21,7 +19,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' }, () => {
 

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

@@ -36,7 +36,7 @@ const Package = cmp(async function Package(props: any) {
       app: :${app},
       version: "${packageVersion(model, target.name)}",
       elixir: "~> 1.14",
-      description: ${JSON.stringify(pkgDescription(model, 'elixir'))},
+      description: ${JSON.stringify(pkgDescription(model, target.name))},
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       deps: deps(),

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

@@ -1,13 +1,9 @@
 
-import {
-  KIT,
-} 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_elixir'
@@ -35,7 +31,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/go/EntityTypes_go.ts

@@ -167,7 +167,7 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
   // This file is GENERATED, not templated, so the GOMODULE placeholder is
   // never substituted for it — the module path has to be interpolated.
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   // only_active:false — getModelPath DROPS active:false entries by default,
   // but the consumer scaffold (create-sdkgen Root.ts) iterates the RAW entity

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

@@ -21,7 +21,7 @@ const Entity = cmp(function Entity(props: any) {
 
   // Module name: concatenated lowercase
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, but disambiguated (e.g. `<Name>EntityClient`) when it would

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

@@ -21,6 +21,12 @@ const Gitignore = cmp(async function Gitignore(_props: any) {
 *.test
 *.out
 
+# Readme-snippet check work dirs (TestReadmeGoSnippets). Normally removed on
+# exit; a killed run leaves one behind, and committing it is how a 1132-file
+# snippet package once shipped in a release.
+_readmecheck-*/
+readmecheck-*/
+
 # Coverage
 coverage.txt
 coverage.html

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

@@ -37,10 +37,10 @@ const Main = cmp(async function Main(props: any) {
 
   // Go module path == the repo path on GitHub (org from model.origin),
   // e.g. github.com/voxgig-sdk/<slug>-sdk. Used in go.mod and every import.
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
   // The root package name must be a plain Go identifier (can't be a path),
   // so it stays a concatenated-lowercase form (e.g. voxgigdogsdk).
-  const gopackage = goPackageIdent(model, 'go')
+  const gopackage = goPackageIdent(model, target.name)
 
   Package({ target })
 

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

@@ -23,7 +23,7 @@ const Package = cmp(async function Package(props: any) {
   // may not be named `<slug>-sdk`, and the hardcoded `go 1.20` this used to
   // emit could not compile sdkgen's own `log` feature (it imports log/slog,
   // which needs 1.21).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   File({ name: 'go.mod' }, () => {
     Content(`module ${gomodule}

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

@@ -67,11 +67,26 @@ import (
 	"testing"
 )
 
-// testSeed is a test-mode fixture seeded for every entity. It is spliced as
-// literal Go source into fragment wrappers and into the test-mode variant of
-// complete programs, so the offline mock transport has data to return.
+// testSeed is a test-mode fixture seeded for every entity, as Go source, so
+// the offline mock transport has data to return. It is NOT spliced into each
+// snippet: it is written ONCE per generated package as seed.go, and snippets
+// reference it by name (seedRef).
+//
+// Splicing it inline was O(snippets x entities). Every fragment lands in ONE
+// package, so a large API multiplied one ~26 KB composite literal by every
+// \`\`\`go block in the docs: gitlab reached 1132 fragments / ~625k literal
+// entries in a single compilation unit, and \`compile\` grew ~15 MB per fragment
+// to ~16 GB — the same superlinear-composite-literal blowup the L1 config data
+// path fixed for core/config.go. One shared var is O(1) in the snippet count.
 const testSeed = \`${goSeed}\`
 
+// seedRef is how a snippet names the shared fixture; seedFile declares it.
+const seedRef = "readmeTestSeed"
+
+func seedFile(pkg string) []byte {
+	return []byte("package " + pkg + "\\n\\nvar " + seedRef + " = " + testSeed + "\\n")
+}
+
 // doc names one of the three docs that carry go examples, with its path
 // relative to this test file's directory (which is <repo>/go/test): the root
 // README is two levels up, the go docs are one.
@@ -109,7 +124,18 @@ func TestReadmeGoSnippets(t *testing.T) {
 		{"go/REFERENCE", filepath.Join(testDir, "..", "REFERENCE.md")},
 	}
 
-	work, err := os.MkdirTemp(moduleRoot, "readmecheck-")
+	// The work dir has to live inside the module (the snippets import the SDK
+	// by module path), but it MUST stay invisible to \`go build ./...\`. The go
+	// tool skips directories whose name starts with "_" for wildcard matching
+	// while still building them by explicit path — exactly what is needed
+	// here, because \`defer os.RemoveAll\` does NOT run when the process is
+	// killed. A leftover frag package inside the module made the NEXT plain
+	// \`go build ./...\` compile every snippet and OOM, which is how a killed
+	// run poisoned later runs (and, once committed, every fresh clone).
+	// Sweeping first lets a repo that already carries one self-heal.
+	sweepStaleWorkDirs(moduleRoot)
+
+	work, err := os.MkdirTemp(moduleRoot, "_readmecheck-")
 	if err != nil {
 		t.Fatalf("mkdir temp: %v", err)
 	}
@@ -179,6 +205,10 @@ func TestReadmeGoSnippets(t *testing.T) {
 					if err := os.WriteFile(filepath.Join(runDir, "main.go"), []byte(variant), 0o644); err != nil {
 						t.Fatal(err)
 					}
+					// The rewritten ctors reference the shared fixture.
+					if err := os.WriteFile(filepath.Join(runDir, "seed.go"), seedFile("main"), 0o644); err != nil {
+						t.Fatal(err)
+					}
 					runDirs = append(runDirs, "./"+rel+"/run"+strconv.Itoa(progCount))
 				}
 
@@ -197,6 +227,10 @@ func TestReadmeGoSnippets(t *testing.T) {
 		if err := os.MkdirAll(fragDir, 0o755); err != nil {
 			t.Fatal(err)
 		}
+		// One shared fixture for the whole fragment package (see testSeed).
+		if err := os.WriteFile(filepath.Join(fragDir, "seed.go"), seedFile("readmefrag"), 0o644); err != nil {
+			t.Fatal(err)
+		}
 		fragPkg = "./" + rel + "/frag"
 	}
 
@@ -305,7 +339,7 @@ func runProgs(moduleRoot string, dirs []string) string {
 // left-to-right pass with balanced-paren matching; returns the rewritten
 // source and whether any replacement was made.
 func rewriteCtorsToTest(src string) (string, bool) {
-	repl := "sdk.TestSDK(" + testSeed + ", nil)"
+	repl := "sdk.TestSDK(" + seedRef + ", nil)"
 	var b strings.Builder
 	changed := false
 	i := 0
@@ -555,7 +589,7 @@ func wrapFragment(name, block, modulePath string) string {
 	b.WriteString("func " + name + "() {\\n")
 	if injectClient {
 		// Seeded test client so the fragment's documented calls have data.
-		b.WriteString("\\tclient := sdk.TestSDK(" + testSeed + ", nil)\\n")
+		b.WriteString("\\tclient := sdk.TestSDK(" + seedRef + ", nil)\\n")
 	}
 	b.WriteString(block)
 	b.WriteString("\\n}\\n")
@@ -664,6 +698,25 @@ func addBlankAssign(content, name string) string {
 	return content[:last] + "\\t_ = " + name + "\\n" + content[last:]
 }
 
+// sweepStaleWorkDirs removes work dirs abandoned by a killed run, under both
+// the current "_readmecheck-" name and the legacy "readmecheck-" one that
+// \`go build ./...\` still picks up.
+func sweepStaleWorkDirs(moduleRoot string) {
+	entries, err := os.ReadDir(moduleRoot)
+	if err != nil {
+		return
+	}
+	for _, e := range entries {
+		if !e.IsDir() {
+			continue
+		}
+		if n := e.Name(); strings.HasPrefix(n, "readmecheck-") ||
+			strings.HasPrefix(n, "_readmecheck-") {
+			os.RemoveAll(filepath.Join(moduleRoot, n))
+		}
+	}
+}
+
 func readModulePath(moduleRoot string) string {
 	data, err := os.ReadFile(filepath.Join(moduleRoot, "go.mod"))
 	if err != nil {

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

@@ -6,7 +6,7 @@ const ReadmeExplanation = cmp(function ReadmeExplanation(props: any) {
   const { target, ctx$: { model } } = props
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   Content(`### Data as maps
 

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

@@ -29,7 +29,7 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
   const { target, ctx$: { model } } = props
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Pick an entity with a real op (prefer a read op) — never fabricate a

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

@@ -7,7 +7,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
   const { model } = ctx$
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = packageName(model, 'go')
+  const gomodule = packageName(model, target.name)
   // `repo` is the directory a `git clone` of this project creates — not
   // `<slug>-sdk`, which is only the DEFAULT repo name.
   const { releasesUrl, repo } = repoInfo(model)

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

@@ -44,7 +44,7 @@ const ReadmeModel = cmp(function ReadmeModel(props: any) {
   const resultShapeRows = resultRows.join('\n')
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   const apikeyOptionRow = isAuthActive(model)
     ? '| `"apikey"` | `string` | API key for authentication. |\n'

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

@@ -20,7 +20,7 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 

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

@@ -15,7 +15,7 @@ const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 

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

@@ -28,7 +28,7 @@ const ReadmeTopTest = cmp(function ReadmeTopTest(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   // Pick an entity with a real op (prefer a read op) — never fabricate a
   // `load` on an op-less entity like Cloudsmith's `Abort`.

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

@@ -1,14 +1,9 @@
 
-import {
-  KIT,
-  getModelPath
-} from '@voxgig/apidef'
-
 import type {
   ModelEntity
 } from '@voxgig/apidef'
 
-import { cmp, each, Folder, File, Content, goModule } from '@voxgig/sdkgen'
+import { cmp, each, Folder, File, Content, goModule, entityCollection } from '@voxgig/sdkgen'
 
 
 import { TestEntity } from './TestEntity_go'
@@ -22,7 +17,7 @@ const Test = cmp(function Test(props: any) {
 
   // Module name: concatenated lowercase
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = goModule(model, 'go')
+  const gomodule = goModule(model, target.name)
 
   Folder({ name: 'test' }, () => {
 
@@ -48,7 +43,10 @@ func TestExists(t *testing.T) {
 `)
     })
 
-    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, gomodule })
       TestDirect({ target, entity, gomodule })
     })

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

@@ -50,8 +50,12 @@ const Main = cmp(function Main(props: any) {
   const { model } = props.ctx$
 
   const org = model.origin || 'voxgig-sdk'
+  // The two names on the next lines are DIFFERENT KINDS of name, and the
+  // adjacency is the trap. `sdkModule` is the Go SDK this CLI imports — a
+  // different target, so it keeps its own name and must NOT follow this
+  // target's alias. `cliModule` is this target itself, so it must.
   const sdkModule = goModule(model, 'go')
-  const cliModule = goModule(model, 'go-cli')
+  const cliModule = goModule(model, target.name)
 
   const entityMap: any = getModelPath(model, `main.${KIT}.entity`)
   // Derive each entity's PascalCase `Name` here rather than relying on another
@@ -369,7 +373,7 @@ this repo, or upstream at
   // (go 1.24.7) — keep in step with BORU_ENG_VERSION.
   File({ name: 'go.mod' }, () => Content(`module ${cliModule}
 
-go ${goVersion(model, 'go-cli', '1.24.7')}
+go ${goVersion(model, target.name, '1.24.7')}
 
 require ${sdkModule} v0.0.0
 require github.com/boru-lang/boru/eng/go ${BORU_ENG_VERSION}

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

@@ -50,8 +50,12 @@ const Main = cmp(function Main(props: any) {
   const { model } = props.ctx$
 
   const org = model.origin || 'voxgig-sdk'
+  // The two names on the next lines are DIFFERENT KINDS of name, and the
+  // adjacency is the trap. `sdkModule` is the Go SDK this CLI imports — a
+  // different target, so it keeps its own name and must NOT follow this
+  // target's alias. `mcpModule` is this target itself, so it must.
   const sdkModule = goModule(model, 'go')
-  const mcpModule = goModule(model, 'go-mcp')
+  const mcpModule = goModule(model, target.name)
 
   const entityMap: any = getModelPath(model, `main.${KIT}.entity`)
   // Derive each entity's PascalCase `Name` here rather than relying on another
@@ -319,7 +323,7 @@ this repo, or upstream at
   // the public proxy. The MCP Go SDK requires go >= 1.25.
   File({ name: 'go.mod' }, () => Content(`module ${mcpModule}
 
-go ${goVersion(model, 'go-mcp', '1.25.0')}
+go ${goVersion(model, target.name, '1.25.0')}
 
 require ${sdkModule} v0.0.0
 require github.com/modelcontextprotocol/go-sdk ${MCP_GO_SDK_VERSION}

package/project/.sdk/src/cmp/java/Test_java.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_java'
@@ -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/java/test/ and is
     // copied by Main_java. 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, javapackage })
       TestDirect({ target, entity, javapackage })
     })

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

@@ -63,7 +63,7 @@ const Package = cmp(async function Package(props: any) {
   const pkg = {
     // The ts target publishes the canonical scoped npm name; the js target
     // appends `-js` so the two never collide on npm.
-    name: packageName(model, 'js'),
+    name: packageName(model, target.name),
     version: packageVersion(model, target.name),
     description: pkgDescription(model, target.name),
     keywords: keywords(model),