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

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

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshEditOld = exports.openEditSketch = exports.EDIT_OLD = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const assets_1 = require("../assets");
+const reachable_files_1 = require("../reachable-files");
+const resolve_product_1 = require("../resolve-product");
+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 Stand von HEAD', [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 Stand von HEAD oder die Änderung`;
+const git = (root, args) => (0, child_process_1.execFileSync)('git', args, { cwd: root, encoding: 'utf8', stdio: 'pipe', maxBuffer: 64 * 1024 * 1024 });
+const headFilesOf = (root, dir) => {
+    try {
+        const paths = git(root, ['ls-tree', '-r', '--name-only', 'HEAD', '--', `./${dir}`])
+            .split('\n')
+            .filter((line) => line !== '');
+        return new Map(paths.map((path) => [(0, path_1.relative)(dir, path), git(root, ['show', `HEAD:./${path}`])]));
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+};
+/**
+ * Opens the old/new sketch of a merged part edited outside a sketch, ready for a pick: `old` holds the part's design at
+ * HEAD, `new` the working one. Answers the sketch, 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 head = headOf(product, resolved);
+    if (typeof head === 'string')
+        return head;
+    const partDir = (0, path_1.dirname)(resolved.file);
+    const working = (0, assets_1.filesBelow)(partDir);
+    const unchanged = working.length === head.size &&
+        working.every((file) => head.get((0, path_1.relative)(partDir, file)) === (0, fs_1.readFileSync)(file, 'utf8'));
+    if (unchanged)
+        return `HEAD holds the edit of ${part} already - 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 }, head);
+    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 HEAD, 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 head = headOf(product, resolved);
+    if (typeof head === 'string')
+        return head;
+    writeOld({ sketch, resolved }, head);
+    rewordEditNotes(sketch);
+    return null;
+};
+exports.refreshEditOld = refreshEditOld;
+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);
+};
+const headOf = (product, resolved) => {
+    const part = (0, resolve_product_1.partKeyOf)(resolved);
+    const root = (0, reachable_files_1.repoRootOf)(product);
+    const head = headFilesOf(root, (0, path_1.relative)(root, (0, path_1.dirname)(resolved.file)));
+    if (typeof head === 'string')
+        return `${part} has no design at HEAD to compare with: ${head}`;
+    if (head.size === 0)
+        return `${part} is not in HEAD - there is no old design to show`;
+    return head;
+};
+const writeOld = ({ sketch, resolved }, head) => {
+    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 head) {
+        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);
+    }
+    if ((0, fs_1.existsSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER))) {
+        (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,137 @@
+"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 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, _c, _d;
+    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 states = new Map();
+    for (const state of read.states) {
+        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 : ''); });
+            states.set(state, { hash: hash.digest('hex'), shot: (_d = (_c = pictures[0]) === null || _c === void 0 ? void 0 : _c.png) !== null && _d !== void 0 ? _d : Buffer.alloc(0) });
+        }
+        catch (_e) {
+            continue;
+        }
+    }
+    return states;
+});
+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-shared.d.ts

@@ -8,6 +8,8 @@ type PartFile = {
 type SharedProduct = Pick<ProductSource, 'dir'> & {
     base: Pick<ProductSource, 'dir'> | null;
 };
+/** The files of the sketch's and the variant's `shared/` under their path there, the variant's file winning. */
+export declare const sketchSharedFilesOf: (sketch: Sketch, variant: string) => Map<string, string>;
 /**
  * What a merge does with the sketch's `shared/` folder: `carry` names the folder of each target with the paths of the
  * files the product's `shared/` does not hold that it takes - each file it imports, directly or through another such

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.carryShared = exports.editedSharedPathsOf = exports.productSharedChangesOf = exports.sharedPlanOf = void 0;
+exports.carryShared = exports.editedSharedPathsOf = exports.productSharedChangesOf = exports.sharedPlanOf = exports.sketchSharedFilesOf = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const assets_1 = require("../assets");
@@ -23,6 +23,7 @@ const sketchSharedFilesOf = (sketch, variant) => {
             files.set((0, path_1.relative)(dir, file), file);
     return files;
 };
+exports.sketchSharedFilesOf = sketchSharedFilesOf;
 const SOURCE = /\.(?:ts|js|mjs)$/u;
 const reachedSharedOf = (options) => {
     const { dirs, partDir, product } = options;
@@ -70,7 +71,7 @@ const sharedPlanOf = (options) => {
     const dirs = sketchSharedDirsOf(sketch, variant);
     const targets = parts.filter((part) => sketch.targets.includes((0, resolve_product_1.partKeyOf)(part)));
     const reached = targets.map((part) => reachedSharedOf({ dirs, partDir: (0, path_1.dirname)(part.file), product }));
-    const unreached = [...sketchSharedFilesOf(sketch, variant).keys()].filter((path) => !inProductShared(product, path) && !reached.some((paths) => paths.has(path)));
+    const unreached = [...(0, exports.sketchSharedFilesOf)(sketch, variant).keys()].filter((path) => !inProductShared(product, path) && !reached.some((paths) => paths.has(path)));
     const heldBy = (part, path) => product.parts.some((held) => (0, resolve_product_1.partKeyOf)(held) === (0, resolve_product_1.partKeyOf)(part) && (0, fs_1.existsSync)((0, path_1.resolve)((0, path_1.dirname)(held.file), imports_1.SHARED_FOLDER, path)));
     const ownersOf = (path) => targets.filter((part) => heldBy(part, path));
     const solo = importers.length === 1 ? importers[0] : undefined;
@@ -101,7 +102,7 @@ exports.sharedPlanOf = sharedPlanOf;
  */
 const productSharedChangesOf = (options) => {
     const { sketch, variant, product } = options;
-    return [...sketchSharedFilesOf(sketch, variant)]
+    return [...(0, exports.sketchSharedFilesOf)(sketch, variant)]
         .filter(([path]) => inProductShared(product, path))
         .map(([path, file]) => ({ from: file, to: (0, path_1.resolve)(product.dir, imports_1.SHARED_FOLDER, path) }));
 };
@@ -109,16 +110,12 @@ exports.productSharedChangesOf = productSharedChangesOf;
 /** The paths of the product's or its base's `shared/` files that the sketch's or the variant's `shared/` changes. */
 const editedSharedPathsOf = (options) => {
     const { sketch, variant, product } = options;
-    return [...sketchSharedFilesOf(sketch, variant)].flatMap(([path, file]) => {
+    return [...(0, exports.sketchSharedFilesOf)(sketch, variant)].flatMap(([path, file]) => {
         const own = (0, imports_1.sharedFileOf)({ dirs: (0, imports_1.productSharedDirsOf)(product), path });
         return own && (0, fs_1.readFileSync)(own, 'utf8') !== (0, fs_1.readFileSync)(file, 'utf8') ? [path.split(path_1.sep).join('/')] : [];
     });
 };
 exports.editedSharedPathsOf = editedSharedPathsOf;
-const relativeSpecifierOf = (options) => {
-    const path = (0, path_1.relative)((0, path_1.dirname)(options.from), options.to).split(path_1.sep).join('/');
-    return path.startsWith('.') ? path : `./${path}`;
-};
 /**
  * Copies the files at `paths` of the sketch's `shared/` folder, the picked variant's own `shared/` winning, into the
  * merged target's folder, and turns each `@shared/` import there of a file the product's `shared/` does not hold into a
@@ -127,7 +124,7 @@ const relativeSpecifierOf = (options) => {
 const carryShared = (options) => {
     const { sketch, variant, targetDir, paths, product } = options;
     const shared = (0, path_1.resolve)(targetDir, imports_1.SHARED_FOLDER);
-    const files = sketchSharedFilesOf(sketch, variant);
+    const files = (0, exports.sketchSharedFilesOf)(sketch, variant);
     for (const path of paths) {
         const file = files.get(path);
         if (!file)
@@ -141,7 +138,7 @@ const carryShared = (options) => {
             const [match = '', quote = '', path = ''] = args;
             return inProductShared(product, path)
                 ? match
-                : `${quote}${relativeSpecifierOf({ from: file, to: (0, path_1.resolve)(shared, path) })}${quote}`;
+                : `${quote}${(0, sketch_1.relativeSpecifierOf)({ from: file, to: (0, path_1.resolve)(shared, path) })}${quote}`;
         });
         if (rewritten !== source)
             (0, fs_1.writeFileSync)(file, rewritten);

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

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

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

@@ -0,0 +1,35 @@
+import { DesignConfig } from '../../paths';
+import { DesignStep } from '../tom-confirm';
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+/** The sketch with the pick a plan allows: its only live variant, when `variant` names it and nobody picked yet. */
+export declare const allowedMergeOf: (options: {
+    sketch: Sketch;
+    variant: string;
+}) => string | Sketch;
+/** Merges the picked variant of `sketch` and logs the reason; answers the merged variant and part keys, or why not. */
+export declare const mergeAndRecord: (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    sketch: Sketch;
+    note?: string;
+    replaceNote?: boolean;
+    by?: string;
+    allowed?: {
+        variant: string;
+        planRef: string;
+    };
+}) => {
+    variant: string;
+    parts: string[];
+} | string;
+/** A merge of one ready sketch as a step, or why it may not run; checks everything a merge needs before anything is written. */
+export declare const mergeStepOf: (options: {
+    target: string;
+    product: string | undefined;
+    part: string;
+    variant?: string;
+    note: string;
+    by: string;
+}) => DesignStep | string;

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

@@ -0,0 +1,98 @@
+"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.mergeStepOf = exports.mergeAndRecord = exports.allowedMergeOf = void 0;
+const harness_map_1 = require("../harness-map");
+const resolve_product_1 = require("../resolve-product");
+const cli_args_1 = require("./cli-args");
+const merge_1 = require("./merge");
+const merged_parts_1 = require("./merged-parts");
+const sketch_1 = require("./sketch");
+/** The sketch with the pick a plan allows: its only live variant, when `variant` names it and nobody picked yet. */
+const allowedMergeOf = (options) => {
+    const { sketch, variant } = options;
+    const live = sketch.variants.filter((candidate) => !(0, sketch_1.rejectionOf)(sketch, candidate));
+    if (live.length !== 1 || live[0] !== variant)
+        return `${sketch.target} has ${live.length} live variants (${live.join(', ') || 'none'}), not only "${variant}" - the user picks in Studio`;
+    return (0, sketch_1.decideSketch)({ sketch, decision: { kind: 'pick', variant } });
+};
+exports.allowedMergeOf = allowedMergeOf;
+/** Merges the picked variant of `sketch` and logs the reason; answers the merged variant and part keys, or why not. */
+const mergeAndRecord = (options) => {
+    var _a;
+    const { target, config, product, sketch, note, replaceNote, by, allowed } = options;
+    const decided = allowed ? (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant }) : sketch;
+    if (typeof decided === 'string')
+        return decided;
+    const result = (0, merge_1.mergeSketch)(Object.assign({ target,
+        config,
+        product, sketch: decided, note,
+        replaceNote, author: by }, (allowed ? { decidedBy: `plan: ${allowed.planRef.trim()}` } : {})));
+    if (!Array.isArray(result))
+        return result.reason;
+    const refreshed = (0, harness_map_1.refreshHarnessMap)({ target, product });
+    if (typeof refreshed === 'string')
+        console.error(`merged, but the harness map is still stale: ${refreshed}`);
+    const reason = (note === null || note === void 0 ? void 0 : note.trim()) || undefined;
+    if (allowed || reason)
+        for (const part of sketch.targets)
+            (0, merged_parts_1.recordMergeReason)({ product, part, planRef: allowed === null || allowed === void 0 ? void 0 : allowed.planRef.trim(), reason });
+    return { variant: ((_a = decided.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? decided.decision.variant : '', parts: result };
+};
+exports.mergeAndRecord = mergeAndRecord;
+/** A merge of one ready sketch as a step, or why it may not run; checks everything a merge needs before anything is written. */
+const mergeStepOf = (options) => {
+    var _a;
+    const { target, by, variant } = options;
+    const note = options.note.trim();
+    const config = (0, cli_args_1.configOf)(target);
+    const parsed = (0, sketch_1.parseTarget)(options.part);
+    if (typeof config === 'string')
+        return config;
+    if (typeof parsed === 'string')
+        return parsed;
+    const product = (0, cli_args_1.oneProductOf)({ target, config, asked: options.product });
+    if (typeof product === 'string')
+        return product;
+    const part = (0, resolve_product_1.partKeyOf)(parsed);
+    const sketch = (0, sketch_1.findSketch)({ productDir: product.dir, product: product.name, sketch: parsed });
+    if (sketch === null)
+        return `no sketch on ${part} in ${product.name}`;
+    if (typeof sketch === 'string')
+        return sketch;
+    if (sketch.status !== 'ready')
+        return `${sketch.target} is ${sketch.status} - mark it ready first: design sketch ready ${sketch.target} --by <model id> --product ${product.name}`;
+    const picked = ((_a = sketch.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? sketch.decision.variant : undefined;
+    const allowed = variant !== undefined && picked === undefined ? { variant, planRef: note } : undefined;
+    if (variant !== undefined && picked !== undefined && picked !== variant)
+        return `${sketch.target} was picked as variant "${picked}", not "${variant}"`;
+    if (allowed) {
+        const decided = (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant });
+        if (typeof decided === 'string')
+            return decided;
+    }
+    else if (picked === undefined)
+        return `${sketch.target} has no pick - name the variant in the entry, or the user picks in Studio`;
+    return {
+        line: `merge ${product.name} ${part}${variant ? ` variant ${variant}` : ''} - ${note}`,
+        run: () => __awaiter(void 0, void 0, void 0, function* () {
+            const merged = (0, exports.mergeAndRecord)({ target, config, product, sketch, note, by, allowed });
+            if (typeof merged === 'string') {
+                console.error(merged);
+                return 1;
+            }
+            console.log(`merged ${sketch.target} variant ${merged.variant} into ${product.name}: ${merged.parts.join(', ')}`);
+            return 0;
+        }),
+    };
+};
+exports.mergeStepOf = mergeStepOf;
+//# sourceMappingURL=merge-step.js.map