@voxgig/sdkgen 3.7.2 → 4.0.0

package/src/action/doctor.ts

@@ -109,7 +109,7 @@ const ROOT_COMPONENTS: [string, string][] = [
 // What the check found, by category. Categories 1-3 are drift; `additive` is
 // the project's own work and is reported separately, never as a problem.
 type DoctorReport = {
-  // `.sdk/src/cmp/**`, or a target's own `.sdk/model/target/<t>.aontu`, that
+  // `.sdk/src/cmp/**`, or a target's own `.sdk/model/target/<t>.aon`, that
   // differs from the scaffold. `target add` will silently revert every one of
   // these.
   forked: string[]
@@ -198,8 +198,8 @@ async function doctor(
 
   // EVERY KIND, not just targets.
   //
-  // `add` writes a copied model file for each kind — `model/target/<t>.aontu`
-  // and `model/feature/<f>.aontu` alike — and overwrites it on every resync.
+  // `add` writes a copied model file for each kind — `model/target/<t>.aon`
+  // and `model/feature/<f>.aon` alike — and overwrites it on every resync.
   // Only the target one was ever compared, so a hand-edit to an installed
   // FEATURE definition read as perfectly in sync and was silently reverted by
   // the next `target add` (which re-runs `feature add` for every active
@@ -777,7 +777,7 @@ function checkFeatureSource(
 }
 
 
-// The copied MODEL FILE — `model/<kind>/<name>.aontu`, written by add with
+// The copied MODEL FILE — `model/<kind>/<name>.aon`, written by add with
 // the `'BASE'` replacement, and overwritten on every resync exactly as
 // `src/cmp` and `tm` are.
 //
@@ -830,7 +830,7 @@ function checkItemModel(
   const aliased = kindDef(kind).alias && name !== origname
 
   const project = definitionPath(actx.folder, kind, name)
-  const label = 'model/' + kind + '/' + name + '.aontu'
+  const label = 'model/' + kind + '/' + name + '.aon'
 
   if (!fs.existsSync(project)) {
     report.missing.push(label)

package/src/action/feature.ts

@@ -141,7 +141,7 @@ const FeatureRoot = cmp(function FeatureRoot(props: any) {
   Project({}, () => {
     // The names as INSTALLED, which is what the index must list. A ref is
     // not a name: `feature add @acme/sdkgen-iot/circuitbreaker` installs
-    // `circuitbreaker`, and writing the raw ref into feature-index.aontu
+    // `circuitbreaker`, and writing the raw ref into feature-index.aon
     // would produce an include of a file that does not exist.
     const fnames: string[] = []
 

package/src/action/kind.ts

@@ -11,9 +11,9 @@
 //   - the ref grammar and resolution, including the fallback to what the
 //     model already records for a bare name;
 //   - whether the kind may be installed under a different name (`~alias`);
-//   - the definition file: `model/<kind>/<name>.aontu`, stamped with
+//   - the definition file: `model/<kind>/<name>.aon`, stamped with
 //     provenance and landing under the INSTALLED name;
-//   - the include list: `model/<kind>/<kind>-index.aontu`.
+//   - the include list: `model/<kind>/<kind>-index.aon`.
 //
 // What a kind adds on top — a target's component and template trees, a
 // feature's per-target source fan-out — stays in that kind's own action. Those
@@ -293,7 +293,7 @@ function kindModel(props: {
 
     if (owned) {
       const dest = Path.join(
-        ctx$.folder ?? '.', 'model', kind, source.name + '.aontu')
+        ctx$.folder ?? '.', 'model', kind, source.name + '.aon')
 
       if (fs.existsSync(dest)) {
         log.info({
@@ -308,14 +308,14 @@ function kindModel(props: {
     const text = null == def.rename ? src :
       def.rename(src, source.origname, source.name)
 
-    File({ name: source.name + '.aontu', exclude: owned }, () =>
+    File({ name: source.name + '.aon', exclude: owned }, () =>
       Content(template(text, ctx$.model, { replace })))
   }
   else {
     Copy({ from: source.model, replace })
   }
 
-  File({ name: def.name + '-index.aontu' }, () => UpdateIndex({
+  File({ name: def.name + '-index.aon' }, () => UpdateIndex({
     content,
     names,
   }))

package/src/action/package.ts

@@ -1029,7 +1029,7 @@ async function reAdd(
         skipped.map((i: Installed) => i.origname).join(', ') +
         ' must be ported by hand: ' +
         skipped.map((i: Installed) =>
-          'model/' + i.kind + '/' + i.name + '.aontu').join(', ')
+          'model/' + i.kind + '/' + i.name + '.aon').join(', ')
     })
   }
 

package/src/action/resolve.ts

@@ -86,7 +86,7 @@ function resolveSource(ref: string, kind: string, ctx$: any): Source {
   if (1 < aliasing.length) {
     name = aliasing.slice(1).join('~')
 
-    // The alias becomes a DESTINATION: `model/<kind>/<name>.aontu`,
+    // The alias becomes a DESTINATION: `model/<kind>/<name>.aon`,
     // `src/cmp/<name>/`, `tm/<name>/` — all written, and `target add`
     // overwrites what it writes. `go~..` therefore redirects the copy out of
     // the target-specific directory and over unrelated scaffold. Checked
@@ -253,7 +253,7 @@ function warnManifest(ctx$: any, file: string, err: string) {
 // Teach the IN-MEMORY model about items that have just been installed.
 //
 // An action reads `actx.model`, compiled from `model/sdk.aontu` before the
-// run. Writing `model/target/iotgo.aontu` does not change it and nothing
+// run. Writing `model/target/iotgo.aon` does not change it and nothing
 // recompiles mid-process, so anything later in the SAME command behaves as if
 // the item is not installed.
 //

package/src/action/target.ts

@@ -431,7 +431,7 @@ function aliasCmpTree(
 // refreshed after upstream moved the fh* harness helpers out of it.
 //
 // tm/ is toolchain-owned — the scaffold rewrites it on every add-target, and
-// model/guide/guide.aontu is the one file a user owns (merged separately by
+// model/guide/guide.aon is the one file a user owns (merged separately by
 // create-sdkgen) — so removing what the toolchain says should not be there is
 // consistent with how the rest of that tree is already treated.
 function pruneStaleTemplates(
@@ -656,7 +656,7 @@ function readTargetFeature(
   const { log } = ctx$
   const fs = ctx$.fs()
 
-  const path = tfolder + '/model/target/' + torigname + '.aontu'
+  const path = tfolder + '/model/target/' + torigname + '.aon'
 
   try {
     const errs: any[] = []

package/src/cmp/AgentGuide.ts

@@ -63,7 +63,7 @@ ${langCommandsBlock(lang)}
 
 | Source | Path | Edit when… |
 | --- | --- | --- |
-| Target definition | \`.sdk/model/target/${lang}.aontu\` | deps, module, extension, phases change |
+| Target definition | \`.sdk/model/target/${lang}.aon\` | 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 |
 
@@ -93,7 +93,7 @@ Each feature's runtime and its own guide live in \`src/feature/<name>/\`.
         // go/py/php/rb/lua: flat files in the shared \`feature/\` package — no
         // per-feature directory, so features are documented inline here.
         Content(`Each feature is a flat file in the \`feature/\` package. Its hooks and
-default activation come from \`.sdk/model/feature/<name>.aontu\`; customise
+default activation come from \`.sdk/model/feature/<name>.aon\`; customise
 the runtime under \`.sdk/tm/${lang}/feature/\` and regenerate.
 
 | Feature | Runtime file | Active hooks |

package/src/cmp/AgentGuideContent.ts

@@ -180,11 +180,11 @@ npm run build && npm run generate
 
 To author a **new** feature:
 
-1. Define its model at \`.sdk/model/feature/<name>.aontu\` — \`name: key()\`,
+1. Define its model at \`.sdk/model/feature/<name>.aon\` — \`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.aontu\` with
-   \`@"<name>.aontu"\`.
+2. Register it in \`.sdk/model/feature/feature-index.aon\` with
+   \`@"<name>.aon"\`.
 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
@@ -210,24 +210,24 @@ 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 \`.aontu\`.
+\`$$path$$\` interpolation of a model value (such as the name) in \`.aon\`.
 
 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>.aontu\`; features in
-\`.sdk/model/feature/<name>.aontu\`.
+deps live in \`.sdk/model/target/<lang>.aon\`; features in
+\`.sdk/model/feature/<name>.aon\`.
 `
 }
 
 
 // (d) how the aontu model language works.
 function aontuSection(): string {
-  return `## The model language (aontu, \`.aontu\` files)
+  return `## The model language (aontu, \`.aon\` 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 \`.aontu\` file is a relaxed JSON (jsonic
+definitions in \`.sdk/model/\`. An \`.aon\` file is a relaxed JSON (jsonic
 syntax) with unification semantics:
 
 | Syntax | Meaning |
@@ -237,7 +237,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.aontu"\` | Include another fragment (how the index files work). |
+| \`@"file.aon"\` | Include another fragment (how the index files work). |
 | \`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}.aontu\` (name, title, version, \`config.options.active\`, the \`hook\` map, per-language \`deps\`) |
-| Registered in | \`.sdk/model/feature/feature-index.aontu\` (\`@"${name}.aontu"\`) |
+| 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"\`) |
 | 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}.aontu\` (\`<Stage>: active: true|false\`).
+  \`.sdk/model/feature/${name}.aon\` (\`<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

@@ -110,7 +110,7 @@ target's feature container) for the generated adapter.
 
 \`\`\`
 .sdk/
-  model/          the model: target/, feature/, and index .aontu files
+  model/          the model: target/, feature/, and index .aon 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

@@ -7,7 +7,7 @@ import {
 
 
 // Generate the SDK root deployment Makefile from the model's per-target
-// `publish` sections (see model/sdkgen.aontu):
+// `publish` sections (see model/sdkgen.aon):
 //
 //   publish.tag       — git release tag `<prefix>/vX.Y.Z`; every port has
 //                       one, pushed with a token from the boru key vault
@@ -179,7 +179,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>.aontu, \`publish\` section).
+# model (.sdk/model/target/<target>.aon, \`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
@@ -218,7 +218,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>.aontu):"
+\t@echo "Registry state is set in the model (.sdk/model/target/<t>.aon):"
 ${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,6 +1,6 @@
 // WHERE A KIND'S DEFINITION FILES LIVE.
 //
-// `model/<kind>/<name>.aontu`, with `model/<kind>/<kind>-index.aontu` as the
+// `model/<kind>/<name>.aon`, with `model/<kind>/<kind>-index.aon` as the
 // include list beside them. One line of path-building — and it was written out
 // longhand in three places (the resolver, the feature catalogue, doctor), each
 // with its own idea of which files in that directory count.
@@ -21,7 +21,7 @@ import { isJunk } from './junk'
 
 // The definition file for one item.
 function definitionPath(sdkfolder: string, kind: string, name: string): string {
-  return Path.join(sdkfolder, 'model', kind, name + '.aontu')
+  return Path.join(sdkfolder, 'model', kind, name + '.aon')
 }
 
 
@@ -33,7 +33,7 @@ function definitionFolder(sdkfolder: string, kind: string): string {
 
 // The include list beside them.
 function indexName(kind: string): string {
-  return kind + '-index.aontu'
+  return kind + '-index.aon'
 }
 
 
@@ -63,13 +63,13 @@ function definitionNames(fs: any, sdkfolder: string, kind: string): string[] {
     return []
   }
 
-  // The `.aontu` suffix is not enough on its own: an emacs lock link is named
-  // `.#target.aontu` and a merge leaves `target.aontu.orig`, so an editor open
+  // 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('.aontu') && index !== n && !isJunk(n))
-    .map((n: string) => n.replace(/\.aontu$/, ''))
+    .filter((n: string) => n.endsWith('.aon') && index !== n && !isJunk(n))
+    .map((n: string) => n.replace(/\.aon$/, ''))
     .sort()
 }
 

package/src/helpers/featureSource.ts

@@ -27,7 +27,7 @@
 //
 // The mapping is deliberately conservative. An entry only counts as feature
 // source when its derived name is one the generator can actually supply
-// (`availableFeatures`, read from `model/feature/*.aontu`). Everything else
+// (`availableFeatures`, read from `model/feature/*.aon`). Everything else
 // inside a feature directory — `feature_options.go`, `FeatureOptions.cs`,
 // `mod.rs`, `support.rs`, `options.hpp`, `__init__.py`, `README.md`, and the
 // `harness.ts` under `test/feature/` — derives a name no feature has, so it
@@ -103,7 +103,7 @@ function featureOf(entry: string, folder: boolean): string {
 
 
 // Feature names this generator can supply, read from the scaffold's
-// `model/feature/*.aontu`. This is the authoritative catalogue: a name not in
+// `model/feature/*.aon`. This is the authoritative catalogue: a name not in
 // it is not a feature, so nothing outside it is ever excluded.
 //
 // LOWERCASED, unlike `definitionNames`, because these are matched against

package/src/helpers/manifest.ts

@@ -305,7 +305,7 @@ function validateManifest(
     // the directory listing; if this loop asked the filesystem instead
     // (`existsSync`/`statSync`), the two would disagree on a case-insensitive
     // filesystem — APFS and NTFS by default, which is most package authors'
-    // machines. A manifest claiming `IoTGo` beside a `model/target/iotgo.aontu`
+    // machines. A manifest claiming `IoTGo` beside a `model/target/iotgo.aon`
     // then validated CLEAN for the author and failed for every Linux consumer,
     // which is precisely the "validated package that cannot install" this
     // function exists to prevent. It also makes the duplicate check above
@@ -337,7 +337,7 @@ function validateManifest(
         found.push({
           level: 'warn', point: 'manifest-item-unclaimed', file, kind, name,
           note: file + ': model/' + kind + '/' + name +
-            '.aontu is in the package but not listed in `provides.' + kind +
+            '.aon is in the package but not listed in `provides.' + kind +
             '` — nothing will install it'
         })
       }
@@ -377,7 +377,7 @@ function missingPaths(
   // The definition, by EXACT NAME from the directory listing — see the note
   // at the call site about the two directions needing one oracle.
   if (!defined.has(name)) {
-    missing.push('model/' + kind + '/' + name + '.aontu')
+    missing.push('model/' + kind + '/' + name + '.aon')
   }
 
   for (const tree of (def.trees ?? []).filter((t) => t.required)) {

package/src/helpers/modelcheck.ts

@@ -1,4 +1,4 @@
-// THE MODEL RULES A PACKAGE'S `.aontu` FILES MUST SATISFY.
+// THE MODEL RULES A PACKAGE'S `.aon` FILES MUST SATISFY.
 //
 // See docs/design/sdkgen-packages.md §10 (the rules) and §14 (the battery).
 //

package/src/helpers/opShape.ts

@@ -680,6 +680,7 @@ export {
   entityCollection,
   opTypeName,
   opParams,
+  ownPoint,
   opActions,
   entityActions,
   entityPath,

package/src/helpers/packageMeta.ts

@@ -176,7 +176,7 @@ function goVersion(model: any, target: string, fallback?: string): string {
 //
 // This was the last of the four things the slug derives that had no override,
 // and the only one that came out wrong — see the identity note at the top of
-// model/sdkgen.aontu.
+// model/sdkgen.aon.
 function goPackageIdent(model: any, target: string): string {
   const declared = model?.main?.[KIT]?.target?.[target]?.module?.package
   if (null != declared && '' !== declared) {

package/src/helpers/shipped.ts

@@ -21,9 +21,9 @@ function packageRoot(): string {
 }
 
 
-// The base model schema — `@voxgig/sdkgen/model/sdkgen.aontu`.
+// The base model schema — `@voxgig/sdkgen/model/sdkgen.aon`.
 function schemaFile(): string {
-  return Path.join(packageRoot(), 'model', 'sdkgen.aontu')
+  return Path.join(packageRoot(), 'model', 'sdkgen.aon')
 }
 
 

package/src/sdkgen.ts

@@ -58,7 +58,7 @@ import { getMatchEntries } from './helpers/getMatchEntries'
 import { collectDeps } from './helpers/collectDeps'
 import type { DepEntry } from './helpers/collectDeps'
 import { canonToType, canonToDtype, canonKey } from './helpers/canonType'
-import { OP_SUFFIX, opTypeName, opParams, opActions, entityActions, entityPath, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection } from './helpers/opShape'
+import { OP_SUFFIX, opTypeName, opParams, ownPoint, opActions, entityActions, entityPath, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection } from './helpers/opShape'
 import { isReservedName, safeVarName, exampleVarName, phpEntityAccessor, entityCacheField, isRbCoreConstant, isRbSdkConstant, rbSafeTypeName, isSwiftSdkType, swiftSafeTypeName, isPhpReservedType, phpSafeTypeName, isTsReservedType, tsSafeTypeName, jsProp, jsOptProp, jsKey } from './helpers/naming'
 import { serverVariables, hasServerVariables } from './helpers/serverVars'
 import { primaryOpCall, idLiteral, matchArg, dataArg, litFor } from './helpers/opExample'
@@ -488,7 +488,7 @@ function SdkGen(opts: SdkGenOptions) {
 
 
   function resolveModel(wanted: boolean) {
-    const path = './model/sdk.aontu'
+    const path = './model/sdk.aon'
     const errs: any[] = []
 
     // A verb that does not act on a project (see `needsModel`) is run where
@@ -642,7 +642,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.aontu') : 'no-model',
+    model: opts.model ? (opts.model.folder + '/api.aon') : 'no-model',
     meta: opts.meta || {},
   }
 
@@ -1063,6 +1063,7 @@ export {
   OP_SUFFIX,
   opTypeName,
   opParams,
+  ownPoint,
   opActions,
   entityActions,
   entityPath,

package/src/testkit.ts

@@ -87,7 +87,7 @@ type StageOptions = {
   // The project's API name, which every derived name comes from.
   name?: string
 
-  // The project's OWN model text, appended to `model/sdk.aontu`.
+  // The project's OWN model text, appended to `model/sdk.aon`.
   //
   // THIS WRITES A FILE. It does NOT reach the action context — see
   // `setModel` on the consumer, and use that if an add needs to SEE what is
@@ -125,7 +125,7 @@ type Consumer = {
   // Install a compiled model as the one the ADD ACTIONS see.
   //
   // Needed because an action reads `actx.model`, which is compiled from
-  // `model/sdk.aontu` BEFORE the run — nothing recompiles mid-process. The
+  // `model/sdk.aon` BEFORE the run — nothing recompiles mid-process. The
   // CLI does that compile per invocation; a kit staging several adds in one
   // process does not, so a feature declared in the project's model is
   // invisible to a later `target add` unless it is installed here. That
@@ -201,9 +201,9 @@ 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.aontu'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'target', 'target-index.aon'),
     '# Targets\n')
-  Fs.writeFileSync(Path.join(sdk, 'model', 'feature', 'feature-index.aontu'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'feature', 'feature-index.aon'),
     '# Features\n')
 
   const name = opts.name ?? 'demo'
@@ -212,10 +212,10 @@ function stageConsumer(opts: StageOptions = {}): Consumer {
   // includes the indexes of the kinds that existed THEN — which is why a
   // consumer staged here can show what an existing project does when a new
   // kind arrives, rather than assuming every index is already wired.
-  Fs.writeFileSync(Path.join(sdk, 'model', 'sdk.aontu'),
+  Fs.writeFileSync(Path.join(sdk, 'model', 'sdk.aon'),
     "name: '" + name + "'\n" +
-    '@"target/target-index.aontu"\n' +
-    '@"feature/feature-index.aontu"\n' +
+    '@"target/target-index.aon"\n' +
+    '@"feature/feature-index.aon"\n' +
     (opts.extra ? opts.extra + '\n' : ''))
 
   // `@voxgig/sdkgen` has to be resolvable FROM THE CONSUMER, because the
@@ -242,7 +242,7 @@ function stageConsumer(opts: StageOptions = {}): Consumer {
   const links = [linkModule(modules, '@voxgig/sdkgen', SDKGEN_ROOT)]
 
   // ...and sdkgen's PEERS, because the base model schema a consumer compiles
-  // against pulls in `@voxgig/apidef/model/apidef.aontu` by package name. A
+  // against pulls in `@voxgig/apidef/model/apidef.aon` by package name. A
   // consumer that really installed sdkgen has these; a staged one has to be
   // given them, or every model compile here fails on an include that resolves
   // fine everywhere else.
@@ -266,7 +266,7 @@ function stageConsumer(opts: StageOptions = {}): Consumer {
         [KIT]: { feature: {}, entity: {}, target: {} },
       },
     },
-    url: Path.join(sdk, 'model', 'sdk.aontu'),
+    url: Path.join(sdk, 'model', 'sdk.aon'),
     jostraca: Jostraca({ existing: { txt: { write: true, merge: false } } }),
     opts: { dryrun: false },
   }

package/src/utility.ts

@@ -27,7 +27,7 @@ function resolvePath(ctx$: any, path: string): any {
 // True unless the model declares auth off. Templates use this to gate
 // apikey-related code, docs, and examples for public APIs that need no
 // authentication. Two opt-outs, in priority order:
-//   1. main.kit.info.auth: false        (user-facing, set in api-info.aontu)
+//   1. main.kit.info.auth: false        (user-facing, set in api-info.aon)
 //   2. main.kit.config.auth.active: false
 function isAuthActive(model: any): boolean {
   const info = getModelPath(model, `main.${KIT}.info`,

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.aontu`; the scaffold is
+// model files include `@voxgig/sdkgen/model/sdkgen.aon`; 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.aontu

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