@ethlete/cli 3.0.0-next.20 → 3.0.0-next.22

package/src/lib/design/system/sketch/duplicate-class.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.duplicateClassWarningsOf = exports.stylesheetsOf = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const css_source_1 = require("../css-source");
+const imports_1 = require("../imports");
+const resolve_product_1 = require("../resolve-product");
+const ts_source_1 = require("../ts-source");
+const bareClassesOf = (css) => (0, css_source_1.cssBlocksOf)(css).selectors.flatMap((selector) => selector
+    .split(',')
+    .map((part) => part.trim())
+    .filter((part) => /^\.[\w-]+$/u.test(part))
+    .flatMap(css_source_1.classesOf));
+const stylesheetsOf = (options) => {
+    var _a, _b;
+    const { product, part } = options;
+    const files = new Set(part.css ? [part.css] : []);
+    for (const specifier of (0, ts_source_1.importsOf)(part.source)) {
+        const imported = (0, imports_1.classifyImport)(specifier);
+        const path = (_a = specifier.split('?')[0]) !== null && _a !== void 0 ? _a : specifier;
+        if (!path.endsWith('.css'))
+            continue;
+        if (imported.kind === 'relative')
+            files.add((0, path_1.resolve)((0, path_1.dirname)(part.file), path));
+        else if (imported.kind === 'shared')
+            files.add((_b = (0, imports_1.sharedFileOf)({ dirs: (0, imports_1.sharedDirsOf)(product), path: path.slice(imports_1.SHARED_PREFIX.length) })) !== null && _b !== void 0 ? _b : (0, path_1.resolve)(product.sharedDir, path.slice(imports_1.SHARED_PREFIX.length)));
+        else if (imported.kind === 'part' && imported.stylesheet) {
+            const owner = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === (0, resolve_product_1.partKeyOf)(imported));
+            if (owner === null || owner === void 0 ? void 0 : owner.css)
+                files.add(owner.css);
+        }
+    }
+    return [...files].filter((file) => (0, fs_1.existsSync)(file));
+};
+exports.stylesheetsOf = stylesheetsOf;
+/**
+ * A warning for each class that two stylesheets loaded by one part of a variant both define as a
+ * selector of its own: the later one silently changes the earlier.
+ */
+const duplicateClassWarningsOf = (options) => {
+    const { target, product } = options;
+    return product.parts
+        .filter((part) => product.sketched.includes((0, resolve_product_1.partKeyOf)(part)))
+        .flatMap((part) => {
+        var _a;
+        const owners = new Map();
+        for (const file of (0, exports.stylesheetsOf)({ product, part }))
+            for (const name of new Set(bareClassesOf((0, fs_1.readFileSync)(file, 'utf8'))))
+                owners.set(name, [...((_a = owners.get(name)) !== null && _a !== void 0 ? _a : []), file]);
+        return [...owners]
+            .filter(([, files]) => files.length > 1)
+            .map(([name, files]) => `WARNING ${(0, resolve_product_1.partKeyOf)(part)}: .${name} is defined in ${files.map((file) => (0, path_1.relative)(target, file)).join(' and ')} - rename one`);
+    });
+};
+exports.duplicateClassWarningsOf = duplicateClassWarningsOf;
+//# sourceMappingURL=duplicate-class.js.map

package/src/lib/design/system/sketch/duplicate-class.js.map

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

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

@@ -0,0 +1,15 @@
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+export type MergePreview = {
+    changed: string[];
+    affected: string[];
+};
+/**
+ * What a merge of one variant changes: the parts the variant holds, and each element and page that
+ * uses one of them, directly or through another part.
+ */
+export declare const mergePreviewOf: (options: {
+    product: ResolvedProduct;
+    sketch: Sketch;
+    variant: string;
+}) => MergePreview;

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergePreviewOf = void 0;
+const imports_1 = require("../imports");
+const resolve_product_1 = require("../resolve-product");
+const overlay_1 = require("./overlay");
+const SHOWN = new Set(['elements', 'pages']);
+const usersOf = (product) => {
+    var _a;
+    const users = new Map();
+    for (const part of product.parts) {
+        for (const dependency of (0, imports_1.partDependenciesOf)(part)) {
+            const key = (0, resolve_product_1.partKeyOf)(dependency);
+            users.set(key, ((_a = users.get(key)) !== null && _a !== void 0 ? _a : new Set()).add((0, resolve_product_1.partKeyOf)(part)));
+        }
+    }
+    return users;
+};
+/**
+ * What a merge of one variant changes: the parts the variant holds, and each element and page that
+ * uses one of them, directly or through another part.
+ */
+const mergePreviewOf = (options) => {
+    var _a;
+    const users = usersOf(options.product);
+    const changed = new Set((0, overlay_1.overlaySketch)(options).sketched);
+    const reached = new Set();
+    const queue = [...changed];
+    for (let key = queue.shift(); key !== undefined; key = queue.shift()) {
+        for (const user of (_a = users.get(key)) !== null && _a !== void 0 ? _a : []) {
+            if (reached.has(user))
+                continue;
+            reached.add(user);
+            queue.push(user);
+        }
+    }
+    return {
+        changed: [...changed].sort(),
+        affected: [...reached].filter((key) => { var _a; return !changed.has(key) && SHOWN.has((_a = key.split('/')[0]) !== null && _a !== void 0 ? _a : ''); }).sort(),
+    };
+};
+exports.mergePreviewOf = mergePreviewOf;
+//# sourceMappingURL=merge-preview.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-preview.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge-preview.ts"],"names":[],"mappings":";;;AAAA,wCAAgD;AAChD,wDAAgE;AAChE,uCAA0C;AAK1C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;AAE7C,MAAM,OAAO,GAAG,CAAC,OAAwB,EAAE,EAAE;;IAC3C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE7C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACjC,KAAK,MAAM,UAAU,IAAI,IAAA,4BAAkB,EAAC,IAAI,CAAC,EAAE,CAAC;YAClD,MAAM,GAAG,GAAG,IAAA,2BAAS,EAAC,UAAU,CAAC,CAAC;YAElC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAA,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,OAI9B,EAAgB,EAAE;;IACjB,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;IAE3B,KAAK,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,KAAK,SAAS,EAAE,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QACrE,KAAK,MAAM,IAAI,IAAI,MAAA,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,EAAE,EAAE,CAAC;YACxC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAEhC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE;QAC5B,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAA,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC,IAAI,EAAE;KACvG,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB"}

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

@@ -0,0 +1,25 @@
+import { Sketch } from './sketch';
+type PartFile = {
+    layer: string;
+    name: string;
+    file: string;
+};
+/**
+ * What a merge does with the sketch's `shared/` folder: `carry` when the target imports it, `drop` when no part
+ * does, or why the merge must stop - a part other than the target imports it, or the target holds a `shared/`
+ * folder of its own.
+ */
+export declare const sharedPlanOf: (options: {
+    sketch: Sketch;
+    parts: PartFile[];
+}) => "carry" | "drop" | string;
+/**
+ * Copies the sketch's `shared/` folder, then the picked variant's own `shared/` over it, into the merged target's folder
+ * and turns each `@shared/` import there into a relative one.
+ */
+export declare const carryShared: (options: {
+    sketch: Sketch;
+    variant: string;
+    targetDir: string;
+}) => void;
+export {};

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.carryShared = exports.sharedPlanOf = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const imports_1 = require("../imports");
+const resolve_product_1 = require("../resolve-product");
+const ts_source_1 = require("../ts-source");
+const sketch_1 = require("./sketch");
+const importsShared = (file) => (0, ts_source_1.importsOf)((0, fs_1.readFileSync)(file, 'utf8')).some((specifier) => specifier.startsWith(imports_1.SHARED_PREFIX));
+const sharedImportersOf = (parts) => parts.filter((part) => (0, sketch_1.sourceFilesIn)((0, path_1.dirname)(part.file)).some(importsShared));
+/**
+ * What a merge does with the sketch's `shared/` folder: `carry` when the target imports it, `drop` when no part
+ * does, or why the merge must stop - a part other than the target imports it, or the target holds a `shared/`
+ * folder of its own.
+ */
+const sharedPlanOf = (options) => {
+    const { sketch, parts } = options;
+    const importers = sharedImportersOf(parts);
+    const others = importers.filter((part) => (0, resolve_product_1.partKeyOf)(part) !== sketch.target);
+    const target = importers.find((part) => (0, resolve_product_1.partKeyOf)(part) === sketch.target);
+    if (others.length > 0)
+        return `${others.map(resolve_product_1.partKeyOf).join(', ')} import ${imports_1.SHARED_PREFIX} - only ${sketch.target} takes the sketch's ${sketch_1.SHARED_FOLDER}/ into the product; move that code into the part`;
+    if (!target)
+        return 'drop';
+    if ((0, fs_1.existsSync)((0, path_1.resolve)((0, path_1.dirname)(target.file), sketch_1.SHARED_FOLDER)))
+        return `${sketch.target} holds a ${sketch_1.SHARED_FOLDER}/ folder of its own and imports ${imports_1.SHARED_PREFIX} - rename the folder`;
+    return 'carry';
+};
+exports.sharedPlanOf = sharedPlanOf;
+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 sketch's `shared/` folder, then the picked variant's own `shared/` over it, into the merged target's folder
+ * and turns each `@shared/` import there into a relative one.
+ */
+const carryShared = (options) => {
+    const { sketch, variant, targetDir } = options;
+    const shared = (0, path_1.resolve)(targetDir, sketch_1.SHARED_FOLDER);
+    for (const dir of [(0, sketch_1.sharedDirOf)(sketch), (0, sketch_1.variantSharedDirOf)(sketch, variant)])
+        if ((0, fs_1.existsSync)(dir))
+            (0, fs_1.cpSync)(dir, shared, { recursive: true });
+    for (const file of (0, sketch_1.sourceFilesIn)(targetDir)) {
+        const source = (0, fs_1.readFileSync)(file, 'utf8');
+        const rewritten = source.replace(new RegExp(`(['"])${imports_1.SHARED_PREFIX}([^'"]+)\\1`, 'gu'), (...[, quote, path]) => `${quote}${relativeSpecifierOf({ from: file, to: (0, path_1.resolve)(shared, path !== null && path !== void 0 ? path : '') })}${quote}`);
+        if (rewritten !== source)
+            (0, fs_1.writeFileSync)(file, rewritten);
+    }
+};
+exports.carryShared = carryShared;
+//# sourceMappingURL=merge-shared.js.map

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

@@ -0,0 +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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"}

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

@@ -0,0 +1,31 @@
+import { DesignConfig } from '../../paths';
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+/** Why a merge did nothing; `changed` names the parts a rebase must take in, `[]` when the sketch records no baseline. */
+export type MergeRefusal = {
+    reason: string;
+    changed?: string[];
+};
+/**
+ * Merges the variant the user picked in a ready sketch into the product: copies each part it holds
+ * over the product's, sets `note` (when given) and `madeBy` (the file's own plus the variant's authors) on the target, runs the check
+ * records each merged part's hash in `merged.json` and deletes the sketch. A target the product only takes from its base is copied into the product first. When the check fails, the
+ * product's old files come back and the sketch stays. Each file in the variant's `assets/` goes into the product's `assets/`. The sketch's `shared/` folder goes into the target's folder when the
+ * target imports it, with its `@shared/` imports made relative; any other part that imports it stops the merge. Otherwise the open comments on its variants are addressed, by `author` or the user. Refuses without a
+ * pick, and when a part the variant replaces changed in the product since the sketch's baseline. Answers with the merged part keys, or with why nothing was merged - and, when a rebase
+ * would let it, the parts that changed (`[]` without a baseline).
+ */
+export declare const mergeSketch: (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    sketch: Sketch;
+    note?: string;
+    author?: string;
+}) => string[] | MergeRefusal;
+/** Deletes a sketch with all its variants and marks the open comments on them addressed, by `author` or the user. */
+export declare const discardSketch: (options: {
+    target: string;
+    sketch: Sketch;
+    author?: string;
+}) => string | null;

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

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.discardSketch = exports.mergeSketch = void 0;
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+const check_system_1 = require("../check-system");
+const comment_1 = require("../comments/comment");
+const assets_1 = require("../assets");
+const product_1 = require("../product");
+const resolve_product_1 = require("../resolve-product");
+const baseline_1 = require("./baseline");
+const merge_shared_1 = require("./merge-shared");
+const merged_parts_1 = require("./merged-parts");
+const part_definition_1 = require("./part-definition");
+const sketch_1 = require("./sketch");
+const swap = (entries) => {
+    const backup = (0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), 'ethlete-sketch-merge-'));
+    const held = entries.map(({ to }, index) => {
+        const copy = (0, path_1.resolve)(backup, String(index));
+        if ((0, fs_1.existsSync)(to))
+            (0, fs_1.cpSync)(to, copy, { recursive: true });
+        return { to, copy: (0, fs_1.existsSync)(copy) ? copy : null };
+    });
+    for (const { from, to } of entries) {
+        (0, fs_1.rmSync)(to, { recursive: true, force: true });
+        (0, fs_1.mkdirSync)((0, path_1.dirname)(to), { recursive: true });
+        (0, fs_1.cpSync)(from, to, { recursive: true });
+    }
+    return {
+        restore: () => {
+            for (const { to, copy } of held) {
+                (0, fs_1.rmSync)(to, { recursive: true, force: true });
+                if (copy)
+                    (0, fs_1.cpSync)(copy, to, { recursive: true });
+            }
+            (0, fs_1.rmSync)(backup, { recursive: true, force: true });
+        },
+        drop: () => (0, fs_1.rmSync)(backup, { recursive: true, force: true }),
+    };
+};
+const pickOf = (sketch) => {
+    const decision = sketch.decision;
+    if ((decision === null || decision === void 0 ? void 0 : decision.kind) !== 'pick')
+        return `${sketch.target} has no pick - the user picks a variant in Studio before a merge`;
+    if (!sketch.variants.includes(decision.variant))
+        return `${sketch.target} has no variant "${decision.variant}", the one picked - it has ${sketch.variants.join(', ') || 'none'}`;
+    return { variant: decision.variant };
+};
+const mergeOrReason = (options) => {
+    var _a, _b, _c;
+    const { target, config, product, sketch, note, author } = options;
+    if (sketch.status !== 'ready')
+        return `${sketch.target} is ${sketch.status} - mark it ready before a merge`;
+    const pick = pickOf(sketch);
+    if (typeof pick === 'string')
+        return pick;
+    const { variant } = pick;
+    const dir = (0, sketch_1.variantDirOf)(sketch, variant);
+    const { parts, problems } = (0, product_1.partFilesOf)(dir);
+    if (problems.length > 0)
+        return problems.map((problem) => `${problem.file}: ${problem.message}`).join('\n');
+    const shared = (0, merge_shared_1.sharedPlanOf)({ sketch, parts });
+    if (shared !== 'carry' && shared !== 'drop')
+        return shared;
+    const fixtures = (0, product_1.fixturesOf)(dir);
+    if (!sketch.baseline)
+        return {
+            reason: `${sketch.target} records no baseline of the product - compare each variant with the product, then run sketch rebase ${sketch.target}`,
+            changed: [],
+        };
+    const conflicts = (0, baseline_1.conflictsOf)({ product, baseline: sketch.baseline, parts, fixtures: fixtures !== null });
+    if (conflicts.length > 0)
+        return {
+            reason: `${conflicts.join(', ')} changed in the product since the sketch on ${sketch.target} was created - bring variant "${variant}" up to date, then run sketch rebase ${sketch.target}`,
+            changed: conflicts,
+        };
+    const targetDir = (0, path_1.resolve)(product.dir, sketch.layer, sketch.name);
+    const noteFile = (0, path_1.resolve)(targetDir, `${sketch.name}.ts`);
+    const carried = (_a = parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === sketch.target)) === null || _a === void 0 ? void 0 : _a.file;
+    const inherited = carried || (0, fs_1.existsSync)(noteFile) ? null : product.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === sketch.target);
+    const held = carried !== null && carried !== void 0 ? carried : (inherited ? inherited.file : noteFile);
+    if (!(0, fs_1.existsSync)(held))
+        return `variant "${variant}" holds no ${sketch.target}, and the product has no ${sketch.target} to carry the note`;
+    const source = (0, fs_1.readFileSync)(held, 'utf8');
+    const variantNote = (_b = sketch.variantInfo[variant]) === null || _b === void 0 ? void 0 : _b.note;
+    const newNote = (note === null || note === void 0 ? void 0 : note.trim()) || (((_c = (0, part_definition_1.noteOf)(source)) === null || _c === void 0 ? void 0 : _c.trim()) === '' ? variantNote : undefined);
+    const withNewNote = newNote ? (0, part_definition_1.withNote)(source, newNote) : source;
+    const madeBy = [...new Set([...(0, part_definition_1.madeByOf)(source), ...(0, sketch_1.authorsOf)(sketch, variant)])];
+    const noted = withNewNote === null || madeBy.length === 0 ? withNewNote : (0, part_definition_1.withMadeBy)(withNewNote, madeBy);
+    if (noted === null)
+        return `${held} holds no definePart({ note: '…' }) to set the note on`;
+    const mergedKeys = [...new Set([sketch.target, ...parts.map(resolve_product_1.partKeyOf)])];
+    const assetFiles = (0, assets_1.filesBelow)((0, path_1.resolve)(dir, assets_1.ASSETS_FOLDER));
+    const untouched = assetFiles.length > 0 ? (0, merged_parts_1.unchangedMergedOf)({ product, except: mergedKeys }) : [];
+    const known = (0, check_system_1.ruleLinesOf)(target, product);
+    const swapped = swap([
+        ...(inherited ? [{ from: (0, path_1.dirname)(inherited.file), to: targetDir }] : []),
+        ...parts.map((part) => ({ from: (0, path_1.dirname)(part.file), to: (0, path_1.resolve)(product.dir, part.layer, part.name) })),
+        ...(fixtures ? [{ from: fixtures, to: (0, path_1.resolve)(product.dir, 'fixtures.ts') }] : []),
+        ...assetFiles.map((file) => ({
+            from: file,
+            to: (0, path_1.resolve)(product.dir, assets_1.ASSETS_FOLDER, (0, path_1.relative)((0, path_1.resolve)(dir, assets_1.ASSETS_FOLDER), file)),
+        })),
+    ]);
+    (0, fs_1.writeFileSync)(noteFile, noted);
+    if (shared === 'carry')
+        (0, merge_shared_1.carryShared)({ sketch, variant, targetDir });
+    if ((0, check_system_1.checkSystem)({ target, config, products: [product.name], known }) !== 0) {
+        swapped.restore();
+        return `the check failed after the merge of ${sketch.target} variant "${variant}" - the product's old files are back, the sketch stays`;
+    }
+    swapped.drop();
+    (0, merged_parts_1.recordMerged)({ product, parts: mergedKeys });
+    const alsoChanged = (0, merged_parts_1.rerecordChangedMerged)({ product, before: untouched });
+    if (alsoChanged.length > 0)
+        console.log(`Asset change also updates: ${alsoChanged.join(', ')}`);
+    (0, comment_1.addressSketchComments)({ sketch, reason: 'merge', author, note });
+    (0, fs_1.rmSync)(sketch.dir, { recursive: true, force: true });
+    (0, sketch_1.clearSketchReport)({ checkout: target, sketch });
+    return [...(inherited ? [sketch.target] : []), ...parts.map(resolve_product_1.partKeyOf)];
+};
+/**
+ * Merges the variant the user picked in a ready sketch into the product: copies each part it holds
+ * over the product's, sets `note` (when given) and `madeBy` (the file's own plus the variant's authors) on the target, runs the check
+ * records each merged part's hash in `merged.json` and deletes the sketch. A target the product only takes from its base is copied into the product first. When the check fails, the
+ * product's old files come back and the sketch stays. Each file in the variant's `assets/` goes into the product's `assets/`. The sketch's `shared/` folder goes into the target's folder when the
+ * target imports it, with its `@shared/` imports made relative; any other part that imports it stops the merge. Otherwise the open comments on its variants are addressed, by `author` or the user. Refuses without a
+ * pick, and when a part the variant replaces changed in the product since the sketch's baseline. Answers with the merged part keys, or with why nothing was merged - and, when a rebase
+ * would let it, the parts that changed (`[]` without a baseline).
+ */
+const mergeSketch = (options) => {
+    const merged = mergeOrReason(options);
+    return typeof merged === 'string' ? { reason: merged } : merged;
+};
+exports.mergeSketch = mergeSketch;
+/** Deletes a sketch with all its variants and marks the open comments on them addressed, by `author` or the user. */
+const discardSketch = (options) => {
+    (0, comment_1.addressSketchComments)({ sketch: options.sketch, reason: 'discard', author: options.author });
+    (0, fs_1.rmSync)(options.sketch.dir, { recursive: true, force: true });
+    (0, sketch_1.clearSketchReport)({ checkout: options.target, sketch: options.sketch });
+    return null;
+};
+exports.discardSketch = discardSketch;
+//# sourceMappingURL=merge.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge.ts"],"names":[],"mappings":";;;AAAA,2BAAqG;AACrG,2BAA4B;AAC5B,+BAAwD;AAExD,kDAA2D;AAC3D,iDAA4D;AAC5D,sCAAsD;AACtD,wCAAqD;AACrD,wDAAgE;AAChE,yCAAyC;AACzC,iDAA2D;AAC3D,iDAAwF;AACxF,uDAA2E;AAC3E,qCAA8E;AAE9E,MAAM,IAAI,GAAG,CAAC,OAAuC,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,IAAA,gBAAW,EAAC,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,uBAAuB,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5C,IAAI,IAAA,eAAU,EAAC,EAAE,CAAC;YAAE,IAAA,WAAM,EAAC,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,OAAO,EAAE,CAAC;QACnC,IAAA,WAAM,EAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,IAAA,cAAS,EAAC,IAAA,cAAO,EAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,IAAA,WAAM,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO;QACL,OAAO,EAAE,GAAG,EAAE;YACZ,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBAChC,IAAA,WAAM,EAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE7C,IAAI,IAAI;oBAAE,IAAA,WAAM,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;YAED,IAAA,WAAM,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,EAAE,GAAG,EAAE,CAAC,IAAA,WAAM,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE;IAChC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAEjC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,MAAM;QAC3B,OAAO,GAAG,MAAM,CAAC,MAAM,kEAAkE,CAAC;IAC5F,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC7C,OAAO,GAAG,MAAM,CAAC,MAAM,oBAAoB,QAAQ,CAAC,OAAO,8BAA8B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;IAElI,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;AACvC,CAAC,CAAC;AAKF,MAAM,aAAa,GAAG,CAAC,OAOtB,EAAoC,EAAE;;IACrC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAElE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;QAAE,OAAO,GAAG,MAAM,CAAC,MAAM,OAAO,MAAM,CAAC,MAAM,iCAAiC,CAAC;IAE5G,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAE5B,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE1C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACzB,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAW,EAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE5G,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/C,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAE3D,MAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC;IAEjC,IAAI,CAAC,MAAM,CAAC,QAAQ;QAClB,OAAO;YACL,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,uGAAuG,MAAM,CAAC,MAAM,EAAE;YAC9I,OAAO,EAAE,EAAE;SACZ,CAAC;IAEJ,MAAM,SAAS,GAAG,IAAA,sBAAW,EAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC,CAAC;IAE1G,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QACtB,OAAO;YACL,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,+CAA+C,MAAM,CAAC,MAAM,iCAAiC,OAAO,wCAAwC,MAAM,CAAC,MAAM,EAAE;YAC1L,OAAO,EAAE,SAAS;SACnB,CAAC;IAEJ,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAA,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,2BAAS,EAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,0CAAE,IAAI,CAAC;IAC9E,MAAM,SAAS,GACb,OAAO,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,2BAAS,EAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3G,MAAM,IAAI,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC;QACnB,OAAO,YAAY,OAAO,cAAc,MAAM,CAAC,MAAM,4BAA4B,MAAM,CAAC,MAAM,oBAAoB,CAAC;IAErH,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAA,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAC;IACtD,MAAM,OAAO,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAE,KAAI,CAAC,CAAA,MAAA,IAAA,wBAAM,EAAC,MAAM,CAAC,0CAAE,IAAI,EAAE,MAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1F,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACjE,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,0BAAQ,EAAC,MAAM,CAAC,EAAE,GAAG,IAAA,kBAAS,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,KAAK,GAAG,WAAW,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,4BAAU,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE1G,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,GAAG,IAAI,wDAAwD,CAAC;IAE3F,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,2BAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,IAAA,cAAO,EAAC,GAAG,EAAE,sBAAa,CAAC,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,gCAAiB,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAElG,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAI,CAAC;QACnB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3B,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,sBAAa,EAAE,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,GAAG,EAAE,sBAAa,CAAC,EAAE,IAAI,CAAC,CAAC;SACrF,CAAC,CAAC;KACJ,CAAC,CAAC;IAEH,IAAA,kBAAa,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE/B,IAAI,MAAM,KAAK,OAAO;QAAE,IAAA,0BAAW,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IAEpE,IAAI,IAAA,0BAAW,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3E,OAAO,CAAC,OAAO,EAAE,CAAC;QAElB,OAAO,uCAAuC,MAAM,CAAC,MAAM,aAAa,OAAO,wDAAwD,CAAC;IAC1I,CAAC;IAED,OAAO,CAAC,IAAI,EAAE,CAAC;IACf,IAAA,2BAAY,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,WAAW,GAAG,IAAA,oCAAqB,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAE1E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhG,IAAA,+BAAqB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,IAAA,WAAM,EAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,IAAA,0BAAiB,EAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,2BAAS,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,WAAW,GAAG,CAAC,OAO3B,EAA2B,EAAE;IAC5B,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAClE,CAAC,CAAC;AAXW,QAAA,WAAW,eAWtB;AAEF,qHAAqH;AAC9G,MAAM,aAAa,GAAG,CAAC,OAA4D,EAAiB,EAAE;IAC3G,IAAA,+BAAqB,EAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7F,IAAA,WAAM,EAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,IAAA,0BAAiB,EAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}

package/src/lib/design/system/sketch/merged-parts.d.ts

@@ -0,0 +1,59 @@
+import { ResolvedProduct } from '../resolve-product';
+export declare const MERGED_FILE = "merged.json";
+/** The content hash of each part, its folder and the assets it imports, as its last sketch merge left it, under the part key. */
+export declare const readMerged: (productDir: string) => Record<string, string>;
+type HashedProduct = Pick<ResolvedProduct, 'dir' | 'base'>;
+/** Records the current content hash of each named part of the product as merged. */
+export declare const recordMerged: (options: {
+    product: HashedProduct;
+    parts: string[];
+}) => void;
+/** The recorded parts of the product, outside `except`, whose files still match their recorded hash, with that hash. */
+export declare const unchangedMergedOf: (options: {
+    product: ResolvedProduct;
+    except: string[];
+}) => {
+    key: string;
+    hash: string;
+}[];
+/** Records the parts of `before` whose hash differs now, and answers with their keys: an asset they use changed in a merge. */
+export declare const rerecordChangedMerged: (options: {
+    product: ResolvedProduct;
+    before: {
+        key: string;
+        hash: string;
+    }[];
+}) => string[];
+export declare const sketchedPartsOf: (product: ResolvedProduct) => Set<string>;
+/**
+ * The merged parts of a product whose files changed since their last sketch merge, while no open
+ * sketch holds them. A merge of a sketch on the part records its new state and clears it.
+ */
+export declare const changedOutsideSketchOf: (product: ResolvedProduct) => string[];
+export declare const ACCEPTED_FILE = "accepted.json";
+export type Acceptance = {
+    part: string;
+    by: string;
+    note: string;
+    hash: string;
+    at: string;
+    auto?: true;
+};
+export declare const readAccepted: (productDir: string) => Acceptance[];
+/** Logs a sketch merged by itself because no state showed a visible change, as an `auto` entry in `accepted.json`. */
+export declare const recordAutoMerge: (options: {
+    product: HashedProduct;
+    part: string;
+    by: string;
+}) => void;
+/**
+ * Records a direct edit of a merged part the user approved: writes the part's current hash to `merged.json` and
+ * logs who accepted it and why in `accepted.json`. Answers with why nothing was accepted, or `null`.
+ */
+export declare const acceptPart: (options: {
+    product: ResolvedProduct;
+    part: string;
+    by: string;
+    note: string;
+}) => string | null;
+export {};

package/src/lib/design/system/sketch/merged-parts.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.acceptPart = exports.recordAutoMerge = exports.readAccepted = exports.ACCEPTED_FILE = exports.changedOutsideSketchOf = exports.sketchedPartsOf = exports.rerecordChangedMerged = exports.unchangedMergedOf = exports.recordMerged = exports.readMerged = exports.MERGED_FILE = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const product_1 = require("../product");
+const resolve_product_1 = require("../resolve-product");
+const baseline_1 = require("./baseline");
+const sketch_1 = require("./sketch");
+exports.MERGED_FILE = 'merged.json';
+const mergedFileOf = (productDir) => (0, path_1.resolve)(productDir, exports.MERGED_FILE);
+/** The content hash of each part, its folder and the assets it imports, as its last sketch merge left it, under the part key. */
+const readMerged = (productDir) => {
+    const file = mergedFileOf(productDir);
+    if (!(0, fs_1.existsSync)(file))
+        return {};
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(file, 'utf8'));
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? Object.fromEntries(Object.entries(parsed).filter((entry) => typeof entry[1] === 'string'))
+            : {};
+    }
+    catch (_a) {
+        return {};
+    }
+};
+exports.readMerged = readMerged;
+/** Records the current content hash of each named part of the product as merged. */
+const recordMerged = (options) => {
+    const { product, parts } = options;
+    const productDir = product.dir;
+    const merged = (0, exports.readMerged)(productDir);
+    for (const part of parts)
+        merged[part] = (0, baseline_1.partHashOf)({ product, dir: (0, path_1.resolve)(productDir, part) });
+    const sorted = Object.fromEntries(Object.entries(merged).sort(([a], [b]) => a.localeCompare(b)));
+    (0, fs_1.writeFileSync)(mergedFileOf(productDir), `${JSON.stringify(sorted, null, 2)}\n`);
+};
+exports.recordMerged = recordMerged;
+/** The recorded parts of the product, outside `except`, whose files still match their recorded hash, with that hash. */
+const unchangedMergedOf = (options) => {
+    const { product, except } = options;
+    const merged = (0, exports.readMerged)(product.dir);
+    return product.parts.flatMap((part) => {
+        const key = (0, resolve_product_1.partKeyOf)(part);
+        const hash = (0, baseline_1.partHashOf)({ product, dir: (0, path_1.dirname)(part.file) });
+        return part.origin !== 'base' && !except.includes(key) && merged[key] === hash ? [{ key, hash }] : [];
+    });
+};
+exports.unchangedMergedOf = unchangedMergedOf;
+/** Records the parts of `before` whose hash differs now, and answers with their keys: an asset they use changed in a merge. */
+const rerecordChangedMerged = (options) => {
+    const { product, before } = options;
+    const changed = before
+        .filter(({ key, hash }) => (0, baseline_1.partHashOf)({ product, dir: (0, path_1.resolve)(product.dir, key) }) !== hash)
+        .map(({ key }) => key);
+    if (changed.length > 0)
+        (0, exports.recordMerged)({ product, parts: changed });
+    return changed;
+};
+exports.rerecordChangedMerged = rerecordChangedMerged;
+const sketchedPartsOf = (product) => new Set((0, sketch_1.listSketches)({ productDir: product.dir, product: product.name }).flatMap((sketch) => typeof sketch === 'string'
+    ? []
+    : [
+        sketch.target,
+        ...sketch.variants.flatMap((variant) => (0, product_1.partFilesOf)((0, sketch_1.variantDirOf)(sketch, variant)).parts.map(resolve_product_1.partKeyOf)),
+    ]));
+exports.sketchedPartsOf = sketchedPartsOf;
+/**
+ * The merged parts of a product whose files changed since their last sketch merge, while no open
+ * sketch holds them. A merge of a sketch on the part records its new state and clears it.
+ */
+const changedOutsideSketchOf = (product) => {
+    const merged = (0, exports.readMerged)(product.dir);
+    const changed = product.parts.filter((part) => {
+        const key = (0, resolve_product_1.partKeyOf)(part);
+        return (part.origin !== 'base' &&
+            merged[key] !== undefined &&
+            (0, baseline_1.partHashOf)({ product, dir: (0, path_1.dirname)(part.file) }) !== merged[key]);
+    });
+    if (changed.length === 0)
+        return [];
+    const sketched = (0, exports.sketchedPartsOf)(product);
+    return changed.map(resolve_product_1.partKeyOf).filter((key) => !sketched.has(key));
+};
+exports.changedOutsideSketchOf = changedOutsideSketchOf;
+exports.ACCEPTED_FILE = 'accepted.json';
+const readAccepted = (productDir) => {
+    const file = (0, path_1.resolve)(productDir, exports.ACCEPTED_FILE);
+    if (!(0, fs_1.existsSync)(file))
+        return [];
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(file, 'utf8'));
+        return Array.isArray(parsed) ? parsed : [];
+    }
+    catch (_a) {
+        return [];
+    }
+};
+exports.readAccepted = readAccepted;
+const logAcceptance = (productDir, entry) => (0, fs_1.writeFileSync)((0, path_1.resolve)(productDir, exports.ACCEPTED_FILE), `${JSON.stringify([...(0, exports.readAccepted)(productDir), entry], null, 2)}\n`);
+/** Logs a sketch merged by itself because no state showed a visible change, as an `auto` entry in `accepted.json`. */
+const recordAutoMerge = (options) => {
+    const { product, part, by } = options;
+    logAcceptance(product.dir, {
+        part,
+        by,
+        note: 'merged automatically: no visible change in any state',
+        hash: (0, baseline_1.partHashOf)({ product, dir: (0, path_1.resolve)(product.dir, part) }),
+        at: new Date().toISOString(),
+        auto: true,
+    });
+};
+exports.recordAutoMerge = recordAutoMerge;
+/**
+ * Records a direct edit of a merged part the user approved: writes the part's current hash to `merged.json` and
+ * logs who accepted it and why in `accepted.json`. Answers with why nothing was accepted, or `null`.
+ */
+const acceptPart = (options) => {
+    var _a;
+    const { product, part, by, note } = options;
+    if (!product.parts.some((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part))
+        return `NO PART "${part}" in ${product.name}`;
+    if ((0, exports.sketchedPartsOf)(product).has(part))
+        return `${part} has an open sketch - merge or discard it; a merge records the part`;
+    if (!(0, exports.changedOutsideSketchOf)(product).includes(part))
+        return `${part} has no change outside a sketch - nothing to accept`;
+    (0, exports.recordMerged)({ product, parts: [part] });
+    const hash = (_a = (0, exports.readMerged)(product.dir)[part]) !== null && _a !== void 0 ? _a : '';
+    const entry = { part, by, note, hash, at: new Date().toISOString() };
+    logAcceptance(product.dir, entry);
+    return null;
+};
+exports.acceptPart = acceptPart;
+//# sourceMappingURL=merged-parts.js.map

package/src/lib/design/system/sketch/merged-parts.js.map

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