@ethlete/cli 3.0.0-next.25 → 3.0.0-next.27

package/src/lib/design/merge-compare.js

@@ -9,10 +9,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareMerge = exports.drawnPair = void 0;
+exports.compareMerge = exports.drawnPair = exports.looksTheSame = void 0;
+const part_compare_1 = require("./system/part-compare");
 const list_system_1 = require("./system/list-system");
 const resolve_product_1 = require("./system/resolve-product");
 const merge_preview_1 = require("./system/sketch/merge-preview");
+const overlay_1 = require("./system/sketch/overlay");
+const ANTI_ALIAS_TOLERANCE = 8;
+/**
+ * `true` when two pictures have the same size and no channel of any pixel differs by more than 8 of 255, so an
+ * anti-alias shift on a rounded edge is no change. A picture that does not decode is the same only byte for byte.
+ */
+const looksTheSame = (a, b) => {
+    if (a.equals(b))
+        return true;
+    try {
+        const left = (0, part_compare_1.decodePng)(a);
+        const right = (0, part_compare_1.decodePng)(b);
+        if (left.width !== right.width || left.height !== right.height)
+            return false;
+        for (let at = 0; at < left.data.length; at++)
+            if (Math.abs(left.data.readUInt8(at) - right.data.readUInt8(at)) > ANTI_ALIAS_TOLERANCE)
+                return false;
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+};
+exports.looksTheSame = looksTheSame;
 /**
  * Draws a state without and with `merged`. A pair that differs is drawn once more, bypassing any kept picture,
  * and only that second pair counts, so one odd picture under load is not taken for a change.
@@ -20,17 +45,18 @@ const merge_preview_1 = require("./system/sketch/merge-preview");
 const drawnPair = (draw, merged) => __awaiter(void 0, void 0, void 0, function* () {
     const both = (fresh) => Promise.all([draw(null, fresh), draw(merged, fresh)]);
     let [now, after] = yield both(false);
-    if (!now.png.equals(after.png))
+    if (!(0, exports.looksTheSame)(now.png, after.png))
         [now, after] = yield both(true);
-    return { now, after, same: now.png.equals(after.png) };
+    return { now, after, same: (0, exports.looksTheSame)(now.png, after.png) };
 });
 exports.drawnPair = drawnPair;
 const outlinesOf = (picture, target) => picture.marks
     .filter((mark) => mark.parts.includes(target))
     .map(({ x, y, width, height }) => ({ x, y, width, height }));
+const SHOWN = new Set(['elements', 'pages']);
 const messageOf = (error) => (error instanceof Error ? error.message : String(error));
 /**
- * Draws each state of every element and page that shows the sketched part twice, as the product has it
+ * Draws each state of every element and page the merge changes or that shows a changed part twice, as the product has it
  * now and with `variant` merged, and splits them by whether the two pictures differ in any pixel. A page
  * is drawn at the preset `size` names, or its first; a part with `widths` at the width `size` names, or
  * its first; any other part fitted to its content.
@@ -39,19 +65,37 @@ const compareMerge = (options) => __awaiter(void 0, void 0, void 0, function* ()
     const { product, sketch, variant, size, params, pictureOf, load } = options;
     const target = sketch.target;
     const merged = { target, variant };
-    const { affected } = (0, merge_preview_1.mergePreviewOf)({ product, sketch, variant });
+    const { changed, affected } = (0, merge_preview_1.mergePreviewOf)({ product, sketch, variant });
+    const drawn = [...changed.filter((key) => { var _a; return SHOWN.has((_a = key.split('/')[0]) !== null && _a !== void 0 ? _a : ''); }), ...affected].sort();
     const rowsOf = (key) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const part = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === key);
         if (!part)
             return [];
-        const read = yield (0, list_system_1.readPartModule)({ part, product: product.name, load });
+        const read = yield (0, list_system_1.readPartModule)({
+            part,
+            product: product.name,
+            load: () => load({ file: part.file, product: product.name, sketch: null }),
+        });
+        const mergedFile = (_a = (0, overlay_1.overlaySketch)({ product, sketch, variant }).parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === key)) === null || _a === void 0 ? void 0 : _a.file;
+        const readMerged = mergedFile
+            ? yield (0, list_system_1.readPartModule)({
+                part: { file: mergedFile },
+                product: product.name,
+                load: () => load({ file: mergedFile, product: product.name, sketch: merged }),
+            })
+            : null;
         if (read.problem)
             return [{ row: { part: key, state: '', outlines: { now: [], merged: [] }, error: read.problem }, changed: true }];
-        const offered = part.layer === 'pages' ? Object.keys(product.presets) : ((_a = ('widths' in read ? read.widths : undefined)) !== null && _a !== void 0 ? _a : []);
-        const picked = (_b = offered.map(String).find((entry) => entry === size)) !== null && _b !== void 0 ? _b : offered[0];
+        const offered = part.layer === 'pages' ? Object.keys(product.presets) : ((_b = ('widths' in read ? read.widths : undefined)) !== null && _b !== void 0 ? _b : []);
+        const picked = (_c = offered.map(String).find((entry) => entry === size)) !== null && _c !== void 0 ? _c : offered[0];
         const at = picked === undefined ? {} : part.layer === 'pages' ? { preset: String(picked) } : { width: Number(picked) };
-        return Promise.all(read.states.map((state) => __awaiter(void 0, void 0, void 0, function* () {
+        const nowStates = read.states;
+        const mergedStates = readMerged && !readMerged.problem ? readMerged.states : nowStates;
+        const states = [...nowStates, ...mergedStates.filter((state) => !nowStates.includes(state))];
+        const missingOf = (state) => !nowStates.includes(state) ? 'now' : !mergedStates.includes(state) ? 'merged' : null;
+        return Promise.all(states.map((state) => __awaiter(void 0, void 0, void 0, function* () {
+            const missing = missingOf(state);
             const draw = (drawn, fresh) => {
                 var _a, _b;
                 return pictureOf({
@@ -67,6 +111,14 @@ const compareMerge = (options) => __awaiter(void 0, void 0, void 0, function* ()
                 });
             };
             try {
+                if (missing) {
+                    const picture = yield draw(missing === 'now' ? merged : null, false);
+                    const outlines = outlinesOf(picture, target);
+                    return {
+                        row: Object.assign(Object.assign({ part: key, state }, at), { missing, outlines: missing === 'now' ? { now: [], merged: outlines } : { now: outlines, merged: [] } }),
+                        changed: true,
+                    };
+                }
                 const { now, after, same } = yield (0, exports.drawnPair)(draw, merged);
                 return {
                     row: Object.assign(Object.assign({ part: key, state }, at), { outlines: { now: outlinesOf(now, target), merged: outlinesOf(after, target) } }),
@@ -81,7 +133,7 @@ const compareMerge = (options) => __awaiter(void 0, void 0, void 0, function* ()
             }
         })));
     });
-    const rows = (yield Promise.all(affected.map(rowsOf))).flat();
+    const rows = (yield Promise.all(drawn.map(rowsOf))).flat();
     return {
         target,
         variant,

package/src/lib/design/merge-compare.js.map

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

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

@@ -23,8 +23,8 @@ const flow_1 = require("./system/flows/flow");
 const cli_args_1 = require("./system/sketch/cli-args");
 const system_modules_1 = require("./system/system-modules");
 const thumb_1 = require("./thumb");
-exports.MOTION_USAGE = `motion shots <layer>/<name> <motion> [--variant <key>] [--mode <${motion_shot_1.MOTION_MODES.join('|')}>] [--preset <preset> | --width <px>] [--scale <1-4>] [--product <name>] [--surface <name>] [--color <name>] [--out <file>]
-  motion flow <flow> <line id | part#state→part#state> [--mode <${motion_shot_1.MOTION_MODES.join('|')}>] [--preset <preset>] [--scale <1-4>] [--product <name>] [--surface <name>] [--color <name>] [--out <file>]`;
+exports.MOTION_USAGE = `motion shots <layer>/<name> <motion> [--variant <key>] [--mode <${motion_shot_1.MOTION_MODES.join('|')}>] [--preset <preset> | --width <px>] [--scale <1-4>] [--product <name>] [--surface <name>] [--color <name>] [--scheme <light|dark>] [--out <file>]
+  motion flow <flow> <line id | part#state→part#state> [--mode <${motion_shot_1.MOTION_MODES.join('|')}>] [--preset <preset>] [--scale <1-4>] [--product <name>] [--surface <name>] [--color <name>] [--scheme <light|dark>] [--out <file>]`;
 const motionsOf = (part) => {
     const motions = part === null || part === void 0 ? void 0 : part.motions;
     return motions && typeof motions === 'object' ? motions : {};
@@ -80,17 +80,9 @@ const MOTION_FLAGS = [
     '--scale',
     '--surface',
     '--color',
+    '--scheme',
     '--out',
 ];
-const themeParamsOf = (values) => {
-    const params = new URLSearchParams();
-    for (const name of ['surface', 'color', 'scale']) {
-        const value = values[`--${name}`];
-        if (value)
-            params.set(name, value);
-    }
-    return params;
-};
 /** Opens a design server and a shooter, lets `draw` draw each mode, and writes the contact sheet and the JSON report. */
 const writeMotionSheet = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -151,7 +143,8 @@ const designMotionFlow = (options) => {
         args.values['--width'] !== undefined ||
         args.values['--variant'] !== undefined ||
         (mode !== undefined && !motion_shot_1.MOTION_MODES.includes(mode)) ||
-        !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) {
+        !(Number.isInteger(scale) && scale >= 1 && scale <= 4) ||
+        !(0, shot_1.isSchemeFlag)(args.values['--scheme'])) {
         console.error(usage);
         return Promise.resolve(2);
     }
@@ -181,7 +174,7 @@ const designMotionFlow = (options) => {
         console.error(`design-explore: product "${product}" has no preset - a flow line is drawn in a preset viewport`);
         return Promise.resolve(1);
     }
-    const params = themeParamsOf(args.values);
+    const params = (0, shot_1.drawParamsOf)(args.values);
     const name = (0, motion_flow_1.flowLineAddressOf)(line);
     return writeMotionSheet({
         target,
@@ -221,7 +214,7 @@ const designMotionFlow = (options) => {
 const designMotion = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const { target, argv, invocation } = options;
-    const args = (0, cli_args_1.argsOf)(argv, MOTION_FLAGS);
+    const args = (0, cli_args_1.argsOf)(argv, { values: MOTION_FLAGS, switches: [] });
     const usage = `usage: ${invocation} ${exports.MOTION_USAGE}`;
     if (typeof args === 'string') {
         console.error(`${args}\n${usage}`);
@@ -248,7 +241,8 @@ const designMotion = (options) => __awaiter(void 0, void 0, void 0, function* ()
         (mode !== undefined && !motion_shot_1.MOTION_MODES.includes(mode)) ||
         (width !== null && !(Number.isInteger(width) && width > 0)) ||
         (preset && width) ||
-        !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) {
+        !(Number.isInteger(scale) && scale >= 1 && scale <= 4) ||
+        !(0, shot_1.isSchemeFlag)(args.values['--scheme'])) {
         console.error(usage);
         return 2;
     }
@@ -285,7 +279,7 @@ const designMotion = (options) => __awaiter(void 0, void 0, void 0, function* ()
                 return `design-explore: ${part} has no motion "${motion}" (motions: ${Object.keys(motions).join(', ') || 'none'})`;
             const presets = (_c = (_b = system.productOf(product)) === null || _b === void 0 ? void 0 : _b.presets) !== null && _c !== void 0 ? _c : {};
             const chosenPreset = preset !== null && preset !== void 0 ? preset : (part.startsWith('pages/') ? ((_d = Object.keys(presets)[0]) !== null && _d !== void 0 ? _d : null) : null);
-            const params = themeParamsOf(args.values);
+            const params = (0, shot_1.drawParamsOf)(args.values);
             const drawn = {};
             for (const shown of modesOf(mode)) {
                 drawn[shown] = yield shooter.motionOf({

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

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

package/src/lib/design/motion-shot.js

@@ -22,6 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.motionPicturesOf = exports.unionOfBoxes = exports.keyframeTimesOf = exports.MOTION_LIMIT_MS = exports.MOTION_MODES = void 0;
 const thumb_1 = require("./thumb");
+const settle_frames_1 = require("./settle-frames");
 exports.MOTION_MODES = ['full', 'reduced'];
 /** How far a motion runs to find its end: a step or animation that starts later is not drawn. */
 exports.MOTION_LIMIT_MS = 30000;
@@ -62,10 +63,10 @@ const motionPicturesOf = (options) => __awaiter(void 0, void 0, void 0, function
     const fullPage = !options.viewport;
     const start = () => __awaiter(void 0, void 0, void 0, function* () {
         yield (0, thumb_1.openFrame)(page, url);
-        yield page.evaluate(thumb_1.settled);
-        yield page.evaluate(thumb_1.finished);
+        yield (0, settle_frames_1.settleFrames)(page);
         yield failureOf(page);
         yield page.evaluate('window.etMotion.start()');
+        yield (0, settle_frames_1.settleFrames)({ frames: () => page.frames().slice(1) });
     });
     yield start();
     const timeline = (yield page.evaluate(`(() => { window.etMotion.seek(${exports.MOTION_LIMIT_MS}); return window.etMotion.timeline(); })()`));

package/src/lib/design/motion-shot.js.map

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

package/src/lib/design/new-call.js

@@ -4,6 +4,7 @@ exports.newCall = exports.CALL_STAGES = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const paths_1 = require("./paths");
+const cli_args_1 = require("./system/sketch/cli-args");
 const status_1 = require("./status");
 const SEGMENT = /^[a-z0-9][a-z0-9-]*$/;
 /** The values of `CallStage` in `design/define-call.ts`; a spec keeps the two lists equal. */
@@ -54,14 +55,16 @@ ${PLACEHOLDER_STYLES}
 const ngVariantFile = (key) => `import { css, drawing, html, ng } from '@design-explore';
 import { FIXTURE } from './fixture';
 
-const button = await ng(html\`<button et-button type="button">\${FIXTURE.title} · variant ${key}</button>\`, {
+const button = ng(html\`<button et-button type="button">\${FIXTURE.title} · variant ${key}</button>\`, {
   imports: ['BUTTON_IMPORTS'],
 });
 
-export default drawing({
-  body: html\`<div class="placeholder">\${button}</div>\`,
+export default button.then((markup) =>
+  drawing({
+    body: html\`<div class="placeholder">\${markup}</div>\`,
 ${PLACEHOLDER_STYLES}
-});
+  }),
+);
 `;
 /**
  * Writes a call that renders at once: `call.ts`, a shared `fixture.ts` and one drawing per variant
@@ -70,13 +73,19 @@ ${PLACEHOLDER_STYLES}
 const newCall = (options) => {
     var _a, _b, _c, _d, _e;
     const { target, argv, invocation } = options;
-    const slug = argv.find((argument, index) => { var _a; return !argument.startsWith('--') && !['--variants', '--stage', '--feature'].includes((_a = argv[index - 1]) !== null && _a !== void 0 ? _a : ''); });
-    const listed = argv[argv.indexOf('--variants') + 1];
-    const stage = argv.includes('--stage') ? ((_a = argv[argv.indexOf('--stage') + 1]) !== null && _a !== void 0 ? _a : '') : null;
-    const feature = argv.includes('--feature') ? ((_b = argv[argv.indexOf('--feature') + 1]) !== null && _b !== void 0 ? _b : '') : null;
-    const keys = argv.includes('--variants') ? (listed !== null && listed !== void 0 ? listed : '').split(',').filter(Boolean) : ['a', 'b'];
+    const args = (0, cli_args_1.argsOf)(argv, { values: ['--variants', '--stage', '--feature'], switches: [] });
+    const usage = `usage: ${invocation} new <project>/<group>/<name> --stage <stage> [--variants a,b] [--feature <name>]`;
+    if (typeof args === 'string') {
+        console.error(`${args}\n${usage}`);
+        return 2;
+    }
+    const [slug] = args.positional;
+    const listed = args.values['--variants'];
+    const stage = (_a = args.values['--stage']) !== null && _a !== void 0 ? _a : null;
+    const feature = (_b = args.values['--feature']) !== null && _b !== void 0 ? _b : null;
+    const keys = listed === undefined ? ['a', 'b'] : listed.split(',').filter(Boolean);
     if (!slug || stage === null) {
-        console.error(`usage: ${invocation} new <project>/<group>/<name> --stage <stage> [--variants a,b] [--feature <name>]`);
+        console.error(usage);
         return 2;
     }
     const segments = slug.split('/');

package/src/lib/design/new-call.js.map

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

package/src/lib/design/part-marks.d.ts

@@ -1,7 +1,8 @@
 import { SystemModules } from './system/system-modules';
 /**
- * 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`.
  */
 export declare const markPartSource: (options: {
     code: string;

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

@@ -7,18 +7,26 @@ 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. */

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,mCAAoC;AACpC,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,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"}

package/src/lib/design/paths.d.ts

@@ -25,11 +25,30 @@ export type DesignRenderConfig = {
     packages?: Record<string, string>;
     modules?: string[];
 };
+export type DesignColorScheme = 'light' | 'dark';
 /** A viewport a product's parts are drawn at. Without a height, the frame grows with its content. */
 export type DesignPreset = {
     width: number;
     height?: number;
 };
+/**
+ * The Angular app that serves a product's design harness, the part map `et design harness` writes into it, and the
+ * app files the design shares with the app (`shared`, files or `<folder>/**`): a part may import them and a task may
+ * change them. `live` is the JSON file that `et design compare --live` opens the app's real pages with. All repo paths
+ * inside `app`.
+ */
+export type DesignHarness = {
+    app: string;
+    map: string;
+    shared?: string[];
+    live?: string;
+    /** Accessible names (whitespace removed) of the app's shared host components, which the action check skips. */
+    hosts?: string[];
+    /** The vitest config of the app's specs; `APP-SPEC` runs the specs related to each part's app files with it. */
+    specs?: string;
+    /** The branch `VISIBLE-CHANGE` compares with at its merge base; the branch `origin/HEAD` names when left out. */
+    baseBranch?: string;
+};
 /**
  * One product's design system: the render settings of a project, the product folder it extends
  * (`base`, a path from the checkout root, or `@ethlete/components`), its viewport presets, and the
@@ -39,10 +58,24 @@ export type DesignPreset = {
 export type DesignProduct = DesignProject & {
     base?: string;
     presets?: Record<string, DesignPreset>;
+    /** The colour schemes the product draws, each a copy of every frame; both when left out. */
+    schemes?: DesignColorScheme[];
     tokens?: string[];
     /** Inherited parts to omit; a product's own part with the same key remains visible. */
     hideBaseParts?: string[];
     generated?: DesignGeneratedStylesheets[];
+    /** Files, relative to the product folder, that a generator owns; a part hash skips them. */
+    generatedFiles?: string[];
+    harness?: DesignHarness;
+    /** Classes and `var()` references the product's parts must not use, each with the fix `et design check` prints. */
+    deniedClasses?: DesignDeniedClass[];
+    /** `'deny'` makes `et design check` fail on a native `title` attribute in the design markup; off when left out. */
+    nativeTitle?: 'deny';
+};
+/** A regular expression a class or a `var(--name)` reference is tested against, and the fix for a match. */
+export type DesignDeniedClass = {
+    pattern: string;
+    fix: string;
 };
 /**
  * Stylesheets a command generates from one part's stylesheet. A frame of a sketch variant that changes `part`
@@ -85,5 +118,14 @@ export declare const callsRootOf: (target: string) => string;
 export declare const workRootOf: (target: string) => string;
 /** A Vite cache folder of its own per checkout, so two servers sharing a symlinked `node_modules` never rewrite each other's deps. */
 export declare const viteCacheOf: (target: string, name: string) => string;
+/**
+ * A Vite cache folder that no other running server writes to: the shared `name` folder while this
+ * server holds its lock, else a folder of its own that `release` removes. Only one server at a time
+ * keeps the optimized deps between runs, so two at once never rewrite each other's.
+ */
+export declare const claimViteCache: (target: string, name: string) => {
+    dir: string;
+    release: () => void;
+};
 export declare const readConfig: (target: string) => DesignConfig | null;
 export declare const portOf: (config: DesignConfig) => number;

package/src/lib/design/paths.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.portOf = exports.readConfig = exports.viteCacheOf = exports.workRootOf = exports.callsRootOf = exports.configPathOf = exports.findCheckoutRoot = exports.snapshotPackage = exports.packageFileOf = exports.installedAssetRoot = exports.assetRoot = exports.DEFAULT_PORT = exports.DESIGN_DIR = void 0;
+exports.portOf = exports.readConfig = exports.claimViteCache = exports.viteCacheOf = exports.workRootOf = exports.callsRootOf = exports.configPathOf = exports.findCheckoutRoot = exports.snapshotPackage = exports.packageFileOf = exports.installedAssetRoot = exports.assetRoot = exports.DEFAULT_PORT = exports.DESIGN_DIR = void 0;
 const fs_1 = require("fs");
 const crypto_1 = require("crypto");
 const path_1 = require("path");
@@ -77,6 +77,55 @@ exports.workRootOf = workRootOf;
 /** A Vite cache folder of its own per checkout, so two servers sharing a symlinked `node_modules` never rewrite each other's deps. */
 const viteCacheOf = (target, name) => (0, path_1.resolve)((0, exports.workRootOf)(target), `${name}-${(0, crypto_1.createHash)('sha1').update((0, path_1.resolve)(target)).digest('hex').slice(0, 10)}`);
 exports.viteCacheOf = viteCacheOf;
+const holdsLock = (lock) => {
+    try {
+        (0, fs_1.writeFileSync)(lock, String(process.pid), { flag: 'wx' });
+        return true;
+    }
+    catch (error) {
+        if (error.code !== 'EEXIST')
+            throw error;
+    }
+    const holder = (0, fs_1.existsSync)(lock) ? Number((0, fs_1.readFileSync)(lock, 'utf8')) : 0;
+    if (holder && isRunning(holder))
+        return false;
+    (0, fs_1.rmSync)(lock, { force: true });
+    return holdsLock(lock);
+};
+let claims = 0;
+const claimed = new Set();
+let exitHooked = false;
+/**
+ * A Vite cache folder that no other running server writes to: the shared `name` folder while this
+ * server holds its lock, else a folder of its own that `release` removes. Only one server at a time
+ * keeps the optimized deps between runs, so two at once never rewrite each other's.
+ */
+const claimViteCache = (target, name) => {
+    var _a;
+    const shared = (0, exports.viteCacheOf)(target, name);
+    const root = (0, path_1.dirname)(shared);
+    const lock = `${shared}.lock`;
+    const own = new RegExp(`^${(0, path_1.basename)(shared)}-(\\d+)-\\d+$`);
+    (0, fs_1.mkdirSync)(root, { recursive: true });
+    for (const entry of (0, fs_1.readdirSync)(root)) {
+        const pid = Number((_a = own.exec(entry)) === null || _a === void 0 ? void 0 : _a[1]);
+        if (pid && !isRunning(pid))
+            (0, fs_1.rmSync)((0, path_1.resolve)(root, entry), { recursive: true, force: true });
+    }
+    const dir = holdsLock(lock) ? shared : `${shared}-${process.pid}-${(claims += 1)}`;
+    const release = () => {
+        if (!claimed.delete(release))
+            return;
+        (0, fs_1.rmSync)(dir === shared ? lock : dir, { recursive: true, force: true });
+    };
+    if (!exitHooked) {
+        exitHooked = true;
+        process.once('exit', () => [...claimed].forEach((held) => held()));
+    }
+    claimed.add(release);
+    return { dir, release };
+};
+exports.claimViteCache = claimViteCache;
 const readConfig = (target) => {
     const path = (0, exports.configPathOf)(target);
     if (!(0, fs_1.existsSync)(path))