@voxgig/sdkgen 4.24.3 → 4.25.0

package/project/.sdk/src/cmp/zig/fragment/Root.fragment.zig

@@ -62,7 +62,7 @@ pub const DebugFeature = @import("feature/debug.zig").DebugFeature;
 pub const AuditFeature = @import("feature/audit.zig").AuditFeature;
 pub const ClienttrackFeature = @import("feature/clienttrack.zig").ClienttrackFeature;
 pub const RbacFeature = @import("feature/rbac.zig").RbacFeature;
-// GATED features (model/feature/<name>.aon `needs:`), exported ONLY when the
+// GATED features (model/feature/<name>.aontu `needs:`), exported ONLY when the
 // model activates them: their source reaches a named build module (the
 // vendored sekreto for `secrets`) that build.zig declares under the same
 // condition, so a static export here would name a module an inactive SDK

package/project/.sdk/tm/c/Makefile

@@ -29,7 +29,7 @@ OMNI_INC := -I tests -I tests/vendor/omni
 TEST_INC := -I tests
 LDLIBS := -lm
 
-# ---- gated feature payloads (model/feature/<name>.aon plugin groups) --------
+# ---- gated feature payloads (model/feature/<name>.aontu plugin groups) --------
 #
 # A gated feature's vendored payload sits two levels under feature/
 # (feature/<name>/<lib>/*.c) - out of reach of the feature/*/*.c glob below,

package/project/.sdk/tm/c/feature/secrets.h

@@ -6,8 +6,8 @@
 // and go's `Sekreto()` / `Credential()` accessors. Named for the feature so
 // the feature trim drops it with feature/secrets.c and feature/secrets/.
 //
-// The feature is GATED (model/feature/secrets.aon `needs: { sekreto: true }`
-// and model/target/c.aon `provides`), so its constructor is NOT in sdk.h's
+// The feature is GATED (model/feature/secrets.aontu `needs: { sekreto: true }`
+// and model/target/c.aontu `provides`), so its constructor is NOT in sdk.h's
 // bundled list: core/config.c emits the prototype for a project that
 // selected it, and this header repeats it for a caller that includes only
 // this file.

package/project/.sdk/tm/c/feature/validate.h

@@ -5,8 +5,8 @@
 // option value cannot hold - so it is set on the feature after construction,
 // the way the retry port takes its injectable sleep.
 //
-// The feature is GATED (model/feature/validate.aon `needs: { schema: true }`
-// and model/target/c.aon `provides`), so its constructor is NOT in sdk.h's
+// The feature is GATED (model/feature/validate.aontu `needs: { schema: true }`
+// and model/target/c.aontu `provides`), so its constructor is NOT in sdk.h's
 // bundled list: core/config.c emits the prototype for a project that selected
 // it, and this header repeats it for a caller that includes only this file.
 

package/project/.sdk/tm/clojure/src/sdk/features.clj

@@ -686,7 +686,7 @@
 ;; ---------------------------------------------------------------------------
 ;; Prices every transport ATTEMPT and commits the spend once per OPERATION.
 ;; Mirrors tm/ts/src/feature/cost/CostFeature.ts; the cases are
-;; .sdk/test/feature/cost.aon.
+;; .sdk/test/feature/cost.aontu.
 ;;
 ;; ORDER MATTERS. Cost must sit INSIDE the cache, or a response served from
 ;; cache is charged for money that was never spent. Activate in list form with

package/project/.sdk/tm/cpp/Makefile

@@ -11,7 +11,7 @@
 CXX ?= g++
 CXXFLAGS ?= -std=c++17 -O0 -g -Wall -Wextra -Wno-unused-parameter -pthread
 
-# ---- gated feature payloads (model/feature/<name>.aon plugin groups) --------
+# ---- gated feature payloads (model/feature/<name>.aontu plugin groups) --------
 #
 # A gated feature's vendored payload sits two levels under feature/
 # (feature/<name>/<lib>/*.cpp), as .cpp/.hpp pairs that cannot ride inside

package/project/.sdk/tm/cpp/test/primary_utility_test.cpp

@@ -786,7 +786,7 @@ static void transformResponseBasic() {
 
 // Sections under `primary` that are NOT this SDK's pipeline surface, with the
 // reason each is exempt. `check` is omni's OWN runner fixture (it comes from
-// .sdk/test/struct/test.aon, which the corpus build merges into primary); no
+// .sdk/test/struct/test.aontu, which the corpus build merges into primary); no
 // port drives it from a primary suite.
 static const std::vector<std::string>& notThisSuite() {
   static const std::vector<std::string> names = {"check"};

package/project/.sdk/tm/csharp/Makefile

@@ -11,7 +11,7 @@ clean:
 	rm -rf bin obj test/bin test/obj
 
 # --- Release: tag for NuGet ------------------------------------------------
-# NuGet publication is pending (see model/target/csharp.aon publish block);
+# NuGet publication is pending (see model/target/csharp.aontu publish block);
 # publishing a version currently means pushing the tag csharp/vX.Y.Z. When the
 # registry goes live, `dotnet pack` + `dotnet nuget push` slot in before the
 # tag (mirroring the voxgig/struct csharp Makefile). Run headless under the

package/project/.sdk/tm/csharp/test/PrimaryUtilityTest.cs

@@ -41,7 +41,7 @@ internal class TestInitFeature : BaseFeature
 public class PrimaryUtilityTest
 {
     // PENDING sections are the ones deliberately left empty in the shared
-    // corpus (.sdk/test/primary/<name>.aon). Everything else MUST
+    // corpus (.sdk/test/primary/<name>.aontu). Everything else MUST
     // contribute cases.
     private static readonly HashSet<string> Pending = new()
     {

package/project/.sdk/tm/java/test/PrimaryUtilityTest.java

@@ -45,7 +45,7 @@ public class PrimaryUtilityTest {
   static final String TEST_JSON_FILE = "../.sdk/test/test.json";
 
   // PENDING sections are the ones deliberately left empty in the shared
-  // corpus (.sdk/test/primary/<name>.aon). Everything else MUST contribute
+  // corpus (.sdk/test/primary/<name>.aontu). Everything else MUST contribute
   // cases.
   static final Set<String> PENDING = Set.of(
       "fetcher", "makeFetchDef", "makeResult",

package/project/.sdk/tm/kotlin/test/PrimaryUtilityTest.kt

@@ -39,7 +39,7 @@ class PrimaryUtilityTest {
     const val TEST_JSON_FILE = "../.sdk/test/test.json"
 
     // PENDING sections are the ones deliberately left empty in the shared
-    // corpus (.sdk/test/primary/<name>.aon). Everything else MUST
+    // corpus (.sdk/test/primary/<name>.aontu). Everything else MUST
     // contribute cases.
     val PENDING = setOf(
       "fetcher", "makeFetchDef", "makeResult",

package/project/.sdk/tm/lua/test/primary_utility_test.lua

@@ -129,7 +129,7 @@ end
 
 
 -- Sections deliberately left empty in the shared corpus
--- (.sdk/test/primary/<name>.aon carries a PENDING header). Everything else
+-- (.sdk/test/primary/<name>.aontu carries a PENDING header). Everything else
 -- MUST contribute cases.
 local PENDING = {
   fetcher = true,

package/project/.sdk/tm/ocaml/sdk_features.ml

@@ -771,7 +771,7 @@ let audit_feature () : feature =
 (* ------------------------------------------------------------------ *)
 (* Prices every transport ATTEMPT and commits the spend once per
    OPERATION. Mirrors tm/ts/src/feature/cost/CostFeature.ts; the corpus
-   cases are .sdk/test/feature/cost.aon.
+   cases are .sdk/test/feature/cost.aontu.
 
    ORDER MATTERS. Cost must sit INSIDE the cache, or a response served from
    cache is charged for money that was never spent. Activate in array form

package/project/.sdk/tm/perl/t/primary_utility.t

@@ -57,7 +57,7 @@ ok(Voxgig::Struct::ismap($spec), 'primary section found in test.json');
 
 
 # Sections deliberately left empty in the shared corpus
-# (.sdk/test/primary/<name>.aon carries a PENDING header). Everything else
+# (.sdk/test/primary/<name>.aontu carries a PENDING header). Everything else
 # MUST contribute cases.
 my %PENDING = map { $_ => 1 } qw(
   fetcher makeFetchDef makeResult featureAdd featureHook featureInit

package/project/.sdk/tm/php/test/PrimaryUtilityTest.php

@@ -38,7 +38,7 @@ class PrimaryUtilityTest extends TestCase
     private const TEST_JSON_FILE = '../../.sdk/test/test.json';
 
     // Sections deliberately left empty in the shared corpus
-    // (.sdk/test/primary/<name>.aon carries a PENDING header). Everything
+    // (.sdk/test/primary/<name>.aontu carries a PENDING header). Everything
     // else MUST contribute cases.
     private const PENDING = [
         'fetcher', 'makeFetchDef', 'makeResult',

package/project/.sdk/tm/py/test/test_primary_utility.py

@@ -105,7 +105,7 @@ def _retarget_auth(node, cred):
 
 
 # Sections deliberately left empty in the shared corpus
-# (.sdk/test/primary/<name>.aon carries a PENDING header). Everything else
+# (.sdk/test/primary/<name>.aontu carries a PENDING header). Everything else
 # MUST contribute cases.
 PENDING = {
     'fetcher', 'makeFetchDef', 'makeResult',

package/project/.sdk/tm/rb/test/primary_utility_test.rb

@@ -29,7 +29,7 @@ class PrimaryUtilityTest < Minitest::Test
   TEST_JSON_FILE = "../../.sdk/test/test.json"
 
   # Sections deliberately left empty in the shared corpus
-  # (.sdk/test/primary/<name>.aon carries a PENDING header). Everything
+  # (.sdk/test/primary/<name>.aontu carries a PENDING header). Everything
   # else MUST contribute cases.
   PENDING = %w[
     fetcher makeFetchDef makeResult

package/project/.sdk/tm/scala/sdktest/OmniSmoke.scala

@@ -10,7 +10,7 @@
 //
 // The Scala peer of tm/java/test/OmniSmokeTest.java, tm/lua/test/
 // omni_smoke_test.lua and tm/ts/test/omni.test.ts. There is no test
-// framework in this target (see model/target/scala.aon), so it is a plain
+// framework in this target (see model/target/scala.aontu), so it is a plain
 // scala-cli main that exits non-zero on failure, like the corpus mains
 // beside it.
 

package/project/.sdk/tm/scala/sdktest/feature/secrets/SecretsTestMain.scala

@@ -775,7 +775,7 @@ object SecretsTestMain {
     check("vocabulary.table", untabled.isEmpty,
       "sekreto ships provider kinds this test does not know about: " +
         untabled.mkString(", ") + " - add them to PLUGINMODULES, and to a " +
-        "`plugin` group in model/feature/secrets.aon")
+        "`plugin` group in model/feature/secrets.aontu")
 
     val w = new Wire()
     val client = secretsClient(w, "feature" -> secretsOpts(memchain("APIKEY" -> "VOCAB01")))

package/project/.sdk/tm/swift/Makefile

@@ -12,7 +12,7 @@ clean:
 
 # --- Release: tag for the SwiftPM registry ---------------------------------
 # SwiftPM has no upload step - publishing IS the git tag. Publication is
-# pending (see model/target/swift.aon publish block); publishing a version
+# pending (see model/target/swift.aontu publish block); publishing a version
 # currently means pushing the tag swift/vX.Y.Z. Run headless under the boru key
 # vault, which injects the GitHub token so nothing lands on disk or argv:
 #   boru vault exec --for=github=<alias> -- make publish

package/project/.sdk/tm/swift/Tests/ProjectNameSDKTests/PrimaryUtilityTest.swift

@@ -36,7 +36,7 @@ final class TestInitFeature: BaseFeature {
 
 final class PrimaryUtilityTest: XCTestCase {
   // PENDING sections are the ones deliberately left EMPTY in the shared
-  // corpus (.sdk/test/primary/<name>.aon). Everything else MUST contribute
+  // corpus (.sdk/test/primary/<name>.aontu). Everything else MUST contribute
   // cases: a renamed section or a fixture that failed to compile used to
   // report PASS while running zero assertions.
   private static let PENDING: Set<String> = [

package/project/.sdk/tm/ts/test/utility/Corpus.test.ts

@@ -31,7 +31,7 @@ describe('Corpus', () => {
     })
     equal(undeclared.join(','), '',
       'these sections compile to ZERO cases and carry no `basic: pending` ' +
-      'reason — add cases, or state the blocker in .sdk/test/primary/<name>.aon')
+      'reason — add cases, or state the blocker in .sdk/test/primary/<name>.aontu')
   })
 
 

package/project/sdkgen-package.json

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

package/src/action/action.ts

@@ -11,11 +11,17 @@ import type {
   ActionContext,
 } from '../types'
 
+import {
+  assertMigrated, indexName, migrateIncludes,
+} from '../helpers/definition'
+
 
-const indexEntry = (name: string) => `@"./${name}.aon"`
+const indexEntry = (name: string) => `@"./${name}.aontu"`
 
 
-const INDEX_ENTRY_RE = /^\s*@"(?:\.\/)?([^"]+)\.aon"\s*(?:#.*)?$/
+// Either extension, so a legacy index is READ as naming its items. `.aontu`
+// is the only one written; see helpers/definition `migrateIncludes`.
+const INDEX_ENTRY_RE = /^\s*@"(?:\.\/)?([^"]+)\.(?:aontu|aon)"\s*(?:#.*)?$/
 
 function indexEntryName(line: string): string | undefined {
   const m = line.match(INDEX_ENTRY_RE)
@@ -30,11 +36,11 @@ function hasIndexEntry(content: string, name: string): boolean {
 }
 
 
-// Append `@"<name>.aon"` import lines for each name not already present in
+// Append `@"<name>.aontu"` import lines for each name not already present in
 // the index content. Checking against the accumulating result (not the
 // original) means duplicate names in the same call are added at most once.
 function appendIndexEntries(content: string, names: string[]): string {
-  let out = content
+  let out = migrateIncludes(content)
 
   for (const n of names) {
     if (!hasIndexEntry(out, n)) {
@@ -82,7 +88,9 @@ function loadContent(
   const modelfolder = Path.dirname(actx.url)
 
   which.map((w: string) => {
-    const indexfile = Path.join(modelfolder, w, w + '-index.aon')
+    const indexfile = Path.join(modelfolder, w, indexName(w))
+
+    assertMigrated(fs, [indexfile])
 
     content[`${w}_index`] = (null != seed?.[w] && !fs.existsSync(indexfile)) ?
       seed[w] : fs.readFileSync(indexfile, 'utf8')

package/src/action/check.ts

@@ -20,7 +20,12 @@ import {
 
 import type { Finding, Manifest } from '../helpers/manifest'
 
-import { definitionPath, definitionNames } from '../helpers/definition'
+import type { CompileResult } from '../helpers/modelcheck'
+
+import {
+  definitionNames, definitionPathAny, dropLegacyIncludes, isLegacyPath,
+  migrateIncludes,
+} from '../helpers/definition'
 
 import {
   ANCHOR,
@@ -45,6 +50,14 @@ import { KINDS } from './kind'
 const SAME_FILE_LIMIT = 5
 
 
+const UNRESOLVED_INCLUDE = ['multisource_not_found', 'include_extension']
+
+function unresolvedIncludeOnly(result: CompileResult): boolean {
+  return 0 < result.why.length &&
+    result.why.every((w: string) => UNRESOLVED_INCLUDE.includes(w))
+}
+
+
 function claims(map: any, key: string): string[] {
   const value = map?.[key]
 
@@ -170,7 +183,7 @@ function checkItems(fs: any, sdk: string, manifest?: Manifest): Finding[] {
     const names = Array.from(new Set([...claimed, ...ondisk])).sort()
 
     for (const name of names) {
-      const file = definitionPath(sdk, kind, name)
+      const file = definitionPathAny(fs, sdk, kind, name)
 
       if (!fs.existsSync(file)) {
         continue
@@ -188,11 +201,29 @@ function checkDefinition(
   fs: any, kind: string, name: string, file: string,
 ): Finding[] {
   const found: Finding[] = []
-  const src = String(fs.readFileSync(file, 'utf8'))
+  const raw = String(fs.readFileSync(file, 'utf8'))
+
+  // Checked as a project receives it: `add` renames `.aon` includes.
+  const src = migrateIncludes(raw)
+  const legacyFile = isLegacyPath(file)
+  const legacy = legacyFile || src !== raw
 
   const at = (level: 'error' | 'warn', point: string, note: string): Finding =>
     ({ level, point, kind, name, file, note: file + ': ' + note })
 
+  if (legacy) {
+    const where = [
+      ...(legacyFile ? ['its file name'] : []),
+      ...(src !== raw ? ['its includes'] : []),
+    ].join(' and ')
+
+    found.push(at('warn', 'model-legacy-aon',
+      'uses the retired `.aon` extension in ' + where + ' — `add` installs ' +
+      'it as `' + name + '.aontu` with every include renamed to `.aontu`, ' +
+      'the only extension aontu reads; rename them in the package so it ' +
+      'holds what a project is given'))
+  }
+
   // 1. The provenance anchor. Its absence costs nothing at add time and
   //    everything afterwards: the copy records no source, so `doctor` and
   //    `package update` cannot find where it came from.
@@ -220,13 +251,26 @@ function checkDefinition(
     return found
   }
 
-  const strict = compileModel(src, file)
+  let checked = src
+  let strict = compileModel(checked, file)
+
+  // The warning does not end the check: what the file itself declares is
+  // still checked, without the includes that cannot resolve.
+  if (legacy && unresolvedIncludeOnly(strict)) {
+    found.push(at('warn', 'model-legacy-unresolved',
+      strict.errors.join(' | ') + '  (an include renamed to `.aontu` ' +
+      'resolves only once what it names ships as `.aontu`; until then a ' +
+      'project that installs this cannot compile it)'))
+
+    checked = dropLegacyIncludes(raw)
+    strict = compileModel(checked, file)
+  }
 
   if (0 < strict.errors.length) {
     // Which parser rejected it changes what the author must do, so say. A
     // file that a bare Aontu() accepts and the strict one rejects is almost
     // always the comment dialect above.
-    const bare = compileModel(src, file, { strict: false })
+    const bare = compileModel(checked, file, { strict: false })
 
     found.push(at('error', 'model-parse',
       strict.errors.join(' | ') +
@@ -249,7 +293,7 @@ function checkDefinition(
   // 5. The base schema. A non-defaulted key the file omits (`ext`,
   //    `comment.line`, `module.name`, a feature's `title`) compiles fine
   //    alone and fails the consumer's whole model.
-  const unified = compileModel(src, file, { schema: true })
+  const unified = compileModel(checked, file, { schema: true })
 
   for (const err of unified.errors.slice(0, SAME_FILE_LIMIT)) {
     found.push(at('error', 'model-schema',
@@ -268,7 +312,7 @@ function checkDefinition(
   }
 
   if ('target' === kind) {
-    found.push(...checkTargetModel(src, name, file, at))
+    found.push(...checkTargetModel(checked, name, file, at))
   }
 
   if ('feature' === kind) {
@@ -405,7 +449,7 @@ function checkFeatureSource(
       level: 'warn', point: 'feature-source-unrecognised', file,
       kind: 'target', name: tname,
       note: 'tm/' + tname + ': ' + strays.map((e) => e.path).join(', ') +
-        ' — named like feature source, but no `model/feature/<name>.aon` ' +
+        ' — named like feature source, but no `model/feature/<name>.aontu` ' +
         'declares ' + strays.map((e) => e.name).join(', ') +
         ', so the trim cannot recognise them and every project gets them ' +
         'whatever its model selects'

package/src/action/doctor.ts

@@ -23,7 +23,9 @@ import {
   aliasCmpName,
 } from './target'
 
-import { recordedRef, KINDS, kindDef, kindTrees } from './kind'
+import {
+  recordedRef, KINDS, kindDef, kindTrees, installedModelText,
+} from './kind'
 import type { TreeDef } from './kind'
 
 import { resolveSource } from './resolve'
@@ -60,7 +62,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>.aon`, that
+  // `.sdk/src/cmp/**`, or a target's own `.sdk/model/target/<t>.aontu`, that
   // differs from the scaffold. `target add` will silently revert every one of
   // these.
   forked: string[]
@@ -184,13 +186,14 @@ function orphanModelFiles(actx: ActionContext): string[] {
   }
 
   const all = walk(fs, modeldir)
-    .filter((rel) => rel.endsWith('.aon') || rel.endsWith('.aontu'))
+    .filter((rel) => rel.endsWith('.aontu') || rel.endsWith('.aon'))
     .filter((rel) => !rel.includes('.jostraca/') && !rel.startsWith('guide/'))
 
+  // Walked, never an entry: aontu reads no `.aon`, so a leftover is an orphan.
   const ENTRY = [
-    'sdk.aon', 'sdk.aontu',
-    'test/test.aon', 'test/test.aontu',
-    '.model-config/model-config.aon', '.model-config/model-config.aontu',
+    'sdk.aontu',
+    'test/test.aontu',
+    '.model-config/model-config.aontu',
   ]
 
   const seen = new Set<string>()
@@ -708,7 +711,7 @@ function checkItemModel(
   const base = source.base
   const fs = actx.fs()
 
-  const scaffold = definitionPath(source.folder, kind, origname)
+  const scaffold = source.model
 
   if (!fs.existsSync(scaffold)) {
     return
@@ -717,7 +720,7 @@ function checkItemModel(
   const aliased = kindDef(kind).alias && name !== origname
 
   const project = definitionPath(actx.folder, kind, name)
-  const label = 'model/' + kind + '/' + name + '.aon'
+  const label = 'model/' + kind + '/' + Path.basename(project)
 
   if (!fs.existsSync(project)) {
     report.missing.push(label)
@@ -727,10 +730,7 @@ function checkItemModel(
   const provenance = provenanceReplace(
     { base, origname, name, package: source.package })
 
-  const rename = kindDef(kind).rename
-
-  const rewrite = (aliased && null != rename) ?
-    (src: string) => rename(src, origname, name) : undefined
+  const rewrite = (src: string) => installedModelText(kind, source, src)
 
   if (!differs(fs, scaffold, project, actx.model, provenance, undefined, rewrite)) {
     return

package/src/action/feature.ts

@@ -140,7 +140,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.aon
+    // `circuitbreaker`, and writing the raw ref into feature-index.aontu
     // would produce an include of a file that does not exist.
     const fnames: string[] = []
 

package/src/action/kind.ts

@@ -1,9 +1,7 @@
 import { kindCollection } from '../helpers/kindCollection'
 
 
-import Path from 'node:path'
-
-import { File, Copy, Content, template } from 'jostraca'
+import { File, Content } from 'jostraca'
 
 import { KIT } from '../types'
 
@@ -11,6 +9,10 @@ import { SdkGenError } from '../utility'
 
 import { provenanceReplace } from '../helpers/stdrep'
 
+import {
+  definitionFileName, definitionPath, indexName, migrateIncludes,
+} from '../helpers/definition'
+
 import { resolveSource, recordedRef, isBare } from './resolve'
 import type { Source } from './resolve'
 
@@ -22,9 +24,8 @@ type KindDef = {
 
   alias: boolean
 
-  // Rewrite the definition's own text when it is installed under a different
-  // name (targets rewrite their `main: kit: target: <name>:` key). Only
-  // reached when `alias` is true.
+  // Rewrite the definition's text when an ALIAS installs it under another
+  // name (targets rewrite their `main: kit: target: <name>:` key).
   rename?: (src: string, origname: string, name: string) => string
 
   // Is the copied definition PROJECT-OWNED once written? An alias exists to
@@ -141,6 +142,16 @@ function resolveKind(ref: string, kind: string, ctx$: any): Source {
 }
 
 
+// What `add` writes as an item's model file, and doctor re-derives to compare.
+function installedModelText(kind: string, source: Source, src: string): string {
+  const rename = kindDef(kind).rename
+  const aliased = source.name !== source.origname
+
+  return migrateIncludes((aliased && null != rename) ?
+    rename(src, source.origname, source.name) : src)
+}
+
+
 function kindModel(props: {
   ctx$: any,
   kind: string,
@@ -154,6 +165,7 @@ function kindModel(props: {
   const log = ctx$.log
 
   const aliased = source.name !== source.origname
+  const owned = aliased && true === def.ownedWhenAliased
 
   const replace = provenanceReplace({
     base: source.base,
@@ -162,33 +174,22 @@ function kindModel(props: {
     package: source.package,
   })
 
-  if (aliased) {
-    const owned = true === def.ownedWhenAliased
+  if (owned) {
+    const dest = definitionPath(ctx$.folder ?? '.', kind, source.name)
 
-    if (owned) {
-      const dest = Path.join(
-        ctx$.folder ?? '.', 'model', kind, source.name + '.aon')
-
-      if (fs.existsSync(dest)) {
-        log.info({
-          point: kind + '-alias-model-kept', [kind]: source.name, file: dest,
-          note: source.name + ': keeping the existing aliased ' + kind +
-            ' model (project-owned — an alias is differentiated by editing it)'
-        })
-      }
+    if (fs.existsSync(dest)) {
+      log.info({
+        point: kind + '-alias-model-kept', [kind]: source.name, file: dest,
+        note: source.name + ': keeping the existing aliased ' + kind +
+          ' model (project-owned — an alias is differentiated by editing it)'
+      })
     }
-
-    const src = fs.readFileSync(source.model, 'utf8')
-    const text = null == def.rename ? src :
-      def.rename(src, source.origname, source.name)
-
-    File({ name: source.name + '.aon', exclude: owned }, () =>
-      Content(template(text, ctx$.model, { replace })))
-  }
-  else {
-    Copy({ from: source.model, replace })
   }
 
+  const src = fs.readFileSync(source.model, 'utf8')
+
+  File({ name: definitionFileName(source.name), exclude: owned }, () =>
+    Content({ src: installedModelText(kind, source, src), replace }))
 }
 
 
@@ -198,7 +199,7 @@ function kindIndex(props: {
   content: string,
 }) {
   const { kind, names, content } = props
-  File({ name: kindDef(kind).name + '-index.aon' }, () => UpdateIndex({
+  File({ name: indexName(kindDef(kind).name) }, () => UpdateIndex({
     content,
     names,
   }))
@@ -225,5 +226,6 @@ export {
   resolveKind,
   kindModel,
   kindIndex,
+  installedModelText,
   isBare,
 }

package/src/action/package.ts

@@ -806,7 +806,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 + '.aon').join(', ')
+          'model/' + i.kind + '/' + i.name + '.aontu').join(', ')
     })
   }