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

package/src/lib/design/system/sketch/edit-sketch.js

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rewordEditNotes = exports.refreshEditOld = exports.openEditSketch = exports.EDIT_OLD_NOT_FOUND = exports.EDIT_OLD = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+const assets_1 = require("../assets");
+const imports_1 = require("../imports");
+const reachable_files_1 = require("../reachable-files");
+const resolve_product_1 = require("../resolve-product");
+const baseline_1 = require("./baseline");
+const merged_parts_1 = require("./merged-parts");
+const sketch_1 = require("./sketch");
+exports.EDIT_OLD = 'old';
+const NEW = 'new';
+const EDIT_ROUND_TITLE = 'Direkte Änderung';
+const EDIT_VARIANT_NOTES = { [exports.EDIT_OLD]: 'der zuletzt gemergte Stand', [NEW]: 'die Änderung außerhalb eines Sketches' };
+const editRoundNoteOf = (part) => `${part} wurde außerhalb eines Sketches geändert und sieht anders aus - wähle den zuletzt gemergten Stand oder die Änderung`;
+exports.EDIT_OLD_NOT_FOUND = 'EDIT-OLD-NOT-FOUND';
+const git = (root, args) => (0, child_process_1.execFileSync)('git', args, { cwd: root, encoding: 'utf8', stdio: 'pipe', maxBuffer: 64 * 1024 * 1024 });
+const blobsAt = ({ root, commit, paths }) => git(root, ['ls-tree', '-r', '-z', commit, '--', ...paths.map((path) => `./${path}`)])
+    .split('\0')
+    .flatMap((entry) => {
+    var _a;
+    const [meta, path] = entry.split('\t');
+    const [, type, oid] = (_a = meta === null || meta === void 0 ? void 0 : meta.split(' ')) !== null && _a !== void 0 ? _a : [];
+    return type === 'blob' && oid && path ? [{ oid, path }] : [];
+});
+const oldDesignOf = (product, resolved) => {
+    const part = (0, resolve_product_1.partKeyOf)(resolved);
+    const hash = (0, merged_parts_1.readMerged)(product.dir)[part];
+    if (hash === undefined)
+        return `${part} has no merged hash - there is no old design to show`;
+    const root = (0, reachable_files_1.repoRootOf)(product);
+    const partDir = (0, path_1.relative)(root, (0, path_1.dirname)(resolved.file));
+    const paths = [
+        partDir,
+        ...[...(0, imports_1.productSharedDirsOf)(product), ...(0, assets_1.assetDirsOf)(product)].map((dir) => (0, path_1.relative)(root, dir)),
+    ];
+    const blobs = new Map();
+    const blobOf = (oid) => {
+        var _a;
+        const cached = (_a = blobs.get(oid)) !== null && _a !== void 0 ? _a : (0, child_process_1.execFileSync)('git', ['cat-file', 'blob', oid], { cwd: root, stdio: 'pipe', maxBuffer: 256 * 1024 * 1024 });
+        blobs.set(oid, cached);
+        return cached;
+    };
+    const scratch = (0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), 'et-design-edit-old-'));
+    const at = (dir) => (0, path_1.join)(scratch, (0, path_1.relative)(root, dir));
+    try {
+        const commits = git(root, ['log', '--format=%H', 'HEAD', '--', ...paths.map((path) => `./${path}`)])
+            .split('\n')
+            .filter((line) => line !== '');
+        for (const commit of commits) {
+            (0, fs_1.rmSync)(scratch, { recursive: true, force: true });
+            (0, fs_1.mkdirSync)(scratch);
+            const tree = blobsAt({ root, commit, paths });
+            for (const { oid, path } of tree) {
+                (0, fs_1.mkdirSync)((0, path_1.dirname)((0, path_1.join)(scratch, path)), { recursive: true });
+                (0, fs_1.writeFileSync)((0, path_1.join)(scratch, path), blobOf(oid));
+            }
+            const moved = Object.assign(Object.assign({}, product), { dir: at(product.dir), base: product.base && Object.assign(Object.assign({}, product.base), { dir: at(product.base.dir) }) });
+            if ((0, baseline_1.partHashOf)({ product: moved, dir: (0, path_1.join)(scratch, partDir) }) !== hash)
+                continue;
+            const files = tree.flatMap(({ oid, path }) => path.startsWith(`${partDir}/`) ? [[(0, path_1.relative)(partDir, path), blobOf(oid)]] : []);
+            return { commit, files: new Map(files) };
+        }
+    }
+    catch (error) {
+        return `${part} has no history to find its old design in: ${error instanceof Error ? error.message : String(error)}`;
+    }
+    finally {
+        (0, fs_1.rmSync)(scratch, { recursive: true, force: true });
+    }
+    return {
+        rule: exports.EDIT_OLD_NOT_FOUND,
+        message: `no commit holds ${part} at its merged hash ${hash}, so the edit has no old design to compare with - ` +
+            `${part} gets a sketch with only the variant new: the user picks it to record the edit, or the change is reverted`,
+    };
+};
+/**
+ * Opens the old/new sketch of a merged part edited outside a sketch, ready for a pick: `old` holds the part's folder at
+ * the newest commit whose part hash is its merged hash, `new` the working one. Answers the sketch, `EDIT-OLD-NOT-FOUND`
+ * when no commit has that hash, or why it cannot open.
+ */
+const openEditSketch = (options) => {
+    const { target, product, part } = options;
+    const resolved = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part);
+    if (!resolved)
+        return `product "${product.name}" has no part "${part}"`;
+    const old = oldDesignOf(product, resolved);
+    if (typeof old === 'string' || 'rule' in old)
+        return old;
+    const partDir = (0, path_1.dirname)(resolved.file);
+    const working = (0, assets_1.filesBelow)(partDir);
+    const unchanged = working.length === old.files.size &&
+        working.every((file) => { var _a; return (_a = old.files.get((0, path_1.relative)(partDir, file))) === null || _a === void 0 ? void 0 : _a.equals((0, fs_1.readFileSync)(file)); });
+    if (unchanged)
+        return `the folder of ${part} at its merged commit ${old.commit.slice(0, 9)} equals the working one - there is no old design to show`;
+    const created = (0, sketch_1.createSketch)({
+        product,
+        sketch: { layer: resolved.layer, name: resolved.name, sketch: merged_parts_1.EDIT_SKETCH },
+        variants: [NEW, exports.EDIT_OLD],
+        roundTitle: EDIT_ROUND_TITLE,
+        roundNote: editRoundNoteOf(part),
+        variantNotes: new Map(Object.entries(EDIT_VARIANT_NOTES)),
+        author: options.author,
+        merge: resolved.origin === 'overridden' ? 'override' : undefined,
+    });
+    if (typeof created === 'string')
+        return created;
+    writeOld({ sketch: created, resolved }, old.files);
+    return (0, sketch_1.markSketchReady)({ checkout: target, sketch: created, author: options.author });
+};
+exports.openEditSketch = openEditSketch;
+/**
+ * Rewrites the `old` variant of an edit sketch from the part at its merged commit, as `openEditSketch` finds it, so `old` draws against the sketch's `shared/` of
+ * today, and its round and variant notes in today's wording. Answers why it cannot, else null.
+ */
+const refreshEditOld = ({ product, sketch, }) => {
+    const resolved = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === (0, resolve_product_1.partKeyOf)(sketch));
+    if (!resolved)
+        return `product "${product.name}" has no part "${(0, resolve_product_1.partKeyOf)(sketch)}"`;
+    const old = oldDesignOf(product, resolved);
+    if (typeof old === 'string' || 'rule' in old)
+        return old;
+    writeOld({ sketch, resolved }, old.files);
+    (0, exports.rewordEditNotes)(sketch);
+    return null;
+};
+exports.refreshEditOld = refreshEditOld;
+/** Rewrites the round and variant notes of an edit sketch in today's wording, writing only when they differ. */
+const rewordEditNotes = (sketch) => {
+    const [first, ...later] = sketch.rounds;
+    const rounds = first
+        ? [Object.assign(Object.assign({}, first), { title: EDIT_ROUND_TITLE, note: editRoundNoteOf((0, resolve_product_1.partKeyOf)(sketch)) }), ...later]
+        : sketch.rounds;
+    const variantInfo = Object.fromEntries(Object.entries(sketch.variantInfo).map(([variant, info]) => [
+        variant,
+        variant === exports.EDIT_OLD || variant === NEW ? Object.assign(Object.assign({}, info), { note: EDIT_VARIANT_NOTES[variant] }) : info,
+    ]));
+    const reworded = Object.assign(Object.assign({}, sketch), { rounds, variantInfo });
+    if (JSON.stringify(reworded) !== JSON.stringify(sketch))
+        (0, sketch_1.writeSketchFile)(reworded);
+};
+exports.rewordEditNotes = rewordEditNotes;
+const writeOld = ({ sketch, resolved }, files) => {
+    const oldDir = (0, path_1.resolve)(sketch.dir, exports.EDIT_OLD, resolved.layer, resolved.name);
+    (0, fs_1.rmSync)(oldDir, { recursive: true, force: true });
+    (0, fs_1.rmSync)((0, sketch_1.variantSharedDirOf)(sketch, exports.EDIT_OLD), { recursive: true, force: true });
+    for (const [path, source] of files) {
+        const file = (0, path_1.resolve)(oldDir, path);
+        (0, fs_1.mkdirSync)((0, path_1.dirname)(file), { recursive: true });
+        (0, fs_1.writeFileSync)(file, source);
+    }
+    const partDir = (0, path_1.dirname)(resolved.file);
+    (0, sketch_1.rebaseOutsideImports)({ dir: oldDir, from: partDir, skip: sketch_1.SHARED_FOLDER });
+    if ((0, fs_1.existsSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER))) {
+        (0, sketch_1.rebaseOutsideImports)({
+            dir: (0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER),
+            from: (0, path_1.resolve)(partDir, sketch_1.SHARED_FOLDER),
+            settledIn: (0, sketch_1.variantSharedDirOf)(sketch, exports.EDIT_OLD),
+        });
+        (0, sketch_1.rewriteSharedImports)(oldDir);
+        (0, fs_1.cpSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER), (0, sketch_1.variantSharedDirOf)(sketch, exports.EDIT_OLD), { recursive: true });
+        (0, fs_1.rmSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER), { recursive: true });
+    }
+};
+//# sourceMappingURL=edit-sketch.js.map

package/src/lib/design/system/sketch/edit-sketch.js.map

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

package/src/lib/design/system/sketch/frame-budget.d.ts

@@ -0,0 +1,24 @@
+/** Variants times states times widths of a sketch's target part that Studio can show without freezing. */
+export declare const SKETCH_FRAME_BUDGET = 24;
+type Drawn = {
+    sketch?: {
+        target: string;
+        variant: string;
+    } | null;
+    part: string;
+    state: string;
+    size: string;
+};
+/**
+ * One warning per sketch whose target part draws more than `budget` frames across its variants, states and widths,
+ * counted from the frames a render check drew.
+ */
+export declare const frameBudgetWarningsOf: ({ drawn, targets, budget, }: {
+    drawn: readonly Drawn[];
+    targets: readonly {
+        target: string;
+        part: string;
+    }[];
+    budget?: number;
+}) => string[];
+export {};

package/src/lib/design/system/sketch/frame-budget.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.frameBudgetWarningsOf = exports.SKETCH_FRAME_BUDGET = void 0;
+/** Variants times states times widths of a sketch's target part that Studio can show without freezing. */
+exports.SKETCH_FRAME_BUDGET = 24;
+/**
+ * One warning per sketch whose target part draws more than `budget` frames across its variants, states and widths,
+ * counted from the frames a render check drew.
+ */
+const frameBudgetWarningsOf = ({ drawn, targets, budget = exports.SKETCH_FRAME_BUDGET, }) => targets.flatMap(({ target, part }) => {
+    const own = drawn.filter((frame) => { var _a; return ((_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.target) === target && frame.part === part; });
+    const frames = new Set(own.map((frame) => { var _a; return `${(_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.variant} ${frame.state} ${frame.size}`; })).size;
+    if (frames <= budget)
+        return [];
+    const countOf = (key) => new Set(own.map(key)).size;
+    return [
+        `${target}: WARNING ${frames} frames (${countOf((frame) => { var _a, _b; return (_b = (_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.variant) !== null && _b !== void 0 ? _b : ''; })} variants x ` +
+            `${countOf((frame) => frame.state)} states x ${countOf((frame) => frame.size)} widths) pass the budget of ${budget}; ` +
+            'Studio opens them all when no state folds as unchanged',
+    ];
+});
+exports.frameBudgetWarningsOf = frameBudgetWarningsOf;
+//# sourceMappingURL=frame-budget.js.map

package/src/lib/design/system/sketch/frame-budget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frame-budget.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/frame-budget.ts"],"names":[],"mappings":";;;AAAA,0GAA0G;AAC7F,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAItC;;;GAGG;AACI,MAAM,qBAAqB,GAAG,CAAC,EACpC,KAAK,EACL,OAAO,EACP,MAAM,GAAG,2BAAmB,GAK7B,EAAE,EAAE,CACH,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;IACnC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,MAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAA,EAAA,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,GAAG,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,CAAC,GAA6B,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9E,OAAO;QACL,GAAG,MAAM,aAAa,MAAM,YAAY,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO,mCAAI,EAAE,CAAA,EAAA,CAAC,cAAc;YACnG,GAAG,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,+BAA+B,MAAM,IAAI;YACtH,wDAAwD;KAC3D,CAAC;AACJ,CAAC,CAAC,CAAC;AAtBQ,QAAA,qBAAqB,yBAsB7B"}

package/src/lib/design/system/sketch/identical-renders.d.ts

@@ -0,0 +1,31 @@
+import { PictureOf } from '../../merge-compare';
+import { BoxOf } from '../../variant-diff';
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+import { SketchPartLoader } from './unchanged-states';
+export type IdenticalRender = {
+    variant: string;
+    sibling: string | null;
+    line: string;
+};
+/**
+ * One line per live variant of the sketch that draws every state of a target pixel for pixel like another live
+ * variant, or like the product's part when the sketch has more than one live variant. Of two variants that draw
+ * alike in every state, only the later one is named. A lone variant like the product is a change without a visible
+ * difference, which `sketch ready` merges on its own, so it is never named. A state that fails to draw counts as
+ * different. Any other variant is named when its first changed state, in its own state order, draws like the first
+ * changed state of an earlier variant. "Changed" and "draws like" there are the pixel diff of `design shot` (`boxOf`),
+ * at the frame a shot draws: the first preset or width, no interaction.
+ */
+export declare const identicalRenderLinesOf: (options: Parameters<typeof identicalRendersOf>[0]) => Promise<string[]>;
+/**
+ * The variants `identicalRenderLinesOf` names, each with the sibling variant it draws like in its first changed state
+ * (`null` when it draws like the product's part) and its line, which starts with the sketch's target.
+ */
+export declare const identicalRendersOf: (options: {
+    product: ResolvedProduct;
+    sketch: Sketch;
+    load: SketchPartLoader;
+    pictureOf: PictureOf;
+    boxOf: BoxOf;
+}) => Promise<IdenticalRender[]>;

package/src/lib/design/system/sketch/identical-renders.js

@@ -0,0 +1,143 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.identicalRendersOf = exports.identicalRenderLinesOf = void 0;
+const crypto_1 = require("crypto");
+const thumb_1 = require("../../thumb");
+const in_order_at_once_1 = require("../in-order-at-once");
+const list_system_1 = require("../list-system");
+const resolve_product_1 = require("../resolve-product");
+const overlay_1 = require("./overlay");
+const sketch_1 = require("./sketch");
+const unchanged_states_1 = require("./unchanged-states");
+const AKTUELL = 'Aktuell';
+const drawingOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const { product, part, file, sketch, load, pictureOf } = options;
+    const read = yield (0, list_system_1.readPartModule)({
+        part: { file },
+        product: product.name,
+        load: () => load({ file, product: product.name, sketch }),
+    });
+    if (read.problem)
+        return null;
+    const layer = (_b = (_a = product.parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _a === void 0 ? void 0 : _a.layer) !== null && _b !== void 0 ? _b : part.split('/')[0];
+    const frames = (0, unchanged_states_1.framesOf)({ widths: 'widths' in read ? read.widths : undefined, interactions: read.interactions }, layer === 'pages' ? Object.keys(product.presets) : null);
+    const drawn = yield (0, in_order_at_once_1.inOrderAtOnce)({
+        items: read.states,
+        limit: thumb_1.DRAWS_AT_ONCE,
+        run: (state) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b;
+            try {
+                const pictures = yield Promise.all(frames.map((frame) => pictureOf(Object.assign(Object.assign({ product: product.name, part, state }, frame), { sketch, params: new URLSearchParams() }))));
+                const hash = (0, crypto_1.createHash)('sha256');
+                frames.forEach((frame, index) => { var _a, _b; return hash.update(JSON.stringify(frame)).update((_b = (_a = pictures[index]) === null || _a === void 0 ? void 0 : _a.png) !== null && _b !== void 0 ? _b : ''); });
+                return [state, { hash: hash.digest('hex'), shot: (_b = (_a = pictures[0]) === null || _a === void 0 ? void 0 : _a.png) !== null && _b !== void 0 ? _b : Buffer.alloc(0) }];
+            }
+            catch (_c) {
+                return null;
+            }
+        }),
+    });
+    return new Map(drawn.filter((entry) => entry !== null));
+});
+const sameInEveryState = (drawn, other) => drawn.states.size > 0 && [...drawn.states].every(([state, { hash }]) => { var _a; return ((_a = other.states.get(state)) === null || _a === void 0 ? void 0 : _a.hash) === hash; });
+const samePixels = (boxOf, pair) => __awaiter(void 0, void 0, void 0, function* () { return (yield boxOf(pair[0].shot, pair[1].shot)).length === 0; });
+const firstChangeOf = (boxOf, pair) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    for (const [state, picture] of pair.drawn.states) {
+        const before = (_a = pair.current) === null || _a === void 0 ? void 0 : _a.states.get(state);
+        if (!before || !(yield samePixels(boxOf, [before, picture])))
+            return { state, picture };
+    }
+    return null;
+});
+const likeOf = (drawn) => (drawn.name === AKTUELL ? AKTUELL : `variant ${drawn.name}`);
+const withdrawAdviceOf = (target, variant) => `withdraw it with \`sketch withdraw ${target} --variant ${variant} --by <model id>\` or redraw it`;
+const refusalsOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { variants, current, of, target, boxOf } = options;
+    const refusals = [];
+    for (const [index, drawn] of variants.entries()) {
+        const earlier = variants.slice(0, index);
+        const later = variants
+            .slice(index + 1)
+            .filter((other) => !(sameInEveryState(other, drawn) && sameInEveryState(drawn, other)));
+        const others = [...earlier, ...later, ...(current && variants.length > 1 ? [current] : [])];
+        const twin = others.find((other) => sameInEveryState(drawn, other));
+        if (!twin) {
+            if (current && sameInEveryState(drawn, current))
+                continue;
+            const shown = yield firstChangeOf(boxOf, { drawn, current });
+            let like;
+            for (const other of shown ? earlier : []) {
+                const first = yield firstChangeOf(boxOf, { drawn: other, current });
+                if (shown && first && (yield samePixels(boxOf, [first.picture, shown.picture]))) {
+                    like = { other, first };
+                    break;
+                }
+            }
+            if (shown && like)
+                refusals.push({
+                    variant: drawn.name,
+                    sibling: like.other.name === AKTUELL ? null : like.other.name,
+                    line: `variant ${drawn.name}${of} first changes ${shown.state}, which draws the same pixels as ${likeOf(like.other)} draws at its first change ${like.first.state}, so the Studio sketch view shows identical frames - ${withdrawAdviceOf(target, drawn.name)}`,
+                });
+            continue;
+        }
+        refusals.push({
+            variant: drawn.name,
+            sibling: twin.name === AKTUELL ? null : twin.name,
+            line: `variant ${drawn.name}${of} draws the same pixels as ${likeOf(twin)} in every state (${[...drawn.states.keys()].join(', ')}) - it adds nothing visible: ${twin.name === AKTUELL ? 'redraw it' : withdrawAdviceOf(target, drawn.name)}`,
+        });
+    }
+    return refusals;
+});
+/**
+ * One line per live variant of the sketch that draws every state of a target pixel for pixel like another live
+ * variant, or like the product's part when the sketch has more than one live variant. Of two variants that draw
+ * alike in every state, only the later one is named. A lone variant like the product is a change without a visible
+ * difference, which `sketch ready` merges on its own, so it is never named. A state that fails to draw counts as
+ * different. Any other variant is named when its first changed state, in its own state order, draws like the first
+ * changed state of an earlier variant. "Changed" and "draws like" there are the pixel diff of `design shot` (`boxOf`),
+ * at the frame a shot draws: the first preset or width, no interaction.
+ */
+const identicalRenderLinesOf = (options) => __awaiter(void 0, void 0, void 0, function* () { return (yield (0, exports.identicalRendersOf)(options)).map((render) => render.line); });
+exports.identicalRenderLinesOf = identicalRenderLinesOf;
+/**
+ * The variants `identicalRenderLinesOf` names, each with the sibling variant it draws like in its first changed state
+ * (`null` when it draws like the product's part) and its line, which starts with the sketch's target.
+ */
+const identicalRendersOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const { product, sketch, load, pictureOf, boxOf } = options;
+    const live = sketch.variants.filter((variant) => !(0, sketch_1.rejectionOf)(sketch, variant));
+    const found = [];
+    for (const part of sketch.targets) {
+        const variants = [];
+        for (const variant of live) {
+            const file = (_a = (0, overlay_1.overlaySketch)({ product, sketch, variant }).parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _a === void 0 ? void 0 : _a.file;
+            const drawn = file
+                ? yield drawingOf({ product, part, file, sketch: { target: sketch.target, variant }, load, pictureOf })
+                : null;
+            if (drawn)
+                variants.push({ name: variant, states: drawn });
+        }
+        const file = (_b = product.parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _b === void 0 ? void 0 : _b.file;
+        const now = file ? yield drawingOf({ product, part, file, sketch: null, load, pictureOf }) : null;
+        const of = sketch.targets.length > 1 ? ` ${part}` : '';
+        const current = now ? { name: AKTUELL, states: now } : null;
+        for (const render of yield refusalsOf({ variants, current, of, target: sketch.target, boxOf }))
+            found.push(Object.assign(Object.assign({}, render), { line: `${sketch.target} ${render.line}` }));
+    }
+    return found;
+});
+exports.identicalRendersOf = identicalRendersOf;
+//# sourceMappingURL=identical-renders.js.map

package/src/lib/design/system/sketch/identical-renders.js.map

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

package/src/lib/design/system/sketch/merge-commit.d.ts

@@ -0,0 +1,20 @@
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+type CommitOptions = {
+    target: string;
+    product: ResolvedProduct;
+    sketch: Sketch;
+    variant: string;
+    before: Map<string, string> | null;
+};
+/** The dirty files of the product's folders by absolute path, each with a hash of its content; `null` outside a git checkout. */
+export declare const dirtyFilesOfSync: (options: {
+    target: string;
+    product: ResolvedProduct;
+}) => Map<string, string> | null;
+/**
+ * Commits what a merge wrote into the product's folders - the files dirty now that were clean or different before,
+ * and the merged sketch's own deletion, never another open sketch - as one commit. A failed commit warns and leaves the files as they are.
+ */
+export declare const commitMergeResultSync: (options: CommitOptions) => boolean;
+export {};

package/src/lib/design/system/sketch/merge-commit.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commitMergeResultSync = exports.dirtyFilesOfSync = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const sketch_1 = require("./sketch");
+const plain_output_1 = require("../../../plain-output");
+const runSync = (target, flow) => {
+    let step = flow.next();
+    while (!step.done)
+        step = flow.next((0, plain_output_1.spawnPlain)(['git', ...step.value.args], { cwd: target, input: step.value.input }));
+    return step.value;
+};
+const dirsOf = (product) => [product.dir, ...(product.base ? [product.base.dir] : [])];
+const below = (path, dir) => path === dir || path.startsWith(`${dir}${path_1.sep}`);
+function* dirtyFilesFlow(product) {
+    const root = yield { args: ['rev-parse', '--show-toplevel'] };
+    const status = yield {
+        args: ['status', '--porcelain', '-z', '--no-renames', '--untracked-files=all', '--', ...dirsOf(product)],
+    };
+    if (root.status !== 0 || status.status !== 0)
+        return null;
+    const top = (0, fs_1.realpathSync)(root.stdout.trim());
+    const files = status.stdout
+        .split('\0')
+        .filter((line) => /^.. /.test(line))
+        .map((entry) => (0, path_1.resolve)(top, entry.slice(3)));
+    const present = files.filter((file) => (0, fs_1.existsSync)(file));
+    const hashed = present.length > 0 ? yield { args: ['hash-object', '--stdin-paths'], input: present.join('\n') } : null;
+    const hashes = (hashed === null || hashed === void 0 ? void 0 : hashed.status) === 0 ? hashed.stdout.trim().split('\n') : [];
+    return new Map(files.map((file) => { var _a; return [file, (_a = hashes[present.indexOf(file)]) !== null && _a !== void 0 ? _a : 'deleted']; }));
+}
+function* commitFlow(options) {
+    const { product, sketch, before } = options;
+    const after = yield* dirtyFilesFlow(product);
+    if (!before || !after)
+        return false;
+    const productDir = (0, fs_1.realpathSync)(product.dir);
+    const sketches = (0, sketch_1.sketchesDirOf)(productDir);
+    const merged = (0, path_1.resolve)(productDir, (0, path_1.relative)(product.dir, sketch.dir));
+    const files = [...after]
+        .filter(([file, hash]) => before.get(file) !== hash)
+        .map(([file]) => file)
+        .filter((file) => !below(file, sketches) || below(file, merged));
+    if (files.length === 0)
+        return true;
+    const added = yield { args: ['add', '--all', '--', ...files] };
+    const committed = added.status === 0
+        ? yield {
+            args: [
+                'commit',
+                '-m',
+                `feat(repo): Merge ${sketch.target} variant ${options.variant} into ${product.name}`,
+                '--',
+                ...files,
+            ],
+        }
+        : added;
+    if (committed.status !== 0)
+        console.warn(`Could not commit the merge: ${(committed.stderr || committed.stdout).trim()}`);
+    return committed.status === 0;
+}
+/** The dirty files of the product's folders by absolute path, each with a hash of its content; `null` outside a git checkout. */
+const dirtyFilesOfSync = (options) => runSync(options.target, dirtyFilesFlow(options.product));
+exports.dirtyFilesOfSync = dirtyFilesOfSync;
+/**
+ * Commits what a merge wrote into the product's folders - the files dirty now that were clean or different before,
+ * and the merged sketch's own deletion, never another open sketch - as one commit. A failed commit warns and leaves the files as they are.
+ */
+const commitMergeResultSync = (options) => runSync(options.target, commitFlow(options));
+exports.commitMergeResultSync = commitMergeResultSync;
+//# sourceMappingURL=merge-commit.js.map

package/src/lib/design/system/sketch/merge-commit.js.map

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

package/src/lib/design/system/sketch/merge-runner.d.ts

@@ -0,0 +1,20 @@
+import { MergeRefusal } from './merge';
+import { Sketch } from './sketch';
+export type MergeRequest = {
+    target: string;
+    product: string;
+    sketch: Sketch;
+    note?: string;
+};
+export type MergeResponse = {
+    result?: string[] | MergeRefusal;
+    error?: string;
+};
+/** Merges the picked variant of `sketch` as the Studio merge does, on this thread: refreshes the harness map, records the note and commits the result. */
+export declare const studioMergeOf: ({ target, product: name, sketch, note }: MergeRequest) => string[] | MergeRefusal;
+/**
+ * Runs `studioMergeOf` in a worker of its own, so the server keeps answering while the merge copies, checks, writes and
+ * commits. On Linux a child process blocks the thread that spawns it for as long as forking the whole process takes, so
+ * the server thread spawns none.
+ */
+export declare const mergeInWorker: (request: MergeRequest) => Promise<string[] | MergeRefusal>;

package/src/lib/design/system/sketch/merge-runner.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeInWorker = exports.studioMergeOf = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const url_1 = require("url");
+const worker_threads_1 = require("worker_threads");
+const package_root_1 = require("../../package-root");
+const design_config_1 = require("../../design-config");
+const harness_map_1 = require("../harness-map");
+const cli_args_1 = require("./cli-args");
+const merge_commit_1 = require("./merge-commit");
+const merge_1 = require("./merge");
+const merged_parts_1 = require("./merged-parts");
+/** Merges the picked variant of `sketch` as the Studio merge does, on this thread: refreshes the harness map, records the note and commits the result. */
+const studioMergeOf = ({ target, product: name, sketch, note }) => {
+    var _a;
+    const config = (0, design_config_1.readConfig)(target);
+    if (!config)
+        return { reason: 'no design config' };
+    const product = (0, cli_args_1.oneProductOf)({ target, config, asked: name });
+    if (typeof product === 'string')
+        return { reason: product };
+    const before = (0, merge_commit_1.dirtyFilesOfSync)({ target, product });
+    const merged = (0, merge_1.mergeSketch)({ target, config, product, sketch, note });
+    if (!Array.isArray(merged))
+        return merged;
+    (0, harness_map_1.refreshHarnessMap)({ target, product });
+    if (note === null || note === void 0 ? void 0 : note.trim())
+        for (const part of sketch.targets)
+            (0, merged_parts_1.recordMergeReason)({ product, part, reason: note.trim() });
+    const variant = ((_a = sketch.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? sketch.decision.variant : '';
+    (0, merge_commit_1.commitMergeResultSync)({ target, product, sketch, variant, before });
+    return merged;
+};
+exports.studioMergeOf = studioMergeOf;
+const startWorker = () => {
+    const built = (0, package_root_1.packageFileOf)((0, path_1.resolve)(__dirname, 'merge-worker.js'));
+    // Specs run this file from source, where only the `.ts` worker exists.
+    return (0, fs_1.existsSync)(built)
+        ? new worker_threads_1.Worker(built)
+        : new worker_threads_1.Worker((0, path_1.resolve)(__dirname, 'merge-worker.ts'), {
+            execArgv: [
+                '--import',
+                (0, url_1.pathToFileURL)((0, path_1.resolve)(require.resolve('jiti/package.json'), '../lib/jiti-register.mjs')).href,
+            ],
+        });
+};
+/**
+ * Runs `studioMergeOf` in a worker of its own, so the server keeps answering while the merge copies, checks, writes and
+ * commits. On Linux a child process blocks the thread that spawns it for as long as forking the whole process takes, so
+ * the server thread spawns none.
+ */
+const mergeInWorker = (request) => new Promise((done, fail) => {
+    const worker = startWorker();
+    let answered = false;
+    worker.once('message', ({ result, error }) => {
+        answered = true;
+        void worker.terminate();
+        if (result)
+            done(result);
+        else
+            fail(new Error(error !== null && error !== void 0 ? error : 'the merge worker answered nothing'));
+    });
+    worker.once('error', (error) => fail(new Error(`the merge worker failed: ${error.message}`)));
+    worker.once('exit', () => {
+        if (!answered)
+            fail(new Error('the merge worker exited before it answered'));
+    });
+    worker.postMessage(request);
+});
+exports.mergeInWorker = mergeInWorker;
+//# sourceMappingURL=merge-runner.js.map