@voxgig/sdkgen 4.18.1 → 4.18.3

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

@@ -103,9 +103,11 @@ const Config = cmp(async function Config(props: any) {
             pluginImports(feature)
           },
 
-          '// #FeatureClasses': () => each(feature, (f: any) => {
-            Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
-          }),
+          '// #FeatureClasses': () => {
+            each(feature, (f: any) => {
+              Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
+            })
+          },
 
           '// #FeaturePlugins': () => pluginDefs(feature),
 
@@ -147,28 +149,34 @@ const Config = cmp(async function Config(props: any) {
           Line(`    target: ${JSON.stringify(configDef.main.target)},`)
         },
 
-        '// #FeatureClasses': () => each(feature, (f: any) => {
-          // Trailing comma: the map has one entry per feature, so entries
-          // must be comma-separated (a single feature hid this until now).
-          Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
-        }),
+        '// #FeatureClasses': () => {
+          each(feature, (f: any) => {
+            // Trailing comma: the map has one entry per feature, so entries
+            // must be comma-separated (a single feature hid this until now).
+            Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
+          })
+        },
 
         '// #FeaturePlugins': () => pluginDefs(feature),
 
         // Rendered from configDefinition's def, not from f.config, so the
         // literal carries the feature's `transport` role (station design
         // §8.4) beside its options and cannot drift from the data rep.
-        '// #FeatureConfigs': () => each(feature, (f: any) => {
-          Line(` ${f.name}: ${formatJson(configDef.feature[f.name], { margin: 4 })},`)
-        }),
+        '// #FeatureConfigs': () => {
+          each(feature, (f: any) => {
+            Line(` ${f.name}: ${formatJson(configDef.feature[f.name], { margin: 4 })},`)
+          })
+        },
 
 
-        '// #EntityConfigs': () => each(entity, (entity: any) => {
-          Content(`
-      ${entity.name}: {
-      },
-`)
-        }),
+        '// #EntityConfigs': () => {
+          each(entity, (entity: any) => {
+            Content(`
+        ${entity.name}: {
+        },
+  `)
+          })
+        },
 
         // configDefinition's `def.entity` verbatim, NOT rebuilt here. This
         // reduce was a second copy of that function's entityDefs loop, and

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

@@ -106,9 +106,11 @@ const Config = cmp(async function Config(props: any) {
             pluginImports(feature)
           },
 
-          '// #FeatureClasses': () => each(feature, (f: any) => {
-            Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
-          }),
+          '// #FeatureClasses': () => {
+            each(feature, (f: any) => {
+              Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
+            })
+          },
 
           '// #FeaturePlugins': () => pluginDefs(feature),
 
@@ -150,28 +152,34 @@ const Config = cmp(async function Config(props: any) {
           Line(`    target: ${JSON.stringify(configDef.main.target)},`)
         },
 
-        '// #FeatureClasses': () => each(feature, (f: any) => {
-          // Trailing comma: the map has one entry per feature, so entries
-          // must be comma-separated (a single feature hid this until now).
-          Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
-        }),
+        '// #FeatureClasses': () => {
+          each(feature, (f: any) => {
+            // Trailing comma: the map has one entry per feature, so entries
+            // must be comma-separated (a single feature hid this until now).
+            Line(` ${f.name}: ${nom(f, 'Name')}Feature,`)
+          })
+        },
 
         '// #FeaturePlugins': () => pluginDefs(feature),
 
         // Rendered from configDefinition's def, not from f.config, so the
         // literal carries the feature's `transport` role (station design
         // §8.4) beside its options and cannot drift from the data rep.
-        '// #FeatureConfigs': () => each(feature, (f: any) => {
-          Line(` ${f.name}: ${formatJson(configDef.feature[f.name], { margin: 4 })},`)
-        }),
+        '// #FeatureConfigs': () => {
+          each(feature, (f: any) => {
+            Line(` ${f.name}: ${formatJson(configDef.feature[f.name], { margin: 4 })},`)
+          })
+        },
 
 
-        '// #EntityConfigs': () => each(entity, (entity: any) => {
-          Content(`
-      ${entity.name}: {
-      },
-`)
-        }),
+        '// #EntityConfigs': () => {
+          each(entity, (entity: any) => {
+            Content(`
+        ${entity.name}: {
+        },
+  `)
+          })
+        },
 
         // configDefinition's `def.entity` verbatim, NOT rebuilt here. This
         // reduce was a second copy of that function's entityDefs loop, and

package/project/sdkgen-package.json

@@ -3,7 +3,7 @@
     "package": 1
   },
   "name": "@voxgig/sdkgen",
-  "version": "4.18.1",
+  "version": "4.18.3",
   "provides": {
     "target": [
       "c",

package/src/action/edition.ts

@@ -49,7 +49,7 @@ import { templateReplacements } from '../helpers/stdrep'
 
 import { copyOpts } from '../helpers/junk'
 
-import { resolveKind, kindModel, kindTrees } from './kind'
+import { resolveKind, kindModel, kindIndex, kindTrees } from './kind'
 import type { TreeDef } from './kind'
 
 import { registerInstalled } from './resolve'
@@ -257,6 +257,14 @@ const EditionRoot = cmp(function EditionRoot(props: any) {
 
       log.info({ point: 'edition-done', edition: source.name, note: source.name })
     })
+
+    // ONCE, after the loop. See kindIndex.
+    if (0 < dnames.length) {
+      Folder({ name: 'model/edition' }, () => kindIndex({
+        kind: 'edition', names: dnames,
+        content: ctx$.meta.content.edition_index,
+      }))
+    }
   })
 })
 

package/src/action/feature.ts

@@ -31,7 +31,7 @@ import { templateReplacements } from '../helpers/stdrep'
 
 import { copyOpts } from '../helpers/junk'
 
-import { resolveKind, kindModel } from './kind'
+import { resolveKind, kindModel, kindIndex } from './kind'
 
 
 import {
@@ -279,6 +279,16 @@ const FeatureRoot = cmp(function FeatureRoot(props: any) {
         note: fname
       })
     })
+
+    // ONCE, after the loop, with every name this run installed. Emitted inside
+    // kindModel it was one File component per feature on the same path, which
+    // jostraca 0.38 refuses.
+    if (0 < fnames.length) {
+      Folder({ name: 'model/feature' }, () => kindIndex({
+        kind: 'feature', names: fnames,
+        content: ctx$.meta.content.feature_index,
+      }))
+    }
   })
 
 })

package/src/action/kind.ts

@@ -262,7 +262,7 @@ function kindModel(props: {
   names: string[],
   content: string,
 }) {
-  const { ctx$, kind, source, names, content } = props
+  const { ctx$, kind, source } = props
   const def = kindDef(kind)
   const fs = ctx$.fs()
   const log = ctx$.log
@@ -312,7 +312,30 @@ function kindModel(props: {
     Copy({ from: source.model, replace })
   }
 
-  File({ name: def.name + '-index.aon' }, () => UpdateIndex({
+}
+
+
+// The kind's include list, emitted ONCE for the whole run.
+//
+// This used to live at the end of kindModel, which is called per item, and the
+// comment there said so plainly: "the index File is re-rendered per item and
+// the last render wins, so each render has to carry all of them". jostraca
+// 0.38 added a duplicate-output-path check and now refuses that outright:
+//
+//   two File components resolve to the same output path,
+//   path=/out/model/feature/feature-index.aon
+//
+// Last-write-wins was never the intent, only the mechanism. Installing three
+// features rendered the index three times to write it once. Emitting it after
+// the loop, with the complete name list, produces the same file from one File
+// component and says what it means.
+function kindIndex(props: {
+  kind: string,
+  names: string[],
+  content: string,
+}) {
+  const { kind, names, content } = props
+  File({ name: kindDef(kind).name + '-index.aon' }, () => UpdateIndex({
     content,
     names,
   }))
@@ -350,5 +373,6 @@ export {
   kindDef,
   resolveKind,
   kindModel,
+  kindIndex,
   isBare,
 }

package/src/action/target.ts

@@ -51,7 +51,7 @@ import {
   loadContent,
 } from './action'
 
-import { kindModel, resolveKind, escapeRe } from './kind'
+import { kindModel, kindIndex, resolveKind, escapeRe } from './kind'
 
 import { BUNDLED, resolveSource, registerInstalled } from './resolve'
 
@@ -281,6 +281,16 @@ const TargetRoot = cmp(function TargetRoot(props: any) {
       })
 
     })
+
+    // ONCE, after the loop. See kindIndex: emitted per item it was one File
+    // component per target on the same output path, which jostraca 0.38
+    // refuses.
+    if (0 < tnames.length) {
+      Folder({ name: 'model/target' }, () => kindIndex({
+        kind: 'target', names: tnames,
+        content: ctx$.meta.content.target_index,
+      }))
+    }
   })
 })
 

package/src/sdkgen.ts

@@ -1148,7 +1148,13 @@ type Component = (props: any, children?: any) => void
 
 
 // Prevents TS2742
-export const cmp: (component: Function) => Component = JostracaModule.cmp
+// `typeof` rather than a hand-written signature: jostraca 0.38 made cmp
+// generic, `<P, Arg, Child>(component: (props: CmpProps<P>, ...) => any) =>
+// Component<P, Arg, Child>`, and the old annotation `(component: Function) =>
+// Component` no longer matched it. Deferring to the module's own type keeps
+// this correct across jostraca versions AND still names the type, which is
+// what prevented TS2742 in the first place.
+export const cmp: typeof JostracaModule.cmp = JostracaModule.cmp
 export const names: (base: any, name: string, prop?: string) => any = JostracaModule.names
 export const each: (subject?: any, apply?: any) => any = JostracaModule.each
 export const snakify: (input: any[] | string) => string = JostracaModule.snakify