@voxgig/sdkgen 2.0.2 → 3.0.0

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
 
 import { dartPackageName } from './Package_dart'
 
@@ -19,7 +19,7 @@ Or add it to your \`pubspec.yaml\`:
 
 \`\`\`yaml
 dependencies:
-  ${pkg}: ^0.0.1
+  ${pkg}: ^${packageVersion(model, target.name)}
 \`\`\`
 
 `)
@@ -39,7 +39,7 @@ dependencies:
     git:
       url: ${repoUrl}
       path: ${target.name}
-      ref: ${target.name}/v0.0.1
+      ref: ${target.name}/v${packageVersion(model, target.name)}
 \`\`\`
 
 Or depend on a local source checkout:

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

@@ -94,7 +94,7 @@ ${opRows}
 
 ### Result shape
 
-Entity operations return the bare result data (a \`Map\` for single-entity
+Entity operations return the ENTITY (call data() for the record) (a \`Map\` for single-entity
 ops, a \`List\` of entity instances for \`list\`) and throw on error. Wrap calls
 in \`try\`/\`catch\` to handle failures.
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, isAuthActive, envName, canonKey, opRequestShape, entityIdField, entityDataIdField, entityOps, safeVarName, exampleVarName } from '@voxgig/sdkgen'
+import { cmp, each, Content, isAuthActive, envName, canonKey, opRequestShape, entityIdField, entityDataIdField, entityOps, safeVarName, exampleVarName, matchArg, idLiteral } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -10,6 +10,17 @@ import {
 import { dartPackageName } from './Package_dart'
 
 
+// A `list()` on a NESTED entity needs its parent path params. The
+// quickstart used to emit `client.Moon().list()` for an entity at
+// `/planet/{planet_id}/moon`, which 404s against a live server from a
+// half-built URL — indistinguishable from "no such record". The model
+// already marks those params `reqd: true`; matchArg renders exactly them.
+function listMatchArg(ent: any): string {
+  const idF = entityIdField(ent)
+  return matchArg('ts', ent, 'list', idF, idLiteral(ent, 'list', idF))
+}
+
+
 const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
   const { target, ctx$: { model } } = props
 
@@ -74,7 +85,7 @@ it and read each record's data via \`.data()\`.
 
 \`\`\`dart
 try {
-  final ${eVar}s = await client.${eName}().list();
+  final ${eVar}s = await client.${eName}().list(${listMatchArg(exampleEntity)});
   for (final item in ${eVar}s) {
     print(item.data());
   }
@@ -108,7 +119,7 @@ try {
       Content(`### 3. Load ${neArticle} ${neName.toLowerCase()}
 
 ${neName} is nested under ${parentName}, so provide the \`${parentParam}\`.
-\`load()\` returns the bare record (a \`Map\`) and throws on error.
+\`load()\` returns the ENTITY — call data() for the record — and throws on error.
 
 \`\`\`dart
 try {
@@ -135,7 +146,7 @@ try {
 
       Content(`### 3. Load ${article} ${eName.toLowerCase()}
 
-\`load()\` returns the bare record (a \`Map\`) and throws on error.
+\`load()\` returns the ENTITY — call data() for the record — and throws on error.
 
 \`\`\`dart
 try {
@@ -167,7 +178,7 @@ try {
       return it && it.type
     }
     const idValueFor = (opname: string): string => (null != dataIdF && opnames.includes('create'))
-      ? `created['${dataIdF}']`
+      ? `created.data()['${dataIdF}']`
       : dartLit(idParamType(opname), 'example_id')
 
     if (opnames.includes('create') || opnames.includes('update') || opnames.includes('remove')) {
@@ -176,7 +187,7 @@ try {
 \`\`\`dart
 `)
       if (opnames.includes('create')) {
-        Content(`// Create — returns the bare created record (a Map)
+        Content(`// Create — returns the ENTITY (call data() for the record)
 final created = await client.${eName}().create({${examplePairs('create').join(', ')}});
 
 `)

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, canonToType, canonKey, File, isAuthActive, entityIdField, opRequestShape, safeVarName, exampleVarName } from '@voxgig/sdkgen'
+import { cmp, each, Content, canonToType, canonKey, File, isAuthActive, entityIdField, opRequestShape, safeVarName, exampleVarName, matchArg, idLiteral } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -23,6 +23,17 @@ function dartLit(type: any, placeholder: string = 'example'): string {
 }
 
 
+// A `list()` on a NESTED entity needs its parent path params. The
+// quickstart used to emit `client.Moon().list()` for an entity at
+// `/planet/{planet_id}/moon`, which 404s against a live server from a
+// half-built URL — indistinguishable from "no such record". The model
+// already marks those params `reqd: true`; matchArg renders exactly them.
+function listMatchArg(ent: any): string {
+  const idF = entityIdField(ent)
+  return matchArg('ts', ent, 'list', idF, idLiteral(ent, 'list', idF))
+}
+
+
 const OP_SIGNATURES: Record<string, { sig: string, returns: string, desc: string }> = {
   load: {
     sig: 'load(reqmatch, [ctrl]) -> Future<dynamic>',
@@ -268,7 +279,7 @@ final result = await client.${ent.Name}().${opname}(${arg});
           }
           else if ('list' === opname) {
             Content(`\`\`\`dart
-final results = await client.${ent.Name}().list();
+final results = await client.${ent.Name}().list(${listMatchArg(ent)});
 for (final ${eVar} in results) {
   print(${eVar}.data());
 }

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, entityIdField, opRequestShape, safeVarName, exampleVarName } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, entityIdField, opRequestShape, safeVarName, exampleVarName, matchArg, idLiteral } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -23,6 +23,17 @@ function dartLit(type: any, placeholder: string = 'example'): string {
 }
 
 
+// A `list()` on a NESTED entity needs its parent path params. The
+// quickstart used to emit `client.Moon().list()` for an entity at
+// `/planet/{planet_id}/moon`, which 404s against a live server from a
+// half-built URL — indistinguishable from "no such record". The model
+// already marks those params `reqd: true`; matchArg renders exactly them.
+function listMatchArg(ent: any): string {
+  const idF = entityIdField(ent)
+  return matchArg('ts', ent, 'list', idF, idLiteral(ent, 'list', idF))
+}
+
+
 const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
   const { target, ctx$: { model } } = props
 
@@ -55,7 +66,7 @@ Future<void> main() async {
 
     if (opnames.includes('list')) {
       Content(`  // List all ${eName.toLowerCase()}s (returns a list of entities, throws on error)
-  final ${eVar}s = await client.${eName}().list();
+  final ${eVar}s = await client.${eName}().list(${listMatchArg(exampleEntity)});
   for (final item in ${eVar}s) {
     print(item.data());
   }

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

@@ -16,7 +16,7 @@ import {
   Slot,
   cmp,
   snakify,
-  isAuthActive,
+  isAuthActive, envName, envToken
 } from '@voxgig/sdkgen'
 
 
@@ -35,8 +35,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const ff = projectPath('src/cmp/dart/fragment/')
 
-  const PROJECTNAME = nom(model, 'Name').toUpperCase().replace(/[^A-Z_]/g, '_')
-  const entidEnvVar = `${PROJECTNAME}_TEST_${nom(entity, 'NAME').replace(/[^A-Z_]/g, '_')}_ENTID`
+  const PROJECTNAME = envName(model)
+  const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive

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

@@ -23,7 +23,7 @@ import {
   Slot,
   cmp,
   each,
-  isAuthActive,
+  isAuthActive, envName, envToken
 } from '@voxgig/sdkgen'
 
 
@@ -50,8 +50,8 @@ const TestEntity = cmp(function TestEntity(props: any) {
 
   const entity: ModelEntity = props.entity
 
-  const PROJENVNAME = nom(model.const, 'NAME').replace(/[^A-Z_]/g, '_')
-  const ENTENVNAME = nom(entity, 'NAME').replace(/[^A-Z_]/g, '_')
+  const PROJENVNAME = envName(model)
+  const ENTENVNAME = envToken(entity.name)
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
     ? `\n    '${PROJENVNAME}_APIKEY': 'NONE',`
@@ -333,7 +333,7 @@ const generateCreate: OpGen = (ctx, step, index) => {
   const hasEntIdC = null != entity.id
 
   Content(`
-      ${datavar} = await ${entvar}.create(${datavar});
+      ${datavar} = (await ${entvar}.create(${datavar})).data();
 `)
   if (hasEntIdC) {
     Content(`      ok(null != ${datavar}['id']);
@@ -373,7 +373,7 @@ const generateList: OpGen = (ctx, step, index) => {
   })
 
   Content(`
-      final ${listvar} = await ${entvar}.list(${matchvar});
+      final ${listvar} = (await ${entvar}.list(${matchvar})).map((e) => e.data()).toList();
 `)
   const allSteps = flow.step
   for (let vI = 0; vI < step.valid.length; vI++) {
@@ -460,7 +460,7 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   }
 
   Content(`
-      final ${resdatavar} = await ${entvar}.update(${updvar});
+      final ${resdatavar} = (await ${entvar}.update(${updvar})).data();
 `)
   if (hasEntIdU) {
     Content(`      ok(${resdatavar}['id'] == ${updvar}['id']);
@@ -550,13 +550,13 @@ const generateLoad: OpGen = (ctx, step, index) => {
   if (hasEntId) {
     Content(`      final ${matchvar} = <String, dynamic>{};
       ${matchvar}['id'] = ${srcdatavar}['id'];
-      final ${datavar} = await ${entvar}.load(${matchvar});
+      final ${datavar} = (await ${entvar}.load(${matchvar})).data();
       ok(${datavar}['id'] == ${srcdatavar}['id']);
 `)
   }
   else {
     Content(`      final ${matchvar} = <String, dynamic>{};
-      final ${datavar} = await ${entvar}.load(${matchvar});
+      final ${datavar} = (await ${entvar}.load(${matchvar})).data();
       ok(null != ${datavar});
 `)
   }

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

@@ -43,6 +43,18 @@ class ProjectNameEntityBase {
     featureHook(entctx, 'PostConstructEntity');
   }
 
+  // Every operation resolves to the entity; `remove` additionally marks
+  // it. The instance KEEPS the data it held — a caller can still read what
+  // was deleted — but it is no longer a live record. See AGENTS.md.
+  bool _deleted = false;
+
+  void markDeleted() {
+    _deleted = true;
+  }
+
+  bool deleted() => _deleted;
+
+
   dynamic entopts() {
     return utility.struct.merge([{}, entoptsMap]);
   }
@@ -235,7 +247,12 @@ class ProjectNameEntityBase {
     if (d is Map) {
       d.forEach((k, v) => out[k.toString()] = v);
     }
-    out[r'entity$'] = Name;
+  // The marker is NAMESPACED. It used to be `entity$` — a short, generic
+  // name, and the `$`-suffix convention is not unique to sdkgen. Seneca uses
+  // `entity$` on its own entities to hold the canon, so an SDK record fed
+  // into `entize` silently overwrote it and produced entities claiming a
+  // canon that does not exist: no error, just wrong entities.
+    out[r'voxgig$entity'] = Name;
     return out;
   }
 

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

@@ -72,7 +72,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

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

@@ -76,7 +76,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

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

@@ -76,7 +76,21 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      if (null != ctx.result && true == ctx.result.ok) {
+        // A removed entity keeps its data but is no longer a live record.
+        markDeleted();
+        return this;
+      }
+
+      return out;
     } catch (err) {
       // #PreUnexpected-Hook
 

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

@@ -76,7 +76,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

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

@@ -11,6 +11,14 @@ class ProjectNameError extends Error {
   dynamic result;
   dynamic spec;
 
+  // HTTP status of the response that caused this error, or -1 when the
+  // request never got one. PROMOTED to the top level: it used to be
+  // reachable only at `err.result['status']`, so every consumer coupled
+  // itself to the internal shape of `result`.
+  int status = -1;
+
+  bool get notFound => 404 == status;
+
   ProjectNameError(this.code, this.message, [this.ctx]);
 
   @override

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

@@ -5,6 +5,7 @@ import {
   cmp,
   pkgDescription,
   repoInfo,
+  packageVersion,
 } from '@voxgig/sdkgen'
 
 
@@ -17,6 +18,7 @@ import type {
 // third-party runtime deps, so the SDK ships with none either.
 const Package = cmp(async function Package(props: any) {
   const ctx$ = props.ctx$
+  const target = props.target
   const model: Model = ctx$.model
 
   const Name = model.const.Name
@@ -32,7 +34,7 @@ const Package = cmp(async function Package(props: any) {
   def project do
     [
       app: :${app},
-      version: "0.0.1",
+      version: "${packageVersion(model, target.name)}",
       elixir: "~> 1.14",
       description: ${JSON.stringify(pkgDescription(model, 'elixir'))},
       elixirc_paths: elixirc_paths(Mix.env()),

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
 
 
 const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
@@ -16,7 +16,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
 \`\`\`elixir
 def deps do
   [
-    {:${app}, "~> 0.0.1"}
+    {:${app}, "~> ${packageVersion(model, target.name)}"}
   ]
 end
 \`\`\`

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

@@ -70,8 +70,15 @@ defmodule ${Name}.${EName}EntityTest do
   test "should list records" do
     sdk = mk_sdk()
     ent = ${Name}.${ename}(sdk)
+    # The op resolves to one ENTITY per record; the record is reached with
+    # data_get. See AGENTS.md "Entity operations return ENTITIES".
     result = ${Name}.Entity.${EName}.list(ent, S.jm([]))
     assert S.islist(result)
+    if S.size(result) > 0 do
+      Enum.each(0..(S.size(result) - 1), fn i ->
+        assert S.ismap(${Name}.EntityBase.data_get(S.getelem(result, i)))
+      end)
+    end
   end
 `)
     }
@@ -84,7 +91,8 @@ defmodule ${Name}.${EName}EntityTest do
     if id != nil do
       sdk = mk_sdk()
       ent = ${Name}.${ename}(sdk)
-      rec = ${Name}.Entity.${EName}.load(ent, S.jm(["id", id]))
+      loaded = ${Name}.Entity.${EName}.load(ent, S.jm(["id", id]))
+      rec = ${Name}.EntityBase.data_get(loaded)
       assert S.ismap(rec)
       assert S.getprop(rec, "id") == id
     end
@@ -97,7 +105,8 @@ defmodule ${Name}.${EName}EntityTest do
   test "should create then read back" do
     sdk = ${Name}.test(S.jm(["entity", S.jm(["${ename}", S.jm([])])]))
     ent = ${Name}.${ename}(sdk)
-    made = ${Name}.Entity.${EName}.create(ent, S.jm(["name", "test-create"]))
+    created = ${Name}.Entity.${EName}.create(ent, S.jm(["name", "test-create"]))
+    made = ${Name}.EntityBase.data_get(created)
     assert S.ismap(made)
     assert S.getprop(made, "id") != nil
   end

package/project/.sdk/src/cmp/elixir/fragment/EntityCreateOp.fragment.ex

@@ -26,7 +26,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityListOp.fragment.ex

@@ -28,6 +28,7 @@
       end
     end
 
+    # `list` resolves to one ENTITY per record — make_result builds them.
     Pipeline.run_op(ctx, post_done)
   end
 

package/project/.sdk/src/cmp/elixir/fragment/EntityLoadOp.fragment.ex

@@ -30,7 +30,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityRemoveOp.fragment.ex

@@ -30,7 +30,10 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    ent = EntityBase.op_return(ent, ctx, out)
+    # A removed entity keeps its data but is no longer a live record.
+    if ent == out, do: out, else: EntityBase.mark_deleted(ent)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityUpdateOp.fragment.ex

@@ -28,7 +28,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

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

@@ -28,7 +28,7 @@
 
 import {
   cmp, each,
-  File, Content, Folder,
+  File, Content, Folder, goModule
 } from '@voxgig/sdkgen'
 
 import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
@@ -165,6 +165,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   const { target } = props
   const { model, log } = props.ctx$
 
+  // 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')
+
   // only_active:false — getModelPath DROPS active:false entries by default,
   // but the consumer scaffold (create-sdkgen Root.ts) iterates the RAW entity
   // collection, so inactive entities still get generated entity code that
@@ -196,7 +200,11 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 // @voxgig/apidef VALID_CANON). Do not edit by hand.
 package entity
 
-import "encoding/json"
+import (
+	"encoding/json"
+
+	"${gomodule}/core"
+)
 
 `)
 
@@ -262,12 +270,26 @@ func asMap(v any) map[string]any {
 	return out
 }
 
-// typedFrom decodes a runtime value (a map[string]any produced by the op
-// pipeline) into a typed model T via a JSON round-trip. On any error it
-// returns the zero value of T; the op's own (value, error) tuple carries the
-// real error.
+// entityData unwraps an entity to its data map.
+//
+// Operations resolve to the ENTITY, not the raw data (see AGENTS.md), and an
+// entity's fields are UNEXPORTED — marshalling one directly yields \`{}\`, so
+// every typed accessor would silently hand back a zero-valued struct. The
+// typed boundary therefore takes the data hop first.
+func entityData(v any) any {
+	if ent, ok := v.(core.Entity); ok {
+		return ent.Data()
+	}
+	return v
+}
+
+// typedFrom decodes a runtime value (an entity, or the map[string]any the op
+// pipeline produced) into a typed model T via a JSON round-trip. On any error
+// it returns the zero value of T; the op's own (value, error) tuple carries
+// the real error.
 func typedFrom[T any](v any) T {
 	var out T
+	v = entityData(v)
 	if v == nil {
 		return out
 	}
@@ -279,13 +301,21 @@ func typedFrom[T any](v any) T {
 	return out
 }
 
-// typedSliceFrom decodes a runtime list value ([]any of maps) into a typed
-// slice []T via a JSON round-trip, for list ops.
+// typedSliceFrom decodes a runtime list value into a typed slice []T via a
+// JSON round-trip, for list ops. \`list\` resolves to a slice of ENTITY
+// instances, so each element takes the data hop.
 func typedSliceFrom[T any](v any) []T {
 	var out []T
 	if v == nil {
 		return out
 	}
+	if list, ok := v.([]any); ok {
+		unwrapped := make([]any, 0, len(list))
+		for _, item := range list {
+			unwrapped = append(unwrapped, entityData(item))
+		}
+		v = unwrapped
+	}
 	b, err := json.Marshal(v)
 	if err != nil {
 		return out

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, camelify, names,
   File, Content, Folder, Fragment, Line, FeatureHook, Slot,
-  entityClassName, entityCollection,
+  entityClassName, entityCollection, goModule
 } from '@voxgig/sdkgen'
 
 import {
@@ -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 = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   // 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/Main_go.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
-  entityClassName, entityCollection,
+  entityClassName, entityCollection, goModule, goPackageIdent
 } from '@voxgig/sdkgen'
 
 
@@ -37,11 +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 = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
   // The root package name must be a plain Go identifier (can't be a path),
-  // so it stays as the concatenated-lowercase form (e.g. voxgigdogsdk).
-  const gopackage = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '').replace(/[^a-z0-9]/gi, '') +
-    model.name.replace(/[^a-z0-9]/gi, '').toLowerCase() + 'sdk'
+  // so it stays a concatenated-lowercase form (e.g. voxgigdogsdk).
+  const gopackage = goPackageIdent(model, 'go')
 
   Package({ target })