@voxgig/sdkgen 2.0.2 → 3.1.0

package/bin/voxgig-sdkgen

@@ -8,7 +8,7 @@ const { Shape, One } = require('shape')
 
 const { SdkGen } = require('../dist/sdkgen.js')
 
-const VERSION = '2.0.2'
+const VERSION = '3.0.0'
 const KONSOLE = console
 
 
@@ -59,7 +59,20 @@ async function operate(options) {
     dryrun: options.dryrun,
   })
 
-  await sdkgen.action(options.args)
+  const res = await sdkgen.action(options.args)
+
+  // `doctor` is a CHECK: it must fail the process so CI can gate on it.
+  // Everything else reports success by not throwing.
+  if (res && res.report && false === res.report.ok) {
+    const r = res.report
+    KONSOLE.log(
+      `\n.sdk has drifted from the scaffold: ` +
+      `${r.forked.length} forked, ${r.edited.length} edited, ` +
+      `${r.stale.length} stale, ${r.missing.length} missing. ` +
+      `Run \`voxgig-sdkgen target add <lang>\` to resync, ` +
+      `and move any project decision into .sdk/model/.`)
+    exit(new Error('sdk drift'))
+  }
 }
 
 
@@ -138,6 +151,13 @@ function version() { return VERSION }
 function help() {
   return `Usage: voxgig-sdkgen [options] <action> [args...]
 
+Actions:
+  target add <lang>     Add (or resync) a language target
+  feature add <name>    Add a feature
+  doctor                Report .sdk/ drift from the scaffold; exits non-zero
+                        when a component is forked, a template master edited,
+                        or a stale file left behind
+
 Options:
   -h, --help            Show this help message
   -v, --version         Show version

package/dist/action/doctor.d.ts

@@ -0,0 +1,14 @@
+import type { ActionContext, ActionResult } from '../types';
+type DoctorReport = {
+    forked: string[];
+    edited: string[];
+    stale: string[];
+    missing: string[];
+    additive: string[];
+    unwired: string[];
+    ok: boolean;
+};
+declare function action_doctor(args: string[], actx: ActionContext): Promise<ActionResult>;
+declare function doctor(actx: ActionContext): Promise<ActionResult>;
+export type { DoctorReport, };
+export { action_doctor, doctor, };

package/dist/action/doctor.js

@@ -0,0 +1,351 @@
+"use strict";
+// `voxgig-sdkgen doctor` — does this project's `.sdk/` still match the
+// scaffold?
+//
+// WHY THIS EXISTS
+//
+// Nothing told a project that its `.sdk/` had drifted. `target add`
+// OVERWRITES the vendored components, the template masters AND the per-target
+// model file, so any hand-edit there is silently reverted on the next run —
+// and any file the scaffold has since stopped shipping just stays, compiling
+// into the output forever. In voxgig-solardemo-sdk two such orphans broke the
+// Go build in a single session: `utility/make_target.go` (replaced upstream by
+// `make_point.go`, leaving a duplicate symbol) and `utility/struct/go.mod` (a
+// nested module that made `utility/struct` unimportable).
+//
+// Every divergence in that repo was found by hand-diffing. Without a check,
+// fixing it once guarantees nothing about next month.
+//
+// WHY A NAIVE `diff -r` DOES NOT WORK
+//
+// `target add` writes template masters with substitution PARTLY applied, and
+// inconsistently: `tm/go/core/error.go` arrives substituted (`SolardemoError`
+// where the scaffold says `ProjectNameError`), `tm/ts/test/utility.ts` arrives
+// raw (its placeholders are substituted later, at generate time), and
+// `tm/go/LICENSE` has the year filled in. A plain `diff -r` against the
+// scaffold reported 20 edited files in that repo; 19 were substitution
+// artefacts and exactly ONE was a real hand-edit.
+//
+// Only sdkgen knows which replacements it applied to which files, which is
+// why this check belongs here and cannot be scripted downstream. It re-runs
+// the same substitution before comparing, so what it reports is real.
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.action_doctor = action_doctor;
+exports.doctor = doctor;
+const node_path_1 = __importDefault(require("node:path"));
+const jostraca_1 = require("jostraca");
+const types_1 = require("../types");
+const utility_1 = require("../utility");
+const stdrep_1 = require("../helpers/stdrep");
+const target_1 = require("./target");
+// jostraca's Copy walk skips these (IGNORED_RE in CopyOp) — editor backups and
+// deliberately-disabled templates never reach a project, so they are not drift.
+const IGNORED_RE = /(~|-jostraca-off)$/;
+// Extensions jostraca copies byte-for-byte. Comparing them as text would
+// report spurious differences, so they are compared by raw bytes.
+const BINARY_RE = /\.(png|jpg|jpeg|gif|ico|pdf|zip|gz|woff2?|ttf|eot|wasm)$/i;
+// Root-level components sdkgen provides, and what a project loses by not
+// wiring one in. A project's `Root.ts` / `Top.ts` come from create-sdkgen at
+// init and are then FROZEN — `target add` never touches them — so a
+// capability added to sdkgen afterwards is invisible to every existing
+// project. solardemo's `Top.ts`, written before `ReadmeTop` existed, kept
+// hand-rolling a 9-line stub root README with an empty mermaid diagram for
+// months, and no number of `target add` runs would ever have said so.
+//
+// Not wiring one in is a legitimate choice, so this is REPORTED, never a
+// failure.
+const ROOT_COMPONENTS = [
+    ['ReadmeTop', 'the assembled root README (quickstart, howto, test, package table)'],
+    ['AgentGuideTop', 'the root AGENTS.md / CLAUDE.md agent guides'],
+    ['License', 'the root LICENSE'],
+    ['Security', 'the root SECURITY.md'],
+    ['Changelog', 'the root CHANGELOG.md'],
+    ['Deploy', 'the release/publish recipes'],
+];
+const CMD_MAP = {
+    check: cmd_doctor_check,
+};
+async function action_doctor(args, actx) {
+    // `doctor` with no subcommand is the check — the command exists to be run
+    // in CI without anyone remembering a verb.
+    const cmdname = args[1];
+    const cmd = null == cmdname ? cmd_doctor_check : CMD_MAP[cmdname];
+    if (null == cmd) {
+        throw new utility_1.SdkGenError('Unknown doctor cmd: ' + cmdname);
+    }
+    return await cmd(args, actx);
+}
+async function cmd_doctor_check(_args, actx) {
+    return doctor(actx);
+}
+// Code API. Returns the report; the CLI turns a non-ok report into a
+// non-zero exit so this can gate CI.
+async function doctor(actx) {
+    const log = actx.log;
+    const fs = actx.fs();
+    const model = actx.model;
+    const root = actx.folder;
+    const report = {
+        forked: [], edited: [], stale: [], missing: [], additive: [],
+        unwired: [], ok: true,
+    };
+    const targets = Object.keys(model?.main?.[types_1.KIT]?.target ?? {});
+    log.info({ point: 'doctor-start', targets: targets.length });
+    for (const tname of targets) {
+        const declared = model?.main?.[types_1.KIT]?.target?.[tname];
+        // The target model records where it came from (`base`, written by
+        // `target add`). Fall back to the bundled scaffold.
+        const tref = (declared && declared.base) ?
+            node_path_1.default.join(declared.base, '..', tname) : tname;
+        let resolved;
+        try {
+            resolved = (0, target_1.resolveTarget)(tref, { folder: root, fs: () => fs });
+        }
+        catch (err) {
+            log.warn({
+                point: 'doctor-target-unresolved', target: tname, err: err.message,
+                note: tname + ': cannot find its scaffold (' + err.message + ')'
+            });
+            continue;
+        }
+        if (null != resolved) {
+            checkTarget(actx, resolved, report);
+        }
+    }
+    checkWiring(actx, report);
+    report.ok = 0 === report.forked.length + report.edited.length +
+        report.stale.length + report.missing.length;
+    for (const [kind, note] of [
+        ['forked', 'FORKED (will be reverted by `target add`)'],
+        ['edited', 'EDITED template master'],
+        ['stale', 'STALE (no longer written by `target add`)'],
+        ['missing', 'MISSING (would be written by `target add`)'],
+        ['additive', 'additive (project-owned, not drift)'],
+        ['unwired', 'NOT WIRED IN (root capability this project is missing)'],
+    ]) {
+        for (const file of report[kind]) {
+            log.info({ point: 'doctor-finding', kind, file, note: note + ': ' + file });
+        }
+    }
+    log.info({
+        point: 'doctor-end',
+        ok: report.ok,
+        forked: report.forked.length,
+        edited: report.edited.length,
+        stale: report.stale.length,
+        missing: report.missing.length,
+        additive: report.additive.length,
+        unwired: report.unwired.length,
+        note: report.ok ?
+            ('.sdk matches the scaffold (' + report.additive.length + ' additive)') :
+            ('.sdk has drifted: ' + report.forked.length + ' forked, ' +
+                report.edited.length + ' edited, ' + report.stale.length + ' stale, ' +
+                report.missing.length + ' missing')
+    });
+    return { report };
+}
+// Which root-level components the project's own wiring calls. The wiring is
+// hand-written TypeScript (Root.ts / Top.ts / BuildSDK.ts), so this is a
+// reference check, not a diff: sdkgen has no reference copy of a file it does
+// not ship.
+function checkWiring(actx, report) {
+    const fs = actx.fs();
+    const src = node_path_1.default.join(actx.folder, 'src');
+    if (!fs.existsSync(src)) {
+        return;
+    }
+    // Everything except cmp/, which is the per-target layer target add owns.
+    const wiring = walk(fs, src)
+        .filter((rel) => !rel.startsWith('cmp/') && rel.endsWith('.ts'))
+        .map((rel) => fs.readFileSync(node_path_1.default.join(src, rel), 'utf8'))
+        .join('\n');
+    if ('' === wiring) {
+        return;
+    }
+    for (const [name, what] of ROOT_COMPONENTS) {
+        // A bare identifier reference: imported and called, or at least named.
+        if (!new RegExp('\\b' + name + '\\b').test(wiring)) {
+            report.unwired.push(name + ' — ' + what);
+        }
+    }
+}
+function checkTarget(actx, resolved, report) {
+    const { tname, tfolder, torigname } = resolved;
+    const fs = actx.fs();
+    const model = actx.model;
+    const root = actx.folder;
+    // The two TREES `target add` owns, and the substitution it applies to each.
+    // (It owns one FILE as well — see checkTargetModel, below.)
+    //
+    //   src/cmp — copied verbatim, so a byte compare is the truth.
+    //   tm      — copied through jostraca's template(), with ProjectName.
+    const trees = [
+        {
+            project: node_path_1.default.join(root, 'src', 'cmp', tname),
+            scaffold: node_path_1.default.join(tfolder, 'src', 'cmp', torigname),
+            replace: {},
+            kind: 'forked',
+        },
+        {
+            project: node_path_1.default.join(root, 'tm', tname),
+            scaffold: node_path_1.default.join(tfolder, 'tm', torigname),
+            replace: (0, stdrep_1.templateReplacements)(model, tname),
+            kind: 'edited',
+        },
+    ];
+    // The feature set `target add` would select right now. A project that
+    // added its targets before feature trimming existed carries source for
+    // features its model never declared — expected here as STALE, which is
+    // exactly what it is.
+    const featuremodel = model?.main?.[types_1.KIT]?.feature ?? {};
+    const features = Array.from(new Set([
+        'test',
+        ...Object.keys(featuremodel).filter((n) => false !== featuremodel[n]?.active),
+    ]));
+    const excludes = (0, target_1.trimFeatures)({ log: quietLog(actx.log), fs: () => fs }, tfolder, torigname, tname, features);
+    for (const tree of trees) {
+        // Findings are reported at project-relative paths, the way a maintainer
+        // would type them.
+        const label = node_path_1.default.relative(root, tree.project).split(node_path_1.default.sep).join('/') + '/';
+        const expected = 'edited' === tree.kind ?
+            walk(fs, tree.scaffold).filter((rel) => !excluded(rel, excludes)) :
+            walk(fs, tree.scaffold);
+        const actual = walk(fs, tree.project);
+        const expectedSet = new Set(expected);
+        const actualSet = new Set(actual);
+        for (const rel of expected) {
+            if (!actualSet.has(rel)) {
+                report.missing.push(label + rel);
+                continue;
+            }
+            if (differs(fs, node_path_1.default.join(tree.scaffold, rel), node_path_1.default.join(tree.project, rel), model, tree.replace)) {
+                report[tree.kind].push(label + rel);
+            }
+        }
+        for (const rel of actual) {
+            if (expectedSet.has(rel)) {
+                continue;
+            }
+            // A component the scaffold has NEVER shipped is the project's own —
+            // the supported way to add a per-target component. Anything else under
+            // a tree `target add` owns is stale output.
+            const known = fs.existsSync(node_path_1.default.join(tree.scaffold, rel));
+            if ('forked' === tree.kind && !known) {
+                report.additive.push(label + rel);
+            }
+            else {
+                report.stale.push(label + rel);
+            }
+        }
+    }
+    checkTargetModel(actx, resolved, report);
+}
+// The THIRD thing `target add` writes for a target, and the one nothing
+// compared: `model/target/<t>.aontu` (src/action/target.ts, the Copy with the
+// `'BASE'` replacement).
+//
+// It is not scaffolding trivia. That file carries the target's dependency
+// set, its `phase` gates, `srcfeature`, `feature.trim` / `feature.fullset`
+// and its publish-registry identity — and `target add` OVERWRITES it exactly
+// as it overwrites src/cmp and tm. So a maintainer who fixes a dep version
+// there loses the fix on the next resync with nothing said (the SDK regresses
+// with nobody touching it, which is the failure the "a project decision
+// belongs in the MODEL" rule exists to prevent), and a project whose copy
+// predates a scaffold change carries the old declaration forever while doctor
+// reported the target in sync. Both are the drift this command exists to
+// name; the file was simply in neither tree it walked.
+function checkTargetModel(actx, resolved, report) {
+    const { tname, tfolder, torigname, base } = resolved;
+    const fs = actx.fs();
+    const scaffold = node_path_1.default.join(tfolder, 'model', 'target', torigname + '.aontu');
+    // No scaffold file means nothing to compare against, which is the ALIASED
+    // target: `target add go~go2` copies go.aontu to model/target/go2.aontu and
+    // docs/how-to/add-a-target.md then tells the project to EDIT it (a second Go
+    // module needs its own module name and deps). doctor resolves a target by
+    // its INSTALLED name — the model records `base`, not the ref it came from —
+    // so the origin is not recoverable here, and reporting that documented edit
+    // as drift on every run is worse than saying nothing.
+    if (!fs.existsSync(scaffold)) {
+        return;
+    }
+    const project = node_path_1.default.join(actx.folder, 'model', 'target', tname + '.aontu');
+    const label = 'model/target/' + tname + '.aontu';
+    if (!fs.existsSync(project)) {
+        report.missing.push(label);
+        return;
+    }
+    // The substitution `target add` applied on the way in: jostraca's template()
+    // against the model (so `module: name: '$$name$$'` arrives as the project
+    // slug) plus the `'BASE'` replacement recording where the scaffold was.
+    //
+    // NOT templateReplacements() — that is the tm/ tree's map. The two writers
+    // pass different maps, so doctor has to as well, or every csharp/swift/ts
+    // project reads as forked on the `base:` line alone.
+    if (differs(fs, scaffold, project, actx.model, { "'BASE'": "'" + base + "'" })) {
+        report.forked.push(label);
+    }
+}
+// Every file under `dir`, as forward-slash paths relative to it, sorted.
+// Missing directory -> no files (a target that was never added).
+function walk(fs, dir) {
+    const out = [];
+    if (!fs.existsSync(dir)) {
+        return out;
+    }
+    const descend = (rel) => {
+        const abs = '' === rel ? dir : node_path_1.default.join(dir, rel);
+        for (const entry of fs.readdirSync(abs).sort()) {
+            if (IGNORED_RE.test(entry)) {
+                continue;
+            }
+            const entryrel = '' === rel ? entry : rel + '/' + entry;
+            if (fs.statSync(node_path_1.default.join(dir, entryrel)).isDirectory()) {
+                descend(entryrel);
+            }
+            else {
+                out.push(entryrel);
+            }
+        }
+    };
+    descend('');
+    return out.sort();
+}
+function excluded(rel, excludes) {
+    for (const re of excludes) {
+        if (re.test(rel)) {
+            return true;
+        }
+    }
+    return false;
+}
+// Compare a scaffold file with a project file, applying the SAME substitution
+// `target add` applied on the way in. Without this the comparison reports
+// every substituted placeholder as an edit.
+function differs(fs, scaffoldPath, projectPath, model, replace) {
+    if (BINARY_RE.test(scaffoldPath)) {
+        return !fs.readFileSync(scaffoldPath).equals(fs.readFileSync(projectPath));
+    }
+    const src = fs.readFileSync(scaffoldPath, 'utf8');
+    // template() runs even when there is nothing to REPLACE, because jostraca's
+    // Copy always interpolates `$$ref$$` against the model as well — the replace
+    // map is an extra, not the whole substitution. Skipping it for the src/cmp
+    // tree (whose Copy passes no replace map) meant the three Config fragments
+    // that carry `$$const.Name$$` / `$$main.kit.info.servers.0.url$$` arrived
+    // substituted and compared as bytes: every project with ts, js or dart
+    // reported `src/cmp/<t>/fragment/Config.fragment.<ext>` as FORKED straight
+    // out of `target add`, which is precisely the noise this function exists to
+    // remove. With no `$$` refs and no replace keys, template() is the identity.
+    const expected = (0, jostraca_1.template)(src, model, { replace });
+    return expected !== fs.readFileSync(projectPath, 'utf8');
+}
+// trimFeatures logs its decisions; doctor is a report, not a run.
+function quietLog(log) {
+    const noop = () => { };
+    const quiet = { info: noop, debug: noop, warn: log.warn.bind(log), error: noop, trace: noop, fatal: noop };
+    quiet.child = () => quiet;
+    return quiet;
+}
+//# sourceMappingURL=doctor.js.map

package/dist/action/doctor.js.map

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

package/dist/action/feature.js

@@ -8,8 +8,10 @@ exports.action_feature = action_feature;
 const node_path_1 = __importDefault(require("node:path"));
 const jostraca_1 = require("jostraca");
 const util_1 = require("@voxgig/util");
+const dryrun_1 = require("../helpers/dryrun");
 const types_1 = require("../types");
 const utility_1 = require("../utility");
+const featureSource_1 = require("../helpers/featureSource");
 const action_1 = require("./action");
 const CMD_MAP = {
     add: cmd_feature_add
@@ -41,7 +43,17 @@ async function feature_add(features, actx) {
             url: actx.url,
             content: (0, action_1.loadContent)(actx, 'feature')
         },
-        model: actx.model
+        model: actx.model,
+        // Dry run must be passed per-call, not left to the Jostraca instance.
+        // jostraca's `generate` runs its own options through OptionsShape FIRST,
+        // which fills in `control.dryrun: false`, and only then merges
+        // `deep({}, gOpts.control, opts.control)` — so the shape default silently
+        // OVERRIDES the instance-level flag. `-y target add ts` printed
+        // ** DRY RUN ** and wrote every file. (Same trap as the `existing` FIX
+        // note in jostraca.js.)
+        control: {
+            dryrun: !!actx.opts.dryrun
+        },
     };
     opts.log.info({
         point: 'feature-start',
@@ -49,6 +61,9 @@ async function feature_add(features, actx) {
     });
     const jres = await jostraca.generate(opts, () => FeatureRoot({ features }));
     (0, util_1.showChanges)(opts.log, 'feature-result', jres);
+    if (actx.opts.dryrun) {
+        (0, dryrun_1.showDryrun)(opts.log, 'feature-result', jres, actx.folder);
+    }
     opts.log.info({
         point: 'feature-end',
         note: (actx.opts.dryrun ? '** DRY RUN **' : '')
@@ -60,6 +75,7 @@ async function feature_add(features, actx) {
 const FeatureRoot = (0, jostraca_1.cmp)(function FeatureRoot(props) {
     const { ctx$, features } = props;
     const { model, log } = ctx$;
+    const fs = ctx$.fs();
     const target = model.main[types_1.KIT].target;
     (0, jostraca_1.Project)({}, () => {
         (0, jostraca_1.each)(features, (n) => {
@@ -81,14 +97,37 @@ const FeatureRoot = (0, jostraca_1.cmp)(function FeatureRoot(props) {
                     names: features,
                 }));
             });
-            (0, jostraca_1.each)(target, (t) => (0, jostraca_1.Folder)({ name: 'tm/' + t.name + '/src/feature/' + fname }, () => {
-                const from = node_path_1.default.join((t.base || node_path_1.default.join(BASE, '/project/.sdk')), 'tm', t.name, '/src/feature/', fname);
-                (0, jostraca_1.Copy)({
-                    // from: BASE + '/project/.sdk/tm/' + target.name + '/src/feature/' + name,
-                    from,
-                    exclude: true
-                });
-            }));
+            // Bring in the feature's source for every target already in the model.
+            // Where that source lives is language-specific — `src/feature/<name>/`
+            // for ts and js, `feature/<name>_feature.go` for go,
+            // `lib/feature/<name>/` for dart, and so on — so discover it in the
+            // target's template tree instead of assuming one layout. Assuming
+            // `src/feature/<name>` meant `feature add` silently added nothing for
+            // every target that keeps feature source elsewhere.
+            (0, jostraca_1.each)(target, (t) => {
+                const sdkfolder = t.base || node_path_1.default.join(BASE, 'project/.sdk');
+                const tmfolder = node_path_1.default.join(sdkfolder, 'tm', t.name);
+                const sources = (0, featureSource_1.findFeatureSources)(fs, tmfolder, [fname]);
+                if (0 === sources.length) {
+                    log.warn({
+                        point: 'feature-source-missing', feature: fname, target: t.name,
+                        folder: tmfolder,
+                        note: 'no ' + fname + ' source found for target ' + t.name
+                    });
+                    return;
+                }
+                for (const source of sources) {
+                    // A folder source IS the destination folder; a file source goes
+                    // into the folder that holds it.
+                    const dest = source.folder ? source.path : node_path_1.default.dirname(source.path);
+                    (0, jostraca_1.Folder)({ name: 'tm/' + t.name + '/' + dest }, () => {
+                        (0, jostraca_1.Copy)({
+                            from: node_path_1.default.join(tmfolder, source.path),
+                            exclude: true
+                        });
+                    });
+                }
+            });
             log.info({
                 point: 'feature-done', feature: fname,
                 note: fname

package/dist/action/feature.js.map

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

package/dist/action/target.d.ts

@@ -1,10 +1,15 @@
 import type { ActionContext, ActionResult } from '../types';
 declare function action_target(args: string[], actx: ActionContext): Promise<ActionResult>;
 declare function target_add(targets: string[], actx: ActionContext): Promise<ActionResult>;
+declare function trimFeatures(ctx$: any, tfolder: string, torigname: string, tname: string, features: string[]): RegExp[];
+declare function readTargetFeature(ctx$: any, tfolder: string, torigname: string, tname: string): {
+    trim: boolean;
+    fullset: string[];
+};
 declare function resolveTarget(tref: string, ctx$: any): {
     tname: string;
     tfolder: string;
     torigname: string;
     base: string;
 };
-export { action_target, target_add, resolveTarget, };
+export { action_target, target_add, resolveTarget, trimFeatures, readTargetFeature, };