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

package/src/lib/design/system/rules/utility-css.js

@@ -0,0 +1,290 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.utilityCssOf = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const postcss_1 = __importDefault(require("postcss"));
+const css_source_1 = require("../css-source");
+const imports_1 = require("../imports");
+const ts_source_1 = require("../ts-source");
+const ALIGN = ['start', 'end', 'center', 'stretch', 'baseline', 'flex-start', 'flex-end', 'normal'];
+const DISTRIBUTE = [...ALIGN, 'space-between', 'space-around', 'space-evenly'];
+const OVERFLOW = ['auto', 'hidden', 'visible', 'scroll', 'clip'];
+const SIZE = ['100%', 'auto', 'fit-content', 'min-content', 'max-content', '100vw', '100vh', '100dvh'];
+const KEYWORDS = {
+    display: [
+        'flex',
+        'inline-flex',
+        'grid',
+        'inline-grid',
+        'block',
+        'inline-block',
+        'inline',
+        'none',
+        'contents',
+        'flow-root',
+    ],
+    position: ['static', 'relative', 'absolute', 'fixed', 'sticky'],
+    'flex-direction': ['row', 'row-reverse', 'column', 'column-reverse'],
+    'flex-wrap': ['wrap', 'nowrap', 'wrap-reverse'],
+    flex: ['1', 'auto', 'none', 'initial'],
+    'flex-grow': ['0', '1'],
+    'flex-shrink': ['0', '1'],
+    'align-items': ALIGN,
+    'align-self': [...ALIGN, 'auto'],
+    'align-content': DISTRIBUTE,
+    'justify-content': DISTRIBUTE,
+    'justify-items': ALIGN,
+    'justify-self': [...ALIGN, 'auto'],
+    'place-items': ALIGN,
+    'place-content': DISTRIBUTE,
+    overflow: OVERFLOW,
+    'overflow-x': OVERFLOW,
+    'overflow-y': OVERFLOW,
+    'text-align': ['left', 'center', 'right', 'justify', 'start', 'end'],
+    'white-space': ['normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'break-spaces'],
+    'text-overflow': ['ellipsis', 'clip'],
+    'text-transform': ['uppercase', 'lowercase', 'capitalize', 'none'],
+    'font-style': ['italic', 'normal'],
+    'pointer-events': ['none', 'auto'],
+    'user-select': ['none', 'text', 'all', 'auto'],
+    visibility: ['visible', 'hidden', 'collapse'],
+    'box-sizing': ['border-box', 'content-box'],
+    cursor: ['pointer', 'default', 'not-allowed', 'text', 'move', 'grab', 'grabbing', 'wait', 'help', 'none', 'auto'],
+    width: SIZE,
+    height: SIZE,
+    'min-width': SIZE,
+    'min-height': SIZE,
+    'max-width': SIZE,
+    'max-height': SIZE,
+};
+const SPACING = [
+    'gap',
+    'row-gap',
+    'column-gap',
+    'padding',
+    'padding-top',
+    'padding-right',
+    'padding-bottom',
+    'padding-left',
+    'padding-inline',
+    'padding-block',
+    'margin',
+    'margin-top',
+    'margin-right',
+    'margin-bottom',
+    'margin-left',
+    'margin-inline',
+    'margin-block',
+    'inset',
+    'top',
+    'right',
+    'bottom',
+    'left',
+    'width',
+    'height',
+    'min-width',
+    'min-height',
+    'max-width',
+    'max-height',
+];
+const COLOUR = [
+    'color',
+    'background',
+    'background-color',
+    'border-color',
+    'border-top-color',
+    'border-right-color',
+    'border-bottom-color',
+    'border-left-color',
+    'outline-color',
+    'text-decoration-color',
+    'caret-color',
+    'accent-color',
+    'fill',
+    'stroke',
+];
+const RADIUS = [
+    'border-radius',
+    'border-top-left-radius',
+    'border-top-right-radius',
+    'border-bottom-left-radius',
+    'border-bottom-right-radius',
+];
+const NAMESPACES = [
+    ['--color-', COLOUR],
+    ['--spacing-', SPACING],
+    ['--font-weight-', ['font-weight']],
+    ['--font-', ['font-family']],
+    ['--text-', ['font-size']],
+    ['--leading-', ['line-height']],
+    ['--tracking-', ['letter-spacing']],
+    ['--radius-', RADIUS],
+    ['--shadow-', ['box-shadow']],
+];
+const stylesheetImportsOf = (file, css) => {
+    const files = [];
+    let tailwind = false;
+    postcss_1.default.parse(css).walkAtRules('import', (rule) => {
+        var _a;
+        const specifier = (_a = /^(?:url\(\s*)?['"]?([^'"\s)]+)/u.exec(rule.params.trim())) === null || _a === void 0 ? void 0 : _a[1];
+        if (specifier === null || specifier === void 0 ? void 0 : specifier.startsWith('.'))
+            files.push((0, path_1.resolve)((0, path_1.dirname)(file), specifier));
+        if (specifier === 'tailwindcss' || (specifier === null || specifier === void 0 ? void 0 : specifier.startsWith('tailwindcss/')))
+            tailwind = true;
+    });
+    return { files, tailwind };
+};
+const themeDeclarationsOf = (sources) => {
+    const root = (source) => (0, path_1.resolve)((0, path_1.dirname)(source.configFile), '../..');
+    const queue = sources.flatMap((source) => { var _a; return ((_a = source.config.styles) !== null && _a !== void 0 ? _a : []).map((style) => (0, path_1.resolve)(root(source), style)); });
+    const seen = new Set();
+    const declarations = [];
+    let tailwind = false;
+    for (let file = queue.shift(); file !== undefined; file = queue.shift()) {
+        if (seen.has(file) || !(0, fs_1.existsSync)(file))
+            continue;
+        seen.add(file);
+        const css = (0, fs_1.readFileSync)(file, 'utf8');
+        try {
+            const imports = stylesheetImportsOf(file, css);
+            queue.push(...imports.files);
+            tailwind || (tailwind = imports.tailwind);
+            postcss_1.default.parse(css).walkAtRules('theme', (rule) => rule.walkDecls((declaration) => {
+                declarations.push([declaration.prop, declaration.value.trim()]);
+            }));
+        }
+        catch (_a) {
+            continue;
+        }
+    }
+    return { declarations, tailwind };
+};
+const utilitiesOf = (product) => {
+    const values = new Map();
+    let spacingScale = false;
+    const { declarations, tailwind } = themeDeclarationsOf([product, ...(product.base ? [product.base] : [])]);
+    const add = (properties, value) => {
+        var _a;
+        for (const property of properties)
+            values.set(property, ((_a = values.get(property)) !== null && _a !== void 0 ? _a : new Set()).add(value));
+    };
+    for (const [name, value] of declarations) {
+        if (name === '--spacing')
+            spacingScale = true;
+        const namespace = NAMESPACES.find(([prefix]) => name.startsWith(prefix));
+        if (!namespace || name.includes('*') || value === 'initial') {
+            continue;
+        }
+        add(namespace[1], `var(${name})`);
+        if (/^var\(--[\w-]+\)$/u.test(value))
+            add(namespace[1], value);
+    }
+    return { values, spacingScale, tailwind };
+};
+const topLevelPartsOf = (value) => {
+    const parts = [];
+    let depth = 0;
+    let part = '';
+    for (const char of value) {
+        if (char === '(')
+            depth++;
+        if (char === ')')
+            depth--;
+        if (char === ' ' && depth === 0) {
+            if (part)
+                parts.push(part);
+            part = '';
+        }
+        else
+            part += char;
+    }
+    return part ? [...parts, part] : parts;
+};
+const isSpacing = (utilities, { property, value }) => {
+    var _a;
+    return value === '0' ||
+        !!((_a = utilities.values.get(property)) === null || _a === void 0 ? void 0 : _a.has(value)) ||
+        (utilities.spacingScale &&
+            /^(?:var\(--spacing\)|calc\(var\(--spacing\)\*-?\d*\.?\d+\))$/u.test(value.replace(/ /g, '')));
+};
+const hasUtility = (utilities, { property, value }) => {
+    var _a, _b;
+    if ((_a = KEYWORDS[property]) === null || _a === void 0 ? void 0 : _a.includes(value))
+        return true;
+    if (COLOUR.includes(property) && ['transparent', 'currentcolor'].includes(value))
+        return true;
+    if (SPACING.includes(property)) {
+        const parts = topLevelPartsOf(value);
+        if (parts.length <= 4 && parts.every((part) => isSpacing(utilities, { property, value: part })))
+            return true;
+    }
+    return !!((_b = utilities.values.get(property)) === null || _b === void 0 ? void 0 : _b.has(value));
+};
+const withoutKeyframes = (css) => css.replace(/@keyframes[^{]*\{(?:[^{}]*\{[^{}]*\})*[^{}]*\}/gu, '');
+const lastCompoundOf = (selector) => {
+    var _a;
+    return (_a = selector
+        .trim()
+        .split(/[\s>+~]+/u)
+        .pop()) !== null && _a !== void 0 ? _a : '';
+};
+const withoutSdkElementRules = (css) => {
+    try {
+        const root = postcss_1.default.parse(css);
+        root.walkRules((rule) => {
+            if (rule.selectors.every((selector) => /\.et-[\w-]/u.test(lastCompoundOf(selector))))
+                rule.remove();
+        });
+        return root.toString();
+    }
+    catch (_a) {
+        return css;
+    }
+};
+const expressibleDeclarationsOf = (utilities, css) => (0, css_source_1.cssBlocksOf)(withoutSdkElementRules(withoutKeyframes(css))).declarations.flatMap((declaration) => {
+    var _a;
+    const property = declaration.slice(0, declaration.indexOf(':')).trim().toLowerCase();
+    const value = ((_a = (0, css_source_1.declarationValueOf)(declaration)) !== null && _a !== void 0 ? _a : '')
+        .replace(/!important/u, '')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .toLowerCase();
+    return value && hasUtility(utilities, { property, value }) ? [`${property}: ${value}`] : [];
+});
+const utilityProblemsOf = (file, declarations) => [...new Set(declarations)].map((declaration) => ({
+    rule: 'UTILITY-CSS',
+    file,
+    message: `${declaration} outside foundations - a Tailwind utility in the markup draws it`,
+}));
+const sourceFilesIn = (dir) => (0, fs_1.existsSync)(dir)
+    ? (0, fs_1.readdirSync)(dir, { recursive: true })
+        .filter((path) => /\.(ts|css)$/u.test(path) && !path.endsWith('.d.ts'))
+        .map((path) => (0, path_1.resolve)(dir, path))
+    : [];
+/**
+ * A declaration that a Tailwind utility of the product draws, in a CSS file below the folder of a part outside
+ * foundations or in the CSS of a TS file there: a core layout keyword such as `display: flex`, or a value of a
+ * spacing, colour, type, radius or shadow token that a `@theme` block of the product's stylesheets registers. A rule
+ * whose selectors all end on an SDK `.et-*` element passes: the part's markup cannot put a utility there. A product
+ * whose stylesheets import no `tailwindcss` has no utilities, so nothing is flagged.
+ */
+const utilityCssOf = (product) => {
+    const utilities = utilitiesOf(product);
+    if (!utilities.tailwind)
+        return [];
+    const below = product.parts
+        .filter((part) => part.layer !== 'foundations')
+        .flatMap((part) => sourceFilesIn((0, path_1.dirname)(part.file)));
+    const files = new Set([...below, ...(0, imports_1.ownSharedFilesOf)(product, below)]);
+    return [...files].sort().flatMap((file) => {
+        const source = (0, fs_1.readFileSync)(file, 'utf8');
+        const texts = file.endsWith('.css') ? [source] : (0, ts_source_1.textsOf)(source);
+        return utilityProblemsOf(file, texts.flatMap((text) => expressibleDeclarationsOf(utilities, text)));
+    });
+};
+exports.utilityCssOf = utilityCssOf;
+//# sourceMappingURL=utility-css.js.map

package/src/lib/design/system/rules/utility-css.js.map

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

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

@@ -2,8 +2,9 @@ import { PartFile } from '../product';
 import { ResolvedProduct } from '../resolve-product';
 export declare const FIXTURES_KEY = "fixtures.ts";
 /**
- * The content hash of a part folder together with the bytes of each `@assets/` file it imports, as `product` resolves
- * them. A part that imports no asset hashes as its folder alone.
+ * The content hash of a part folder together with the bytes of each product `shared/` file it reaches through
+ * `@shared/` and each `@assets/` file it or those files import, as `product` resolves them. A part that imports
+ * neither hashes as its folder alone.
  */
 export declare const partHashOf: (options: {
     product: Pick<ResolvedProduct, "dir" | "base">;

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

@@ -5,25 +5,31 @@ const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const assets_1 = require("../assets");
+const imports_1 = require("../imports");
 const product_1 = require("../product");
 const resolve_product_1 = require("../resolve-product");
 exports.FIXTURES_KEY = 'fixtures.ts';
 const hashOf = (paths) => {
-    var _a;
+    var _a, _b;
     const hash = (0, crypto_1.createHash)('sha256');
     for (const file of paths.files)
         hash.update(`${(0, path_1.relative)(paths.root, file)}\0`).update((0, fs_1.readFileSync)(file));
     for (const asset of (_a = paths.assets) !== null && _a !== void 0 ? _a : [])
         hash.update(`${assets_1.ASSETS_PREFIX}${asset.path}\0`).update((0, fs_1.readFileSync)(asset.file));
+    for (const shared of (_b = paths.shared) !== null && _b !== void 0 ? _b : [])
+        hash.update(`${imports_1.SHARED_PREFIX}${shared.path}\0`).update((0, fs_1.readFileSync)(shared.file));
     return hash.digest('hex').slice(0, 16);
 };
 /**
- * The content hash of a part folder together with the bytes of each `@assets/` file it imports, as `product` resolves
- * them. A part that imports no asset hashes as its folder alone.
+ * The content hash of a part folder together with the bytes of each product `shared/` file it reaches through
+ * `@shared/` and each `@assets/` file it or those files import, as `product` resolves them. A part that imports
+ * neither hashes as its folder alone.
  */
 const partHashOf = (options) => {
     const files = (0, assets_1.filesBelow)(options.dir);
-    return hashOf({ root: options.dir, files, assets: (0, assets_1.importedAssetsOf)({ product: options.product, files }) });
+    const shared = (0, imports_1.importedSharedOf)({ product: options.product, files });
+    const assets = (0, assets_1.importedAssetsOf)({ product: options.product, files: [...files, ...shared.map(({ file }) => file)] });
+    return hashOf({ root: options.dir, files, assets, shared });
 };
 exports.partHashOf = partHashOf;
 /**

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

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