@voxgig/sdkgen 4.21.0 → 4.23.0

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

@@ -33,10 +33,10 @@ function normalizePathParams(
       // original name was renamed to another param's current name (e.g. badge
       // load: param 'group_id' has orig 'id', and another param has name 'id').
       const param = params.find((p: any) =>
-          p.name === snaked || p.name === depluralized) ||
+          p.n === snaked || p.n === depluralized) ||
         params.find((p: any) =>
-          p.orig === snaked || p.orig === depluralized)
-      if (param) return '{' + param.name + '}'
+          p.or === snaked || p.or === depluralized)
+      if (param) return '{' + param.n + '}'
 
       if (rename) {
         for (const [origCamel, renamedTo] of Object.entries(rename)) {
@@ -44,10 +44,10 @@ function normalizePathParams(
             const origSnaked = snakify(origCamel)
             const origDepluralized = depluralize(origSnaked)
             const renamedParam = params.find(
-              (p: any) => p.orig === origSnaked || p.name === origSnaked ||
-                p.orig === origDepluralized || p.name === origDepluralized
+              (p: any) => p.or === origSnaked || p.n === origSnaked ||
+                p.or === origDepluralized || p.n === origDepluralized
             )
-            if (renamedParam) return '{' + renamedParam.name + '}'
+            if (renamedParam) return '{' + renamedParam.n + '}'
           }
         }
       }
@@ -110,8 +110,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const listOp = entity.op?.list
 
   const loadPoint = loadOp?.points?.[0]
-  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''
-  const allLoadParams = loadPoint?.args?.params || []
+  const loadPath = loadPoint ? normalizePathParams(pointParts(loadPoint), loadPoint?.g?.params || [], loadPoint?.r?.param) : ''
+  const allLoadParams = loadPoint?.g?.params || []
   // Only path params that actually appear in the URL template drive direct-
   // test path-param setup and URL-substitution asserts (see TestDirect_rb).
   const _pathPlaceholders = new Set<string>()
@@ -120,7 +120,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
       _pathPlaceholders.add(part.slice(1, -1))
     }
   }
-  const _renameMap = (loadPoint?.rename?.param || {}) as Record<string, string>
+  const _renameMap = (loadPoint?.r?.param || {}) as Record<string, string>
   const _renamedPlaceholders = new Set<string>()
   for (const ph of _pathPlaceholders) {
     _renamedPlaceholders.add(ph)
@@ -129,25 +129,25 @@ const TestDirect = cmp(function TestDirect(props: any) {
     }
   }
   const loadParams = allLoadParams.filter((p: any) =>
-    _renamedPlaceholders.has(p.name) || _renamedPlaceholders.has(p.orig))
+    _renamedPlaceholders.has(p.n) || _renamedPlaceholders.has(p.or))
 
   const listPoint = listOp?.points?.[0]
-  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.args?.params || [], listPoint?.rename?.param) : ''
-  const listParams = listPoint?.args?.params || []
+  const listPath = listPoint ? normalizePathParams(pointParts(listPoint), listPoint?.g?.params || [], listPoint?.r?.param) : ''
+  const listParams = listPoint?.g?.params || []
 
   // Required query params with spec-provided examples - needed in live mode.
-  const loadQuery = loadPoint?.args?.query || []
+  const loadQuery = loadPoint?.g?.query || []
   const loadLiveQueryEntries = loadQuery
-    .filter((q: any) => q.reqd && undefined !== q.example && null !== q.example)
+    .filter((q: any) => q.r && undefined !== q.ex && null !== q.ex)
   const loadLiveQueryLines = loadLiveQueryEntries
-    .map((q: any) => `    $query->{'${q.name}'} = ${perlScalar(q.example)};`)
+    .map((q: any) => `    $query->{'${q.n}'} = ${perlScalar(q.ex)};`)
     .join('\n')
 
   const loadAllHaveExamples =
     loadParams.length > 0 &&
-    loadParams.every((p: any) => undefined !== p.example && null !== p.example)
+    loadParams.every((p: any) => undefined !== p.ex && null !== p.ex)
   const loadExampleLines = loadAllHaveExamples
-    ? loadParams.map((p: any) => `    $params->{'${p.name}'} = ${perlScalar(p.example)};`).join('\n')
+    ? loadParams.map((p: any) => `    $params->{'${p.n}'} = ${perlScalar(p.ex)};`).join('\n')
     : ''
 
   const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
@@ -171,9 +171,9 @@ require(Cwd::abs_path("$FindBin::Bin/runner.pm"));
 
     if (hasList && listPoint) {
       const listLiveIdKeys: string[] = listParams.map((lp: any) => {
-        return lp.name === 'id'
+        return lp.n === 'id'
           ? entity.name + '01'
-          : lp.name.replace(/_id$/, '') + '01'
+          : lp.n.replace(/_id$/, '') + '01'
       })
       const listSkipBlock = listLiveIdKeys.length > 0
         ? `  if ($setup->{live}) {
@@ -207,14 +207,14 @@ ${listSkipBlock}  my $client = $setup->{client};
         Content(`  my $params = {};
 `)
         for (const lp of listParams) {
-          const key = lp.name === 'id'
+          const key = lp.n === 'id'
             ? entity.name + '01'
-            : lp.name.replace(/_id$/, '') + '01'
+            : lp.n.replace(/_id$/, '') + '01'
           Content(`  if ($setup->{live}) {
-    $params->{'${lp.name}'} = $setup->{idmap}{'${key}'};
+    $params->{'${lp.n}'} = $setup->{idmap}{'${key}'};
   }
   else {
-    $params->{'${lp.name}'} = 'direct01';
+    $params->{'${lp.n}'} = 'direct01';
   }
 `)
         }
@@ -270,8 +270,6 @@ ${listSkipBlock}  my $client = $setup->{client};
     }
 
     if (hasLoad && loadPoint) {
-      // Skip live direct-load only when we can't fill path params:
-      // no spec examples and no list-bootstrap. Spec examples win first.
       const loadSkipBlock = (loadParams.length > 0 && !loadAllHaveExamples)
         ? `  if ($setup->{live}) {
     note('live direct-load needs real ID - set *_ENTID env var with real IDs to run');
@@ -307,7 +305,7 @@ ${loadSkipBlock}  my $client = $setup->{client};
   else {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`    $params->{'${loadParams[i].name}'} = 'direct0${i + 1}';
+            Content(`    $params->{'${loadParams[i].n}'} = 'direct0${i + 1}';
 `)
           }
           Content(`  }
@@ -322,7 +320,7 @@ ${loadLiveQueryLines}
           Content(`  unless ($setup->{live}) {
 `)
           for (let i = 0; i < loadParams.length; i++) {
-            Content(`    $params->{'${loadParams[i].name}'} = 'direct0${i + 1}';
+            Content(`    $params->{'${loadParams[i].n}'} = 'direct0${i + 1}';
 `)
           }
           Content(`  }

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

@@ -1,3 +1,4 @@
+import { flowSteps } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -80,10 +81,10 @@ const TestEntity = cmp(function TestEntity(props: any) {
   const idnames = buildIdNames(entity, basicflow)
   const idnamesStr = idnames.map(n => `'${n}'`).join(', ')
 
-  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('$'))
     : []
   const aliases = updateData.map(([k, v]: any) => [k, v])
 
@@ -93,7 +94,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // below therefore wraps this in a second pair of parens, which is a no-op
   // for a non-empty list because Perl flattens it.
   const opsList = Array.from(new Set(
-    (allSteps as any[]).map((s: any) => s.op).filter(Boolean)))
+    (allSteps as any[]).map((s: any) => s.o).filter(Boolean)))
     .map(o => `'${o}'`).join(', ')
 
   const genCtx: GenCtx = { model, entity, flow: basicflow, N, PROJUPPER }
@@ -145,7 +146,7 @@ BASIC_FLOW: {
 `)
 
     // Check if the flow has a create step
-    const flowHasCreate = allSteps.some((s: any) => s.op === 'create')
+    const flowHasCreate = allSteps.some((s: any) => s.o === 'create')
     if (!flowHasCreate) {
       Content(`  # Bootstrap entity data from existing test data.
   $V{${entity.name}_ref01_data_raw} = Voxgig::Struct::items(${N}Helpers::to_map(
@@ -159,8 +160,8 @@ BASIC_FLOW: {
     }
 
     // Model-driven step iteration
-    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) {
         opgen(genCtx, step, index)
         Content('\n')
@@ -261,13 +262,13 @@ done_testing();
 
 const generateCreate: OpGen = (ctx, step, index) => {
   const { entity, flow, N } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const datavar = 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
 `)
@@ -299,14 +300,14 @@ const generateCreate: OpGen = (ctx, step, index) => {
 
 const generateList: OpGen = (ctx, step, index) => {
   const { entity, flow, N } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const matchvar = step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? ''))
-  const listvar = step.input.listvar ?? (ref + '_list' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const listvar = 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
 `)
@@ -336,12 +337,12 @@ const generateList: OpGen = (ctx, step, index) => {
 `)
 
   // Handle validators
-  const allSteps = Object.values(flow.step) as any[]
-  if (step.valid) {
-    for (const validator of step.valid) {
+  const allSteps = Object.values(flowSteps(flow)) as any[]
+  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))
 
       if ('ItemExists' === validator.apply && hasRefData) {
         const refDataVar = validRef + '_data'
@@ -367,16 +368,16 @@ const generateList: OpGen = (ctx, step, index) => {
 
 const generateUpdate: OpGen = (ctx, step, index) => {
   const { entity, flow, N } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
-  const resdatavar = step.input.resdatavar ?? (ref + '_resdata' + (step.input.suffix ?? ''))
-  const markdefvar = step.input.markdefvar ?? (ref + '_markdef' + (step.input.suffix ?? ''))
-  const srcdatavar = 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 = step.i.entvar ?? ref + '_ent'
+  const datavar = step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? ''))
+  const resdatavar = step.i.resdatavar ?? (ref + '_resdata' + (step.i.suffix ?? ''))
+  const markdefvar = step.i.markdefvar ?? (ref + '_markdef' + (step.i.suffix ?? ''))
+  const srcdatavar = 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 hasEntIdU = null != entity.id
 
@@ -393,8 +394,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(`    '${key}' => $setup->{idmap}{'${key}'},
 `)
@@ -404,10 +405,10 @@ const generateUpdate: OpGen = (ctx, step, index) => {
   Content(`  };
 `)
 
-  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}`
         Content(`
   $V{${markdefvar}_name} = '${fieldname}';
@@ -428,9 +429,9 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 `)
   }
 
-  if (step.spec) {
-    for (const spec of step.spec) {
-      if ('TextFieldMark' === spec.apply && null != step.input.textfield) {
+  if (step.s) {
+    for (const spec of step.s) {
+      if ('TextFieldMark' === spec.apply && null != step.i.textfield) {
         Content(`  is($V{${resdatavar}}{ $V{${markdefvar}_name} }, $V{${markdefvar}_value}, '${entity.name} update: mark');
 `)
       }
@@ -441,23 +442,23 @@ const generateUpdate: OpGen = (ctx, step, index) => {
 
 const generateLoad: OpGen = (ctx, step, index) => {
   const { entity, flow, N } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const matchvar = step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? ''))
-  const datavar = step.input.datavar ?? (ref + '_data' + (step.input.suffix ?? ''))
-  const srcdatavar = step.input.srcdatavar ?? (ref + '_data' + (step.input.suffix ?? ''))
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const datavar = step.i.datavar ?? (ref + '_data' + (step.i.suffix ?? ''))
+  const srcdatavar = 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 === (preambleRef + '_data')) ||
     priorSteps.some((s: any) => {
-      if ('create' === s.op) {
-        const priorRef = s.input.ref ?? entity.name + '_ref01'
-        const priorDatvar = s.input.datavar ?? (priorRef + '_data' + (s.input.suffix ?? ''))
+      if ('create' === s.o) {
+        const priorRef = s.i.ref ?? entity.name + '_ref01'
+        const priorDatvar = s.i.datavar ?? (priorRef + '_data' + (s.i.suffix ?? ''))
         return priorDatvar === srcdatavar
       }
       return false
@@ -501,14 +502,14 @@ const generateLoad: OpGen = (ctx, step, index) => {
 
 const generateRemove: OpGen = (ctx, step, index) => {
   const { entity, flow, N } = ctx
-  const ref = step.input.ref ?? entity.name + '_ref01'
-  const entvar = step.input.entvar ?? ref + '_ent'
-  const matchvar = step.input.matchvar ?? (ref + '_match' + (step.input.suffix ?? ''))
-  const srcdatavar = step.input.srcdatavar ?? (ref + '_data')
+  const ref = step.i.ref ?? entity.name + '_ref01'
+  const entvar = step.i.entvar ?? ref + '_ent'
+  const matchvar = step.i.matchvar ?? (ref + '_match' + (step.i.suffix ?? ''))
+  const srcdatavar = step.i.srcdatavar ?? (ref + '_data')
 
-  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/perl/utility_perl.ts

@@ -12,34 +12,8 @@ function projectPath(suffix?: string): string {
 }
 
 
-// Strip model-internal keys (ending in `$`) so generated config JSON only
-// carries API-shaped data.
-// 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
-// absent, so emitting them is pure payload.
 const CONFIG_DEFAULT: Record<string, any> = {
   active: true,
   req: false,

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

@@ -35,45 +35,11 @@ import {
 } from './utility_php'
 
 
-// PLUGIN DEFINITION REQUIRES AND THE feature_plugins ACCESSOR (the php peer
-// of cmp/rb/Config_rb.ts's rbPlugins and cmp/py/Config_py.ts's
-// pluginImports/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 config names each active
-// plugin's exported DEFINITION FUNCTION (the model's `def.php` map) and
-// hands the list to the feature.
-//
-// A METHOD rather than a constant, and this is php's own constraint: a
-// plugin definition holds CLOSURES (sekreto's Providers.php says so where
-// it declares `builtins()`), and php has no constant that can. The
-// `require_once` calls live INSIDE the method for the same reason upstream
-// puts them inside plugins.php's own accessors - a plugin file is read only
-// when a feature actually asks for its definitions.
-//
-// The `def` map is declared in the model rather than derived from filenames
-// because one file may export several definitions (sekreto's aws.php
-// exports awssecrets AND awsparams) - hence the de-duplication by path, so
-// a two-definition file yields ONE require_once. A def value is the file's
-// path under tm/php, which is this target's root and also config.php's own
-// directory, so the require is that path verbatim.
-//
-// GATED, like rb: the whole block is emitted only when an active feature
-// DECLARES a plugin catalogue for this target. An SDK that does not carry
-// the secrets feature must be byte-identical to what it was before the
-// feature existed, and an unread accessor is not a thing a simple SDK
-// should have to explain. The feature reads it through `method_exists`, so
-// its absence is not a load error.
 function phpPlugins(model: any, feature: any) {
   const defs: Record<string, { paths: string[], syms: string[] }> = {}
   let declared = false
 
   each(feature, (f: any) => {
-    // `only_active: false`, and this is the whole subtlety: the feature
-    // object a component is handed has ALREADY been filtered, so asking it
-    // whether a catalogue EXISTS answers no as soon as every group is off.
-    // (Same trap helpers/featureSource documents one level down.)
     const all = getModelPath(model, `main.${KIT}.feature.${f.name}.plugin`,
       { required: false, only_active: false }) || {}
 
@@ -85,10 +51,6 @@ function phpPlugins(model: any, feature: any) {
     const syms: string[] = []
 
     each(f.plugin, (plugin: any) => {
-      // Filter on `active` HERE rather than trusting the feature object to
-      // arrive filtered: getting it wrong in this direction emits a
-      // require_once for a file the plugin trim just deleted - an SDK that
-      // does not load, rather than one that merely carries too much.
       if (false === plugin.active || null == plugin.active) return
 
       for (const [sym, one] of Object.entries(plugin.def?.php || {})) {
@@ -113,15 +75,11 @@ const Config = cmp(async function Config(props: any) {
   const model: Model = ctx$.model
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
-  // 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)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 
   const authActive = isAuthActive(model)
-  // config.auth.prefix override -> spec-derived info.security.prefix -> 'Bearer'
   const authPrefix = resolveAuthPrefix(model)
   // `in` and `name` travel with the prefix now. They were resolved by
   // apidef all along and dropped here, so an apiKey-in-query API got an
@@ -134,9 +92,6 @@ 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 ? '' :
@@ -152,21 +107,12 @@ const Config = cmp(async function Config(props: any) {
                 ],\n`
     : ''
 
-  // The same config as an OBJECT, built by the shared helper so this target's
-  // literal and the data that replaces it above the threshold are the same
-  // config by construction. The JSON is what the threshold is measured on -
-  // emitted source size varies by language, the model does not. Passing the
-  // target name opts in to the main.slug/version/target identity fields -
-  // both representations below carry them, keeping the reps interchangeable.
   const { def: configDef, json: configJson } = configDefinition(model, target.name)
   const asData = isConfigData(configJson, configReprSetting(model))
 
   const { defs: pluginDefs, declared: pluginDeclared } = phpPlugins(model, feature)
   const pluginFeatures = Object.keys(pluginDefs).sort()
 
-  // Emitted whenever a catalogue is declared, even with every group off:
-  // the feature asks for the list unconditionally, and an SDK whose chain
-  // is all built-ins still has to be answered with an empty one.
   const featurePluginsBlock = !pluginDeclared ? '' : `
     /**
      * The sekreto plugin DEFINITIONS the model selected per feature, from
@@ -224,25 +170,6 @@ class ${model.const.Name}Config
 
 `)
 
-    // ABOVE THE THRESHOLD: emit the model as DATA.
-    //
-    // An array literal is compiled opcode by opcode and held in the opcache
-    // entry for this file; a string constant is one token, and `json_decode`
-    // (C) builds the array far faster than the equivalent literal.
-    //
-    // PHP cannot tell an empty list from an empty map, so `{}` and `[]` decode
-    // to the same value and the two representations have to AGREE about which
-    // one the literal would have produced. `formatPhpArray` emits `[]` for
-    // every empty map, and the literal branch hand-writes `(object)[]` in
-    // exactly two places - `entity` and `options.entity`, and only when the
-    // model declares no entities at all, because the SDK runtime validator
-    // wants a map there. This reproduces that rule rather than improving on
-    // it: an emission wart is not something the data path gets to fix
-    // unilaterally, or the two branches stop being interchangeable.
-    //
-    // A SINGLE-quoted literal, so the JSON survives verbatim: a double-quoted
-    // PHP string would interpolate any `$name` the model contains - and the
-    // model is full of them (`$STRING`, `$action`).
     if (asData) {
       Content(`    /**
      * THE API MODEL, EMBEDDED AS DATA (sdkgen rung L1).
@@ -323,9 +250,6 @@ class ${model.const.Name}Config
 `)
     })
 
-    // PHP can't distinguish empty list from empty map; the SDK runtime
-    // validator wants an object for `entity` and `feature.test.entity`. Use
-    // `(object)[]` when the map is empty so the merge preserves map shape.
     const entityIsEmpty = Object.keys(entity || {}).length === 0
     if (entityIsEmpty) {
       Content(`            ],

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

@@ -1,28 +1,5 @@
 
 
-// Typed-model generator (PHP target).
-//
-// Ported from the TypeScript reference EntityTypes_ts.ts. Reads
-// main.<KIT>.entity.<e>.fields[] and per-op params (op.<name>.points[].args.params[])
-// and emits one file, types/<Sdk>Types.php, containing a PHP 8 class with typed
-// properties per active entity plus a request/match class per active op. Field/param
-// sentinels ($STRING, $INTEGER, ...) are turned into real PHP types by the shared
-// sdkgen helper `canonToType` (source of truth: @voxgig/apidef VALID_CANON):
-//   $STRING -> string, $INTEGER -> int, $NUMBER -> float, $BOOLEAN -> bool,
-//   $OBJECT/$ARRAY -> array, unknown -> mixed.
-//
-// Type-name scheme (IDENTICAL to TS): data type = <Name>; per-op request
-// <Name>LoadMatch / <Name>ListMatch / <Name>RemoveMatch (query/id ops),
-// <Name>CreateData / <Name>UpdateData (body ops). An op WITH params -> a typed
-// class of those params (reqd:false -> nullable, defaulted null). An op WITHOUT
-// params -> a match class over the entity fields, all nullable/optional (the
-// PHP stand-in for TS `Partial<Name>`; callers may also pass a plain assoc-array).
-//
-// PHP has no generics and no structural typing, so these classes are documentation-
-// grade value objects: op signatures keep a permissive native type (assoc-array in,
-// mixed out at the item-5 boundary) and surface the class names via PHPDoc. The file
-// lands under types/ and is registered on composer's classmap autoload (see
-// Package_php.ts) so `new <Name>()` / type references resolve globally.
 
 import {
   cmp, each, names,
@@ -40,19 +17,11 @@ import {
 const LANG = 'php'
 
 
-// A valid PHP property/label name (identifiers only; the corpus never carries
-// exotic field names, but guard so a bad name can never emit invalid PHP).
 function validName(name: string): boolean {
   return /^[A-Za-z_\x80-\xff][A-Za-z0-9_\x80-\xff]*$/.test(name)
 }
 
 
-// Emit one typed PHP property line. `mixed` is already nullable in PHP and
-// rejects the `?` prefix, so it is special-cased; every other optional field
-// becomes `?type` with a `= null` default so the property is safely optional.
-// A `$NULL`-typed field maps to the 'null' type name, which is not usable as
-// a property type here (`?null` is a fatal, and standalone `null` needs
-// PHP >= 8.2), so it degrades to `mixed` too.
 function propLine(name: string, sentinel: unknown, optional: boolean): string {
   const type = canonToType(sentinel, LANG)
   if ('mixed' === type || 'null' === type) {
@@ -69,10 +38,6 @@ function propLine(name: string, sentinel: unknown, optional: boolean): string {
 const EntityTypes = cmp(function EntityTypes(props: any) {
   const { model, log } = props.ctx$
 
-  // 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
-  // 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 generated entity code: the consumer
   // scaffold (create-sdkgen Root.ts) iterates entities WITHOUT an active
@@ -84,9 +49,6 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // entity not yet named (e.g. a fieldless placeholder) would otherwise read
   // `Name = undefined` below. Parity with the go emitter's fix.
 
-  // 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: 'types' }, () => {
@@ -98,8 +60,8 @@ declare(strict_types=1);
 
 // 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 come from the
+// GENERATED from the API model: main.${KIT}.entity.<e>.fields{} and per-op
+// params (op.<name>.points[].g.params[]). Field/param types come from the
 // canonical type sentinels via @voxgig/sdkgen canonToType (source of truth:
 // @voxgig/apidef VALID_CANON). Do not edit by hand.
 //
@@ -112,34 +74,21 @@ declare(strict_types=1);
       entityList.forEach((ent: any) => {
         const Name = ent.Name
         const fields = (ent.fields ? each(ent.fields) : [])
-          .filter((f: any) => f.active !== false && validName(f.name))
-
-        // PHP refuses a reserved word where a class name is expected, and the
-        // check is CASE-INSENSITIVE — an entity named `Namespace` emitted
-        // `class Namespace`, which does not parse, and took the whole types
-        // file with it (issue #64). phpSafeTypeName appends `Type` on a real
-        // collision and leaves every other name untouched.
-        //
-        // Only the bare data class needs it: the per-op names below already
-        // carry a suffix no reserved word matches, and the entity accessor is
-        // a method, which PHP resolves separately.
+          .filter((f: any) => f.a !== false && validName(f.n))
+
         const TypeName = phpSafeTypeName(Name)
 
-        // Entity data model: one typed property per field (`req:false` -> nullable).
         Content(`/** ${Name} entity data model. */
 class ${TypeName}
 {
 `)
         fields.forEach((f: any) => {
-          Content(propLine(f.name, f.type, false === f.req))
+          Content(propLine(f.n, f.t, false === f.r))
         })
         Content(`}
 
 `)
 
-        // Per active op: a request/match class. Members and their optionality
-        // come from the shared partiality policy (opRequestShape); this file
-        // only renders them as a PHP value-object class.
         const ops = ent.op || {}
         ;['load', 'list', 'create', 'update', 'remove'].forEach((opname: string) => {
           if (null == ops[opname]) {