@ethlete/cli 3.0.0-next.26 → 3.0.0-next.28

package/src/lib/design/part-marks.js

@@ -2,28 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.partMarksTransform = exports.markPartSource = void 0;
 const path_1 = require("path");
-const paths_1 = require("./paths");
+const package_root_1 = require("./package-root");
 const resolve_product_1 = require("./system/resolve-product");
 const system_modules_1 = require("./system/system-modules");
 const vite_paths_1 = require("./vite-paths");
 const DEFAULT_EXPORT = /^export default /gm;
+const NAMED_EXPORT = /^export (const|(?:async\s+)?function\*?)\s+(?!enum\b)([A-Za-z_$][\w$]*)/gm;
 /**
- * The source of a part module whose default export renders with its first element marked as the
- * part `key`, or `null` when the module has no single top-level `export default`.
+ * The source of a part module whose default export renders with its first element marked as the part `key`, and
+ * whose exported `const` and `function` helpers mark their markup the same way, or `null` when the module has no
+ * single top-level `export default`.
  */
 const markPartSource = (options) => {
     var _a;
     const { code, key, marker } = options;
     if (((_a = code.match(DEFAULT_EXPORT)) !== null && _a !== void 0 ? _a : []).length !== 1)
         return null;
-    return (`${code.replace(DEFAULT_EXPORT, 'const __etPart = ')}\n` +
-        `import { markPart as __etMarkPart } from ${JSON.stringify(marker)};\n` +
-        `export default __etMarkPart(__etPart, ${JSON.stringify(key)});\n`);
+    const named = Array.from(code.matchAll(NAMED_EXPORT), ([, , name]) => name !== null && name !== void 0 ? name : '');
+    const reexports = named
+        .map((name) => `const __etNamed_${name} = __etMarkNamed(${name}, { key: ${JSON.stringify(key)}, part: __etPart });\n`)
+        .join('');
+    const exported = named.map((name) => `__etNamed_${name} as ${name}`).join(', ');
+    return (`${code.replace(DEFAULT_EXPORT, 'const __etPart = ').replace(NAMED_EXPORT, '$1 $2')}\n` +
+        `import { markNamed as __etMarkNamed, markPart as __etMarkPart } from ${JSON.stringify(marker)};\n` +
+        `export default __etMarkPart(__etPart, ${JSON.stringify(key)});\n` +
+        (named.length > 0 ? `${reexports}export { ${exported} };\n` : ''));
 };
 exports.markPartSource = markPartSource;
 /** A Vite `transform` that marks the root element of every part a product or a sketch variant draws. */
 const partMarksTransform = (system) => {
-    const marker = (0, vite_paths_1.fsUrl)((0, path_1.resolve)((0, paths_1.assetRoot)(), 'mark-part.ts'));
+    const marker = (0, vite_paths_1.fsUrl)((0, path_1.resolve)((0, package_root_1.assetRoot)(), 'mark-part.ts'));
     return (code, id) => {
         var _a;
         const product = (0, system_modules_1.productOfModuleId)(id);

package/src/lib/design/part-marks.js.map

@@ -1 +1 @@
-{"version":3,"file":"part-marks.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/part-marks.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,mCAAoC;AACpC,8DAAqD;AACrD,4DAA6G;AAC7G,6CAAqC;AAErC,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAE5C;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,OAAsD,EAAE,EAAE;;IACvF,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEtC,IAAI,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjE,OAAO,CACL,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,IAAI;QACxD,4CAA4C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK;QACvE,yCAAyC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CACnE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,cAAc,kBAUzB;AAEF,wGAAwG;AACjG,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAC1D,MAAM,MAAM,GAAG,IAAA,kBAAK,EAAC,IAAA,cAAO,EAAC,IAAA,iBAAS,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3D,OAAO,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE;;QAClC,MAAM,OAAO,GAAG,IAAA,kCAAiB,EAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAA,iCAAgB,EAAC,EAAE,CAAC,CAAC,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAE/G,OAAO,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAA,2BAAS,EAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}
+{"version":3,"file":"part-marks.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/part-marks.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,iDAA2C;AAC3C,8DAAqD;AACrD,4DAA6G;AAC7G,6CAAqC;AAErC,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAC5C,MAAM,YAAY,GAAG,2EAA2E,CAAC;AAEjG;;;;GAIG;AACI,MAAM,cAAc,GAAG,CAAC,OAAsD,EAAE,EAAE;;IACvF,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEtC,IAAI,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,AAAD,EAAG,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC;IAClF,MAAM,SAAS,GAAG,KAAK;SACpB,GAAG,CACF,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,IAAI,oBAAoB,IAAI,YAAY,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,wBAAwB,CACjH;SACA,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhF,OAAO,CACL,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI;QACvF,wEAAwE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK;QACnG,yCAAyC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM;QAClE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,YAAY,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,cAAc,kBAmBzB;AAEF,wGAAwG;AACjG,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAC1D,MAAM,MAAM,GAAG,IAAA,kBAAK,EAAC,IAAA,cAAO,EAAC,IAAA,wBAAS,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3D,OAAO,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE;;QAClC,MAAM,OAAO,GAAG,IAAA,kCAAiB,EAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAA,iCAAgB,EAAC,EAAE,CAAC,CAAC,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAE/G,OAAO,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAA,2BAAS,EAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}

package/src/lib/design/phase-timing.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Runs `run` and records its duration as a phase of the design run in progress. With `ETHLETE_DESIGN_PHASES=1` it also
+ * writes `PHASE <name> <seconds>s` to stderr when it settles.
+ */
+export declare const timedPhase: <T>(name: string, run: () => T) => T;

package/src/lib/design/phase-timing.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.timedPhase = void 0;
+const perf_hooks_1 = require("perf_hooks");
+const run_deadline_1 = require("./run-deadline");
+const timings_1 = require("./timings");
+/**
+ * Runs `run` and records its duration as a phase of the design run in progress. With `ETHLETE_DESIGN_PHASES=1` it also
+ * writes `PHASE <name> <seconds>s` to stderr when it settles.
+ */
+const timedPhase = (name, run) => {
+    const start = perf_hooks_1.performance.now();
+    (0, run_deadline_1.noteStep)(`phase ${name}`);
+    const done = () => {
+        const ms = perf_hooks_1.performance.now() - start;
+        (0, timings_1.recordPhase)(name, ms);
+        if (process.env['ETHLETE_DESIGN_PHASES'] === '1')
+            process.stderr.write(`PHASE ${name} ${(ms / 1000).toFixed(2)}s\n`);
+    };
+    const result = run();
+    if (result instanceof Promise)
+        return result.finally(done);
+    done();
+    return result;
+};
+exports.timedPhase = timedPhase;
+//# sourceMappingURL=phase-timing.js.map

package/src/lib/design/phase-timing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"phase-timing.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/phase-timing.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AACzC,iDAA0C;AAC1C,uCAAwC;AAExC;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAI,IAAY,EAAE,GAAY,EAAK,EAAE;IAC7D,MAAM,KAAK,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;IAEhC,IAAA,uBAAQ,EAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,MAAM,EAAE,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAErC,IAAA,qBAAW,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEtB,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,GAAG;YAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACvE,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC;IAErB,IAAI,MAAM,YAAY,OAAO;QAAE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAM,CAAC;IAEhE,IAAI,EAAE,CAAC;IAEP,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAnBW,QAAA,UAAU,cAmBrB"}

package/src/lib/design/physical-cores.d.ts

@@ -0,0 +1,12 @@
+/** @internal How `physicalCoresOf` reads the machine, swapped in specs. */
+export type CoreProbe = {
+    platform: NodeJS.Platform;
+    sysctl: () => number;
+    lscpu: () => number;
+    logical: () => number;
+};
+/**
+ * The physical cores of the machine, the measure every load threshold compares the load average with: `sysctl
+ * hw.physicalcpu` on macOS, `lscpu` elsewhere, else half the logical CPUs.
+ */
+export declare const physicalCoresOf: (probe?: CoreProbe) => number;

package/src/lib/design/physical-cores.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.physicalCoresOf = void 0;
+const child_process_1 = require("child_process");
+const os_1 = require("os");
+const outputOf = (command, args) => {
+    try {
+        return (0, child_process_1.execFileSync)(command, args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 2000 });
+    }
+    catch (_a) {
+        return null;
+    }
+};
+const fromSysctl = () => { var _a, _b; return Number.parseInt((_b = (_a = outputOf('sysctl', ['-n', 'hw.physicalcpu'])) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '', 10); };
+const fromLscpu = () => {
+    var _a;
+    const lines = (_a = outputOf('lscpu', ['-p=Core,Socket'])) === null || _a === void 0 ? void 0 : _a.split('\n').filter((line) => line !== '' && !line.startsWith('#'));
+    return lines && lines.length > 0 ? new Set(lines).size : Number.NaN;
+};
+const MACHINE = {
+    platform: process.platform,
+    sysctl: fromSysctl,
+    lscpu: fromLscpu,
+    logical: os_1.availableParallelism,
+};
+const counted = (value) => (Number.isInteger(value) && value > 0 ? value : null);
+let known = null;
+/**
+ * The physical cores of the machine, the measure every load threshold compares the load average with: `sysctl
+ * hw.physicalcpu` on macOS, `lscpu` elsewhere, else half the logical CPUs.
+ */
+const physicalCoresOf = (probe) => {
+    var _a;
+    if (!probe && known !== null)
+        return known;
+    const { platform, sysctl, lscpu, logical } = probe !== null && probe !== void 0 ? probe : MACHINE;
+    const cores = (_a = (platform === 'darwin' ? counted(sysctl()) : counted(lscpu()))) !== null && _a !== void 0 ? _a : Math.max(1, Math.ceil(logical() / 2));
+    if (!probe)
+        known = cores;
+    return cores;
+};
+exports.physicalCoresOf = physicalCoresOf;
+//# sourceMappingURL=physical-cores.js.map

package/src/lib/design/physical-cores.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"physical-cores.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/physical-cores.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,2BAA0C;AAE1C,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,EAAE;IACnD,IAAI,CAAC;QACH,OAAO,IAAA,4BAAY,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/G,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,EAAE,eAAC,OAAA,MAAM,CAAC,QAAQ,CAAC,MAAA,MAAA,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,0CAAE,IAAI,EAAE,mCAAI,EAAE,EAAE,EAAE,CAAC,CAAA,EAAA,CAAC;AAEzG,MAAM,SAAS,GAAG,GAAG,EAAE;;IACrB,MAAM,KAAK,GAAG,MAAA,QAAQ,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC,0CAC/C,KAAK,CAAC,IAAI,EACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAE1D,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;AACtE,CAAC,CAAC;AAUF,MAAM,OAAO,GAAc;IACzB,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,yBAAoB;CAC9B,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEzF,IAAI,KAAK,GAAkB,IAAI,CAAC;AAEhC;;;GAGG;AACI,MAAM,eAAe,GAAG,CAAC,KAAiB,EAAE,EAAE;;IACnD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAE3C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,OAAO,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAA,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,mCAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtH,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,KAAK,CAAC;IAE1B,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B"}

package/src/lib/design/product-command.d.ts

@@ -15,7 +15,7 @@ export declare const designProduct: (options: {
     target: string;
     argv: string[];
     invocation: string;
-}) => 0 | 1;
+}) => 0 | 1 | 2;
 /**
  * POST `/__design/product` with `{ name, base? }` creates a product as `et design product new` does. `base` names
  * another product of the checkout, or `@ethlete/components`. Answers 201 with `{ name }`, or 400/409 with `{ error }`.

package/src/lib/design/product-command.js

@@ -20,24 +20,20 @@ exports.newProductAnswer = exports.designProduct = exports.createProduct = expor
 const fs_1 = require("fs");
 const path_1 = require("path");
 const json_layout_1 = require("./json-layout");
-const paths_1 = require("./paths");
+const design_config_1 = require("./design-config");
 const base_1 = require("./system/base");
+const cli_args_1 = require("./system/sketch/cli-args");
 const layers_1 = require("./system/layers");
 const product_1 = require("./system/product");
 exports.PRODUCT_PATH = '/__design/product';
 const FROM_PROJECT_KEYS = ['styles', 'head', 'providers', 'themes'];
-const valueOf = (argv, flag) => {
-    var _a;
-    const index = argv.indexOf(flag);
-    return index === -1 ? null : ((_a = argv[index + 1]) !== null && _a !== void 0 ? _a : null);
-};
 /** Writes a product's `config.json` entry and its empty layer folders; answers with why it refused, or null. */
 const createProduct = (options) => {
     var _a, _b, _c, _d;
     const { target, name, base, fromProject } = options;
     if (!/^[a-z0-9][a-z0-9-]*$/.test(name))
         return `BAD NAME "${name}" - use lowercase letters, digits and dashes.`;
-    const config = (_a = (0, paths_1.readConfig)(target)) !== null && _a !== void 0 ? _a : {};
+    const config = (_a = (0, design_config_1.readConfig)(target)) !== null && _a !== void 0 ? _a : {};
     const dir = (0, product_1.productDirOf)({ target, product: name });
     if (((_b = config.products) === null || _b === void 0 ? void 0 : _b[name]) || (0, fs_1.existsSync)(dir)) {
         return `PRODUCT EXISTS - ${name} is declared in config.json or its folder exists; nothing was changed.`;
@@ -57,7 +53,7 @@ const createProduct = (options) => {
         entry.base = base;
     else
         entry.presets = { phone: { width: 390, height: 844 }, desktop: { width: 1440, height: 900 } };
-    const configPath = (0, paths_1.configPathOf)(target);
+    const configPath = (0, design_config_1.configPathOf)(target);
     (0, fs_1.mkdirSync)((0, path_1.dirname)(configPath), { recursive: true });
     (0, fs_1.writeFileSync)(configPath, (0, json_layout_1.jsonLayoutOf)(Object.assign(Object.assign({}, config), { products: Object.assign(Object.assign({}, config.products), { [name]: entry }) })));
     for (const layer of layers_1.LAYERS)
@@ -72,19 +68,21 @@ exports.createProduct = createProduct;
  * product's `config.json` entry and its empty layer folders.
  */
 const designProduct = (options) => {
+    var _a, _b;
     const { target, argv, invocation } = options;
-    const [verb, name] = argv;
-    if (verb !== 'new' || !name || name.startsWith('--')) {
-        console.error(`USAGE ${invocation} product new <name> [--base <path|@ethlete/components>] [--from-project <name>]`);
-        return 1;
+    const usage = `USAGE ${invocation} product new <name> [--base <path|@ethlete/components>] [--from-project <name>]`;
+    const args = (0, cli_args_1.argsOf)(argv, { values: ['--base', '--from-project'], switches: [] });
+    if (typeof args === 'string') {
+        console.error(`${args}\n${usage}`);
+        return 2;
     }
-    const flags = argv.slice(2);
-    const base = valueOf(flags, '--base');
-    const fromProject = valueOf(flags, '--from-project');
-    if ((flags.includes('--base') && !base) || (flags.includes('--from-project') && !fromProject)) {
-        console.error('A flag is missing its value.');
+    const [verb, name] = args.positional;
+    if (verb !== 'new' || !name || args.positional.length > 2) {
+        console.error(usage);
         return 1;
     }
+    const base = (_a = args.values['--base']) !== null && _a !== void 0 ? _a : null;
+    const fromProject = (_b = args.values['--from-project']) !== null && _b !== void 0 ? _b : null;
     const refused = (0, exports.createProduct)({ target, name, base, fromProject });
     if (refused) {
         console.error(refused);
@@ -137,7 +135,7 @@ const newProductAnswer = (options) => __awaiter(void 0, void 0, void 0, function
     const base = typeof (body === null || body === void 0 ? void 0 : body['base']) === 'string' && body['base'] !== '' ? body['base'] : null;
     if (!name)
         return { status: 400, body: { error: 'A name is required.' } };
-    const config = (_a = (0, paths_1.readConfig)(target)) !== null && _a !== void 0 ? _a : {};
+    const config = (_a = (0, design_config_1.readConfig)(target)) !== null && _a !== void 0 ? _a : {};
     const builtIn = base !== null && (0, base_1.isBuiltInBase)(base);
     const baseConfig = base && !builtIn ? (_b = config.products) === null || _b === void 0 ? void 0 : _b[base] : undefined;
     if (base && !builtIn && !baseConfig)

package/src/lib/design/product-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-command.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/product-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-command.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/product-command.ts"],"names":[],"mappings":"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"}

package/src/lib/design/push-status.d.ts

@@ -0,0 +1,30 @@
+export type PushStatus = {
+    base: string;
+    strayUpstream: string | null;
+    unpushed: number;
+    oldestAt: string | null;
+    oldestAgeHours: number | null;
+} & CiStatus;
+export type CiState = 'green' | 'red' | 'running' | 'unknown';
+export type CiStatus = {
+    ci: CiState;
+    ciUrl: string | null;
+    ciAt: string | null;
+};
+/** The CI state of the newest run in `gh run list --json status,conclusion,url,createdAt` output that was not cancelled or skipped. */
+export declare const ciStatusOfRuns: (json: string) => CiStatus;
+/** Where `ciStatusOf` caches the CI state of one checkout. */
+export declare const ciCachePath: (checkout: string) => string;
+export type StatusOptions = {
+    now?: number;
+    gh?: string;
+};
+/**
+ * The state of the latest finished or running "CI (Next)" run on GitHub, through `gh`, cached for a minute per
+ * pushed head of `next`. No `gh`, no network or any error gives `unknown`. Blocks for the `gh` call: never call it
+ * on a server thread.
+ */
+export declare const ciStatusOf: (checkout: string, { now, gh }?: StatusOptions) => CiStatus;
+/** The commits of `checkout` the remote does not have yet and the age of the oldest. */
+export declare const pushStatusOf: (checkout: string, { now, gh }?: StatusOptions) => PushStatus | null;
+export declare const pushStatusLines: (status: PushStatus) => string[];

package/src/lib/design/push-status.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pushStatusLines = exports.pushStatusOf = exports.ciStatusOf = exports.ciCachePath = exports.ciStatusOfRuns = void 0;
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+const plain_output_1 = require("../plain-output");
+const UNKNOWN_CI = { ci: 'unknown', ciUrl: null, ciAt: null };
+const CI_WORKFLOW = 'ci-next.yml';
+const CI_CACHE_MS = 60000;
+const SKIPPED_CONCLUSIONS = ['cancelled', 'skipped', 'neutral', 'stale'];
+const flattened = (value) => value.replace(/[^A-Za-z0-9]/gu, '-');
+const git = (cwd, args) => {
+    const result = (0, plain_output_1.spawnPlain)(['git', ...args], { cwd });
+    return result.status === 0 ? result.stdout.trim() : null;
+};
+const baseOf = (cwd) => {
+    const upstream = git(cwd, ['rev-parse', '--abbrev-ref', '@{u}']);
+    const branch = git(cwd, ['symbolic-ref', '--quiet', '--short', 'HEAD']);
+    const own = branch === null ? null : `origin/${branch}`;
+    const base = own !== null && git(cwd, ['rev-parse', '--verify', '--quiet', `refs/remotes/${own}`]) !== null
+        ? own
+        : (upstream !== null && upstream !== void 0 ? upstream : 'origin/next');
+    return { base, strayUpstream: upstream !== null && upstream !== base ? upstream : null };
+};
+const ciOfRun = ({ status, conclusion }) => {
+    if (status !== 'completed')
+        return 'running';
+    if (conclusion === 'success')
+        return 'green';
+    return conclusion ? 'red' : 'unknown';
+};
+/** The CI state of the newest run in `gh run list --json status,conclusion,url,createdAt` output that was not cancelled or skipped. */
+const ciStatusOfRuns = (json) => {
+    var _a, _b;
+    let runs;
+    try {
+        runs = JSON.parse(json);
+    }
+    catch (_c) {
+        return UNKNOWN_CI;
+    }
+    const run = Array.isArray(runs) ? runs.find((entry) => !SKIPPED_CONCLUSIONS.includes(entry.conclusion)) : undefined;
+    if (!run)
+        return UNKNOWN_CI;
+    return { ci: ciOfRun(run), ciUrl: (_a = run.url) !== null && _a !== void 0 ? _a : null, ciAt: (_b = run.createdAt) !== null && _b !== void 0 ? _b : null };
+};
+exports.ciStatusOfRuns = ciStatusOfRuns;
+/** Where `ciStatusOf` caches the CI state of one checkout. */
+const ciCachePath = (checkout) => (0, path_1.join)((0, os_1.tmpdir)(), 'ethlete-studio-checks', `${flattened(checkout)}.ci.json`);
+exports.ciCachePath = ciCachePath;
+const cachedCi = (checkout, { head, now }) => {
+    try {
+        const cache = JSON.parse((0, fs_1.readFileSync)((0, exports.ciCachePath)(checkout), 'utf8'));
+        return cache.head === head && now - cache.fetchedAt < CI_CACHE_MS ? cache.status : null;
+    }
+    catch (_a) {
+        return null;
+    }
+};
+/**
+ * The state of the latest finished or running "CI (Next)" run on GitHub, through `gh`, cached for a minute per
+ * pushed head of `next`. No `gh`, no network or any error gives `unknown`. Blocks for the `gh` call: never call it
+ * on a server thread.
+ */
+const ciStatusOf = (checkout, { now = Date.now(), gh = 'gh' } = {}) => {
+    const head = git(checkout, ['rev-parse', '--verify', '--quiet', 'refs/remotes/origin/next']);
+    if (head === null)
+        return UNKNOWN_CI;
+    const cached = cachedCi(checkout, { head, now });
+    if (cached)
+        return cached;
+    const result = (0, plain_output_1.spawnPlain)([
+        gh,
+        'run',
+        'list',
+        '--workflow',
+        CI_WORKFLOW,
+        '--branch',
+        'next',
+        '--limit',
+        '10',
+        '--json',
+        'status,conclusion,url,createdAt',
+    ], { cwd: checkout, timeout: 15000 });
+    const status = result.status === 0 ? (0, exports.ciStatusOfRuns)(result.stdout) : UNKNOWN_CI;
+    try {
+        (0, fs_1.mkdirSync)((0, path_1.join)((0, exports.ciCachePath)(checkout), '..'), { recursive: true });
+        (0, fs_1.writeFileSync)((0, exports.ciCachePath)(checkout), JSON.stringify({ head, fetchedAt: now, status }));
+    }
+    catch (_a) {
+        return status;
+    }
+    return status;
+};
+exports.ciStatusOf = ciStatusOf;
+/** The commits of `checkout` the remote does not have yet and the age of the oldest. */
+const pushStatusOf = (checkout, { now = Date.now(), gh = 'gh' } = {}) => {
+    const { base, strayUpstream } = baseOf(checkout);
+    const head = git(checkout, ['rev-parse', 'HEAD']);
+    const stamps = git(checkout, ['log', '--format=%cI', `${base}..HEAD`]);
+    if (head === null || stamps === null)
+        return null;
+    const dates = stamps.split('\n').filter(Boolean);
+    const oldest = dates.map((date) => Date.parse(date)).sort((a, b) => a - b)[0];
+    return Object.assign({ base,
+        strayUpstream, unpushed: dates.length, oldestAt: oldest === undefined ? null : new Date(oldest).toISOString(), oldestAgeHours: oldest === undefined ? null : Math.round(((now - oldest) / 3600000) * 10) / 10 }, (0, exports.ciStatusOf)(checkout, { now, gh }));
+};
+exports.pushStatusOf = pushStatusOf;
+const pushStatusLines = (status) => [
+    status.unpushed === 0
+        ? `nothing unpushed (${status.base})`
+        : `${status.unpushed} unpushed commit(s) on ${status.base}, oldest ${status.oldestAgeHours} h old`,
+    `ci: ${status.ci}${status.ci === 'red' ? ' - fix or revert before any feature slice' : ''}${status.ciUrl ? ` (${status.ciUrl})` : ''}`,
+    ...(status.strayUpstream === null
+        ? []
+        : [
+            `warning: the upstream is ${status.strayUpstream}, not ${status.base}; run git branch --set-upstream-to=${status.base}`,
+        ]),
+];
+exports.pushStatusLines = pushStatusLines;
+//# sourceMappingURL=push-status.js.map

package/src/lib/design/push-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push-status.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/push-status.ts"],"names":[],"mappings":"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"}

package/src/lib/design/ready-shots.d.ts

@@ -1,20 +1,29 @@
-import { DesignConfig } from './paths';
+import { DesignConfig } from './design-config';
 import { ResolvedProduct } from './system/resolve-product';
+import { IdenticalRender } from './system/sketch/identical-renders';
 import { Sketch } from './system/sketch/sketch';
-/** Loads each target of each live variant of the sketch on a render server of its own; why each one fails to load. */
-export declare const variantsThatDoNotLoad: (options: {
+import { VariantChange } from './system/sketch/viewed-shots';
+import { WarmDraw } from './warm-draw';
+type SketchShots = {
     target: string;
     config: DesignConfig;
     product: ResolvedProduct;
     sketch: Sketch;
-}) => Promise<string[]>;
+    warm?: WarmDraw;
+};
+/** Loads each target of each live variant of the sketch on a render server; why each one fails to load. */
+export declare const variantsThatDoNotLoad: (options: SketchShots) => Promise<string[]>;
+/** Renders each target of each live variant on a render server; see `sampleMarkDriftLinesOf`. */
+export declare const sampleMarkDriftLines: (options: SketchShots) => Promise<string[]>;
 /**
- * Shoots every state of every variant of the sketch and of the product's part on a render server of its own
- * (a free port). `true` when all of them match pixel for pixel; otherwise why not, a failure to shoot included.
+ * Shoots every state of every variant of the sketch and of the product's part on a render server. What each live
+ * variant draws differently, `null` when it matches pixel for pixel; a failure to shoot answers why.
  */
-export declare const shotsShowNoChange: (options: {
-    target: string;
-    config: DesignConfig;
-    product: ResolvedProduct;
-    sketch: Sketch;
-}) => Promise<true | string>;
+export declare const variantChangesShown: (options: SketchShots) => Promise<VariantChange[] | string>;
+/** Shoots the sketch on a render server; one warning per target part whose "Aktuell" column shows only placeholders. */
+export declare const aktuellPlaceholderWarnings: (options: SketchShots) => Promise<string[]>;
+/** Shoots the sketch on a render server; one line per live variant that adds nothing visible, see `identicalRenderLinesOf`. */
+export declare const identicalRenderLines: (options: SketchShots) => Promise<string[]>;
+/** Shoots the sketch like `identicalRenderLines`, and says which sibling each named variant draws like. */
+export declare const identicalRenders: (options: SketchShots) => Promise<IdenticalRender[]>;
+export {};