@voxgig/sdkgen 4.24.2 → 4.25.0

package/src/action/remove.ts

@@ -11,7 +11,9 @@ import type {
 
 import { SdkGenError } from '../utility'
 
-import { definitionPath, definitionFolder, indexName } from '../helpers/definition'
+import {
+  assertMigrated, definitionPathAny, indexName, indexPath,
+} from '../helpers/definition'
 
 import { findFeatureSources, BASE_FEATURE } from '../helpers/featureSource'
 
@@ -158,8 +160,10 @@ async function planRemove(
       '\n  a name matches ' + ITEM_NAME_RE.source + ' — it is not a path')
   }
 
+  assertMigrated(fs, [indexPath(root, kind)])
+
   const declared: any = kindCollection(model, kind)?.[name]
-  const modelfile = definitionPath(root, kind, name)
+  const modelfile = definitionPathAny(fs, root, kind, name)
   const hasModel = fs.existsSync(modelfile)
 
   if (null == declared && !hasModel) {
@@ -213,7 +217,7 @@ async function planRemove(
   }
 
   if (hasModel) {
-    plan.files.push('model/' + kind + '/' + name + '.aon')
+    plan.files.push('model/' + kind + '/' + Path.basename(modelfile))
   }
 
   const wanted = new Set(plan.files)
@@ -226,7 +230,7 @@ async function planRemove(
     }
   }
 
-  const index = Path.join(definitionFolder(root, kind), indexName(kind))
+  const index = indexPath(root, kind)
   plan.indexed = fs.existsSync(index) &&
     removeIndexEntries(String(fs.readFileSync(index, 'utf8')), [name]) !==
     String(fs.readFileSync(index, 'utf8'))
@@ -353,7 +357,7 @@ function projectMentions(kind: string, name: string, actx: ActionContext): strin
 
   const out: string[] = []
   for (const r of walk(fs, modeldir)) {
-    if (!r.endsWith('.aon') || r.startsWith(own)) {
+    if (!/\.(aontu|aon)$/.test(r) || r.startsWith(own)) {
       continue
     }
     let src = ''
@@ -404,7 +408,7 @@ function applyRemove(plan: RemovePlan, actx: ActionContext, dryrun: boolean): st
   }
 
   if (plan.indexed) {
-    const index = Path.join(definitionFolder(root, kind), indexName(kind))
+    const index = indexPath(root, kind)
     say('model/' + kind + '/' + indexName(kind), 'the index entry for ' + name)
     if (!dryrun) {
       fs.writeFileSync(index,

package/src/action/resolve.ts

@@ -6,7 +6,7 @@ import { getelem } from '@voxgig/struct'
 
 import { KIT } from '../types'
 
-import { definitionPath } from '../helpers/definition'
+import { definitionPathAny } from '../helpers/definition'
 import { readManifest, checkShape, ITEM_NAME_RE } from '../helpers/manifest'
 
 
@@ -123,7 +123,7 @@ function resolveSource(ref: string, kind: string, ctx$: any): Source {
     // Path.join, not concatenation: an absolute Windows ref makes `folder`
     // backslash-separated, and appending '/model/...' produced a mixed-
     // separator path that some readers handle and others do not.
-    model: definitionPath(folder, kind, origname),
+    model: definitionPathAny(fs, folder, kind, origname),
 
     package: sourcePackage(fs, folder, kind, origname, ctx$),
   }
@@ -276,7 +276,7 @@ function providesStill(
   // No manifest, or one too malformed to be believed: a bare `.sdk`-shaped
   // folder is a legal source, and its definition file is the only claim it
   // makes.
-  return fs.existsSync(definitionPath(folder, kind, seek))
+  return fs.existsSync(definitionPathAny(fs, folder, kind, seek))
 }
 
 

package/src/action/target.ts

@@ -20,6 +20,8 @@ import { templateReplacements, provenanceReplace } from '../helpers/stdrep'
 
 import { isJunk, copyOpts } from '../helpers/junk'
 
+import { definitionPathAny, migrateIncludes } from '../helpers/definition'
+
 import { Aontu } from 'aontu'
 
 import {
@@ -496,11 +498,12 @@ function readTargetFeature(
   const { log } = ctx$
   const fs = ctx$.fs()
 
-  const path = tfolder + '/model/target/' + torigname + '.aon'
+  const path = definitionPathAny(fs, tfolder, 'target', torigname)
 
   try {
     const errs: any[] = []
-    const model = new Aontu().generate(fs.readFileSync(path, 'utf8'), { path, errs })
+    const src = migrateIncludes(fs.readFileSync(path, 'utf8'))
+    const model = new Aontu().generate(src, { path, errs })
 
     if (0 < errs.length) {
       throw new Error(errs.map((e: any) => e.msg || String(e)).join('\n'))

package/src/cmp/AgentGuide.ts

@@ -61,7 +61,7 @@ ${langCommandsBlock(lang)}
 
 | Source | Path | Edit when… |
 | --- | --- | --- |
-| Target definition | \`.sdk/model/target/${lang}.aon\` | deps, module, extension, phases change |
+| Target definition | \`.sdk/model/target/${lang}.aontu\` | deps, module, extension, phases change |
 | Templates | \`.sdk/tm/${lang}/\` | the file is the **same for every API** (runtime, transport, base classes) — copied verbatim with placeholder substitution |
 | Components | \`.sdk/src/cmp/${lang}/\` | the file's shape **depends on the API** (entities, constructor, README, tests) — TypeScript that walks the model |
 
@@ -88,7 +88,7 @@ Each feature's runtime and its own guide live in \`src/feature/<name>/\`.
       }
       else {
         Content(`Each feature is a flat file in the \`feature/\` package. Its hooks and
-default activation come from \`.sdk/model/feature/<name>.aon\`; customise
+default activation come from \`.sdk/model/feature/<name>.aontu\`; customise
 the runtime under \`.sdk/tm/${lang}/feature/\` and regenerate.
 
 | Feature | Runtime file | Active hooks |

package/src/cmp/AgentGuideContent.ts

@@ -196,11 +196,11 @@ npm run build && npm run generate
 
 To author a **new** feature:
 
-1. Define its model at \`.sdk/model/feature/<name>.aon\` — \`name: key()\`,
+1. Define its model at \`.sdk/model/feature/<name>.aontu\` — \`name: key()\`,
    \`title\`, \`version\`, \`active\`, \`config.options.active\`, a \`hook\`
    map (\`<Stage>: active: true\`), and per-language \`deps\`.
-2. Register it in \`.sdk/model/feature/feature-index.aon\` with
-   \`@"<name>.aon"\`.
+2. Register it in \`.sdk/model/feature/feature-index.aontu\` with
+   \`@"<name>.aontu"\`.
 3. Provide the per-language runtime under that target's feature template dir
    (\`.sdk/tm/<lang>/src/feature/<name>/\` for ts/js, \`.sdk/tm/<lang>/feature/\`
    otherwise) — the \`FEATURE_Name\` / \`FEATURE_VERSION\` placeholders are
@@ -225,23 +225,23 @@ Each language target is generated from **two layers**:
 
 Placeholders substituted on copy: \`ProjectName\` (Pascal-case SDK name),
 \`GOMODULE\` (Go module path), \`FEATURE_Name\` / \`FEATURE_VERSION\`, and the
-\`$$path$$\` interpolation of a model value (such as the name) in \`.aon\`.
+\`$$path$$\` interpolation of a model value (such as the name) in \`.aontu\`.
 
 Propagate a change: edit the template/component → \`npm run build\` (only
 needed if you touched a component) → \`npm run generate\`. Target shape and
-deps live in \`.sdk/model/target/<lang>.aon\`; features in
-\`.sdk/model/feature/<name>.aon\`.
+deps live in \`.sdk/model/target/<lang>.aontu\`; features in
+\`.sdk/model/feature/<name>.aontu\`.
 `
 }
 
 
 function aontuSection(): string {
-  return `## The model language (aontu, \`.aon\` files)
+  return `## The model language (aontu, \`.aontu\` files)
 
 The model is one structured object assembled by **aontu** (a unification
 engine) from three sources: the API model (entities/operations, from the
 OpenAPI spec via \`@voxgig/apidef\`), the base schema, and the target/feature
-definitions in \`.sdk/model/\`. An \`.aon\` file is a relaxed JSON (jsonic
+definitions in \`.sdk/model/\`. An \`.aontu\` file is a relaxed JSON (jsonic
 syntax) with unification semantics:
 
 | Syntax | Meaning |
@@ -251,7 +251,7 @@ syntax) with unification semantics:
 | \`*default \\| type\` | A default value unified against a type (e.g. \`*true \\| boolean\`). |
 | \`name: key()\` | Bind a field to its map key (so \`feature: log: {}\` gets \`name: 'log'\`). |
 | \`$$path$$\` | Interpolate a model value into a string — e.g. the SDK \`name\`. |
-| \`@"./file.aon"\` | Include another fragment (how the index files work). The \`./\` is required on a local path. |
+| \`@"./file.aontu"\` | Include another fragment (how the index files work). The \`./\` is required on a local path. |
 | \`x: .y\` | Reference another path's value (e.g. \`deps: ts: .js\`). |
 
 For example, the schema for every feature entry:

package/src/cmp/AgentGuideFeature.ts

@@ -65,8 +65,8 @@ later feature can override an earlier one.
 
 | Part | Path |
 | --- | --- |
-| Model definition | \`.sdk/model/feature/${name}.aon\` (name, title, version, \`config.options.active\`, the \`hook\` map, per-language \`deps\`) |
-| Registered in | \`.sdk/model/feature/feature-index.aon\` (\`@"${name}.aon"\`) |
+| Model definition | \`.sdk/model/feature/${name}.aontu\` (name, title, version, \`config.options.active\`, the \`hook\` map, per-language \`deps\`) |
+| Registered in | \`.sdk/model/feature/feature-index.aontu\` (\`@"${name}.aontu"\`) |
 | Runtime template | \`.sdk/tm/${lang}/src/feature/${name}/\` (copied here on \`generate\`; \`FEATURE_Name\`/\`FEATURE_VERSION\` substituted) |
 
 (Paths are relative to the **project root** — four levels up from here.)
@@ -74,7 +74,7 @@ later feature can override an earlier one.
 ## Customising this feature
 
 - **Turn hooks on/off**: edit the \`hook\` map in
-  \`.sdk/model/feature/${name}.aon\` (\`<Stage>: active: true|false\`).
+  \`.sdk/model/feature/${name}.aontu\` (\`<Stage>: active: true|false\`).
 - **Change default activation**: set \`config.options.active\` in the same file.
 - **Dependencies**: edit \`deps.<lang>\` in the same file.
 - **Behaviour**: edit the runtime template under

package/src/cmp/AgentGuideTop.ts

@@ -111,7 +111,7 @@ target's feature container) for the generated adapter.
 
 \`\`\`
 .sdk/
-  model/          the model: target/, feature/, and index .aon files
+  model/          the model: target/, feature/, and index .aontu files
   src/cmp/<lang>/  components — TypeScript that generates API-specific source
   tm/<lang>/       templates — verbatim source copied with placeholders
   dist/            compiled components (npm run build)

package/src/cmp/Deploy.ts

@@ -151,7 +151,7 @@ deploy-dry-${t.name}:
 
   return `# ${model.Name} SDK deployment. GENERATED by @voxgig/sdkgen — regenerated
 # on every \`npm run generate\` in .sdk/; publication details live in the
-# model (.sdk/model/target/<target>.aon, \`publish\` section).
+# model (.sdk/model/target/<target>.aontu, \`publish\` section).
 #
 # Every port gets a git release tag <target>/vX.Y.Z. Ports with an ACTIVE
 # registry also publish a package there. Credentials are injected at exec
@@ -188,7 +188,7 @@ TARGETS := ${targets.map((t: any) => t.name).join(' ')}
 deploy:
 \t@echo "Deployment is per-target — pick one (each upload is irreversible):"
 \t@echo "  make deploy-<target>    targets: $(TARGETS)"
-\t@echo "Registry state is set in the model (.sdk/model/target/<t>.aon):"
+\t@echo "Registry state is set in the model (.sdk/model/target/<t>.aontu):"
 ${targets.map((t: any) => {
     const reg = registryOf(t)
     const state = reg ? `${reg.name} ${regIsActive(reg) ? 'ACTIVE' : 'publish pending (deploy = git tag only)'}` : 'tag-only'

package/src/helpers/definition.ts

@@ -1,12 +1,129 @@
 
 import Path from 'node:path'
 
+import { SdkGenError } from '../utility'
+
 import { isJunk } from './junk'
 
 
+const EXT = '.aontu'
+
+// Pre-rename aontu files: read from a package not yet renamed, never written.
+const LEGACY_EXT = '.aon'
+
+const SOURCE_RE = /\.(aontu|aon)$/
+
+
+function definitionFileName(name: string): string {
+  return name + EXT
+}
+
+
 // The definition file for one item.
 function definitionPath(sdkfolder: string, kind: string, name: string): string {
-  return Path.join(sdkfolder, 'model', kind, name + '.aon')
+  return Path.join(sdkfolder, 'model', kind, definitionFileName(name))
+}
+
+
+function legacyPath(path: string): string {
+  return path.replace(/\.aontu$/, LEGACY_EXT)
+}
+
+
+function isLegacyPath(path: string): boolean {
+  return path.endsWith(LEGACY_EXT)
+}
+
+
+// The file an item ACTUALLY has: `.aontu`, else the pre-rename `.aon`. Without
+// the fallback a remove reports success and leaves the file behind, and an
+// item from a package that has not renamed its files is not found at all.
+function definitionPathAny(
+  fs: any, sdkfolder: string, kind: string, name: string,
+): string {
+  const current = definitionPath(sdkfolder, kind, name)
+  if (fs.existsSync(current)) {
+    return current
+  }
+
+  const legacy = legacyPath(current)
+
+  return fs.existsSync(legacy) ? legacy : current
+}
+
+
+const LEGACY_INCLUDE_RE =
+  /@([ \t]*)(?:"((?:[^"\\\r\n]|\\.)*)\.aon"|'((?:[^'\\\r\n]|\\.)*)\.aon')/y
+
+
+// Renames each `.aon` include to `.aontu`, the only extension aontu reads.
+// Strings and comments are skipped whole, so a `.aon` that is only text stays.
+function migrateIncludes(src: string): string {
+  return mapLegacyIncludes(src, (gap: string, quote: string, path: string) =>
+    '@' + gap + quote + path + '.aontu' + quote)
+}
+
+
+// Removes each `.aon` include instead, leaving what the file itself declares.
+function dropLegacyIncludes(src: string): string {
+  return mapLegacyIncludes(src, () => '')
+}
+
+
+function mapLegacyIncludes(
+  src: string, replace: (gap: string, quote: string, path: string) => string,
+): string {
+  let out = ''
+  let at = 0
+
+  while (at < src.length) {
+    LEGACY_INCLUDE_RE.lastIndex = at
+    const include = '@' === src[at] ? LEGACY_INCLUDE_RE.exec(src) : null
+
+    if (null != include) {
+      const [, gap, dq, sq] = include
+      out += null != dq ? replace(gap, '"', dq) : replace(gap, "'", sq)
+      at = LEGACY_INCLUDE_RE.lastIndex
+      continue
+    }
+
+    const end = textEnd(src, at)
+    out += src.slice(at, end)
+    at = end
+  }
+
+  return out
+}
+
+
+// The end of the string or comment that starts at `at`, else `at + 1`.
+function textEnd(src: string, at: number): number {
+  const c = src[at]
+  const next = src[at + 1]
+
+  if ('#' === c || ('/' === c && '/' === next)) {
+    const eol = src.indexOf('\n', at)
+    return eol < 0 ? src.length : eol
+  }
+
+  if ('/' === c && '*' === next) {
+    const close = src.indexOf('*/', at + 2)
+    return close < 0 ? src.length : close + 2
+  }
+
+  if ('"' === c || "'" === c || '`' === c) {
+    for (let i = at + 1; i < src.length; i++) {
+      if ('\\' === src[i]) {
+        i++
+      }
+      else if (c === src[i] || ('`' !== c && '\n' === src[i])) {
+        return i + 1
+      }
+    }
+    return src.length
+  }
+
+  return at + 1
 }
 
 
@@ -18,13 +135,19 @@ function definitionFolder(sdkfolder: string, kind: string): string {
 
 // The include list beside them.
 function indexName(kind: string): string {
-  return kind + '-index.aon'
+  return kind + '-index' + EXT
+}
+
+
+function indexPath(sdkfolder: string, kind: string): string {
+  return Path.join(definitionFolder(sdkfolder, kind), indexName(kind))
 }
 
 
 function definitionNames(fs: any, sdkfolder: string, kind: string): string[] {
   const dir = definitionFolder(sdkfolder, kind)
   const index = indexName(kind)
+  const indexes = [index, legacyPath(index)]
 
   let entries: string[]
   try {
@@ -34,20 +157,50 @@ function definitionNames(fs: any, sdkfolder: string, kind: string): string[] {
     return []
   }
 
-  // The `.aon` suffix is not enough on its own: an emacs lock link is named
-  // `.#target.aon` and a merge leaves `target.aon.orig`, so an editor open
-  // in the wrong window invents an item called `.#target`, which then fails to
-  // resolve everywhere it is named. See helpers/junk.
-  return entries
-    .filter((n: string) => n.endsWith('.aon') && index !== n && !isJunk(n))
-    .map((n: string) => n.replace(/\.aon$/, ''))
-    .sort()
+  // The suffix alone is not enough: `.#target.aontu` is an emacs lock link and
+  // `target.aontu.orig` a merge leftover, either of which would invent an item
+  // that then resolves nowhere. See helpers/junk. Both extensions, deduped.
+  const names = new Set<string>(entries
+    .filter((n: string) =>
+      SOURCE_RE.test(n) && !indexes.includes(n) && !isJunk(n))
+    .map((n: string) => n.replace(SOURCE_RE, '')))
+
+  return [...names].sort()
+}
+
+
+// A project from before the rename has the `.aon` file and no `.aontu`: aontu
+// reads neither it nor a new `.aontu` written beside it that nothing includes.
+function assertMigrated(fs: any, paths: string[]): void {
+  const stale = paths
+    .filter((p: string) => !fs.existsSync(p) && fs.existsSync(legacyPath(p)))
+    .map((p: string) => Path.normalize(legacyPath(p)).split(Path.sep).join('/'))
+
+  if (0 === stale.length) {
+    return
+  }
+
+  throw new SdkGenError(
+    'This project predates .aontu model files: ' + stale.join(', ') +
+    (1 === stale.length ? ' has' : ' have') + ' no .aontu counterpart, ' +
+    'and aontu reads only .aontu.' +
+    '\n  Re-scaffold the project with the current create-sdkgen, which ' +
+    'migrates it:' +
+    '\n    npm create @voxgig/sdkgen@latest ...   (run over this project, ' +
+    'with the arguments it was created with)')
 }
 
 
 export {
+  assertMigrated,
+  definitionFileName,
   definitionPath,
+  definitionPathAny,
   definitionFolder,
+  dropLegacyIncludes,
   definitionNames,
   indexName,
+  indexPath,
+  isLegacyPath,
+  migrateIncludes,
 }

package/src/helpers/manifest.ts

@@ -1,7 +1,7 @@
 
 import Path from 'node:path'
 
-import { definitionNames } from './definition'
+import { definitionNames, definitionPathAny } from './definition'
 
 
 const MANIFEST = 'sdkgen-package.json'
@@ -281,8 +281,9 @@ function validateManifest(
       if (!claimed.has(name)) {
         found.push({
           level: 'warn', point: 'manifest-item-unclaimed', file, kind, name,
-          note: file + ': model/' + kind + '/' + name +
-            '.aon is in the package but not listed in `provides.' + kind +
+          note: file + ': model/' + kind + '/' +
+            Path.basename(definitionPathAny(fs, sdkfolder, kind, name)) +
+            ' is in the package but not listed in `provides.' + kind +
             '` — nothing will install it'
         })
       }
@@ -304,7 +305,7 @@ function missingPaths(
   const missing: string[] = []
 
   if (!defined.has(name)) {
-    missing.push('model/' + kind + '/' + name + '.aon')
+    missing.push('model/' + kind + '/' + name + '.aontu')
   }
 
   for (const tree of (def.trees ?? []).filter((t) => t.required)) {

package/src/helpers/modelcheck.ts

@@ -67,6 +67,10 @@ function includeLine(file: string): string {
 type CompileResult = {
   model?: any
   errors: string[]
+
+  // aontu's code for each error that carries one, such as
+  // `multisource_not_found` for an include that did not resolve.
+  why: string[]
 }
 
 
@@ -104,14 +108,23 @@ function compileModel(
       model,
       errors: errs.map((e: any) =>
         tidy((null == e.why ? '' : '[' + e.why + '] ') + (e.msg ?? String(e)))),
+      why: whyOf(errs),
     }
   }
   catch (err: any) {
-    return { errors: [tidy(err.message ?? String(err))] }
+    return {
+      errors: [tidy(err.message ?? String(err))],
+      why: whyOf('function' === typeof err?.errs ? err.errs() : []),
+    }
   }
 }
 
 
+function whyOf(errs: any[]): string[] {
+  return errs.map((e: any) => e?.why).filter((w: any) => 'string' === typeof w)
+}
+
+
 const PUBLISH_OVERRIDES: [string, string, string][] = [
   ['publish: version', "'9.9.9'", "'8.8.8'"],
   ['publish: tag: active', 'false', 'true'],
@@ -141,6 +154,7 @@ function publishOverrideProbe(
   return {
     model: first.model ?? second.model,
     errors: [...first.errors, ...second.errors],
+    why: [...first.why, ...second.why],
   }
 }
 

package/src/helpers/shipped.ts

@@ -8,7 +8,7 @@ function packageRoot(): string {
 
 
 function schemaFile(): string {
-  return Path.join(packageRoot(), 'model', 'sdkgen.aon')
+  return Path.join(packageRoot(), 'model', 'sdkgen.aontu')
 }
 
 

package/src/sdkgen.ts

@@ -87,9 +87,11 @@ import {
 import type { FeatureSource } from './helpers/featureSource'
 import { stationLibrary } from './helpers/station'
 import {
+  assertMigrated,
   definitionPath,
   definitionFolder,
   definitionNames,
+  indexPath,
 } from './helpers/definition'
 import { isNoise, copyOpts } from './helpers/junk'
 import {
@@ -156,6 +158,7 @@ import { edition_add } from './action/edition'
 
 // The verbs, built from the kind registry — see action/dispatch.
 import { ACTION_MAP, actionNames, needsModel } from './action/dispatch'
+import { KINDS } from './action/kind'
 
 
 
@@ -398,7 +401,7 @@ function SdkGen(opts: SdkGenOptions) {
 
 
   function resolveModel(wanted: boolean) {
-    const path = './model/sdk.aon'
+    const path = './model/sdk.aontu'
     const errs: any[] = []
 
     // A verb that does not act on a project (see `needsModel`) is run where
@@ -409,6 +412,9 @@ function SdkGen(opts: SdkGenOptions) {
       return { model: { main: {} } as any, url: path }
     }
 
+    assertMigrated(fs, [
+      path, ...Object.keys(KINDS).map((kind: string) => indexPath('.', kind))])
+
     if (null == aontu) {
       aontu = new Aontu()
     }
@@ -536,7 +542,7 @@ SdkGen.makeBuild = async function(opts: SdkGenOptions) {
     root: opts.root,
     def: opts.def || 'no-def',
     kind: 'openapi-3',
-    model: opts.model ? (opts.model.folder + '/api.aon') : 'no-model',
+    model: opts.model ? (opts.model.folder + '/api.aontu') : 'no-model',
     meta: opts.meta || {},
   }
 

package/src/testkit.ts

@@ -102,17 +102,17 @@ function stageConsumer(opts: StageOptions = {}): Consumer {
   Fs.mkdirSync(Path.join(sdk, 'model', 'target'), { recursive: true })
   Fs.mkdirSync(Path.join(sdk, 'model', 'feature'), { recursive: true })
 
-  Fs.writeFileSync(Path.join(sdk, 'model', 'target', 'target-index.aon'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'target', 'target-index.aontu'),
     '# Targets\n')
-  Fs.writeFileSync(Path.join(sdk, 'model', 'feature', 'feature-index.aon'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'feature', 'feature-index.aontu'),
     '# Features\n')
 
   const name = opts.name ?? 'demo'
 
-  Fs.writeFileSync(Path.join(sdk, 'model', 'sdk.aon'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'sdk.aontu'),
     "name: '" + name + "'\n" +
-    '@"./target/target-index.aon"\n' +
-    '@"./feature/feature-index.aon"\n' +
+    '@"./target/target-index.aontu"\n' +
+    '@"./feature/feature-index.aontu"\n' +
     (opts.extra ? opts.extra + '\n' : ''))
 
   const modules = Path.join(sdk, 'node_modules')
@@ -138,7 +138,7 @@ function stageConsumer(opts: StageOptions = {}): Consumer {
         [KIT]: { feature: {}, entity: {}, target: {} },
       },
     },
-    url: Path.join(sdk, 'model', 'sdk.aon'),
+    url: Path.join(sdk, 'model', 'sdk.aontu'),
     jostraca: Jostraca({ existing: { txt: { write: true, merge: false } } }),
     opts: { dryrun: false },
   }

package/testkit.js

@@ -5,7 +5,7 @@
 // A stub rather than an `exports` map entry, on purpose. A map would name
 // this subpath and, in doing so, replace the deep-import freedom this package
 // has without one — and consumers depend on that freedom invisibly (generated
-// model files include `@voxgig/sdkgen/model/sdkgen.aon`; the scaffold is
+// model files include `@voxgig/sdkgen/model/sdkgen.aontu`; the scaffold is
 // reached as `@voxgig/sdkgen/project/<lang>`). See the `_no_exports_comment`
 // in package.json for what was measured.
 

package/project/.sdk/model/feature/feature-index.aon

@@ -1,27 +0,0 @@
-# Features
-
-# Core
-@"./test.aon"
-@"./log.aon"
-@"./secrets.aon"
-
-# Enterprise capabilities
-@"./retry.aon"
-@"./timeout.aon"
-@"./ratelimit.aon"
-@"./cache.aon"
-@"./cost.aon"
-@"./idempotency.aon"
-@"./paging.aon"
-@"./streaming.aon"
-@"./proxy.aon"
-@"./telemetry.aon"
-@"./metrics.aon"
-@"./debug.aon"
-@"./audit.aon"
-@"./clienttrack.aon"
-@"./rbac.aon"
-@"./validate.aon"
-
-# Test support: network behaviour simulation
-@"./netsim.aon"