@voxgig/create-sdkgen 0.27.0 → 0.28.0

package/README.md

@@ -59,6 +59,29 @@ Packagist, RubyGems, LuaRocks, or a Go module tag).
 The step-by-step tutorial, the model reference, and the generator's CLI flags
 are in the [sdkgen documentation](https://github.com/voxgig/sdkgen/tree/main/docs).
 
+## Re-scaffold an existing project
+
+Run the same command over the project's output directory to pick up a newer
+scaffold:
+
+```sh
+create-sdkgen my-api -d ./openapi.yaml -o ./my-api-sdk
+```
+
+A re-scaffold rewrites the scaffold's own files and keeps the project's: the
+guide in `.sdk/model/guide/`, the project overlay `.sdk/model/project.aontu`,
+and the target, feature, and edition indexes with the files they name.
+
+The same command brings a project from before the `.aontu` rename up to date,
+which it needs, because `aontu` now refuses to include a `.aon` file. The
+re-scaffold renames each `.aon` file under `.sdk/model/` and `.sdk/test/` to
+`.aontu`, or removes it where the scaffold writes its replacement, and updates
+every include that names a renamed file. Nothing else in a file changes. An
+include the scaffold can't update, such as one pointing outside `.sdk/`, gets
+a warning that names the file. Commit first, so the migration is a diff you
+can read. [`test/create-sdkgen.test.ts`](./test/create-sdkgen.test.ts) builds
+such a project and re-scaffolds it.
+
 ## The toolchain
 
 - **create-sdkgen** (this package) — scaffolds the project.

package/dist/project/standard/CreateRoot.js

@@ -8,6 +8,7 @@ exports.sanitizeDefName = sanitizeDefName;
 const node_path_1 = __importDefault(require("node:path"));
 const jostraca_1 = require("jostraca");
 const ModelSdk_1 = require("./ModelSdk");
+const migrate_1 = require("./migrate");
 const GITIGNORE_TOP = `# Local config / secrets
 *.local.*
 *.local
@@ -47,15 +48,16 @@ log/
 # OS
 .DS_Store
 `;
-const PROJECT_FILE = 'project.aon';
+const PROJECT_FILE = 'project.aontu';
 const PROJECT_STUB = `# Project overlay — YOURS. The scaffold creates this file once and never
-# overwrites it, unlike every other file it writes.
+# overwrites it.
 #
-# Everything else under model/ is toolchain-derived and is deliberately
-# regenerated so that toolchain fixes propagate. Put anything here that is a
-# decision about THIS project rather than a fact about the API.
+# Most of model/ is toolchain-derived and is deliberately regenerated so that
+# toolchain fixes propagate; this file, the guide, and the target, feature and
+# edition indexes are kept. Put anything here that is a decision about THIS
+# project rather than a fact about the API.
 #
-# Included LAST by sdk.aon, after target/target-index.aon, because a key
+# Included LAST by sdk.aontu, after target/target-index.aontu, because a key
 # under main.kit.target.<t> can only refine a target that has already been
 # defined. Declared earlier, the model build fails with "Cannot unify value:
 # nil with value: string / key ext value was: nil", which names nothing that
@@ -75,28 +77,14 @@ const PROJECT_STUB = `# Project overlay — YOURS. The scaffold creates this fil
 `;
 const GUIDE_FILE = 'guide.aontu';
 const GUIDE_REL = ['model', 'guide', GUIDE_FILE];
-function renameIncludes(src, from, to) {
-    return src.replace(new RegExp(`(@['"][^'"]+)\\.${from}(['"])`, 'g'), `$1.${to}$2`);
-}
-// Only apidef's own files became .aontu; a project's own includes keep theirs.
-function migrateGuideIncludes(src) {
-    return src.replace(/(@(['"])(?:@voxgig\/apidef\/model\/[^'"]+|(?:[^'"]*\/)?[^'"/]*base-guide))\.aon\2/g, '$1.aontu$2');
-}
-function migrateOverlay(fs, dir, name, from, to, rewrite = (src) => renameIncludes(src, from, to)) {
-    const next = node_path_1.default.join(dir, name + '.' + to);
-    const prev = node_path_1.default.join(dir, name + '.' + from);
-    if (fs.existsSync(next) || !fs.existsSync(prev)) {
-        return;
-    }
-    try {
-        fs.writeFileSync(next, rewrite(String(fs.readFileSync(prev))));
-        fs.unlinkSync(prev);
-    }
-    catch (_err) {
-        // A failed migration must not fail the scaffold: the worst case is the
-        // template being written fresh, which is what would have happened anyway.
-    }
-}
+const INDEX_KINDS = ['target', 'feature', 'edition'];
+const indexFile = (kind) => kind + '-index.aontu';
+// Written back from the project rather than from the template.
+const KEPT = [
+    ['model', PROJECT_FILE],
+    GUIDE_REL,
+    ...INDEX_KINDS.map((kind) => ['model', kind, indexFile(kind)]),
+].map((rel) => rel.join('/'));
 function mergeGuide(existing, template) {
     if (null == existing) {
         return template;
@@ -138,9 +126,10 @@ const CreateRoot = (0, jostraca_1.cmp)(function CreateRoot(props) {
     (0, jostraca_1.Project)({ folder }, () => {
         const from = node_path_1.default.resolve(node_path_1.default.join(__dirname, '..', '..', '..', 'project', 'standard'));
         const guideExclude = [spec.sdk_folder, ...GUIDE_REL].join('/');
+        const indexExclude = INDEX_KINDS.map((kind) => [spec.sdk_folder, 'model', kind, indexFile(kind)].join('/'));
         (0, jostraca_1.Copy)({
             from,
-            exclude: [/\.fragment\./, guideExclude, /^\.sdk\/admin\/.*\.sh$/]
+            exclude: [/\.fragment\./, guideExclude, ...indexExclude, /^\.sdk\/admin\/.*\.sh$/]
         });
         (0, jostraca_1.File)({ name: '.gitignore' }, () => {
             (0, jostraca_1.Content)(GITIGNORE_TOP);
@@ -149,6 +138,14 @@ const CreateRoot = (0, jostraca_1.cmp)(function CreateRoot(props) {
         const projdef = sanitizeDefName(node_path_1.default.basename(origdef));
         spec.def = projdef;
         (0, jostraca_1.Folder)({ name: spec.sdk_folder }, () => {
+            // Before anything reads the project's own files, so a project from the
+            // .aon era is read under the names it now has.
+            if (!spec.dryrun) {
+                const sdk = node_path_1.default.join(folder, spec.sdk_folder);
+                (0, migrate_1.migrateToAontu)(fs, sdk, (0, migrate_1.scaffoldFiles)(fs, node_path_1.default.join(from, spec.sdk_folder), KEPT), (file, note) => ctx$.log.warn({
+                    point: 'migrate-aontu', file: node_path_1.default.join(sdk, file), note: file + ': ' + note,
+                }));
+            }
             (0, jostraca_1.Folder)({ name: 'admin' }, () => {
                 const admin = node_path_1.default.join(from, spec.sdk_folder, 'admin');
                 for (const name of fs.readdirSync(admin).filter((name) => name.endsWith('.sh')).sort()) {
@@ -174,30 +171,30 @@ const CreateRoot = (0, jostraca_1.cmp)(function CreateRoot(props) {
                 // unchanged rather than skipped, so the write is a no-op instead of a
                 // special case in the component tree.
                 const projectPath = node_path_1.default.join(folder, spec.sdk_folder, 'model', PROJECT_FILE);
-                // Same hazard, worse symptom: this file carries the release version,
-                // so an ignored project.aontu silently resets every generated manifest
-                // to the sdkgen default 0.0.1 — the exact bug fixed earlier this week.
-                if (!spec.dryrun) {
-                    migrateOverlay(fs, node_path_1.default.dirname(projectPath), 'project', 'aontu', 'aon');
-                }
                 const existingProject = fs.existsSync(projectPath) ? fs.readFileSync(projectPath, 'utf8') : null;
                 (0, jostraca_1.File)({ name: PROJECT_FILE }, () => {
                     (0, jostraca_1.Content)(null == existingProject ? PROJECT_STUB : existingProject);
                 });
+                // `target add`, `feature add` and docgen register their items here, and
+                // docgen bootstraps only once, so a reset index would lose them for good.
+                for (const kind of INDEX_KINDS) {
+                    (0, jostraca_1.Folder)({ name: kind }, () => {
+                        const name = indexFile(kind);
+                        const indexPath = node_path_1.default.join(folder, spec.sdk_folder, 'model', kind, name);
+                        (0, jostraca_1.File)({ name }, () => {
+                            (0, jostraca_1.Content)(fs.existsSync(indexPath) ?
+                                fs.readFileSync(indexPath, 'utf8') :
+                                fs.readFileSync(node_path_1.default.join(from, spec.sdk_folder, 'model', kind, name), 'utf8'));
+                        });
+                    });
+                }
                 // Re-emit the guide the Copy skipped, merged over whatever is already
                 // there. On a fresh scaffold there is no existing file and this writes
                 // the template unchanged; on a re-scaffold the user's overlay survives.
                 (0, jostraca_1.Folder)({ name: 'guide' }, () => {
                     const guideTemplate = fs.readFileSync(node_path_1.default.join(from, spec.sdk_folder, ...GUIDE_REL), 'utf8');
                     const guidePath = node_path_1.default.join(folder, spec.sdk_folder, ...GUIDE_REL);
-                    // Before the merge looks for it — otherwise a project whose guide is
-                    // still named .aon reads as having no overlay at all.
-                    if (!spec.dryrun) {
-                        migrateOverlay(fs, node_path_1.default.dirname(guidePath), 'guide', 'aon', 'aontu', migrateGuideIncludes);
-                    }
-                    // An entry already named .aontu can still include a retired .aon file.
-                    const existingGuide = fs.existsSync(guidePath) ?
-                        migrateGuideIncludes(fs.readFileSync(guidePath, 'utf8')) : null;
+                    const existingGuide = fs.existsSync(guidePath) ? fs.readFileSync(guidePath, 'utf8') : null;
                     (0, jostraca_1.File)({ name: GUIDE_FILE }, () => {
                         (0, jostraca_1.Content)(mergeGuide(existingGuide, guideTemplate));
                     });

package/dist/project/standard/CreateRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateRoot.js","sourceRoot":"","sources":["../../../src/project/standard/CreateRoot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CreateRoot.js","sourceRoot":"","sources":["../../../src/project/standard/CreateRoot.ts"],"names":[],"mappings":"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"}

package/dist/project/standard/ModelSdk.js

@@ -9,9 +9,9 @@ const jostraca_1 = require("jostraca");
 const ModelSdk = (0, jostraca_1.cmp)(function ModelSdk(props) {
     const { spec } = props;
     const from = node_path_1.default.resolve(node_path_1.default.join(__dirname, '..', '..', '..', 'project', 'standard'));
-    (0, jostraca_1.File)({ name: 'sdk.aon' }, () => {
+    (0, jostraca_1.File)({ name: 'sdk.aontu' }, () => {
         (0, jostraca_1.Fragment)({
-            from: node_path_1.default.join(from, spec.sdk_folder, 'model', 'sdk.fragment.aon'),
+            from: node_path_1.default.join(from, spec.sdk_folder, 'model', 'sdk.fragment.aontu'),
             replace: {
                 ProjectName: spec.name,
                 NAME: spec.name,

package/dist/project/standard/ModelSdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelSdk.js","sourceRoot":"","sources":["../../../src/project/standard/ModelSdk.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAG5B,uCAKiB;AAIjB,MAAM,QAAQ,GAAG,IAAA,cAAG,EAAC,SAAS,QAAQ,CAAC,KAAU;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAEtB,MAAM,IAAI,GACR,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAA;IAE7E,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE;QAC7B,IAAA,mBAAQ,EAAC;YACP,IAAI,EAAE,mBAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC;YACnE,OAAO,EAAE;gBACP,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;QAIA,QAAQ"}
+{"version":3,"file":"ModelSdk.js","sourceRoot":"","sources":["../../../src/project/standard/ModelSdk.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAG5B,uCAKiB;AAIjB,MAAM,QAAQ,GAAG,IAAA,cAAG,EAAC,SAAS,QAAQ,CAAC,KAAU;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAEtB,MAAM,IAAI,GACR,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAA;IAE7E,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE;QAC/B,IAAA,mBAAQ,EAAC;YACP,IAAI,EAAE,mBAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,CAAC;YACrE,OAAO,EAAE;gBACP,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;QAIA,QAAQ"}

package/dist/project/standard/migrate.d.ts

@@ -0,0 +1,9 @@
+type Warn = (file: string, note: string) => void;
+type Scaffold = {
+    kept: Set<string>;
+    replaced: Set<string>;
+};
+declare function rewriteIncludes(src: string, rename: (path: string) => boolean): string;
+declare function scaffoldFiles(fs: any, templateSdk: string, kept: string[]): Scaffold;
+declare function migrateToAontu(fs: any, sdk: string, scaffold: Scaffold, warn: Warn): void;
+export { migrateToAontu, rewriteIncludes, scaffoldFiles, };

package/dist/project/standard/migrate.js

@@ -0,0 +1,137 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToAontu = migrateToAontu;
+exports.rewriteIncludes = rewriteIncludes;
+exports.scaffoldFiles = scaffoldFiles;
+const node_path_1 = __importDefault(require("node:path"));
+const TREES = ['model', 'test'];
+const LEGACY = '.aon';
+const CURRENT = '.aontu';
+const TOOLCHAIN_RE = /^@voxgig\//;
+const APIDEF_WRITES_RE = /^model\/guide\/[^/]*base-guide\.aontu$/;
+// Comments and strings are matched whole, so an include is only ever an `@`
+// outside both: a `.aon` named in a comment or held as data is not rewritten.
+const TOKEN_RE = /#[^\n]*|@([ \t]*)(["'`])([^"'`\n]*)\2|"(?:\\.|[^"\\\n])*"|'(?:\\.|[^'\\\n])*'|`(?:\\.|[^`\\])*`/g;
+function rewriteIncludes(src, rename) {
+    return src.replace(TOKEN_RE, (token, space, quote, path) => null != quote && path.endsWith(LEGACY) && rename(path) ?
+        '@' + space + quote + path.slice(0, -LEGACY.length) + CURRENT + quote : token);
+}
+function legacyIncludes(src) {
+    return [...src.matchAll(TOKEN_RE)]
+        .filter((m) => null != m[2] && m[3].endsWith(LEGACY))
+        .map((m) => m[3]);
+}
+function modelFiles(fs, sdk, ext) {
+    const found = [];
+    const walk = (rel) => {
+        let entries;
+        try {
+            entries = fs.readdirSync(node_path_1.default.join(sdk, rel), { withFileTypes: true });
+        }
+        catch (_err) {
+            return;
+        }
+        for (const entry of entries) {
+            const child = rel + '/' + entry.name;
+            if (entry.isDirectory()) {
+                walk(child);
+            }
+            else if (entry.isFile() && entry.name.endsWith(ext)) {
+                found.push(child);
+            }
+        }
+    };
+    TREES.forEach(walk);
+    return found.sort();
+}
+function scaffoldFiles(fs, templateSdk, kept) {
+    const keep = new Set(kept);
+    const written = modelFiles(fs, templateSdk, CURRENT)
+        .map((rel) => rel.replace('.fragment.', '.'));
+    return { kept: keep, replaced: new Set(written.filter((rel) => !keep.has(rel))) };
+}
+// A failed step must not fail the scaffold: the file keeps the name it had.
+function attempt(step) {
+    try {
+        step();
+    }
+    catch (_err) {
+    }
+}
+// Written beside the target and renamed over it, so a write that fails part
+// way leaves the file it would have replaced whole.
+function writeWhole(fs, path, data) {
+    const tmp = path + '.migrating';
+    try {
+        fs.writeFileSync(tmp, data);
+        fs.renameSync(tmp, path);
+    }
+    catch (err) {
+        attempt(() => fs.unlinkSync(tmp));
+        throw err;
+    }
+}
+function migrateFile(fs, prev, next) {
+    if (fs.existsSync(next) || !fs.existsSync(prev)) {
+        return;
+    }
+    attempt(() => {
+        writeWhole(fs, next, fs.readFileSync(prev));
+        fs.unlinkSync(prev);
+    });
+}
+function includeRenamer(fs, sdk, scaffold, from) {
+    const dir = node_path_1.default.dirname(node_path_1.default.join(sdk, from));
+    return (path) => {
+        if (TOOLCHAIN_RE.test(path)) {
+            return true;
+        }
+        if (path.startsWith('@')) {
+            return false;
+        }
+        const twin = node_path_1.default.resolve(dir, path.slice(0, -LEGACY.length) + CURRENT);
+        const rel = node_path_1.default.relative(sdk, twin).split(node_path_1.default.sep).join('/');
+        return fs.existsSync(twin) || scaffold.kept.has(rel) || scaffold.replaced.has(rel) ||
+            APIDEF_WRITES_RE.test(rel);
+    };
+}
+// Renames first and rewrites after, so an include changes only once the file
+// it names is on disk as .aontu.
+function migrateToAontu(fs, sdk, scaffold, warn) {
+    const legacy = modelFiles(fs, sdk, LEGACY);
+    const twin = (rel) => rel.slice(0, -LEGACY.length) + CURRENT;
+    const abs = (rel) => node_path_1.default.join(sdk, rel);
+    for (const rel of legacy.filter((rel) => !scaffold.replaced.has(twin(rel)))) {
+        migrateFile(fs, abs(rel), abs(twin(rel)));
+    }
+    const sources = modelFiles(fs, sdk, CURRENT).filter((rel) => !scaffold.replaced.has(rel));
+    for (const rel of sources) {
+        attempt(() => {
+            const src = String(fs.readFileSync(abs(rel)));
+            const out = rewriteIncludes(src, includeRenamer(fs, sdk, scaffold, rel));
+            if (out !== src) {
+                writeWhole(fs, abs(rel), out);
+            }
+        });
+    }
+    for (const rel of legacy.filter((rel) => scaffold.replaced.has(twin(rel)))) {
+        attempt(() => fs.unlinkSync(abs(rel)));
+    }
+    for (const rel of modelFiles(fs, sdk, LEGACY)) {
+        warn(rel, fs.existsSync(abs(twin(rel))) ?
+            'left in place: ' + twin(rel) + ' exists, and is the file aontu reads' :
+            'could not be migrated to ' + twin(rel));
+    }
+    for (const rel of sources) {
+        attempt(() => {
+            for (const path of legacyIncludes(String(fs.readFileSync(abs(rel))))) {
+                warn(rel, 'includes ' + path + ', which aontu refuses: rename that file ' +
+                    'to .aontu and update the include');
+            }
+        });
+    }
+}
+//# sourceMappingURL=migrate.js.map

package/dist/project/standard/migrate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/project/standard/migrate.ts"],"names":[],"mappings":"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"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"7.0.2","root":["../src/create-sdkgen.ts","../src/project/standard/CreateRoot.ts","../src/project/standard/ModelSdk.ts"],"packageJsons":["../node_modules/@types/node/package.json","../node_modules/@voxgig/util/package.json","../node_modules/jostraca/package.json","../node_modules/memfs/package.json","../node_modules/pino-pretty/package.json","../node_modules/pino-std-serializers/package.json","../node_modules/pino/package.json","../node_modules/shape/package.json","../node_modules/sonic-boom/package.json","../node_modules/thread-stream/package.json","../node_modules/undici-types/package.json","../package.json"],"missingPackageJsons":["../node_modules/@types/assert/package.json","../node_modules/@types/assert/strict/package.json","../node_modules/@types/async_hooks/package.json","../node_modules/@types/buffer/package.json","../node_modules/@types/child_process/package.json","../node_modules/@types/cluster/package.json","../node_modules/@types/console/package.json","../node_modules/@types/constants/package.json","../node_modules/@types/crypto/package.json","../node_modules/@types/dgram/package.json","../node_modules/@types/diagnostics_channel/package.json","../node_modules/@types/dns/package.json","../node_modules/@types/dns/promises/package.json","../node_modules/@types/domain/package.json","../node_modules/@types/events/package.json","../node_modules/@types/fs/package.json","../node_modules/@types/fs/promises/package.json","../node_modules/@types/http/package.json","../node_modules/@types/http2/package.json","../node_modules/@types/https/package.json","../node_modules/@types/inspector/package.json","../node_modules/@types/inspector/promises/package.json","../node_modules/@types/module/package.json","../node_modules/@types/net/package.json","../node_modules/@types/node/assert/package.json","../node_modules/@types/node/dns/package.json","../node_modules/@types/node/fs/package.json","../node_modules/@types/node/inspector/package.json","../node_modules/@types/node/path/package.json","../node_modules/@types/node/readline/package.json","../node_modules/@types/node/stream/package.json","../node_modules/@types/node/test/package.json","../node_modules/@types/node/timers/package.json","../node_modules/@types/node/util/package.json","../node_modules/@types/node/web-globals/package.json","../node_modules/@types/node/zlib/package.json","../node_modules/@types/os/package.json","../node_modules/@types/path/package.json","../node_modules/@types/path/posix/package.json","../node_modules/@types/path/win32/package.json","../node_modules/@types/perf_hooks/package.json","../node_modules/@types/process/package.json","../node_modules/@types/punycode/package.json","../node_modules/@types/querystring/package.json","../node_modules/@types/readline/package.json","../node_modules/@types/readline/promises/package.json","../node_modules/@types/repl/package.json","../node_modules/@types/stream/consumers/package.json","../node_modules/@types/stream/iter/package.json","../node_modules/@types/stream/package.json","../node_modules/@types/stream/promises/package.json","../node_modules/@types/stream/web/package.json","../node_modules/@types/string_decoder/package.json","../node_modules/@types/timers/package.json","../node_modules/@types/timers/promises/package.json","../node_modules/@types/tls/package.json","../node_modules/@types/trace_events/package.json","../node_modules/@types/tty/package.json","../node_modules/@types/url/package.json","../node_modules/@types/util/package.json","../node_modules/@types/util/types/package.json","../node_modules/@types/v8/package.json","../node_modules/@types/vm/package.json","../node_modules/@types/wasi/package.json","../node_modules/@types/worker_threads/package.json","../node_modules/@types/zlib/package.json","../node_modules/@voxgig/util/dist/package.json","../node_modules/assert/package.json","../node_modules/assert/strict/package.json","../node_modules/async_hooks/package.json","../node_modules/buffer/package.json","../node_modules/child_process/package.json","../node_modules/cluster/package.json","../node_modules/console/package.json","../node_modules/constants/package.json","../node_modules/crypto/package.json","../node_modules/dgram/package.json","../node_modules/diagnostics_channel/package.json","../node_modules/dns/package.json","../node_modules/dns/promises/package.json","../node_modules/domain/package.json","../node_modules/events/package.json","../node_modules/fs/package.json","../node_modules/fs/promises/package.json","../node_modules/http/package.json","../node_modules/http2/package.json","../node_modules/https/package.json","../node_modules/inspector/package.json","../node_modules/inspector/promises/package.json","../node_modules/jostraca/dist/build/package.json","../node_modules/jostraca/dist/cmp/package.json","../node_modules/jostraca/dist/package.json","../node_modules/jostraca/dist/util/package.json","../node_modules/module/package.json","../node_modules/net/package.json","../node_modules/os/package.json","../node_modules/path/package.json","../node_modules/path/posix/package.json","../node_modules/path/win32/package.json","../node_modules/perf_hooks/package.json","../node_modules/process/package.json","../node_modules/punycode/package.json","../node_modules/querystring/package.json","../node_modules/readline/package.json","../node_modules/readline/promises/package.json","../node_modules/repl/package.json","../node_modules/shape/dist/package.json","../node_modules/sonic-boom/types/package.json","../node_modules/stream/consumers/package.json","../node_modules/stream/iter/package.json","../node_modules/stream/package.json","../node_modules/stream/promises/package.json","../node_modules/stream/web/package.json","../node_modules/string_decoder/package.json","../node_modules/thread-stream/node_modules/events/package.json","../node_modules/thread-stream/node_modules/worker_threads/package.json","../node_modules/timers/package.json","../node_modules/timers/promises/package.json","../node_modules/tls/package.json","../node_modules/trace_events/package.json","../node_modules/tty/package.json","../node_modules/url/package.json","../node_modules/util/package.json","../node_modules/util/types/package.json","../node_modules/v8/package.json","../node_modules/vm/package.json","../node_modules/wasi/package.json","../node_modules/worker_threads/package.json","../node_modules/zlib/package.json"]}
+{"version":"7.0.2","root":["../src/create-sdkgen.ts","../src/project/standard/CreateRoot.ts","../src/project/standard/ModelSdk.ts","../src/project/standard/migrate.ts"],"packageJsons":["../node_modules/@types/node/package.json","../node_modules/@voxgig/util/package.json","../node_modules/jostraca/package.json","../node_modules/memfs/package.json","../node_modules/pino-pretty/package.json","../node_modules/pino-std-serializers/package.json","../node_modules/pino/package.json","../node_modules/shape/package.json","../node_modules/sonic-boom/package.json","../node_modules/thread-stream/package.json","../node_modules/undici-types/package.json","../package.json"],"missingPackageJsons":["../node_modules/@types/assert/package.json","../node_modules/@types/assert/strict/package.json","../node_modules/@types/async_hooks/package.json","../node_modules/@types/buffer/package.json","../node_modules/@types/child_process/package.json","../node_modules/@types/cluster/package.json","../node_modules/@types/console/package.json","../node_modules/@types/constants/package.json","../node_modules/@types/crypto/package.json","../node_modules/@types/dgram/package.json","../node_modules/@types/diagnostics_channel/package.json","../node_modules/@types/dns/package.json","../node_modules/@types/dns/promises/package.json","../node_modules/@types/domain/package.json","../node_modules/@types/events/package.json","../node_modules/@types/fs/package.json","../node_modules/@types/fs/promises/package.json","../node_modules/@types/http/package.json","../node_modules/@types/http2/package.json","../node_modules/@types/https/package.json","../node_modules/@types/inspector/package.json","../node_modules/@types/inspector/promises/package.json","../node_modules/@types/module/package.json","../node_modules/@types/net/package.json","../node_modules/@types/node/assert/package.json","../node_modules/@types/node/dns/package.json","../node_modules/@types/node/fs/package.json","../node_modules/@types/node/inspector/package.json","../node_modules/@types/node/path/package.json","../node_modules/@types/node/readline/package.json","../node_modules/@types/node/stream/package.json","../node_modules/@types/node/test/package.json","../node_modules/@types/node/timers/package.json","../node_modules/@types/node/util/package.json","../node_modules/@types/node/web-globals/package.json","../node_modules/@types/node/zlib/package.json","../node_modules/@types/os/package.json","../node_modules/@types/path/package.json","../node_modules/@types/path/posix/package.json","../node_modules/@types/path/win32/package.json","../node_modules/@types/perf_hooks/package.json","../node_modules/@types/process/package.json","../node_modules/@types/punycode/package.json","../node_modules/@types/querystring/package.json","../node_modules/@types/readline/package.json","../node_modules/@types/readline/promises/package.json","../node_modules/@types/repl/package.json","../node_modules/@types/stream/consumers/package.json","../node_modules/@types/stream/iter/package.json","../node_modules/@types/stream/package.json","../node_modules/@types/stream/promises/package.json","../node_modules/@types/stream/web/package.json","../node_modules/@types/string_decoder/package.json","../node_modules/@types/timers/package.json","../node_modules/@types/timers/promises/package.json","../node_modules/@types/tls/package.json","../node_modules/@types/trace_events/package.json","../node_modules/@types/tty/package.json","../node_modules/@types/url/package.json","../node_modules/@types/util/package.json","../node_modules/@types/util/types/package.json","../node_modules/@types/v8/package.json","../node_modules/@types/vm/package.json","../node_modules/@types/wasi/package.json","../node_modules/@types/worker_threads/package.json","../node_modules/@types/zlib/package.json","../node_modules/@voxgig/util/dist/package.json","../node_modules/assert/package.json","../node_modules/assert/strict/package.json","../node_modules/async_hooks/package.json","../node_modules/buffer/package.json","../node_modules/child_process/package.json","../node_modules/cluster/package.json","../node_modules/console/package.json","../node_modules/constants/package.json","../node_modules/crypto/package.json","../node_modules/dgram/package.json","../node_modules/diagnostics_channel/package.json","../node_modules/dns/package.json","../node_modules/dns/promises/package.json","../node_modules/domain/package.json","../node_modules/events/package.json","../node_modules/fs/package.json","../node_modules/fs/promises/package.json","../node_modules/http/package.json","../node_modules/http2/package.json","../node_modules/https/package.json","../node_modules/inspector/package.json","../node_modules/inspector/promises/package.json","../node_modules/jostraca/dist/build/package.json","../node_modules/jostraca/dist/cmp/package.json","../node_modules/jostraca/dist/package.json","../node_modules/jostraca/dist/util/package.json","../node_modules/module/package.json","../node_modules/net/package.json","../node_modules/os/package.json","../node_modules/path/package.json","../node_modules/path/posix/package.json","../node_modules/path/win32/package.json","../node_modules/perf_hooks/package.json","../node_modules/process/package.json","../node_modules/punycode/package.json","../node_modules/querystring/package.json","../node_modules/readline/package.json","../node_modules/readline/promises/package.json","../node_modules/repl/package.json","../node_modules/shape/dist/package.json","../node_modules/sonic-boom/types/package.json","../node_modules/stream/consumers/package.json","../node_modules/stream/iter/package.json","../node_modules/stream/package.json","../node_modules/stream/promises/package.json","../node_modules/stream/web/package.json","../node_modules/string_decoder/package.json","../node_modules/thread-stream/node_modules/events/package.json","../node_modules/thread-stream/node_modules/worker_threads/package.json","../node_modules/timers/package.json","../node_modules/timers/promises/package.json","../node_modules/tls/package.json","../node_modules/trace_events/package.json","../node_modules/tty/package.json","../node_modules/url/package.json","../node_modules/util/package.json","../node_modules/util/types/package.json","../node_modules/v8/package.json","../node_modules/vm/package.json","../node_modules/wasi/package.json","../node_modules/worker_threads/package.json","../node_modules/zlib/package.json"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/create-sdkgen",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "main": "dist/create-sdkgen.js",
   "type": "commonjs",
   "types": "dist/create-sdkgen.d.ts",
@@ -27,8 +27,8 @@
     "watch": "tsc --build src test -w",
     "build": "tsc --build src test",
     "scan-prose": "python3 tools/check_prose.py",
-    "test-model": "voxgig-model project/.sdk/test/test.aon",
-    "test-model-watch": "voxgig-model -w project/.sdk/test/test.aon",
+    "test-model": "voxgig-model project/.sdk/test/test.aontu",
+    "test-model-watch": "voxgig-model -w project/.sdk/test/test.aontu",
     "clean": "rm -rf dist dist-test node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-bump": "npm version patch --no-git-tag-version && node -e \"console.log('bumped to v' + require('./package.json').version + ' (package.json only - commit via repo-tag / repo-release)')\"",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@voxgig/util": "0.5.4",
-    "aontu": ">=0.68",
+    "aontu": ">=0.75.0",
     "chokidar": "5.0.0",
     "jostraca": "0.31.2",
     "shape": ">=10"

package/project/standard/.sdk/model/.model-config/{model-config.aon → model-config.aontu}

@@ -1,6 +1,6 @@
 
 
-@'@voxgig/model/model/.model-config/model-config.aon'
+@'@voxgig/model/model/.model-config/model-config.aontu'
 
 sys: model: action: {
   apidef: load: 'build/apidef.js'

package/project/standard/.sdk/model/{sdk.fragment.aon → sdk.fragment.aontu}

@@ -1,7 +1,7 @@
 
 # Model definitions.
 @"@voxgig/apidef/model/apidef.aontu"
-@"@voxgig/sdkgen/model/sdkgen.aon"
+@"@voxgig/sdkgen/model/sdkgen.aontu"
 
 
 name: 'NAME'
@@ -14,7 +14,7 @@ def: 'DEF'
 
 
 # SDK Configuration.
-@"./config.aon"
+@"./config.aontu"
 
 
 # SDK Entities
@@ -22,18 +22,18 @@ def: 'DEF'
 
 
 # SDK Features.
-@"feature/feature-index.aon"
+@"feature/feature-index.aontu"
 
 
 # SDK Targets.
-@"target/target-index.aon"
+@"target/target-index.aontu"
 
 
 # Operation workflows.
 @"flow/flow-index.aontu"
 
 
-@"./project.aon"
+@"./project.aontu"
 
-# Documentation editions. Settings belong in project.aon.
-@"edition/edition-index.aon"
+# Documentation editions. Settings belong in project.aontu.
+@"edition/edition-index.aontu"

package/project/standard/.sdk/package.json

@@ -3,12 +3,12 @@
   "version": "0.0.1",
   "description": "$$const.Name$$ SDK Project",
   "scripts": {
-    "generate": "node build/docgen.js && tsc --build src && voxgig-model model/sdk.aon && voxgig-model test/test.aon",
-    "watch-generate": "voxgig-model -w model/sdk.aon",
-    "dry-generate": "tsc --build src && voxgig-model -y model/sdk.aon",
-    "watch-dry-generate": "voxgig-model -w -y model/sdk.aon",
-    "test-model": "voxgig-model test/test.aon",
-    "watch-test-model": "voxgig-model -w test/test.aon",
+    "generate": "node build/docgen.js && tsc --build src && voxgig-model model/sdk.aontu && voxgig-model test/test.aontu",
+    "watch-generate": "voxgig-model -w model/sdk.aontu",
+    "dry-generate": "tsc --build src && voxgig-model -y model/sdk.aontu",
+    "watch-dry-generate": "voxgig-model -w -y model/sdk.aontu",
+    "test-model": "voxgig-model test/test.aontu",
+    "watch-test-model": "voxgig-model -w test/test.aontu",
     "watch": "tsc --build src -w",
     "build": "tsc --build src",
     "test": "echo no-test",
@@ -29,13 +29,13 @@
   "devDependencies": {
     "@types/node": ">=25.6",
     "typescript": ">=6.0",
-    "@voxgig/apidef": ">=8.16.0",
-    "@voxgig/model": ">=10.0",
-    "@voxgig/sdkgen": ">=4.22.0",
+    "@voxgig/apidef": ">=8.17.0",
+    "@voxgig/model": ">=12.0.0",
+    "@voxgig/sdkgen": ">=4.25.0",
     "@voxgig/util": ">=0.5",
     "@voxgig/struct": ">=0.2",
-    "jostraca": ">=0.33.1",
-    "aontu": ">=0.68",
-    "@voxgig/docgen": ">=0.23.0"
+    "jostraca": ">=0.39.0",
+    "aontu": ">=0.75.0",
+    "@voxgig/docgen": ">=0.27.0"
   }
 }

package/project/standard/.sdk/test/.model-config/model-config.aontu

@@ -0,0 +1,4 @@
+
+@"@voxgig/model/model/.model-config/model-config.aontu"
+
+sys: model: builders: {}

package/project/standard/.sdk/test/feature/{feature-test-index.aon → feature-test-index.aontu}

@@ -1,2 +1,2 @@
 # Feature behaviour cases, one section per feature.
-feature: cost: @"./cost.aon"
+feature: cost: @"./cost.aontu"

package/project/standard/.sdk/test/primary/primary-test-index.aontu

@@ -0,0 +1,30 @@
+primary: clean: @"./clean.aontu"
+primary: done: @"./done.aontu"
+primary: featureAdd: @"./featureAdd.aontu"
+primary: featureHook: @"./featureHook.aontu"
+primary: featureInit: @"./featureInit.aontu"
+primary: fetcher: @"./fetcher.aontu"
+primary: makeContext: @"./makeContext.aontu"
+primary: makeError: @"./makeError.aontu"
+primary: makeFetchDef: @"./makeFetchDef.aontu"
+primary: makeOptions: @"./makeOptions.aontu"
+primary: makeRequest: @"./makeRequest.aontu"
+primary: makeResponse: @"./makeResponse.aontu"
+primary: makeResult: @"./makeResult.aontu"
+primary: makeSpec: @"./makeSpec.aontu"
+primary: makePoint: @"./makePoint.aontu"
+primary: makeUrl: @"./makeUrl.aontu"
+primary: operator: @"./operator.aontu"
+primary: param: @"./param.aontu"
+primary: prepareAuth: @"./prepareAuth.aontu"
+primary: prepareBody: @"./prepareBody.aontu"
+primary: prepareHeaders: @"./prepareHeaders.aontu"
+primary: prepareMethod: @"./prepareMethod.aontu"
+primary: prepareParams: @"./prepareParams.aontu"
+primary: preparePath: @"./preparePath.aontu"
+primary: prepareQuery: @"./prepareQuery.aontu"
+primary: resultBasic: @"./resultBasic.aontu"
+primary: resultBody: @"./resultBody.aontu"
+primary: resultHeaders: @"./resultHeaders.aontu"
+primary: transformRequest: @"./transformRequest.aontu"
+primary: transformResponse: @"./transformResponse.aontu"

package/project/standard/.sdk/test/struct/test.aontu

@@ -0,0 +1,26 @@
+
+struct: &: {
+  name: key()
+  set: []
+}
+
+struct: minor: @"./minor.aontu"
+struct: getpath: @"./getpath.aontu"
+struct: inject: @"./inject.aontu"
+struct: merge: @"./merge.aontu"
+struct: transform: @"./transform.aontu"
+struct: walk: @"./walk.aontu"
+struct: validate: @"./validate.aontu"
+struct: select: @"./select.aontu"
+struct: nullsem: @"./nullsem.aontu"
+
+primary: check: {
+  DEF: {
+    client:a:test:options:foo:1
+  }
+  basic: set: [
+    { ctx:meta:bar:BAR0, out:zed:ZED_BAR0 }
+    { ctx:meta:bar:BAR1, client:a, out:zed:ZED1_BAR1 }
+  ]
+}
+

package/project/standard/.sdk/test/test.aontu

@@ -0,0 +1,4 @@
+
+@"struct/test.aontu"
+@"primary/primary-test-index.aontu"
+@"feature/feature-test-index.aontu"

package/src/project/standard/CreateRoot.ts

@@ -16,6 +16,7 @@ import {
 
 
 import { ModelSdk } from './ModelSdk'
+import { migrateToAontu, scaffoldFiles } from './migrate'
 
 
 const GITIGNORE_TOP = `# Local config / secrets
@@ -61,15 +62,16 @@ log/
 `
 
 
-const PROJECT_FILE = 'project.aon'
+const PROJECT_FILE = 'project.aontu'
 const PROJECT_STUB = `# Project overlay — YOURS. The scaffold creates this file once and never
-# overwrites it, unlike every other file it writes.
+# overwrites it.
 #
-# Everything else under model/ is toolchain-derived and is deliberately
-# regenerated so that toolchain fixes propagate. Put anything here that is a
-# decision about THIS project rather than a fact about the API.
+# Most of model/ is toolchain-derived and is deliberately regenerated so that
+# toolchain fixes propagate; this file, the guide, and the target, feature and
+# edition indexes are kept. Put anything here that is a decision about THIS
+# project rather than a fact about the API.
 #
-# Included LAST by sdk.aon, after target/target-index.aon, because a key
+# Included LAST by sdk.aontu, after target/target-index.aontu, because a key
 # under main.kit.target.<t> can only refine a target that has already been
 # defined. Declared earlier, the model build fails with "Cannot unify value:
 # nil with value: string / key ext value was: nil", which names nothing that
@@ -92,37 +94,15 @@ const PROJECT_STUB = `# Project overlay — YOURS. The scaffold creates this fil
 const GUIDE_FILE = 'guide.aontu'
 const GUIDE_REL = ['model', 'guide', GUIDE_FILE]
 
+const INDEX_KINDS = ['target', 'feature', 'edition']
+const indexFile = (kind: string) => kind + '-index.aontu'
 
-function renameIncludes(src: string, from: string, to: string): string {
-  return src.replace(new RegExp(`(@['"][^'"]+)\\.${from}(['"])`, 'g'), `$1.${to}$2`)
-}
-
-
-// Only apidef's own files became .aontu; a project's own includes keep theirs.
-function migrateGuideIncludes(src: string): string {
-  return src.replace(
-    /(@(['"])(?:@voxgig\/apidef\/model\/[^'"]+|(?:[^'"]*\/)?[^'"/]*base-guide))\.aon\2/g,
-    '$1.aontu$2')
-}
-
-
-function migrateOverlay(
-  fs: any, dir: string, name: string, from: string, to: string,
-  rewrite: (src: string) => string = (src) => renameIncludes(src, from, to)): void {
-  const next = Path.join(dir, name + '.' + to)
-  const prev = Path.join(dir, name + '.' + from)
-  if (fs.existsSync(next) || !fs.existsSync(prev)) {
-    return
-  }
-  try {
-    fs.writeFileSync(next, rewrite(String(fs.readFileSync(prev))))
-    fs.unlinkSync(prev)
-  }
-  catch (_err: any) {
-    // A failed migration must not fail the scaffold: the worst case is the
-    // template being written fresh, which is what would have happened anyway.
-  }
-}
+// Written back from the project rather than from the template.
+const KEPT = [
+  ['model', PROJECT_FILE],
+  GUIDE_REL,
+  ...INDEX_KINDS.map((kind: string) => ['model', kind, indexFile(kind)]),
+].map((rel: string[]) => rel.join('/'))
 
 
 function mergeGuide(existing: string | null, template: string): string {
@@ -181,10 +161,12 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
 
 
     const guideExclude = [spec.sdk_folder, ...GUIDE_REL].join('/')
+    const indexExclude = INDEX_KINDS.map((kind: string) =>
+      [spec.sdk_folder, 'model', kind, indexFile(kind)].join('/'))
 
     Copy({
       from,
-      exclude: [/\.fragment\./, guideExclude, /^\.sdk\/admin\/.*\.sh$/]
+      exclude: [/\.fragment\./, guideExclude, ...indexExclude, /^\.sdk\/admin\/.*\.sh$/]
     })
 
     File({ name: '.gitignore' }, () => {
@@ -196,6 +178,16 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
     spec.def = projdef
 
     Folder({ name: spec.sdk_folder }, () => {
+      // Before anything reads the project's own files, so a project from the
+      // .aon era is read under the names it now has.
+      if (!spec.dryrun) {
+        const sdk = Path.join(folder, spec.sdk_folder)
+        migrateToAontu(fs, sdk, scaffoldFiles(fs, Path.join(from, spec.sdk_folder), KEPT),
+          (file: string, note: string) => ctx$.log.warn({
+            point: 'migrate-aontu', file: Path.join(sdk, file), note: file + ': ' + note,
+          }))
+      }
+
       Folder({ name: 'admin' }, () => {
         const admin = Path.join(from, spec.sdk_folder, 'admin')
         for (const name of fs.readdirSync(admin).filter((name: string) => name.endsWith('.sh')).sort()) {
@@ -227,12 +219,6 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
         const projectPath =
           Path.join(folder, spec.sdk_folder, 'model', PROJECT_FILE)
 
-        // Same hazard, worse symptom: this file carries the release version,
-        // so an ignored project.aontu silently resets every generated manifest
-        // to the sdkgen default 0.0.1 — the exact bug fixed earlier this week.
-        if (!spec.dryrun) {
-          migrateOverlay(fs, Path.dirname(projectPath), 'project', 'aontu', 'aon')
-        }
         const existingProject =
           fs.existsSync(projectPath) ? fs.readFileSync(projectPath, 'utf8') : null
 
@@ -240,6 +226,20 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
           Content(null == existingProject ? PROJECT_STUB : existingProject)
         })
 
+        // `target add`, `feature add` and docgen register their items here, and
+        // docgen bootstraps only once, so a reset index would lose them for good.
+        for (const kind of INDEX_KINDS) {
+          Folder({ name: kind }, () => {
+            const name = indexFile(kind)
+            const indexPath = Path.join(folder, spec.sdk_folder, 'model', kind, name)
+            File({ name }, () => {
+              Content(fs.existsSync(indexPath) ?
+                fs.readFileSync(indexPath, 'utf8') :
+                fs.readFileSync(Path.join(from, spec.sdk_folder, 'model', kind, name), 'utf8'))
+            })
+          })
+        }
+
         // Re-emit the guide the Copy skipped, merged over whatever is already
         // there. On a fresh scaffold there is no existing file and this writes
         // the template unchanged; on a re-scaffold the user's overlay survives.
@@ -247,17 +247,8 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
           const guideTemplate =
             fs.readFileSync(Path.join(from, spec.sdk_folder, ...GUIDE_REL), 'utf8')
           const guidePath = Path.join(folder, spec.sdk_folder, ...GUIDE_REL)
-
-          // Before the merge looks for it — otherwise a project whose guide is
-          // still named .aon reads as having no overlay at all.
-          if (!spec.dryrun) {
-            migrateOverlay(fs, Path.dirname(guidePath), 'guide', 'aon', 'aontu',
-              migrateGuideIncludes)
-          }
-
-          // An entry already named .aontu can still include a retired .aon file.
-          const existingGuide = fs.existsSync(guidePath) ?
-            migrateGuideIncludes(fs.readFileSync(guidePath, 'utf8')) : null
+          const existingGuide =
+            fs.existsSync(guidePath) ? fs.readFileSync(guidePath, 'utf8') : null
 
           File({ name: GUIDE_FILE }, () => {
             Content(mergeGuide(existingGuide, guideTemplate))

package/src/project/standard/ModelSdk.ts

@@ -17,9 +17,9 @@ const ModelSdk = cmp(function ModelSdk(props: any) {
   const from =
     Path.resolve(Path.join(__dirname, '..', '..', '..', 'project', 'standard'))
 
-  File({ name: 'sdk.aon' }, () => {
+  File({ name: 'sdk.aontu' }, () => {
     Fragment({
-      from: Path.join(from, spec.sdk_folder, 'model', 'sdk.fragment.aon'),
+      from: Path.join(from, spec.sdk_folder, 'model', 'sdk.fragment.aontu'),
       replace: {
         ProjectName: spec.name,
         NAME: spec.name,

package/src/project/standard/migrate.ts

@@ -0,0 +1,172 @@
+import Path from 'node:path'
+
+
+const TREES = ['model', 'test']
+
+const LEGACY = '.aon'
+const CURRENT = '.aontu'
+
+const TOOLCHAIN_RE = /^@voxgig\//
+const APIDEF_WRITES_RE = /^model\/guide\/[^/]*base-guide\.aontu$/
+
+// Comments and strings are matched whole, so an include is only ever an `@`
+// outside both: a `.aon` named in a comment or held as data is not rewritten.
+const TOKEN_RE =
+  /#[^\n]*|@([ \t]*)(["'`])([^"'`\n]*)\2|"(?:\\.|[^"\\\n])*"|'(?:\\.|[^'\\\n])*'|`(?:\\.|[^`\\])*`/g
+
+
+type Warn = (file: string, note: string) => void
+
+type Scaffold = {
+  kept: Set<string>
+  replaced: Set<string>
+}
+
+
+function rewriteIncludes(src: string, rename: (path: string) => boolean): string {
+  return src.replace(TOKEN_RE, (token: string, space: string, quote: string, path: string) =>
+    null != quote && path.endsWith(LEGACY) && rename(path) ?
+      '@' + space + quote + path.slice(0, -LEGACY.length) + CURRENT + quote : token)
+}
+
+
+function legacyIncludes(src: string): string[] {
+  return [...src.matchAll(TOKEN_RE)]
+    .filter((m) => null != m[2] && m[3].endsWith(LEGACY))
+    .map((m) => m[3])
+}
+
+
+function modelFiles(fs: any, sdk: string, ext: string): string[] {
+  const found: string[] = []
+  const walk = (rel: string) => {
+    let entries: any[]
+    try {
+      entries = fs.readdirSync(Path.join(sdk, rel), { withFileTypes: true })
+    }
+    catch (_err: any) {
+      return
+    }
+    for (const entry of entries) {
+      const child = rel + '/' + entry.name
+      if (entry.isDirectory()) {
+        walk(child)
+      }
+      else if (entry.isFile() && entry.name.endsWith(ext)) {
+        found.push(child)
+      }
+    }
+  }
+  TREES.forEach(walk)
+  return found.sort()
+}
+
+
+function scaffoldFiles(fs: any, templateSdk: string, kept: string[]): Scaffold {
+  const keep = new Set(kept)
+  const written = modelFiles(fs, templateSdk, CURRENT)
+    .map((rel: string) => rel.replace('.fragment.', '.'))
+  return { kept: keep, replaced: new Set(written.filter((rel) => !keep.has(rel))) }
+}
+
+
+// A failed step must not fail the scaffold: the file keeps the name it had.
+function attempt(step: () => void): void {
+  try {
+    step()
+  }
+  catch (_err: any) {
+  }
+}
+
+
+// Written beside the target and renamed over it, so a write that fails part
+// way leaves the file it would have replaced whole.
+function writeWhole(fs: any, path: string, data: any): void {
+  const tmp = path + '.migrating'
+  try {
+    fs.writeFileSync(tmp, data)
+    fs.renameSync(tmp, path)
+  }
+  catch (err: any) {
+    attempt(() => fs.unlinkSync(tmp))
+    throw err
+  }
+}
+
+
+function migrateFile(fs: any, prev: string, next: string): void {
+  if (fs.existsSync(next) || !fs.existsSync(prev)) {
+    return
+  }
+  attempt(() => {
+    writeWhole(fs, next, fs.readFileSync(prev))
+    fs.unlinkSync(prev)
+  })
+}
+
+
+function includeRenamer(fs: any, sdk: string, scaffold: Scaffold, from: string) {
+  const dir = Path.dirname(Path.join(sdk, from))
+  return (path: string): boolean => {
+    if (TOOLCHAIN_RE.test(path)) {
+      return true
+    }
+    if (path.startsWith('@')) {
+      return false
+    }
+    const twin = Path.resolve(dir, path.slice(0, -LEGACY.length) + CURRENT)
+    const rel = Path.relative(sdk, twin).split(Path.sep).join('/')
+    return fs.existsSync(twin) || scaffold.kept.has(rel) || scaffold.replaced.has(rel) ||
+      APIDEF_WRITES_RE.test(rel)
+  }
+}
+
+
+// Renames first and rewrites after, so an include changes only once the file
+// it names is on disk as .aontu.
+function migrateToAontu(fs: any, sdk: string, scaffold: Scaffold, warn: Warn): void {
+  const legacy = modelFiles(fs, sdk, LEGACY)
+  const twin = (rel: string) => rel.slice(0, -LEGACY.length) + CURRENT
+  const abs = (rel: string) => Path.join(sdk, rel)
+
+  for (const rel of legacy.filter((rel) => !scaffold.replaced.has(twin(rel)))) {
+    migrateFile(fs, abs(rel), abs(twin(rel)))
+  }
+
+  const sources = modelFiles(fs, sdk, CURRENT).filter((rel) => !scaffold.replaced.has(rel))
+  for (const rel of sources) {
+    attempt(() => {
+      const src = String(fs.readFileSync(abs(rel)))
+      const out = rewriteIncludes(src, includeRenamer(fs, sdk, scaffold, rel))
+      if (out !== src) {
+        writeWhole(fs, abs(rel), out)
+      }
+    })
+  }
+
+  for (const rel of legacy.filter((rel) => scaffold.replaced.has(twin(rel)))) {
+    attempt(() => fs.unlinkSync(abs(rel)))
+  }
+
+  for (const rel of modelFiles(fs, sdk, LEGACY)) {
+    warn(rel, fs.existsSync(abs(twin(rel))) ?
+      'left in place: ' + twin(rel) + ' exists, and is the file aontu reads' :
+      'could not be migrated to ' + twin(rel))
+  }
+  for (const rel of sources) {
+    attempt(() => {
+      for (const path of legacyIncludes(String(fs.readFileSync(abs(rel))))) {
+        warn(rel, 'includes ' + path + ', which aontu refuses: rename that file ' +
+          'to .aontu and update the include')
+      }
+    })
+  }
+}
+
+
+export {
+  migrateToAontu,
+  rewriteIncludes,
+  scaffoldFiles,
+}

package/project/standard/.sdk/test/.model-config/model-config.aon

@@ -1,4 +0,0 @@
-
-@"@voxgig/model/model/.model-config/model-config.aon"
-
-sys: model: builders: {}

package/project/standard/.sdk/test/primary/primary-test-index.aon

@@ -1,30 +0,0 @@
-primary: clean: @"./clean.aon"
-primary: done: @"./done.aon"
-primary: featureAdd: @"./featureAdd.aon"
-primary: featureHook: @"./featureHook.aon"
-primary: featureInit: @"./featureInit.aon"
-primary: fetcher: @"./fetcher.aon"
-primary: makeContext: @"./makeContext.aon"
-primary: makeError: @"./makeError.aon"
-primary: makeFetchDef: @"./makeFetchDef.aon"
-primary: makeOptions: @"./makeOptions.aon"
-primary: makeRequest: @"./makeRequest.aon"
-primary: makeResponse: @"./makeResponse.aon"
-primary: makeResult: @"./makeResult.aon"
-primary: makeSpec: @"./makeSpec.aon"
-primary: makePoint: @"./makePoint.aon"
-primary: makeUrl: @"./makeUrl.aon"
-primary: operator: @"./operator.aon"
-primary: param: @"./param.aon"
-primary: prepareAuth: @"./prepareAuth.aon"
-primary: prepareBody: @"./prepareBody.aon"
-primary: prepareHeaders: @"./prepareHeaders.aon"
-primary: prepareMethod: @"./prepareMethod.aon"
-primary: prepareParams: @"./prepareParams.aon"
-primary: preparePath: @"./preparePath.aon"
-primary: prepareQuery: @"./prepareQuery.aon"
-primary: resultBasic: @"./resultBasic.aon"
-primary: resultBody: @"./resultBody.aon"
-primary: resultHeaders: @"./resultHeaders.aon"
-primary: transformRequest: @"./transformRequest.aon"
-primary: transformResponse: @"./transformResponse.aon"

package/project/standard/.sdk/test/struct/test.aon

@@ -1,26 +0,0 @@
-
-struct: &: {
-  name: key()
-  set: []
-}
-
-struct: minor: @"./minor.aon"
-struct: getpath: @"./getpath.aon"
-struct: inject: @"./inject.aon"
-struct: merge: @"./merge.aon"
-struct: transform: @"./transform.aon"
-struct: walk: @"./walk.aon"
-struct: validate: @"./validate.aon"
-struct: select: @"./select.aon"
-struct: nullsem: @"./nullsem.aon"
-
-primary: check: {
-  DEF: {
-    client:a:test:options:foo:1
-  }
-  basic: set: [
-    { ctx:meta:bar:BAR0, out:zed:ZED_BAR0 }
-    { ctx:meta:bar:BAR1, client:a, out:zed:ZED1_BAR1 }
-  ]
-}
-

package/project/standard/.sdk/test/test.aon

@@ -1,4 +0,0 @@
-
-@"struct/test.aon"
-@"primary/primary-test-index.aon"
-@"feature/feature-test-index.aon"