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

package/src/lib/design/system/stale-dist.js

@@ -0,0 +1,141 @@
+"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.readFreshDist = exports.rebuildStaleDist = exports.staleDistWarningsOf = exports.libBuildCommandOf = exports.libBuildStampOf = exports.staleLibsOf = exports.missingDistOf = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const lib_build_lock_1 = require("./lib-build-lock");
+const render_packages_1 = require("../render-packages");
+const SKIPPED_DIRS = new Set(['node_modules', 'scenarios', 'stories', '__fixtures__']);
+const SKIPPED_FILE = /\.(spec|stories)\.ts$/;
+const newestMtimeOf = (dir) => (0, fs_1.readdirSync)(dir, { withFileTypes: true }).reduce((newest, entry) => {
+    const path = (0, path_1.join)(dir, entry.name);
+    if (entry.isDirectory())
+        return SKIPPED_DIRS.has(entry.name) ? newest : Math.max(newest, newestMtimeOf(path));
+    return entry.isFile() && !SKIPPED_FILE.test(entry.name) ? Math.max(newest, (0, fs_1.statSync)(path).mtimeMs) : newest;
+}, 0);
+const ethleteDependenciesOf = (dir) => {
+    const manifest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(dir, 'package.json'), 'utf8'));
+    return ['dependencies', 'peerDependencies'].flatMap((field) => {
+        var _a;
+        return Object.keys((_a = manifest[field]) !== null && _a !== void 0 ? _a : {}).filter((name) => name.startsWith('@ethlete/'));
+    });
+};
+const checkoutLibsOf = (options) => {
+    var _a, _b;
+    const { target, config } = options;
+    const packages = (0, render_packages_1.renderPackagesOf)({ target, config });
+    const queue = [...((_b = (_a = config === null || config === void 0 ? void 0 : config.render) === null || _a === void 0 ? void 0 : _a.modules) !== null && _b !== void 0 ? _b : render_packages_1.DEFAULT_RENDER_MODULES)];
+    const seen = new Set();
+    const libs = [];
+    while (queue.length > 0) {
+        const specifier = queue.shift();
+        if (seen.has(specifier))
+            continue;
+        seen.add(specifier);
+        const mapped = (0, render_packages_1.mapPackage)({ specifier, packages, target });
+        if (!mapped || mapped.dir.split(/[\\/]/).includes('node_modules') || !(0, fs_1.existsSync)((0, path_1.join)(mapped.dir, 'package.json')))
+            continue;
+        queue.push(...ethleteDependenciesOf(mapped.dir));
+        const name = (0, path_1.basename)(mapped.dir);
+        const source = (0, path_1.resolve)(target, 'libs', name, 'src');
+        if ((0, fs_1.existsSync)(source))
+            libs.push({ specifier, name, source, dir: mapped.dir });
+    }
+    return libs;
+};
+/**
+ * The checkout lib build folders the render modules map to that do not exist, each with the command that builds it.
+ * A checkout with a source `libs/<name>` but no `dist/libs/<name>` cannot render its drawings.
+ */
+const missingDistOf = (options) => {
+    var _a, _b;
+    const { target, config } = options;
+    const packages = (0, render_packages_1.renderPackagesOf)({ target, config });
+    return ((_b = (_a = config === null || config === void 0 ? void 0 : config.render) === null || _a === void 0 ? void 0 : _a.modules) !== null && _b !== void 0 ? _b : render_packages_1.DEFAULT_RENDER_MODULES).flatMap((specifier) => {
+        const mapped = (0, render_packages_1.mapPackage)({ specifier, packages, target });
+        if (!mapped || mapped.dir.split(/[\\/]/).includes('node_modules'))
+            return [];
+        const name = (0, path_1.basename)(mapped.dir);
+        return (0, fs_1.existsSync)((0, path_1.join)(mapped.dir, 'package.json')) || !(0, fs_1.existsSync)((0, path_1.resolve)(target, 'libs', name, 'src'))
+            ? []
+            : [`${(0, path_1.relative)(target, mapped.dir)} is missing - run ${(0, exports.libBuildCommandOf)(name)}`];
+    });
+};
+exports.missingDistOf = missingDistOf;
+const staleLibsOf = (options) => checkoutLibsOf(options).filter(({ source, dir }) => newestMtimeOf(source) > newestMtimeOf(dir));
+exports.staleLibsOf = staleLibsOf;
+/** Changes whenever a checkout lib build folder the drawings load from is rebuilt. */
+const libBuildStampOf = (options) => checkoutLibsOf(options)
+    .map(({ dir }) => `${dir}:${newestMtimeOf(dir)}`)
+    .join('|');
+exports.libBuildStampOf = libBuildStampOf;
+/** The shell command that rebuilds the build folder of the checkout lib `name`. */
+const libBuildCommandOf = (name) => `NX_NO_CLOUD=true npx nx build ${name} --skip-nx-cache`;
+exports.libBuildCommandOf = libBuildCommandOf;
+/**
+ * One warning line per checkout lib the drawings load from a build folder (the render modules and their `@ethlete/*`
+ * dependencies) whose `libs/<name>/src` changed after that build, naming the command that rebuilds it.
+ */
+const staleDistWarningsOf = (options) => (0, exports.staleLibsOf)(options).map(({ specifier, name, source, dir }) => `WARNING STALE BUILD ${specifier} - ${(0, path_1.relative)(options.target, source)} changed after ${(0, path_1.relative)(options.target, dir)} was built; the drawings use the old build - run npx nx build ${name}`);
+exports.staleDistWarningsOf = staleDistWarningsOf;
+const runLibBuild = ({ target, name, dir }) => {
+    const result = (0, child_process_1.spawnSync)('npx', ['nx', 'build', name, '--skip-nx-cache'], {
+        cwd: target,
+        env: Object.assign(Object.assign({}, process.env), { NX_NO_CLOUD: 'true' }),
+        stdio: ['ignore', 2, 2],
+    });
+    if (result.status !== 0)
+        return false;
+    // A cache hit whose outputs already match leaves the build folder untouched, which would still read as stale.
+    const now = new Date();
+    (0, fs_1.utimesSync)((0, path_1.join)(dir, 'package.json'), now, now);
+    return true;
+};
+/**
+ * Rebuilds every stale checkout lib the drawings load from a build folder, then checks again. Answers false, after
+ * printing the build command to run, when a build fails or a lib is still stale - a drawing must not use an old build.
+ */
+const rebuildStaleDist = (options) => {
+    const { target, config, build = runLibBuild } = options;
+    const stale = (0, exports.staleLibsOf)({ target, config });
+    if (stale.length === 0)
+        return true;
+    for (const lib of [...stale].reverse()) {
+        console.error(`STALE BUILD ${lib.specifier} - rebuilding: ${(0, exports.libBuildCommandOf)(lib.name)}`);
+        if (!build({ target, name: lib.name, dir: lib.dir })) {
+            console.error(`REFUSED STALE BUILD ${lib.specifier} - the build failed; fix it and run ${(0, exports.libBuildCommandOf)(lib.name)}`);
+            return false;
+        }
+    }
+    const still = (0, exports.staleLibsOf)({ target, config });
+    for (const lib of still)
+        console.error(`REFUSED STALE BUILD ${lib.specifier} - ${(0, path_1.relative)(target, lib.dir)} is still older than ${(0, path_1.relative)(target, lib.source)} after the rebuild; run ${(0, exports.libBuildCommandOf)(lib.name)}`);
+    return still.length === 0;
+};
+exports.rebuildStaleDist = rebuildStaleDist;
+/**
+ * Runs `rebuildStaleDist` under the lib build lock of the checkout and keeps the build read until `release`, so a
+ * concurrent design call waits instead of rebuilding a lib folder this one still renders from.
+ */
+const readFreshDist = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { target } = options;
+    if (!(0, fs_1.existsSync)((0, path_1.join)(target, 'dist/libs')))
+        return { ok: (0, exports.rebuildStaleDist)(options), release: () => undefined };
+    return (0, lib_build_lock_1.readFreshLibBuild)({
+        directory: (0, path_1.join)(target, 'tmp/design-lib-build'),
+        stale: () => (0, exports.staleLibsOf)(options).length > 0,
+        rebuild: () => (0, exports.rebuildStaleDist)(options),
+    });
+});
+exports.readFreshDist = readFreshDist;
+//# sourceMappingURL=stale-dist.js.map

package/src/lib/design/system/stale-dist.js.map

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

package/src/lib/design/system/stale-parts.d.ts

@@ -0,0 +1,45 @@
+import { Problem } from './problem';
+import { ResolvedProduct } from './resolve-product';
+export declare const UNLISTED_FILES = "files unknown: recorded before file lists";
+/** A recorded or done part whose design or app files moved since its records, with the changed paths of each side. */
+export type StalePart = {
+    part: string;
+    design: string[];
+    app: string[];
+};
+/**
+ * The parts with a check record or an implemented record whose design hash moved since the check record, or whose app
+ * component files moved since the implemented record.
+ */
+export declare const stalePartsOf: (options: {
+    product: ResolvedProduct;
+    only?: string;
+}) => StalePart[];
+export declare const staleLineOf: (product: string, stale: StalePart) => string;
+export declare const UNCOMPARED_RULE = "IMPLEMENTATION-UNCOMPARED";
+/**
+ * One problem per file in `changed` that an implemented part's app component reaches and that moved since the part's
+ * implemented record, so an app edit cannot land without a fresh compare. A part in the implementation baseline passes
+ * while each such file still has its pinned hash; an entry added to the baseline, or whose part is no longer
+ * uncompared, is a problem too; with `onlyChanged`, only while the baseline file is in `changed`. Prints each baseline
+ * entry.
+ */
+export declare const uncomparedAppProblemsOf: (options: {
+    product: ResolvedProduct;
+    changed: string[];
+    invocation: string;
+    onlyChanged?: boolean;
+}) => Problem[];
+/**
+ * Moves each check record and implemented record stored before file lists to the design hash, with the hash of each
+ * file it covers, while its folder-only hash still holds; an implemented record also gets its app file hashes. A
+ * record whose folder changed since, or a file it reaches outside its folder that was committed or edited after the
+ * record's time, stays as it is and reads as stale.
+ */
+export declare const upgradeLegacyMarksOf: (options: {
+    product: ResolvedProduct;
+    only?: string;
+}) => {
+    part: string;
+    marks: string[];
+}[];

package/src/lib/design/system/stale-parts.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upgradeLegacyMarksOf = exports.uncomparedAppProblemsOf = exports.UNCOMPARED_RULE = exports.staleLineOf = exports.stalePartsOf = exports.UNLISTED_FILES = void 0;
+const child_process_1 = require("child_process");
+const json_file_1 = require("../../json-file");
+const path_1 = require("path");
+const app_files_1 = require("./app-files");
+const design_hash_1 = require("./design-hash");
+const inventory_approval_1 = require("./inventory-approval");
+const part_ready_1 = require("./part-ready");
+const part_task_1 = require("./part-task");
+const implementation_baseline_1 = require("./implementation-baseline");
+const reachable_files_1 = require("./reachable-files");
+const resolve_product_1 = require("./resolve-product");
+exports.UNLISTED_FILES = 'files unknown: recorded before file lists';
+const changedSinceOf = (record, now) => (0, design_hash_1.recordHolds)(record, now) ? [] : record.files ? (0, design_hash_1.changedDesignFilesOf)(record.files, now) : [exports.UNLISTED_FILES];
+const partsOf = (product, only) => product.parts.filter((part) => !only || (0, resolve_product_1.partKeyOf)(part) === only);
+/**
+ * The parts with a check record or an implemented record whose design hash moved since the check record, or whose app
+ * component files moved since the implemented record.
+ */
+const stalePartsOf = (options) => partsOf(options.product, options.only).flatMap((resolved) => {
+    const { product } = options;
+    const part = (0, resolve_product_1.partKeyOf)(resolved);
+    const { dir } = (0, inventory_approval_1.partOwnerOf)({ product, part: resolved });
+    const ready = (0, part_ready_1.readReady)(dir)[part];
+    const implemented = (0, part_task_1.readImplemented)(dir)[part];
+    if (!ready && !implemented)
+        return [];
+    const now = (0, design_hash_1.designHashOf)({ product, part: resolved });
+    const design = (ready ? changedSinceOf(ready, now) : []).sort((a, b) => a.localeCompare(b));
+    const app = implemented ? (0, part_task_1.changedAppFilesOf)({ product, part, record: implemented }) : [];
+    return design.length > 0 || app.length > 0 ? [{ part, design, app }] : [];
+});
+exports.stalePartsOf = stalePartsOf;
+const staleLineOf = (product, stale) => `STALE ${product} ${stale.part}: ${[
+    stale.design.length > 0 ? `design ${stale.design.join(', ')}` : '',
+    stale.app.length > 0 ? `app ${stale.app.join(', ')}` : '',
+]
+    .filter(Boolean)
+    .join('; ')}`;
+exports.staleLineOf = staleLineOf;
+exports.UNCOMPARED_RULE = 'IMPLEMENTATION-UNCOMPARED';
+/**
+ * One problem per file in `changed` that an implemented part's app component reaches and that moved since the part's
+ * implemented record, so an app edit cannot land without a fresh compare. A part in the implementation baseline passes
+ * while each such file still has its pinned hash; an entry added to the baseline, or whose part is no longer
+ * uncompared, is a problem too; with `onlyChanged`, only while the baseline file is in `changed`. Prints each baseline
+ * entry.
+ */
+const uncomparedAppProblemsOf = (options) => {
+    const { product, invocation } = options;
+    const changed = new Set(options.changed);
+    const root = (0, reachable_files_1.repoRootOf)(product);
+    const baselineFile = (0, implementation_baseline_1.implementationBaselineFileOf)(product.dir);
+    const baseline = (0, implementation_baseline_1.readImplementationBaseline)(product.dir);
+    const baselineProblem = (message) => ({ rule: exports.UNCOMPARED_RULE, file: baselineFile, message });
+    Object.entries(baseline).forEach(([part, entry]) => console.log((0, implementation_baseline_1.baselineLineOf)(part, entry)));
+    const own = product.parts.filter((resolved) => resolved.origin !== 'base');
+    const recordOf = (resolved) => {
+        const part = (0, resolve_product_1.partKeyOf)(resolved);
+        return { part, record: (0, part_task_1.readImplemented)((0, inventory_approval_1.partOwnerOf)({ product, part: resolved }).dir)[part] };
+    };
+    const driftOf = (resolved) => {
+        const { part, record } = recordOf(resolved);
+        return { part, record, drifted: record ? (0, part_task_1.changedAppFilesOf)({ product, part, record }) : [] };
+    };
+    const pinOf = (resolved, drifted) => {
+        const component = (0, part_task_1.linkedComponentOf)(resolved.source);
+        return component === null ? {} : (0, implementation_baseline_1.driftPinOf)(drifted, (0, app_files_1.appFilesOf)({ root, component }));
+    };
+    const checksBaseline = !options.onlyChanged || changed.has((0, path_1.relative)(root, baselineFile).split(path_1.sep).join('/'));
+    const added = (checksBaseline ? (0, implementation_baseline_1.addedBaselineEntriesOf)({ file: baselineFile }) : []).map((part) => baselineProblem(`${part} was added to the baseline - it may only shrink (ADR 0205)`));
+    const removable = Object.entries(checksBaseline ? baseline : {})
+        .filter(([part]) => {
+        const resolved = own.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part);
+        return !resolved || driftOf(resolved).drifted.length === 0;
+    })
+        .map(([part, entry]) => baselineProblem(`${part} is no longer uncompared - remove its entry (finding ${entry.finding})`));
+    const uncompared = own.flatMap((resolved) => {
+        const { record } = recordOf(resolved);
+        if (!(record === null || record === void 0 ? void 0 : record.app) || !Object.keys(record.app).some((file) => changed.has(file)))
+            return [];
+        const { part, drifted } = driftOf(resolved);
+        const entry = baseline[part];
+        const pin = entry ? pinOf(resolved, drifted) : {};
+        return drifted
+            .filter((file) => changed.has(file) && (!entry || entry.app[file] !== pin[file]))
+            .map((file) => ({
+            rule: exports.UNCOMPARED_RULE,
+            file: (0, path_1.resolve)(root, file),
+            part,
+            message: `${entry
+                ? `changed since ${part} was baselined for finding ${entry.finding} (ADR 0205)`
+                : `changed since ${part} was recorded as implemented (${record.at})`} - run ${invocation} compare --affected --product ${product.name} to compare and record every affected part`,
+        }));
+    });
+    return [...added, ...removable, ...uncompared];
+};
+exports.uncomparedAppProblemsOf = uncomparedAppProblemsOf;
+const rewrite = (file, entries) => {
+    const sorted = Object.entries(entries).sort(([a], [b]) => a.localeCompare(b));
+    (0, json_file_1.writeJsonFile)({ file: file, value: Object.fromEntries(sorted) });
+};
+const newerThanOf = ({ root, paths, at }) => {
+    const since = Date.parse(at);
+    if (Number.isNaN(since) || paths.length === 0)
+        return paths.length > 0;
+    try {
+        const git = (args) => (0, child_process_1.execFileSync)('git', ['-C', root, ...args], { maxBuffer: 1 << 26, stdio: ['ignore', 'pipe', 'pipe'] })
+            .toString()
+            .trim();
+        const dirty = git(['status', '--porcelain', '--', ...paths]);
+        if (dirty)
+            return true;
+        return paths.some((path) => {
+            const committed = git(['log', '-1', '--format=%ct', '--', path]);
+            return committed === '' || Number(committed) * 1000 > since;
+        });
+    }
+    catch (_a) {
+        return true;
+    }
+};
+const upgradeOf = (product, resolved) => {
+    var _a;
+    const part = (0, resolve_product_1.partKeyOf)(resolved);
+    const { dir } = (0, inventory_approval_1.partOwnerOf)({ product, part: resolved });
+    const ready = (0, part_ready_1.readReady)(dir);
+    const implemented = (0, part_task_1.readImplemented)(dir);
+    const legacy = (record) => !!record && !record.files;
+    if (!legacy(ready[part]) && !(implemented[part] && !((_a = implemented[part]) === null || _a === void 0 ? void 0 : _a.app)))
+        return [];
+    const now = (0, design_hash_1.designHashOf)({ product, part: resolved });
+    const root = (0, reachable_files_1.repoRootOf)(product);
+    const folder = `${(0, path_1.relative)(root, (0, path_1.dirname)(resolved.file)).split(path_1.sep).join('/')}/`;
+    const outside = Object.keys(now.files).filter((path) => !path.startsWith(folder));
+    const holds = (record) => record !== undefined &&
+        legacy(record) &&
+        (0, design_hash_1.legacyHolds)(record.hash, now) &&
+        !newerThanOf({ root, paths: outside, at: record.at });
+    const upgraded = [];
+    const readyEntry = ready[part];
+    const implementedEntry = implemented[part];
+    if (holds(readyEntry)) {
+        rewrite((0, path_1.resolve)(dir, part_ready_1.READY_FILE), Object.assign(Object.assign({}, (0, part_ready_1.readReadyEntries)(dir)), { [part]: Object.assign(Object.assign({}, readyEntry), { hash: now.hash, files: now.files }) }));
+        upgraded.push('ready');
+    }
+    const component = (0, part_task_1.linkedComponentOf)(resolved.source);
+    if (implementedEntry &&
+        (0, design_hash_1.legacyHolds)(implementedEntry.hash, now) &&
+        !implementedEntry.app &&
+        component !== null &&
+        !newerThanOf({ root, paths: outside, at: implementedEntry.at })) {
+        rewrite((0, path_1.resolve)(dir, part_task_1.IMPLEMENTED_FILE), Object.assign(Object.assign({}, implemented), { [part]: Object.assign(Object.assign({}, implementedEntry), { hash: now.hash, app: (0, app_files_1.appFilesOf)({ root: (0, reachable_files_1.repoRootOf)(product), component }) }) }));
+        upgraded.push('implemented');
+    }
+    return upgraded.length > 0 ? [{ part, marks: upgraded }] : [];
+};
+/**
+ * Moves each check record and implemented record stored before file lists to the design hash, with the hash of each
+ * file it covers, while its folder-only hash still holds; an implemented record also gets its app file hashes. A
+ * record whose folder changed since, or a file it reaches outside its folder that was committed or edited after the
+ * record's time, stays as it is and reads as stale.
+ */
+const upgradeLegacyMarksOf = (options) => partsOf(options.product, options.only).flatMap((part) => upgradeOf(options.product, part));
+exports.upgradeLegacyMarksOf = upgradeLegacyMarksOf;
+//# sourceMappingURL=stale-parts.js.map

package/src/lib/design/system/stale-parts.js.map

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

package/src/lib/design/system/surface-nesting.d.ts

@@ -0,0 +1,11 @@
+/** The rule a card breaks when it is the only content of a pane that draws the same fill, with a padding band around it. */
+export declare const NESTED_SURFACE_RULE = "NESTED-SURFACE";
+/** The rule a card breaks when its fill equals the surface around it, so only its edge shows where it is. */
+export declare const LOST_SURFACE_RULE = "LOST-SURFACE";
+/**
+ * The statements of the surface checks inside the frame script of `render-check`. They use `root` and `report` of
+ * that script. A card is a box with a fill and a border or shadow; its surface is the nearest ancestor with an opaque
+ * fill, or the page canvas. A card over a patterned backdrop (a `background-image` between it and its surface, or on a
+ * sibling painted under its centre) hides the pattern, so its fill is a surface of its own.
+ */
+export declare const SURFACE_STATEMENTS: string;

package/src/lib/design/system/surface-nesting.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SURFACE_STATEMENTS = exports.LOST_SURFACE_RULE = exports.NESTED_SURFACE_RULE = void 0;
+/** The rule a card breaks when it is the only content of a pane that draws the same fill, with a padding band around it. */
+exports.NESTED_SURFACE_RULE = 'NESTED-SURFACE';
+/** The rule a card breaks when its fill equals the surface around it, so only its edge shows where it is. */
+exports.LOST_SURFACE_RULE = 'LOST-SURFACE';
+const CONTROLS = 'input, textarea, select, button, [role="button"], [role="switch"], [role="tab"], [data-et-control]';
+const MIN_WIDTH = 80;
+const MIN_HEIGHT = 24;
+const OPAQUE = 0.95;
+/**
+ * The statements of the surface checks inside the frame script of `render-check`. They use `root` and `report` of
+ * that script. A card is a box with a fill and a border or shadow; its surface is the nearest ancestor with an opaque
+ * fill, or the page canvas. A card over a patterned backdrop (a `background-image` between it and its surface, or on a
+ * sibling painted under its centre) hides the pattern, so its fill is a surface of its own.
+ */
+exports.SURFACE_STATEMENTS = `
+  {
+    const paint = document.createElement('canvas').getContext('2d', { willReadFrequently: true });
+    const rgbaOf = (colour) => {
+      paint.clearRect(0, 0, 1, 1);
+      paint.fillStyle = 'rgba(0, 0, 0, 0)';
+      paint.fillStyle = colour;
+      paint.fillRect(0, 0, 1, 1);
+      return [...paint.getImageData(0, 0, 1, 1).data];
+    };
+    const opaque = (colour) => rgbaOf(colour)[3] / 255 >= ${OPAQUE};
+    const same = (a, b) => rgbaOf(a).every((value, index) => Math.abs(value - rgbaOf(b)[index]) <= 1);
+    const edged = (style) =>
+      ['Top', 'Right', 'Bottom', 'Left'].every((side) => parseFloat(style['border' + side + 'Width']) > 0 && style['border' + side + 'Style'] !== 'none' && rgbaOf(style['border' + side + 'Color'])[3] > 0) ||
+      (style.outlineStyle !== 'none' && parseFloat(style.outlineWidth) > 0 && rgbaOf(style.outlineColor)[3] > 0) ||
+      (style.boxShadow !== 'none' && style.boxShadow.split(/,(?![^(]*\\))/).some((shadow) => !/\\binset\\b/.test(shadow) && rgbaOf(shadow.match(/(rgba?|oklch|oklab|lab|lch|hsla?|color)\\([^)]*\\)/)?.[0] ?? 'transparent')[3] > 0));
+    const surfaceOf = (element) => {
+      let patterned = false;
+      for (let at = element.parentElement; at; at = at.parentElement) {
+        const style = getComputedStyle(at);
+        patterned ||= style.backgroundImage !== 'none';
+        if (opaque(style.backgroundColor)) return { pane: root.contains(at) && at !== root ? at : null, fill: style.backgroundColor, patterned };
+      }
+      return { pane: null, fill: 'rgb(255, 255, 255)', patterned };
+    };
+    const patternedBackdrop = (card, rect) => {
+      const below = document.elementsFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2);
+      if (!below.includes(card)) return false;
+      for (const at of below.slice(below.indexOf(card) + 1)) {
+        if (at.contains(card)) continue;
+        const style = getComputedStyle(at);
+        if (style.backgroundImage !== 'none') return true;
+        if (opaque(style.backgroundColor)) return false;
+      }
+      return false;
+    };
+    const onlyContentOf = (pane, card) => {
+      for (const element of pane.querySelectorAll('*')) {
+        if (element === card || card.contains(element) || element.contains(card) || element.matches('style, script, template')) continue;
+        const rect = element.getBoundingClientRect();
+        if (rect.width > 0 && rect.height > 0) return false;
+      }
+      for (let at = card.parentElement; at && at !== pane.parentElement; at = at.parentElement)
+        for (const child of at.childNodes) if (child.nodeType === Node.TEXT_NODE && child.data.trim()) return false;
+      return true;
+    };
+    for (const card of root.querySelectorAll('*')) {
+      if (card.matches(${JSON.stringify(CONTROLS)}) || card.closest(${JSON.stringify(CONTROLS)}) || !card.firstElementChild) continue;
+      const rect = card.getBoundingClientRect();
+      if (rect.width < ${MIN_WIDTH} || rect.height < ${MIN_HEIGHT}) continue;
+      const style = getComputedStyle(card);
+      if (style.visibility !== 'visible' || !opaque(style.backgroundColor) || !edged(style)) continue;
+      const surface = surfaceOf(card);
+      if (!same(style.backgroundColor, surface.fill) || surface.patterned) continue;
+      const fill = style.backgroundColor;
+      if (surface.pane && onlyContentOf(surface.pane, card)) {
+        const outer = surface.pane.getBoundingClientRect();
+        const band = [rect.left - outer.left, rect.top - outer.top, outer.right - rect.right, outer.bottom - rect.bottom].map(Math.round);
+        if (Math.min(...band) >= 0 && Math.max(...band) >= 1) {
+          report(${JSON.stringify(exports.NESTED_SURFACE_RULE)}, card, 'is the only content of ' + pathOf(surface.pane) + ', which draws the same fill ' + fill + ' with a band of ' + band.join('/') + 'px around it, so two surfaces draw as one - drop the card or the pane');
+          continue;
+        }
+      }
+      if (patternedBackdrop(card, rect)) continue;
+      report(${JSON.stringify(exports.LOST_SURFACE_RULE)}, card, 'fills with ' + fill + ', the fill of ' + (surface.pane ? pathOf(surface.pane) : 'the canvas') + ' around it, so only its edge shows the card - give it the surface it is placed on (data-et-auto-surface) or drop the fill');
+    }
+  }
+`;
+//# sourceMappingURL=surface-nesting.js.map

package/src/lib/design/system/surface-nesting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"surface-nesting.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/lib/design/system/surface-nesting.ts"],"names":[],"mappings":";;;AAAA,4HAA4H;AAC/G,QAAA,mBAAmB,GAAG,gBAAgB,CAAC;AAEpD,6GAA6G;AAChG,QAAA,iBAAiB,GAAG,cAAc,CAAC;AAEhD,MAAM,QAAQ,GAAG,oGAAoG,CAAC;AAEtH,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,MAAM,GAAG,IAAI,CAAC;AAEpB;;;;;GAKG;AACU,QAAA,kBAAkB,GAAG;;;;;;;;;;4DAU0B,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAqCzC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;;yBAErE,SAAS,qBAAqB,UAAU;;;;;;;;;;mBAU9C,IAAI,CAAC,SAAS,CAAC,2BAAmB,CAAC;;;;;eAKvC,IAAI,CAAC,SAAS,CAAC,yBAAiB,CAAC;;;CAG/C,CAAC"}

package/src/lib/design/system/system-command.js

@@ -10,29 +10,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.designSystem = void 0;
-const paths_1 = require("../paths");
+const design_config_1 = require("../design-config");
 const serve_1 = require("../serve");
 const list_system_1 = require("./list-system");
+const cli_args_1 = require("./sketch/cli-args");
 const system_modules_1 = require("./system-modules");
 /**
  * `et design system --json [--product <name>]` prints the parts list the design server answers on
  * `/__design/system`, loading each part through the same Vite setup.
  */
 const designSystem = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     const { target, argv, invocation } = options;
-    const productIndex = argv.indexOf('--product');
-    const asked = productIndex === -1 ? null : argv[productIndex + 1];
-    if (!argv.includes('--json') || asked === undefined) {
-        console.error(`usage: ${invocation} system --json [--product <name>]`);
+    const args = (0, cli_args_1.argsOf)(argv, { values: ['--product'], switches: ['--json'] });
+    const usage = `usage: ${invocation} system --json [--product <name>]`;
+    const asked = typeof args === 'string' ? null : ((_a = args.values['--product']) !== null && _a !== void 0 ? _a : null);
+    if (typeof args === 'string' || !args.flags.has('--json') || args.positional.length > 0) {
+        console.error(typeof args === 'string' ? `${args}\n${usage}` : usage);
         return 2;
     }
-    const config = (0, paths_1.readConfig)(target);
+    const config = (0, design_config_1.readConfig)(target);
     if (!config) {
-        console.error(`design-explore: no config at ${(0, paths_1.configPathOf)(target)}`);
+        console.error(`design-explore: no config at ${(0, design_config_1.configPathOf)(target)}`);
         return 1;
     }
-    const declared = Object.keys((_a = config.products) !== null && _a !== void 0 ? _a : {});
+    const declared = Object.keys((_b = config.products) !== null && _b !== void 0 ? _b : {});
     if (asked && !declared.includes(asked)) {
         console.error(`NO PRODUCT "${asked}" - config.json declares ${declared.join(', ') || 'none'}.`);
         return 1;

package/src/lib/design/system/system-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-command.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/lib/design/system/system-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoD;AACpD,oCAA8C;AAC9C,+CAA2C;AAC3C,qDAA0E;AAE1E;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAO,OAA+D,EAAE,EAAE;;IACpG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IAElE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACpD,OAAO,CAAC,KAAK,CAAC,UAAU,UAAU,mCAAmC,CAAC,CAAC;QAEvE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAC;IAElC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,gCAAgC,IAAA,oBAAY,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC;IAEpD,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,eAAe,KAAK,4BAA4B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;QAEhG,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAEzE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC;YAChC,MAAM;YACN,MAAM,EAAE,IAAA,oCAAmB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC/C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ;YACpC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAA,kCAAiB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SACtF,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/C,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAA,CAAC;AA3CW,QAAA,YAAY,gBA2CvB"}
+{"version":3,"file":"system-command.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/lib/design/system/system-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA4D;AAC5D,oCAA8C;AAC9C,+CAA2C;AAC3C,gDAA2C;AAC3C,qDAA0E;AAE1E;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAO,OAA+D,EAAE,EAAE;;IACpG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,iBAAM,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,UAAU,UAAU,mCAAmC,CAAC;IACtE,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,IAAI,CAAC,CAAC;IAEnF,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxF,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEtE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,0BAAU,EAAC,MAAM,CAAC,CAAC;IAElC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,gCAAgC,IAAA,4BAAY,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC;IAEpD,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,eAAe,KAAK,4BAA4B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;QAEhG,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAEzE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC;YAChC,MAAM;YACN,MAAM,EAAE,IAAA,oCAAmB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC/C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ;YACpC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAA,kCAAiB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SACtF,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/C,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAA,CAAC;AA5CW,QAAA,YAAY,gBA4CvB"}

package/src/lib/design/system/system-modules.d.ts

@@ -1,4 +1,4 @@
-import { DesignConfig } from '../paths';
+import { DesignConfig } from '../design-config';
 import { ResolvedProduct } from './resolve-product';
 import { Sketch } from './sketch/sketch';
 /** One variant of the sketch on `target` (`<layer>/<name>`). */
@@ -41,7 +41,22 @@ export declare const createSystemModules: (options: {
     products: () => string[];
     productOf: (name: string) => ResolvedProduct | null;
     sketchesOf: (name: string) => Sketch[];
-    drawnOf: (name: string, sketch?: SketchVariant | null) => ResolvedProduct | null;
+    drawnOf: (name: string, sketch?: SketchVariant | null) => ResolvedProduct | {
+        sketchGone: SketchVariant;
+        name: string;
+        dir: string;
+        config: import("../design-config").DesignProduct;
+        configFile: string;
+        base: import("./base").ProductSource | null;
+        parts: import("./resolve-product").ResolvedPart[];
+        fixtures: string | null;
+        presets: Record<string, import("../design-config").DesignPreset>;
+        schemes: import("../design-config").DesignColorScheme[];
+        tokens: string[];
+        problems: import("./problem").Problem[];
+    } | null;
+    sketchOf: (name: string, sketchTarget: string) => Sketch | null;
+    sketchVariantsOf: (name: string, sketchTarget: string) => string[] | null;
     partOf: (options: {
         product: string;
         part: string;

package/src/lib/design/system/system-modules.js

@@ -71,7 +71,10 @@ const createSystemModules = (options) => {
             ? (0, sketch_1.listSketches)({ productDir: sketchesRoot !== null && sketchesRoot !== void 0 ? sketchesRoot : product.dir, product: name }).filter((sketch) => typeof sketch !== 'string')
             : [];
     };
-    /** The product as it draws, or as one variant of one of its sketches draws it; `null` when either is missing. */
+    /**
+     * The product as it draws, or as one variant of one of its sketches draws it. A sketch that is gone (merged or
+     * discarded) draws as the product with `sketchGone` set; `null` when the product or the variant is missing.
+     */
     const drawnOf = (name, sketch) => {
         var _a;
         const product = productOf(name);
@@ -84,12 +87,23 @@ const createSystemModules = (options) => {
         const found = typeof target === 'string'
             ? null
             : (0, sketch_1.findSketch)({ productDir: sketchesRoot !== null && sketchesRoot !== void 0 ? sketchesRoot : product.dir, product: name, sketch: target });
-        const drawn = found && typeof found !== 'string' && found.variants.includes(sketch.variant)
+        if (!found || typeof found === 'string')
+            return Object.assign(Object.assign({}, product), { sketchGone: sketch });
+        const drawn = found.variants.includes(sketch.variant)
             ? (0, overlay_1.overlaySketch)({ product, sketch: found, variant: sketch.variant })
             : null;
         sketched.set(key, drawn);
         return drawn;
     };
+    const sketchOf = (name, sketchTarget) => {
+        const product = productOf(name);
+        const target = (0, sketch_1.parseTarget)(sketchTarget);
+        if (!product || typeof target === 'string')
+            return null;
+        const found = (0, sketch_1.findSketch)({ productDir: sketchesRoot !== null && sketchesRoot !== void 0 ? sketchesRoot : product.dir, product: name, sketch: target });
+        return !found || typeof found === 'string' ? null : found;
+    };
+    const sketchVariantsOf = (name, sketchTarget) => { var _a, _b; return (_b = (_a = sketchOf(name, sketchTarget)) === null || _a === void 0 ? void 0 : _a.variants) !== null && _b !== void 0 ? _b : null; };
     const partOf = (options) => { var _a, _b; return (_b = (_a = drawnOf(options.product, options.sketch)) === null || _a === void 0 ? void 0 : _a.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === options.part)) !== null && _b !== void 0 ? _b : null; };
     const tokenStylesheetsOf = (options) => {
         var _a, _b;
@@ -189,6 +203,8 @@ const createSystemModules = (options) => {
         productOf,
         sketchesOf,
         drawnOf,
+        sketchOf,
+        sketchVariantsOf,
         partOf,
         tokenStylesheetsOf,
         replacedStylesheetsOf,