@voxgig/sdkgen 4.21.0 → 4.23.0

package/project/.sdk/src/cmp/scala/TestEntity_scala.ts

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -24,11 +25,6 @@ import {
 import { scalaVarName } from './utility_scala'
 
 
-// Scala GenCtx mirrors the java donor's shape (see TestEntity_java.ts). The
-// scala per-entity test is a dependency-free scala-cli object (default
-// package) exposing run(rep) — driven by the generated SdkEntityTestMain
-// aggregator. Only the offline unit path is emitted: the in-memory test
-// transport serves the fixtures, so there is no live/env/synthetic machinery.
 type GenCtx = {
   model: Model
   entity: ModelEntity
@@ -68,10 +64,10 @@ const TestEntity = cmp(function TestEntity(props: any) {
   for (const n of idnames) {
     idmapObj[n] = String(n).toUpperCase()
   }
-  const allSteps = Object.values(basicflow.step) as any[]
-  const updateStep = allSteps.find((s: any) => s.op === 'update')
-  const updateData = updateStep?.data
-    ? Object.entries(updateStep.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
+  const allSteps = Object.values(flowSteps(basicflow)) as any[]
+  const updateStep = allSteps.find((s: any) => s.o === 'update')
+  const updateData = updateStep?.d
+    ? Object.entries(updateStep.d).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
     : []
   for (const [k, v] of updateData as any[]) {
     if (null == idmapObj[k] && null != idmapObj[v as string]) {
@@ -125,10 +121,10 @@ object ${EntityName}EntityTest {
     // that a later load/update/remove reads its id from. Seed it from the
     // shipped "existing" fixtures here, mirroring the ts generator. Guarded on a
     // DATA id field — an entity that carries no id has no `.get("id")` to read.
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     const needsPreambleData = !flowHasCreate &&
       null != entityDataIdField(entity) &&
-      allSteps.some((s: any) => ['load', 'update', 'remove'].includes(s.op))
+      allSteps.some((s: any) => ['load', 'update', 'remove'].includes(s.o))
     if (needsPreambleData) {
       const preambleData = scalaVarName(entity.name + '_ref01_data')
       Content(`      val ${preambleData}Raw = Struct.items(Helpers.toMapAny(
@@ -138,8 +134,8 @@ object ${EntityName}EntityTest {
     }
 
     // Model-driven step iteration (sorted-key order for byte-stable output).
-    each(basicflow.step, (step: any, index: any) => {
-      const opgen: OpGen = GENERATE_OP[step.op]
+    each(flowSteps(basicflow), (step: any, index: any) => {
+      const opgen: OpGen = GENERATE_OP[step.o]
       if (opgen) {
         Content('\n')
         opgen(genCtx, step, index)
@@ -156,13 +152,13 @@ object ${EntityName}EntityTest {
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // CREATE
 `)
@@ -193,14 +189,14 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const listvar = scalaVarName(step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const listvar = scalaVarName(step.i.listvar ?? (ref + '_list' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // LIST
 `)
@@ -217,16 +213,13 @@ const generateList: OpGen = (ctx, step, index) => {
 `)
   }
 
-  // Select-by-id assertions require the DATA type to carry an id field
-  // (entityDataIdField); an entity keyed only on a load-MATCH id it does not
-  // return as data has no `.get("id")` to compare, so skip them.
   const hasDataId = null != entityDataIdField(entity)
-  const allSteps = Object.values(flow.step) as any[]
-  const listvarUsed = hasDataId && !!step.valid?.some((v: any) => {
+  const allSteps = Object.values(flowSteps(flow)) as any[]
+  const listvarUsed = hasDataId && !!step.v?.some((v: any) => {
     if ('ItemExists' !== v.apply && 'ItemNotExists' !== v.apply) return false
     const validRef = v.def?.ref
-    return validRef && allSteps.some((s: any) => 'create' === s.op &&
-      ((s.input.ref ?? entity.name + '_ref01') === validRef))
+    return validRef && allSteps.some((s: any) => 'create' === s.o &&
+      ((s.i.ref ?? entity.name + '_ref01') === validRef))
   })
 
   Content(`      val ${listvar}Result = ${entvar}.list(${matchvar}, null)
@@ -237,11 +230,11 @@ const generateList: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.valid) {
-    for (const validator of step.valid) {
+  if (step.v) {
+    for (const validator of step.v) {
       const validRef = validator.def?.ref
-      const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.op &&
-        ((s.input.ref ?? entity.name + '_ref01') === validRef))
+      const hasRefData = validRef && allSteps.some((s: any) => 'create' === s.o &&
+        ((s.i.ref ?? entity.name + '_ref01') === validRef))
       const refDataVar = scalaVarName(validRef + '_data')
 
       if ('ItemExists' === validator.apply && hasRefData && hasDataId) {
@@ -262,16 +255,16 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const resdatavar = scalaVarName(step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? '')))
-  const markdefvar = scalaVarName(step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const resdatavar = scalaVarName(step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? '')))
+  const markdefvar = scalaVarName(step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   const hasDataId = null != entityDataIdField(entity)
 
@@ -288,8 +281,8 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.data) {
-    const dataEntries = Object.entries(step.data).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
+  if (step.d) {
+    const dataEntries = Object.entries(step.d).filter(([k]: any) => k !== 'id' && !k.endsWith('$'))
     for (const [key] of dataEntries) {
       Content(`      ${datavar}Up.put("${key}", idmap.get("${key}"))
 `)
@@ -297,10 +290,10 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   }
 
   let hasMark = false
-  if (step.spec) {
-    for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
-        const fieldname = step.input.textfield
+  if (step.s) {
+    for (const spec of step.s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
+        const fieldname = step.i.textfield
         const fieldvalue = spec.def?.mark ?? `Mark01-${ref}`
         hasMark = true
         Content(`      val ${markdefvar}Name = "${fieldname}"
@@ -328,23 +321,23 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const datavar = scalaVarName(step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? '')))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const datavar = scalaVarName(step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data' + (step.i.suffix ?? '')))
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const hasEntVar = priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
-  const flowHasCreate = Object.values(flow.step).some((s: any) => (s as any).op === 'create')
+  const flowHasCreate = Object.values(flowSteps(flow)).some((s: any) => (s as any).o === 'create')
   const preambleRef = entity.name + '_ref01'
   const hasSrcData = (!flowHasCreate && srcdatavar === scalaVarName(preambleRef + '_data')) ||
     priorSteps.some((s: any) => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = scalaVarName(s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? '')))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = scalaVarName(s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? '')))
         return priorDatvar === srcdatavar
       }
       return false
@@ -383,10 +376,10 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 const generateRemove: OpGen = (ctx, step, index) => {
   const { entity, flow, accessor, ENTLOWER } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = scalaVarName(step.input.entvar ?? ref + '_ent')
-  const matchvar = scalaVarName(step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? '')))
-  const srcdatavar = scalaVarName(step.input.srcdatavar ?? (ref + '_data'))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = scalaVarName(step.i.entvar ?? ref + '_ent')
+  const matchvar = scalaVarName(step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? '')))
+  const srcdatavar = scalaVarName(step.i.srcdatavar ?? (ref + '_data'))
 
   // The remove-by-id match reads ${srcdatavar}.get("id"); skip the whole step
   // when the DATA type has no id field (there is no created id to remove by).
@@ -394,9 +387,9 @@ const generateRemove: OpGen = (ctx, step, index) => {
     return
   }
 
-  const priorSteps = Object.values(flow.step).slice(0, Number(index)) as any[]
+  const priorSteps = Object.values(flowSteps(flow)).slice(0, Number(index)) as any[]
   const needsEnt = !priorSteps.some((s: any) =>
-    ['create', 'list', 'load', 'update', 'remove'].includes(s.op))
+    ['create', 'list', 'load', 'update', 'remove'].includes(s.o))
 
   Content(`      // REMOVE
 `)

package/project/.sdk/src/cmp/scala/Test_scala.ts

@@ -62,9 +62,6 @@ const Test = cmp(function Test(props: any) {
       }
     })
 
-    // Documentation scala-examples presence + structure gate over the root
-    // README, scala/README.md and scala/REFERENCE.md. Driven through the same
-    // shared report by the SdkEntityTestMain aggregator below.
     ReadmeExamplesTest({ target, scalapackage })
 
     // Aggregating main: run every generated per-entity test through one

package/project/.sdk/src/cmp/scala/utility_scala.ts

@@ -17,12 +17,6 @@ function projectPath(suffix?: string): string {
 }
 
 
-// The Scala package root for the generated SDK, mirroring how the go target
-// derives GOMODULE and the java target derives its package: org segment from
-// model.origin, name segment from the model name (e.g. origin voxgig-sdk +
-// name solardemo -> voxgig.solardemosdk). Each runtime piece lives under it:
-// <pkg>.core, <pkg>.utility, <pkg>.utility.struct, <pkg>.feature,
-// <pkg>.entity, <pkg>.sdktest.
 function scalaPackage(model: any): string {
   const org = String(model.origin || 'voxgig-sdk')
     .replace(/-sdk$/, '')
@@ -55,8 +49,6 @@ const SCALA_KEYWORDS = new Set([
 ])
 
 
-// A camelCase Scala identifier for a snake_case model name
-// (`status_embed_config` -> `statusEmbedConfig`), with a reserved-word guard.
 function scalaVarName(name: string): string {
   const pascal = camelify(name)
   const out = pascal.charAt(0).toLowerCase() + pascal.slice(1)
@@ -64,29 +56,6 @@ function scalaVarName(name: string): string {
 }
 
 
-// Strip model bookkeeping keys (ending in $) from a config subtree.
-// Emission-time normalisation of a model subtree (L0).
-//
-// Always drops jostraca's iteration metadata (`$`-suffixed keys: index$,
-// key$, val$). With `dropDefaults`, also drops keys whose value IS the
-// default the runtime already assumes when the key is absent, which is pure
-// payload — see CONFIG_DEFAULT.
-//
-// Rebuilds the tree rather than mutating during a walk. The previous
-// implementation walked a clone calling `delete p[k]`, but walk() assigns its
-// callback's result back over the child (`setprop(out, ckey, walk(...))`), so
-// the delete was undone on the way out and the helper silently did nothing.
-// Returning `undefined` from the callback does not fix it either: setprop
-// stores undefined rather than removing the key, which then emits as a null.
-//
-// `dropDefaults` is opt-in and must be passed ONLY for the entity subtree.
-// `active` means something different in feature config, where absent reads as
-// INACTIVE (see feature_init) — dropping `active: true` there would silently
-// disable the feature.
-// jostraca's iteration metadata, injected by each()/names() while it walks the
-// model. Listed explicitly rather than matched by trailing-dollar suffix: a
-// trailing dollar is not exclusive to jostraca -- Seneca uses entity$ as real
-// data -- so a blanket suffix match can silently drop a legitimate API field.
 const MODEL_META = ['index$', 'key$', 'val$']
 
 // Keys whose value IS the default the runtime already assumes when the key is

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

@@ -29,42 +29,10 @@ const Config = cmp(async function Config(props: any) {
 
   const model: Model = ctx$.model
 
-  // Gated by the applicability tags, so this target never imports or
-  // registers a feature it has no source for. One rule, one place:
-  // helpers/applicability.
   const feature = targetFeatures(model, target)
 
-  // The config as data, built by the shared helper so every target embeds
-  // the same model by construction. Passing target.name opts this target
-  // into main.slug / main.version / main.target (the three station
-  // descriptor identity fields, station design §4); swift has only the
-  // JSON-literal rep, so that one call covers every rep this target emits.
-  //
-  // `def` rather than the helper's own `json`, because `in` and `name` are
-  // added to the auth block below and the JSON has to be re-serialised over
-  // that. When nothing is added, `JSON.stringify(def)` IS the helper's
-  // `json` - same object, same key order - so a header SDK's config is
-  // byte-identical to what it was.
   const { def } = configDefinition(model, target.name)
 
-  // `in` and `name` TRAVEL WITH THE PREFIX NOW. apidef resolved both from
-  // the spec's securityScheme all along (main.kit.info.security - joplin's
-  // says `in: "query", name: "token"`) and generation dropped them, so an
-  // apiKey-in-query API got an Authorization header it does not read.
-  //
-  // Emitted ONLY when they differ from the header/Authorization defaults, so
-  // every header-based SDK regenerates byte-identical. The generated
-  // prepareAuth bakes the placement in at generation time (see
-  // PrepareAuth_swift); these carry it in the config so a running SDK, and
-  // anything reading its descriptor, can say what its scheme actually is.
-  //
-  // THE OPTSPEC HAS TO NAME THEM TOO. `main.kit.optspec.auth` does, but
-  // swift does not read the model for its option spec - buildOptSpec() in
-  // tm/swift/Sources/ProjectNameSDK/utility/MakeOptions.swift is written out
-  // by hand - so both were added there in the same change. Without that this
-  // block is inert at best: makeOptions merges the config's options and
-  // validates the result against that spec, and a key the spec does not name
-  // is dropped or rejected.
   const authIn = resolveAuthIn(model)
   const authName = resolveAuthName(model)
   const authOpt: any = (def as any)?.options?.auth
@@ -75,42 +43,12 @@ const Config = cmp(async function Config(props: any) {
 
   const json = JSON.stringify(def)
 
-  // Model-data defaults may carry the ProjectName placeholder (e.g. the
-  // clienttrack clientName); resolve it to the API name so the embedded JSON
-  // matches the token-replaced runtime.
   const configJson = json.replace(/ProjectName/g, model.const.Name)
 
-  // PLUGIN DEFINITIONS AND THE featurePlugins MAP (the swift peer of
-  // Config_go's featurePlugins / Config_ts's pluginDefs).
-  //
-  // Upstream sekreto replaced its self-registration registry with
-  // voxgig/plugin definitions: a provider kind the caller did not pass in
-  // via `plugins:` is unknown to that Sekreto. So the config names each
-  // active plugin's exported Definition BY SYMBOL (the model's per-target
-  // `def.swift` map - `hashicorp`, a top-level `let` in the vendored
-  // SekretoPlugins module) and hands the list to the feature through
-  // SdkConfig.featurePlugins.
-  //
-  // Typed `[String: [Any]]`, as go types it `[]any`, so Config never has to
-  // name `Definition` - and so needs `import SekretoPlugins` only when a
-  // definition is actually listed. The feature reads the list back and
-  // downcasts.
-  //
-  // The ACCESSOR IS EMITTED UNCONDITIONALLY (empty map when nothing is
-  // selected). Its caller, feature/SecretsFeature.swift, ships whenever the
-  // feature is active, and java gated the accessor on "a feature declares a
-  // plugin block" - which a project that never selected secrets does not
-  // have - and shipped an SDK that did not compile (.handover-briefs/
-  // fixb-java.md). One rule: what a template may reference, Config always
-  // declares.
   const featurePlugins: Record<string, string[]> = {}
   each(feature, (f: any) => {
     const syms: string[] = []
     each(f.plugin, (plugin: any) => {
-      // Filter on `active` HERE rather than trusting the feature object to
-      // arrive filtered (see Config_ts.pluginImports: getting this wrong
-      // names a definition the trim just deleted, and swiftc fails the
-      // whole module on the unresolved symbol).
       if (false === plugin.active || null == plugin.active) return
       for (const sym of Object.keys(plugin.def?.swift || {})) {
         syms.push(sym)

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

@@ -9,9 +9,6 @@ const EntityOperation = cmp(function Operation(props: any) {
   const { model } = props.ctx$
   const { ff, opname, entity, entrep, cls } = props
 
-  // The op markers sit inside the class body; the captured indent (2-space
-  // class-member indent) is applied to the whole spliced EJECT region, which
-  // is written at column 0.
   const { indent } = props
 
   Fragment({

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

@@ -1,24 +1,4 @@
 
-// Typed-model generator (Swift target). Port of EntityTypes_rust.ts /
-// EntityTypes_go.ts.
-//
-// Reads main.<KIT>.entity.<e>.fields[] and per-op params
-// (op.<name>.points[].args.params[]) and emits one file,
-// Sources/ProjectNameSDK/entity/<Name>Types.swift, with a `struct <Name>` per
-// entity plus a request/match struct per active op. Field/param sentinels
-// ($STRING, $INTEGER, ...) map to Swift types via the SHARED canonToType
-// 'swift' column (the single source of truth per language — do not keep a
-// local table here).
-//
-// DESIGN NOTE: the Swift runtime is fully DYNAMIC — every op takes and returns
-// the vendored `Value` enum (throws on error) and the op fragments emit no
-// typed wrappers. These typed models are therefore DOCUMENTARY: they mirror the
-// entity/op shapes for reference and IDE support, but are not wired into the op
-// signatures. They compile as part of the SwiftPM target (every .swift under
-// Sources/ProjectNameSDK is built) so they stay in sync with the model.
-//   * Optional (req:false) member -> `T?`.
-//   * Unknown/missing sentinel -> the dynamic `Value` (never fails), matching
-//     the runtime's open shape.
 
 import {
   cmp, each,
@@ -48,9 +28,6 @@ function propLine(name: string, sentinel: any, optional: boolean): string {
 }
 
 
-// Emit a `struct <typeName>` from {name, type, optional} items, dropping
-// duplicate Swift identifiers (two model names can collapse to one ident). An
-// empty struct is a valid, zero-property shape.
 function emitStruct(comment: string, typeName: string, items: any[]): void {
   Content(`${comment}
 public struct ${typeName} {
@@ -78,14 +55,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // collection, so inactive entities still get generated entity code that
   // references these typed names. The typed model must cover them too.
   const entity = getModelPath(model, `main.${KIT}.entity`, { only_active: false, required: false })
-  // Emit for every entity that gets an entity file (filter on `name`, always
-  // present; derive `Name` here so the struct set is deterministic — parity
-  // with the rust/go emitter's fix).
   const entityList = deriveEntityNames(entity)
 
-  // Surface duplicate generated type names (two entities with the same
-  // PascalCase Name) — they would redeclare a type in statically-typed
-  // targets. Detection only; renaming is a model-level decision.
   warnEntityTypeCollisions(entity, log, LANG)
 
   Folder({ name: 'Sources' }, () => {
@@ -96,8 +67,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 
           Content(`// Typed models for the ${model.const.Name} SDK.
 //
-// GENERATED from the API model: main.${KIT}.entity.<e>.fields[] and per-op
-// params (op.<name>.points[].args.params[]). Field/param types are mapped
+// GENERATED from the API model: main.${KIT}.entity.<e>.fields{} and per-op
+// params (op.<name>.points[].g.params[]). Field/param types are mapped
 // from the canonical type sentinels. Do not edit by hand.
 //
 // These are DOCUMENTARY: the SDK runtime is dynamic (ops take/return the
@@ -111,25 +82,15 @@ import Foundation
           entityList.forEach((ent: any) => {
             const Name = ent.Name
             const fields = (ent.fields ? each(ent.fields) : [])
-              .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.
+              .filter((f: any) => f.a !== false)
+
             const TypeName = swiftSafeTypeName(Name)
             emitStruct(
               `/// ${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 }))
+              fields.map((f: any) => ({ name: f.n, type: f.t, optional: false === f.r }))
             )
 
-            // Per active op: a request/match struct. Members and their
-            // optionality come from the shared partiality policy
-            // (opRequestShape).
             const ops = ent.op || {}
               ;['load', 'list', 'create', 'update', 'remove'].forEach((opname: string) => {
                 if (null == ops[opname]) {

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

@@ -39,19 +39,6 @@ const Main = cmp(async function Main(props: any) {
 
   const entity: ModelEntity = getModelPath(model, `main.${KIT}.entity`)
 
-  // THE SECRETS TRIM, at generate time, and swift NEEDS it where go, py and
-  // dart leave the feature-level trim to `target add` (vendor-tag rollout,
-  // Decision 5). DELIBERATE DIVERGENCE, and the reason is the build: the
-  // feature's three vendored trees are separate SwiftPM MODULES that
-  // Package_swift declares only when the feature is active (see the note
-  // there). With the feature off, a tree still in Sources/<Name>Sdk/ would
-  // be folded into the SDK target and fail it on five redeclarations, and
-  // feature/SecretsFeature.swift would fail on `import Sekreto` naming a
-  // module the manifest never declared. Every other swift feature is a
-  // single file the SDK module compiles regardless, so it needs no such
-  // exclude. Keyed on the SAME predicate the manifest uses, so the two
-  // cannot disagree. The gated suite under Tests/.../feature/secrets/ goes
-  // with it: it imports Sekreto too.
   const secrets = swiftSecretsActive(model, target)
   const secretsSourceExcludes: RegExp[] = secrets ? [] : [
     /(^|\/)feature\/SecretsFeature\.swift$/,
@@ -65,19 +52,6 @@ const Main = cmp(async function Main(props: any) {
 
   Gitignore({})
 
-  // Copy tm/swift files with replacements. `src/` holds only the per-feature
-  // extension folders (not shipped into the SDK output).
-  // THE COPIED TREE HAS TO CARRY THE API NAME TOO.
-  //
-  // Copy substitutes file CONTENTS, never path components, so a blanket copy
-  // of tm/swift landed the runtime in a directory literally called
-  // ProjectNameSDK. Package.swift papered over it with an explicit `path:`,
-  // so it compiled and every swift suite passed — while every published SDK
-  // shipped `Sources/ProjectNameSDK/`, and SwiftPM's own convention
-  // (Sources/<target>) was broken in all of them.
-  //
-  // Copy's `to` prop names the destination, so the two placeholder subtrees
-  // are copied explicitly and the rest of tm/swift blanket-copied as before.
   Copy({
     from: 'tm/' + target.name,
     exclude: [/src\//, /Sources\//, /Tests\//],
@@ -91,15 +65,6 @@ const Main = cmp(async function Main(props: any) {
     Copy({
       from: 'tm/' + target.name + '/Sources/ProjectNameSDK',
       to: swiftTargetDir(model),
-      // pluginExcludes: the generate-time plugin trim (an ACTIVE feature's
-      // INACTIVE plugin group's declared files stay out of the tree). The
-      // model's swift `path` entries are relative to THIS Copy's root
-      // (`feature/secrets/plugins/Aws.swift`, not `Sources/ProjectNameSDK/
-      // ...`), as py's are to its pkg copy - helpers/featureSource documents
-      // that getting the root wrong makes the trim a silent no-op. No
-      // verbatim carve-out is needed for the vendored trees: none of the
-      // upstream swift files carries a ProjectName/PROJECTENV token, so the
-      // blanket replace is inert over them.
       exclude: [...secretsSourceExcludes, ...pluginExcludes(model)],
       replace: {
         ...props.ctx$.stdrep,
@@ -171,13 +136,6 @@ const Main = cmp(async function Main(props: any) {
     })
   })
 
-  // utility/PrepareAuth.swift — GENERATED, NOT COPIED. Where the credential
-  // goes (header, query or cookie, and under what name) is a fact about the
-  // API, and tm/ can only hold one answer; the function was extracted from
-  // the copied utility/Prepare.swift, which no longer declares it. Called at
-  // THIS level, not inside the `core` folder above: the component opens the
-  // whole `Sources/<Name>Sdk/utility` path itself, exactly as EntityTypes
-  // does for `entity`. See PrepareAuth_swift.
   PrepareAuth({ target })
 
   // entity/<Name>Types.swift — documentary typed models (one struct per entity

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

@@ -13,73 +13,6 @@ import type {
 } from '@voxgig/apidef'
 
 
-// Emits Package.swift (the SwiftPM manifest; the Swift twin of Package_go's
-// go.mod / Package_csharp's csproj). The library target compiles everything
-// under Sources/<Name>Sdk (the copied runtime + generated sources); the test
-// target compiles Tests/<Name>SdkTests. Both directories carry the API name:
-// Copy does not rewrite path components, so Main_swift copies the two
-// placeholder subtrees explicitly via Copy's `to` prop rather than letting a
-// blanket copy ship them as ProjectNameSDK.
-//
-// Dependencies: the runtime itself is dependency-free (Foundation + the
-// vendored struct), but declared target/feature deps flow into the manifest
-// via collectDeps. SwiftPM cannot name a package by product alone, so a
-// swift deps entry carries its coordinates in a documented convention:
-//
-//   deps: swift: {
-//     'VoxgigStation': { active: true, version: '0.0.1', kind: prod,
-//       url: 'https://github.com/voxgig/station-swift' }
-//   }
-//
-//   - the entry KEY is the SwiftPM PRODUCT name (also the module the
-//     generated source imports);
-//   - the extra `url` field is the git repository SwiftPM resolves
-//     (`.package(url:from:)`); the package identity SwiftPM derives from it
-//     is the URL's last path component (minus any .git), which is what the
-//     `.product(name:package:)` reference must use;
-//   - `version` feeds `from:` - a plain semver (any leading range operator
-//     like '>=' is stripped, since `from:` already means >=).
-//
-// An entry WITHOUT a `url` is not expressible in a SwiftPM manifest (no
-// registry-less by-name dependencies), so it is skipped - unadorned entries
-// keep today's zero-dependency output.
-//
-// The `Omni` target is the VENDORED corpus test engine (Tests/vendor/omni,
-// @voxgig/omni at the shared tag). It has to be its own MODULE, not files
-// folded into the test target: the port calls `Omni.errify` by module name,
-// and its top-level `clone`/`getpath`/`walk`/`stringify`/`pathify` collide
-// head-on with the struct utility's functions of the same names. It is
-// declared as a .testTarget rather than a .target so `swift build` - a
-// consumer's library build - never compiles the test engine; `swift test`
-// builds it and the suite target depends on it.
-//
-// THE SECRETS FEATURE ADDS THREE MORE MODULES, and this is the same
-// precedent, load-bearing rather than tidy. The vendored @voxgig/plugin
-// host, the @voxgig/sekreto core and its plugins live under
-// Sources/<Name>Sdk/feature/secrets/{plugin,sekreto,plugins} and are
-// compiled as VoxgigPlugin, Sekreto and SekretoPlugins - upstream's own
-// three-module boundary (sekreto's swift Makefile builds exactly these). A
-// flat layout collides on five names: plugin's `Value` and `Point` against
-// the SDK's, sekreto's `Json` against plugin's, and `dropsuffix`/`getenv`,
-// which sekreto declares in BOTH src/ and plugins/ because upstream never
-// compiles them as one module. So, when the feature is active for this
-// target:
-//
-//   - three `.target`s are declared over the three directories;
-//   - the SDK target gains them as dependencies and `exclude: ["feature/
-//     secrets"]`, so SwiftPM does not ALSO fold the files into the SDK
-//     module (`exclude:` must come AFTER `path:` in the argument list, or
-//     the manifest itself fails to compile);
-//   - the library product vends all four, because `SecretsFeature.sekreto()`
-//     is public API returning a `Sekreto`, and a downstream package may only
-//     `import Sekreto` if the product exposes it;
-//   - the test target depends on Sekreto and VoxgigPlugin as well, since
-//     the gated suite builds providers against Sekreto's `Provider`
-//     protocol and reads the selected `Definition`s' kinds back.
-//
-// Keyed on swiftSecretsActive - the SAME predicate Main_swift's Copy uses
-// to ship or withhold the trees - so the manifest and the tree agree by
-// construction (a manifest naming a missing path fails the whole package).
 const Package = cmp(async function Package(props: any) {
   const ctx$ = props.ctx$
   const target = props.target
@@ -109,8 +42,6 @@ const Package = cmp(async function Package(props: any) {
   const secrets = swiftSecretsActive(model, target)
   const srcdir = `Sources/${swiftTargetDir(model)}`
 
-  // The SDK target's dependency list: declared package products, then the
-  // three vendored secrets modules when the feature is active.
   const sdkdeps: string[] = deps.map((d) =>
     `.product(name: "${d.product}", package: "${d.identity}")`)
   if (secrets) {