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

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

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importsAnyOf = exports.changesOnlyImports = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const imports_1 = require("../imports");
+const resolve_product_1 = require("../resolve-product");
+const ts_source_1 = require("../ts-source");
+const IMPORTED = '\u0000';
+const importedBindingsOf = (source) => new Set(source.statements.filter(typescript_1.default.isImportDeclaration).flatMap((declaration) => {
+    const clause = declaration.importClause;
+    const bindings = clause === null || clause === void 0 ? void 0 : clause.namedBindings;
+    return [
+        ...((clause === null || clause === void 0 ? void 0 : clause.name) ? [clause.name.text] : []),
+        ...(bindings && typescript_1.default.isNamespaceImport(bindings) ? [bindings.name.text] : []),
+        ...(bindings && typescript_1.default.isNamedImports(bindings) ? bindings.elements.map((element) => element.name.text) : []),
+    ];
+}));
+const rootOf = (node) => typescript_1.default.isPropertyAccessExpression(node) ? rootOf(node.expression) : node;
+const tokensOf = (text) => {
+    const scanner = typescript_1.default.createScanner(typescript_1.default.ScriptTarget.Latest, true, typescript_1.default.LanguageVariant.Standard, text);
+    const tokens = [];
+    for (let kind = scanner.scan(); kind !== typescript_1.default.SyntaxKind.EndOfFileToken; kind = scanner.scan())
+        tokens.push(scanner.getTokenText());
+    return tokens;
+};
+/** The source without its import declarations, each use of an imported name (with its member access) as one token. */
+const bodyOf = (text) => {
+    const source = typescript_1.default.createSourceFile('part.ts', text, typescript_1.default.ScriptTarget.Latest, true);
+    const imported = importedBindingsOf(source);
+    const ranges = [];
+    const visit = (node) => {
+        if (typescript_1.default.isImportDeclaration(node)) {
+            ranges.push({ start: node.getStart(source), end: node.end, with: ' ' });
+            return;
+        }
+        const root = typescript_1.default.isPropertyAccessExpression(node) || typescript_1.default.isIdentifier(node) ? rootOf(node) : null;
+        if (root &&
+            typescript_1.default.isIdentifier(root) &&
+            imported.has(root.text) &&
+            !(typescript_1.default.isPropertyAccessExpression(node.parent) && node.parent.expression === node) &&
+            !(typescript_1.default.isPropertyAccessExpression(node.parent) && node.parent.name === node)) {
+            ranges.push({ start: node.getStart(source), end: node.end, with: ` ${IMPORTED} ` });
+            return;
+        }
+        typescript_1.default.forEachChild(node, visit);
+    };
+    visit(source);
+    const sorted = ranges.sort((a, b) => a.start - b.start);
+    let body = '';
+    let at = 0;
+    for (const range of sorted) {
+        body += `${text.slice(at, range.start)}${range.with}`;
+        at = range.end;
+    }
+    return tokensOf(body + text.slice(at)).join(' ');
+};
+/** Whether `after` differs from `before` only in what it imports and how it spells the imported names it uses. */
+const changesOnlyImports = (before, after) => bodyOf(before) === bodyOf(after);
+exports.changesOnlyImports = changesOnlyImports;
+/** Whether a part source imports one of `targets` (`<layer>/<name>` keys). */
+const importsAnyOf = (source, targets) => (0, ts_source_1.importsOf)(source)
+    .map(imports_1.classifyImport)
+    .some((imported) => imported.kind === 'part' && targets.includes((0, resolve_product_1.partKeyOf)(imported)));
+exports.importsAnyOf = importsAnyOf;
+//# sourceMappingURL=host-edit.js.map

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

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

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

@@ -2,11 +2,13 @@ import { ResolvedProduct } from '../resolve-product';
 import { Sketch } from './sketch';
 export type MergePreview = {
     changed: string[];
+    shared: 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.
+ * What a merge of one variant changes: the parts the variant holds and, in `shared`, each other part that imports a
+ * `shared/` file the variant edits (both in `changed`), and each element and page that uses one of them, directly or
+ * through another part.
  */
 export declare const mergePreviewOf: (options: {
     product: ResolvedProduct;

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

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergePreviewOf = void 0;
+const path_1 = require("path");
 const imports_1 = require("../imports");
 const resolve_product_1 = require("../resolve-product");
+const merge_shared_1 = require("./merge-shared");
 const overlay_1 = require("./overlay");
+const sketch_1 = require("./sketch");
 const SHOWN = new Set(['elements', 'pages']);
 const usersOf = (product) => {
     var _a;
@@ -16,14 +19,27 @@ const usersOf = (product) => {
     }
     return users;
 };
+const sharedReachOf = (options) => {
+    const { product, held } = options;
+    const edited = new Set((0, merge_shared_1.editedSharedPathsOf)(options));
+    if (edited.size === 0)
+        return [];
+    return product.parts
+        .filter((part) => !held.has((0, resolve_product_1.partKeyOf)(part)))
+        .filter((part) => (0, imports_1.importedSharedOf)({ product, files: (0, sketch_1.sourceFilesIn)((0, path_1.dirname)(part.file)) }).some(({ path }) => edited.has(path)))
+        .map(resolve_product_1.partKeyOf);
+};
 /**
- * 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.
+ * What a merge of one variant changes: the parts the variant holds and, in `shared`, each other part that imports a
+ * `shared/` file the variant edits (both in `changed`), 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 held = new Set((0, overlay_1.overlaySketch)(options).sketched);
+    const shared = sharedReachOf(Object.assign(Object.assign({}, options), { held }));
+    const changed = new Set([...held, ...shared]);
     const reached = new Set();
     const queue = [...changed];
     for (let key = queue.shift(); key !== undefined; key = queue.shift()) {
@@ -36,6 +52,7 @@ const mergePreviewOf = (options) => {
     }
     return {
         changed: [...changed].sort(),
+        shared: shared.sort(),
         affected: [...reached].filter((key) => { var _a; return !changed.has(key) && SHOWN.has((_a = key.split('/')[0]) !== null && _a !== void 0 ? _a : ''); }).sort(),
     };
 };

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

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

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

@@ -1,25 +1,61 @@
+import { ProductSource } from '../base';
 import { Sketch } from './sketch';
 type PartFile = {
     layer: string;
     name: string;
     file: string;
 };
+type SharedProduct = Pick<ProductSource, 'dir'> & {
+    base: Pick<ProductSource, 'dir'> | null;
+};
 /**
- * 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.
+ * 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
+ * file, and each file nobody imports that its `shared/` held in the product; a file nobody imports and no target held
+ * goes to the one target importing `@shared/`. Or why the merge must stop - a part other than a target imports one, a
+ * target taking files holds a `shared/` folder of its own, or a file nobody imports has no target to go to.
  */
 export declare const sharedPlanOf: (options: {
     sketch: Sketch;
+    variant: string;
     parts: PartFile[];
-}) => "carry" | "drop" | string;
+    product: SharedProduct & {
+        parts: PartFile[];
+    };
+}) => {
+    carry: {
+        targetDir: string;
+        paths: string[];
+    }[];
+} | string;
+/**
+ * The files of the sketch's and the variant's `shared/` whose path the product's or its base's `shared/` holds, each
+ * with the file it replaces in the product's own `shared/`.
+ */
+export declare const productSharedChangesOf: (options: {
+    sketch: Sketch;
+    variant: string;
+    product: SharedProduct;
+}) => {
+    from: string;
+    to: string;
+}[];
+/** The paths of the product's or its base's `shared/` files that the sketch's or the variant's `shared/` changes. */
+export declare const editedSharedPathsOf: (options: {
+    sketch: Sketch;
+    variant: string;
+    product: SharedProduct;
+}) => 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.
+ * 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
+ * relative one.
  */
 export declare const carryShared: (options: {
     sketch: Sketch;
     variant: string;
     targetDir: string;
+    paths: string[];
+    product: SharedProduct;
 }) => void;
 export {};

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

@@ -1,50 +1,148 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.carryShared = exports.sharedPlanOf = void 0;
+exports.carryShared = exports.editedSharedPathsOf = exports.productSharedChangesOf = exports.sharedPlanOf = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const assets_1 = require("../assets");
 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));
+const inProductShared = (product, path) => (0, imports_1.sharedFileOf)({ dirs: (0, imports_1.productSharedDirsOf)(product), path }) !== null;
+const importsSketchShared = (product, file) => (0, ts_source_1.importsOf)((0, fs_1.readFileSync)(file, 'utf8')).some((specifier) => specifier.startsWith(imports_1.SHARED_PREFIX) && !inProductShared(product, specifier.slice(imports_1.SHARED_PREFIX.length)));
+const sharedImportersOf = (product, parts) => parts.filter((part) => (0, sketch_1.sourceFilesIn)((0, path_1.dirname)(part.file)).some((file) => importsSketchShared(product, file)));
+const sketchSharedDirsOf = (sketch, variant) => [
+    (0, sketch_1.variantSharedDirOf)(sketch, variant),
+    (0, sketch_1.sharedDirOf)(sketch),
+];
+/** The files of the sketch's and the variant's `shared/` under their path there, the variant's file winning. */
+const sketchSharedFilesOf = (sketch, variant) => {
+    const files = new Map();
+    for (const dir of sketchSharedDirsOf(sketch, variant).reverse())
+        for (const file of (0, assets_1.filesBelow)(dir))
+            files.set((0, path_1.relative)(dir, file), file);
+    return files;
+};
+const SOURCE = /\.(?:ts|js|mjs)$/u;
+const reachedSharedOf = (options) => {
+    const { dirs, partDir, product } = options;
+    const reached = new Set();
+    const queue = (0, sketch_1.sourceFilesIn)(partDir).map((file) => ({ file, at: null }));
+    for (let next = queue.shift(); next; next = queue.shift()) {
+        for (const specifier of (0, ts_source_1.importsOf)((0, fs_1.readFileSync)(next.file, 'utf8'))) {
+            const path = specifier.startsWith(imports_1.SHARED_PREFIX)
+                ? specifier.slice(imports_1.SHARED_PREFIX.length)
+                : next.at !== null && specifier.startsWith('.')
+                    ? (0, path_1.join)((0, path_1.dirname)(next.at), specifier)
+                    : null;
+            if (path === null || path.startsWith('..'))
+                continue;
+            if (specifier.startsWith(imports_1.SHARED_PREFIX) && inProductShared(product, path))
+                continue;
+            const file = (0, imports_1.sharedFileOf)({ dirs, path });
+            const dir = file && dirs.find((candidate) => !(0, path_1.relative)(candidate, file).startsWith('..'));
+            if (!file || !dir)
+                continue;
+            const at = (0, path_1.relative)(dir, file);
+            if (reached.has(at))
+                continue;
+            reached.add(at);
+            if (SOURCE.test(at))
+                queue.push({ file, at });
+        }
+    }
+    return reached;
+};
 /**
- * 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.
+ * 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
+ * file, and each file nobody imports that its `shared/` held in the product; a file nobody imports and no target held
+ * goes to the one target importing `@shared/`. Or why the merge must stop - a part other than a target imports one, a
+ * target taking files holds a `shared/` folder of its own, or a file nobody imports has no target to go to.
  */
 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);
+    const { sketch, variant, parts, product } = options;
+    const importers = sharedImportersOf(product, parts);
+    const others = importers.filter((part) => !sketch.targets.includes((0, resolve_product_1.partKeyOf)(part)));
+    const takers = sketch.targets.join(', ');
     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';
+        return `${others.map(resolve_product_1.partKeyOf).join(', ')} import ${imports_1.SHARED_PREFIX} - only ${takers} take${sketch.targets.length > 1 ? '' : 's'} the sketch's ${imports_1.SHARED_FOLDER}/ into the product; move that code into the part`;
+    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 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;
+    const orphan = importers.length > 1 ? unreached.find((path) => ownersOf(path).length === 0) : undefined;
+    if (orphan !== undefined)
+        return `${imports_1.SHARED_FOLDER}/${orphan.split(path_1.sep).join('/')} is imported by no target and was held by none in the product - import it or delete it`;
+    const carry = targets
+        .map((part, index) => {
+        var _a;
+        return ({
+            part,
+            paths: [
+                ...((_a = reached[index]) !== null && _a !== void 0 ? _a : []),
+                ...unreached.filter((path) => (ownersOf(path).length > 0 ? heldBy(part, path) : part === solo)),
+            ].sort(),
+        });
+    })
+        .filter(({ paths }) => paths.length > 0);
+    const owning = carry.find(({ part }) => (0, fs_1.existsSync)((0, path_1.resolve)((0, path_1.dirname)(part.file), imports_1.SHARED_FOLDER)));
+    if (owning)
+        return `${(0, resolve_product_1.partKeyOf)(owning.part)} holds a ${imports_1.SHARED_FOLDER}/ folder of its own and imports ${imports_1.SHARED_PREFIX} - rename the folder`;
+    return { carry: carry.map(({ part, paths }) => ({ targetDir: (0, path_1.resolve)(product.dir, part.layer, part.name), paths })) };
 };
 exports.sharedPlanOf = sharedPlanOf;
+/**
+ * The files of the sketch's and the variant's `shared/` whose path the product's or its base's `shared/` holds, each
+ * with the file it replaces in the product's own `shared/`.
+ */
+const productSharedChangesOf = (options) => {
+    const { sketch, variant, product } = options;
+    return [...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) }));
+};
+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]) => {
+        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 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.
+ * 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
+ * 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 });
+    const { sketch, variant, targetDir, paths, product } = options;
+    const shared = (0, path_1.resolve)(targetDir, imports_1.SHARED_FOLDER);
+    const files = sketchSharedFilesOf(sketch, variant);
+    for (const path of paths) {
+        const file = files.get(path);
+        if (!file)
+            continue;
+        (0, fs_1.mkdirSync)((0, path_1.dirname)((0, path_1.resolve)(shared, path)), { recursive: true });
+        (0, fs_1.cpSync)(file, (0, path_1.resolve)(shared, path));
+    }
     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}`);
+        const rewritten = source.replace(new RegExp(`(['"])${imports_1.SHARED_PREFIX}([^'"]+)\\1`, 'gu'), (...args) => {
+            const [match = '', quote = '', path = ''] = args;
+            return inProductShared(product, path)
+                ? match
+                : `${quote}${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.d.ts

@@ -8,10 +8,11 @@ export type MergeRefusal = {
 };
 /**
  * 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
+ * over the product's - a part the product takes from its base over the base's, unless the sketch was opened with
+ * `override`; `into-base` also removes the product copy and its `merged.json` entry - 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. With `override`, 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/`. A file of the sketch's `shared/` folder whose path the product's `shared/` holds
+ * replaces it there; the rest 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 addressed comments on its variants, and those on the merged parts that have no sketch, are resolved, and the open ones 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).
  */
@@ -23,7 +24,7 @@ export declare const mergeSketch: (options: {
     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. */
+/** Deletes a sketch with all its variants and resolves the addressed comments on them and marks the open ones addressed, by `author` or the user. */
 export declare const discardSketch: (options: {
     target: string;
     sketch: Sketch;