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

package/src/lib/design/system/accept-command.d.ts

@@ -1,7 +1,41 @@
+import { DrawStates } from './accepted-pictures';
+import { DesignConfig } from '../paths';
+import { ResolvedProduct } from './resolve-product';
+import { AcceptRefusal } from './sketch/merged-parts';
+import { DesignStep, WriteCommandOptions } from './tom-confirm';
 export declare const ACCEPT_USAGE = "accept <layer>/<name> --product <name> --by <model id> --note <why the user approved the direct edit>";
-/** `et design accept <layer>/<name> …` records a direct edit of a merged part the user approved, so check stops warning of it. */
-export declare const designAccept: (options: {
+export type PartAcceptRefusal = AcceptRefusal | {
+    reason: 'findings';
+    error: string;
+    findings: string[];
+};
+/** Why a direct edit of a part cannot be accepted - theming findings in its folder first - or `null` when it can. */
+export declare const partAcceptRefusalOf: (options: {
     target: string;
-    argv: string[];
-    invocation: string;
-}) => 0 | 1 | 2;
+    product: ResolvedProduct;
+    part: string;
+}) => PartAcceptRefusal | null;
+/** Accepts a direct edit and stores the review pictures, for a part whose {@link partAcceptRefusalOf} is `null`. */
+export declare const acceptRunOf: (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    part: string;
+    by: string;
+    note: string;
+    draw?: DrawStates;
+}) => DesignStep;
+/** An acceptance of a direct edit of one part as a step, or why it may not run. */
+export declare const acceptStepOf: (options: {
+    target: string;
+    product: string | undefined;
+    part: string;
+    by: string;
+    note: string;
+    draw?: DrawStates;
+}) => DesignStep | string;
+/**
+ * `et design accept <layer>/<name> …` records a direct edit of a merged part the user approved, so check stops warning
+ * of it. `--by tom` needs Tom's confirm at a terminal.
+ */
+export declare const designAccept: (options: WriteCommandOptions) => Promise<number>;

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

@@ -1,16 +1,105 @@
 "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.designAccept = exports.ACCEPT_USAGE = void 0;
+exports.designAccept = exports.acceptStepOf = exports.acceptRunOf = exports.partAcceptRefusalOf = exports.ACCEPT_USAGE = void 0;
+const path_1 = require("path");
+const accepted_pictures_1 = require("./accepted-pictures");
+const check_system_1 = require("./check-system");
 const resolve_product_1 = require("./resolve-product");
 const cli_args_1 = require("./sketch/cli-args");
 const merged_parts_1 = require("./sketch/merged-parts");
 const sketch_1 = require("./sketch/sketch");
+const tom_confirm_1 = require("./tom-confirm");
 exports.ACCEPT_USAGE = 'accept <layer>/<name> --product <name> --by <model id> --note <why the user approved the direct edit>';
-/** `et design accept <layer>/<name> …` records a direct edit of a merged part the user approved, so check stops warning of it. */
-const designAccept = (options) => {
-    var _a;
+const THEMING_CLASS_RULES = new Set(['CLASS-UNDEFINED', 'DENIED-CLASS', 'DENIED-STYLESHEET']);
+const findingsOfPart = (options) => {
+    const found = options.product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === options.part);
+    if (!found)
+        return [];
+    const dir = (0, path_1.dirname)(found.file);
+    return (0, check_system_1.ruleProblemsOf)(options.product)
+        .filter((problem) => THEMING_CLASS_RULES.has(problem.rule) && !(0, path_1.relative)(dir, problem.file).startsWith('..'))
+        .map((problem) => `${problem.rule} ${(0, path_1.relative)(options.target, problem.file)}: ${problem.message}`);
+};
+/** Why a direct edit of a part cannot be accepted - theming findings in its folder first - or `null` when it can. */
+const partAcceptRefusalOf = (options) => {
+    const findings = findingsOfPart(options);
+    if (findings.length > 0)
+        return {
+            reason: 'findings',
+            error: `${findings.join('\n')}\n${options.part} has problems - fix them before accept`,
+            findings,
+        };
+    return (0, merged_parts_1.acceptRefusalOf)(options);
+};
+exports.partAcceptRefusalOf = partAcceptRefusalOf;
+/** Accepts a direct edit and stores the review pictures, for a part whose {@link partAcceptRefusalOf} is `null`. */
+const acceptRunOf = (options) => {
+    const { target, config, product, part, by, note } = options;
+    return {
+        line: `accept ${product.name} ${part} - ${note}`,
+        run: () => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            const problem = (0, merged_parts_1.acceptPart)({ product, part, by, note });
+            if (problem) {
+                console.error(problem);
+                return 1;
+            }
+            console.log(`accepted the direct edit of ${part} in ${product.name}`);
+            const unstored = yield (0, accepted_pictures_1.storePictures)({
+                target,
+                config,
+                product,
+                part,
+                kind: 'review',
+                hash: (_a = (0, merged_parts_1.readMerged)(product.dir)[part]) !== null && _a !== void 0 ? _a : '',
+                draw: options.draw,
+            });
+            if (unstored)
+                console.warn(`PICTURES NOT STORED ${part}: ${unstored} - design check draws them`);
+            return 0;
+        }),
+    };
+};
+exports.acceptRunOf = acceptRunOf;
+/** An acceptance of a direct edit of one part as a step, or why it may not run. */
+const acceptStepOf = (options) => {
+    const { target, by, note } = options;
+    const refused = (0, tom_confirm_1.onlyTomRefusalOf)({ by, action: 'accept' });
+    if (refused)
+        return refused;
+    const config = (0, cli_args_1.configOf)(target);
+    if (typeof config === 'string')
+        return config;
+    const parsed = (0, sketch_1.parseTarget)(options.part);
+    if (typeof parsed === 'string')
+        return parsed;
+    const product = (0, cli_args_1.oneProductOf)({ target, config, asked: options.product });
+    if (typeof product === 'string')
+        return product;
+    const part = (0, resolve_product_1.partKeyOf)(parsed);
+    const refusal = (0, exports.partAcceptRefusalOf)({ target, product, part });
+    if (refusal)
+        return refusal.error;
+    return (0, exports.acceptRunOf)({ target, config, product, part, by, note, draw: options.draw });
+};
+exports.acceptStepOf = acceptStepOf;
+/**
+ * `et design accept <layer>/<name> …` records a direct edit of a merged part the user approved, so check stops warning
+ * of it. `--by tom` needs Tom's confirm at a terminal.
+ */
+const designAccept = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     const { target, argv, invocation } = options;
-    const args = (0, cli_args_1.argsOf)(argv, ['--product', '--by', '--note']);
+    const args = (0, cli_args_1.argsOf)(argv, { values: ['--product', '--by', '--note'], switches: [] });
     const usage = `usage: ${invocation} ${exports.ACCEPT_USAGE}`;
     if (typeof args === 'string') {
         console.error(args);
@@ -27,29 +116,24 @@ const designAccept = (options) => {
         console.error(usage);
         return 2;
     }
-    const config = (0, cli_args_1.configOf)(target);
-    if (typeof config === 'string') {
-        console.error(config);
-        return 1;
-    }
-    const parsed = (0, sketch_1.parseTarget)(args.positional[0]);
-    if (typeof parsed === 'string') {
-        console.error(parsed);
+    const step = (0, exports.acceptStepOf)({
+        target,
+        product: args.values['--product'],
+        part: (_b = args.positional[0]) !== null && _b !== void 0 ? _b : '',
+        by,
+        note,
+        draw: options.draw,
+    });
+    if (typeof step === 'string') {
+        console.error(step);
         return 1;
     }
-    const product = (0, cli_args_1.oneProductOf)({ target, config, asked: args.values['--product'] });
-    if (typeof product === 'string') {
-        console.error(product);
+    const refusal = yield (0, tom_confirm_1.tomConfirmRefusalOf)({ steps: [step], invocation, prompt: (_c = options.prompt) !== null && _c !== void 0 ? _c : (0, tom_confirm_1.ttyPrompt)() });
+    if (refusal) {
+        console.error(refusal);
         return 1;
     }
-    const part = (0, resolve_product_1.partKeyOf)(parsed);
-    const problem = (0, merged_parts_1.acceptPart)({ product, part, by, note });
-    if (problem) {
-        console.error(problem);
-        return 1;
-    }
-    console.log(`accepted the direct edit of ${part} in ${product.name}`);
-    return 0;
-};
+    return (0, tom_confirm_1.runSteps)([step]);
+});
 exports.designAccept = designAccept;
 //# sourceMappingURL=accept-command.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"accept-command.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/lib/design/system/accept-command.ts"],"names":[],"mappings":";;;AAAA,uDAA8C;AAC9C,gDAA2F;AAC3F,wDAAmD;AACnD,4CAA8C;AAEjC,QAAA,YAAY,GACvB,uGAAuG,CAAC;AAE1G,kIAAkI;AAC3H,MAAM,YAAY,GAAG,CAAC,OAA+D,EAAE,EAAE;;IAC9F,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,iBAAM,EAAC,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,UAAU,UAAU,IAAI,oBAAY,EAAE,CAAC;IAErD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,EAAE,GAAG,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,0CAAE,IAAI,EAAE,CAAC;IAE3C,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzD,IAAI,EAAE,KAAK,IAAI;YAAE,OAAO,CAAC,KAAK,CAAC,UAAU,uBAAY,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QAExF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,mBAAQ,EAAC,MAAM,CAAC,CAAC;IAEhC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,uBAAY,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAElF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEvB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,2BAAS,EAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEvB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AA5DW,QAAA,YAAY,gBA4DvB"}
+{"version":3,"file":"accept-command.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/lib/design/system/accept-command.ts"],"names":[],"mappings":"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"}

package/src/lib/design/system/accepted-pictures.d.ts

@@ -0,0 +1,83 @@
+import { DesignConfig } from '../paths';
+import { Problem } from './problem';
+import { ResolvedProduct } from './resolve-product';
+import { SketchVariant } from './system-modules';
+export declare const PICTURES_FILE = "pictures.json";
+/** The sha16 of each state's picture, under the state name. */
+export type StatePictures = Record<string, string>;
+/**
+ * The pictures of a part's states at a hash, and `partHash`, the part hash `merged.json` keeps, they were drawn at.
+ * Pictures without `slots` were drawn with slots emptied and cannot prove that slot content is unchanged, so they are
+ * read as missing.
+ */
+export type AcceptedPictures = {
+    hash: string;
+    states: StatePictures;
+    slots: true;
+    partHash?: string;
+};
+/**
+ * `record` is drawn at the part's design hash while it is merged and unchanged since. `review` (at the merged hash)
+ * and `go` (at the go's design hash) are older kinds, still read.
+ */
+export type PictureKind = 'record' | 'review' | 'go';
+export type PartPictures = Partial<Record<PictureKind, AcceptedPictures>>;
+/**
+ * Draws every state of each part as `design compare` draws its design side, and answers per part with the picture
+ * hash of each state or why it could not be drawn. A state that differs from `expected` is drawn once more, fresh.
+ */
+export type DrawStates = (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    parts: string[];
+    expected?: Record<string, StatePictures>;
+    sketch?: SketchVariant;
+}) => Promise<Map<string, StatePictures | string>>;
+export declare const readPictures: (dir: string) => Record<string, PartPictures>;
+/** Writes the `record` pictures of one part into the pictures.json in `dir`, dropping its older kinds, sorted by part. */
+export declare const writePictures: (options: {
+    dir: string;
+    part: string;
+    pictures: Omit<AcceptedPictures, "slots">;
+}) => void;
+/** The states whose picture differs between two drawings, added and removed states included, sorted. */
+export declare const changedStatesOf: (before: StatePictures, now: StatePictures) => string[];
+export declare const drawStatePictures: DrawStates;
+/**
+ * Draws a part and stores its `record` pictures at its design hash, after a go or an acceptance verified `hash` (of
+ * `kind`). Answers with why nothing was stored, or `null`; `design check` draws the pictures later when they are missing.
+ */
+export declare const storePictures: (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    part: string;
+    kind: "review" | "go";
+    hash: string;
+    draw?: DrawStates;
+}) => Promise<string | null>;
+export declare const newStatesLineOf: ({ product, part, states }: {
+    product: string;
+    part: string;
+    states: string[];
+}) => string;
+/**
+ * The work of `design check` on the pictures of each merged part, or of `parts`: draws the `record` pictures of a part
+ * unchanged since its merge when none are stored at its design hash, and resolves a direct edit of a part changed
+ * outside a sketch, and of a part whose old/new edit sketch is open without a decision. A direct edit is compared with
+ * its pictures at the merged hash, else with the `old` variant of the old/new edit sketch, which holds the design at
+ * HEAD (an open sketch's `old` is rewritten from HEAD first). One that draws every state as before holds at once (its
+ * new hash goes to `merged.json`, and the edit sketch closes); one that draws a state differently leaves the edit
+ * sketch open. An `old` that does not draw goes to `problems`, else to the lines.
+ * Answers with one line per part it drew or decided.
+ */
+export declare const autoAcceptOf: (options: {
+    target: string;
+    config: DesignConfig;
+    product: ResolvedProduct;
+    only?: string;
+    parts?: string[];
+    draw?: DrawStates;
+    problems?: Problem[];
+}) => Promise<string[]>;

package/src/lib/design/system/accepted-pictures.js

@@ -0,0 +1,324 @@
+"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.autoAcceptOf = exports.newStatesLineOf = exports.storePictures = exports.drawStatePictures = exports.changedStatesOf = exports.writePictures = exports.readPictures = exports.PICTURES_FILE = void 0;
+const fs_1 = require("fs");
+const json_file_1 = require("../../json-file");
+const path_1 = require("path");
+const browser_1 = require("../browser");
+const serve_1 = require("../serve");
+const shot_1 = require("../shot");
+const thumb_1 = require("../thumb");
+const compare_command_1 = require("./compare-command");
+const design_hash_1 = require("./design-hash");
+const inventory_approval_1 = require("./inventory-approval");
+const resolve_product_1 = require("./resolve-product");
+const baseline_1 = require("./sketch/baseline");
+const edit_sketch_1 = require("./sketch/edit-sketch");
+const merge_1 = require("./sketch/merge");
+const merged_parts_1 = require("./sketch/merged-parts");
+const sketch_1 = require("./sketch/sketch");
+const system_modules_1 = require("./system-modules");
+const unchanged_rows_1 = require("./unchanged-rows");
+exports.PICTURES_FILE = 'pictures.json';
+const messageOf = (error) => (error instanceof Error ? error.message : String(error));
+const picturesFileOf = (dir) => (0, path_1.resolve)(dir, exports.PICTURES_FILE);
+const isAccepted = (value) => {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const { hash, states, slots, partHash } = value;
+    return (typeof hash === 'string' &&
+        slots === true &&
+        (partHash === undefined || typeof partHash === 'string') &&
+        !!states &&
+        typeof states === 'object' &&
+        !Array.isArray(states) &&
+        Object.values(states).every((picture) => typeof picture === 'string'));
+};
+const KINDS = ['record', 'review', 'go'];
+const readPictures = (dir) => {
+    const file = picturesFileOf(dir);
+    if (!(0, fs_1.existsSync)(file))
+        return {};
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(file, 'utf8'));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return {};
+        return Object.fromEntries(Object.entries(parsed).map(([part, entry]) => {
+            const kinds = (entry !== null && entry !== void 0 ? entry : {});
+            return [
+                part,
+                Object.fromEntries(KINDS.flatMap((kind) => (isAccepted(kinds[kind]) ? [[kind, kinds[kind]]] : []))),
+            ];
+        }));
+    }
+    catch (_a) {
+        return {};
+    }
+};
+exports.readPictures = readPictures;
+/** Writes the `record` pictures of one part into the pictures.json in `dir`, dropping its older kinds, sorted by part. */
+const writePictures = (options) => {
+    const { dir, part, pictures } = options;
+    const all = (0, exports.readPictures)(dir);
+    const entries = Object.entries(Object.assign(Object.assign({}, all), { [part]: { record: Object.assign(Object.assign({}, pictures), { slots: true }) } })).sort(([a], [b]) => a.localeCompare(b));
+    (0, json_file_1.writeJsonFile)({ file: picturesFileOf(dir), value: Object.fromEntries(entries) });
+};
+exports.writePictures = writePictures;
+/** The states whose picture differs between two drawings, added and removed states included, sorted. */
+const changedStatesOf = (before, now) => [...new Set([...Object.keys(before), ...Object.keys(now)])]
+    .filter((state) => before[state] !== now[state])
+    .sort((a, b) => a.localeCompare(b));
+exports.changedStatesOf = changedStatesOf;
+const drawStatePictures = (_a) => __awaiter(void 0, [_a], void 0, function* ({ target, config, product, parts, expected, sketch }) {
+    var _b, _c, _d, _e;
+    const drawn = new Map();
+    if (parts.length === 0)
+        return drawn;
+    if (!(yield (0, browser_1.chromiumOf)(target))) {
+        for (const part of parts)
+            drawn.set(part, 'drawing needs playwright or playwright-core in the checkout');
+        return drawn;
+    }
+    const queue = (0, thumb_1.createDrawQueue)({ target });
+    const server = yield (0, serve_1.createDesignServer)({ target, config, listen: true, port: 0 });
+    let shooter;
+    try {
+        yield server.listen();
+        const { port } = (_b = server.httpServer) === null || _b === void 0 ? void 0 : _b.address();
+        const system = (0, system_modules_1.createSystemModules)({ target, config });
+        const pictures = (0, shot_1.createPartShooter)({ target, base: `http://localhost:${port}`, system, queue });
+        shooter = pictures;
+        for (const part of parts) {
+            try {
+                const frame = (0, compare_command_1.compareFrameOf)({ presets: product.presets, part, preset: null });
+                if (typeof frame === 'string') {
+                    drawn.set(part, frame);
+                    continue;
+                }
+                const file = sketch
+                    ? (_c = system.partOf({ product: product.name, part, sketch })) === null || _c === void 0 ? void 0 : _c.file
+                    : (_d = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part)) === null || _d === void 0 ? void 0 : _d.file;
+                if (!file) {
+                    drawn.set(part, `product "${product.name}" has no part "${part}"`);
+                    continue;
+                }
+                const module = (yield server.ssrLoadModule((0, system_modules_1.productModuleIdOf)({ file, product: product.name, sketch })));
+                const states = yield (0, unchanged_rows_1.drawnStateNamesOf)(module.default);
+                const pictureOf = (state, fresh) => __awaiter(void 0, void 0, void 0, function* () {
+                    return (0, design_hash_1.sha16)((yield pictures.pictureOf({
+                        product: product.name,
+                        part,
+                        state,
+                        preset: frame.preset,
+                        width: null,
+                        sketch: sketch !== null && sketch !== void 0 ? sketch : null,
+                        interaction: null,
+                        bare: true,
+                        emptySlots: false,
+                        checker: true,
+                        params: new URLSearchParams(),
+                        fresh,
+                    })).png);
+                });
+                if (states.length === 0) {
+                    drawn.set(part, `${part} has no states`);
+                    continue;
+                }
+                const hashes = {};
+                for (const state of states) {
+                    const first = yield pictureOf(state, false);
+                    const want = (_e = expected === null || expected === void 0 ? void 0 : expected[part]) === null || _e === void 0 ? void 0 : _e[state];
+                    hashes[state] = want !== undefined && want !== first ? yield pictureOf(state, true) : first;
+                }
+                drawn.set(part, hashes);
+            }
+            catch (error) {
+                drawn.set(part, messageOf(error));
+            }
+        }
+    }
+    catch (error) {
+        for (const part of parts)
+            if (!drawn.has(part))
+                drawn.set(part, messageOf(error));
+    }
+    finally {
+        yield (shooter === null || shooter === void 0 ? void 0 : shooter.close());
+        yield queue.close();
+        yield server.close();
+    }
+    return drawn;
+});
+exports.drawStatePictures = drawStatePictures;
+/**
+ * Draws a part and stores its `record` pictures at its design hash, after a go or an acceptance verified `hash` (of
+ * `kind`). Answers with why nothing was stored, or `null`; `design check` draws the pictures later when they are missing.
+ */
+const storePictures = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const { target, config, product, part, kind, hash } = options;
+    const resolved = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part);
+    if (!resolved)
+        return `product "${product.name}" has no part "${part}"`;
+    const design = (0, design_hash_1.designHashOf)({ product, part: resolved }).hash;
+    const drawn = (yield ((_a = options.draw) !== null && _a !== void 0 ? _a : exports.drawStatePictures)({ target, config, product, parts: [part] })).get(part);
+    const partHash = (0, baseline_1.partHashOf)({ product, dir: (0, path_1.dirname)(resolved.file) });
+    const now = kind === 'review' ? partHash : design;
+    if (drawn === undefined || typeof drawn === 'string')
+        return drawn !== null && drawn !== void 0 ? drawn : `${part} was not drawn`;
+    if (now !== hash || (0, design_hash_1.designHashOf)({ product, part: resolved }).hash !== design)
+        return `${part} changed while it was drawn`;
+    (0, exports.writePictures)({
+        dir: (0, inventory_approval_1.partOwnerOf)({ product, part: resolved }).dir,
+        part,
+        pictures: { hash: design, states: drawn, partHash },
+    });
+    return null;
+});
+exports.storePictures = storePictures;
+const newStatesLineOf = ({ product, part, states }) => `NEW STATES ${product} ${part}: ${states.join(', ')} - for Tom's next review`;
+exports.newStatesLineOf = newStatesLineOf;
+/**
+ * The pictures a direct edit of the part is compared with: its `record` or `review` drawn at the merged part hash. A
+ * `go` carries only a design hash, which cannot show that it was drawn at the merged part hash.
+ */
+const baselineOf = (pictures, merged) => {
+    var _a, _b, _c, _d;
+    return (_d = (_b = (merged !== undefined && ((_a = pictures.record) === null || _a === void 0 ? void 0 : _a.partHash) === merged ? pictures.record : undefined)) !== null && _b !== void 0 ? _b : (merged !== undefined && ((_c = pictures.review) === null || _c === void 0 ? void 0 : _c.hash) === merged ? pictures.review : undefined)) !== null && _d !== void 0 ? _d : null;
+};
+const isUndecidedEditSketch = (sketch) => {
+    var _a;
+    return sketch.target === `${(0, resolve_product_1.partKeyOf)(sketch)}@${merged_parts_1.EDIT_SKETCH}` &&
+        sketch.status === 'ready' &&
+        !sketch.decision &&
+        !sketch.hold &&
+        Object.values((_a = sketch.rejections) !== null && _a !== void 0 ? _a : {}).every((rejections) => rejections.length === 0);
+};
+/**
+ * The work of `design check` on the pictures of each merged part, or of `parts`: draws the `record` pictures of a part
+ * unchanged since its merge when none are stored at its design hash, and resolves a direct edit of a part changed
+ * outside a sketch, and of a part whose old/new edit sketch is open without a decision. A direct edit is compared with
+ * its pictures at the merged hash, else with the `old` variant of the old/new edit sketch, which holds the design at
+ * HEAD (an open sketch's `old` is rewritten from HEAD first). One that draws every state as before holds at once (its
+ * new hash goes to `merged.json`, and the edit sketch closes); one that draws a state differently leaves the edit
+ * sketch open. An `old` that does not draw goes to `problems`, else to the lines.
+ * Answers with one line per part it drew or decided.
+ */
+const autoAcceptOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d;
+    const { target, config, product, only } = options;
+    const edited = new Set((0, merged_parts_1.changedOutsideSketchOf)(product));
+    const editSketches = new Map((0, sketch_1.listSketches)({ productDir: product.dir, product: product.name }).flatMap((sketch) => typeof sketch !== 'string' && isUndecidedEditSketch(sketch) ? [[(0, resolve_product_1.partKeyOf)(sketch), sketch]] : []));
+    const merged = (0, merged_parts_1.readMerged)(product.dir);
+    const records = [];
+    const edits = [];
+    const lines = [];
+    const draw = (_a = options.draw) !== null && _a !== void 0 ? _a : exports.drawStatePictures;
+    const heads = [];
+    const oldNotDrawn = ({ resolved, sketch }, why) => {
+        const message = `variant ${edit_sketch_1.EDIT_OLD} of ${sketch.target} (the part at HEAD) does not draw: ${why}`;
+        if (options.problems)
+            options.problems.push({ rule: 'EDIT-OLD-NOT-DRAWN', file: resolved.file, message });
+        else
+            lines.push(`EDIT-OLD-NOT-DRAWN ${product.name} ${(0, resolve_product_1.partKeyOf)(resolved)}: ${message}`);
+    };
+    const opened = (part, sketch) => lines.push(typeof sketch === 'string'
+        ? `DIRECT EDIT ${product.name} ${part}: changed outside a sketch, no old/new sketch: ${sketch}`
+        : `DIRECT EDIT ${product.name} ${part}: changed outside a sketch - pick old or new in sketch ${sketch.target}`);
+    const open = (part) => (0, edit_sketch_1.openEditSketch)({ target, product, part, author: 'design check' });
+    for (const resolved of product.parts) {
+        const part = (0, resolve_product_1.partKeyOf)(resolved);
+        if ((only && part !== only) || (options.parts && !options.parts.includes(part)))
+            continue;
+        if (resolved.origin === 'base' || merged[part] === undefined)
+            continue;
+        const pictures = (_b = (0, exports.readPictures)((0, inventory_approval_1.partOwnerOf)({ product, part: resolved }).dir)[part]) !== null && _b !== void 0 ? _b : {};
+        const design = (0, design_hash_1.designHashOf)({ product, part: resolved }).hash;
+        const editSketch = editSketches.get(part);
+        if (edited.has(part)) {
+            const baseline = baselineOf(pictures, merged[part]);
+            if (baseline) {
+                edits.push({ part: resolved, design, baseline });
+                continue;
+            }
+            const sketch = open(part);
+            if (typeof sketch === 'string')
+                opened(part, sketch);
+            else
+                heads.push({ part: resolved, design, sketch });
+        }
+        else if (editSketch)
+            heads.push({ part: resolved, design, sketch: editSketch, recheck: true });
+        else if (((_c = pictures.record) === null || _c === void 0 ? void 0 : _c.hash) !== design)
+            records.push({ part: resolved, design, baseline: null });
+    }
+    for (const { part: resolved, design, sketch, recheck } of heads) {
+        const part = (0, resolve_product_1.partKeyOf)(resolved);
+        const unreadable = recheck ? (0, edit_sketch_1.refreshEditOld)({ product, sketch }) : null;
+        if (unreadable) {
+            oldNotDrawn({ resolved, sketch }, unreadable);
+            continue;
+        }
+        const old = (yield draw({ target, config, product, parts: [part], sketch: { target: sketch.target, variant: edit_sketch_1.EDIT_OLD } })).get(part);
+        if (old === undefined || typeof old === 'string')
+            oldNotDrawn({ resolved, sketch }, old !== null && old !== void 0 ? old : 'no drawing');
+        else
+            edits.push({ part: resolved, design, baseline: { hash: (_d = merged[part]) !== null && _d !== void 0 ? _d : '', states: old, slots: true }, sketch });
+    }
+    const needs = [...edits, ...records];
+    if (needs.length === 0)
+        return lines;
+    const drawn = yield draw({
+        target,
+        config,
+        product,
+        parts: needs.map(({ part }) => (0, resolve_product_1.partKeyOf)(part)),
+        expected: Object.fromEntries(edits.flatMap(({ part, baseline }) => (baseline ? [[(0, resolve_product_1.partKeyOf)(part), baseline.states]] : []))),
+    });
+    for (const { part: resolved, design, baseline, sketch } of needs) {
+        const part = (0, resolve_product_1.partKeyOf)(resolved);
+        const states = drawn.get(part);
+        const notDrawn = (why) => {
+            lines.push(`PICTURES NOT DRAWN ${product.name} ${part}: ${why}`);
+            if (sketch)
+                opened(part, sketch);
+        };
+        if (states === undefined || typeof states === 'string') {
+            notDrawn(states !== null && states !== void 0 ? states : 'no drawing');
+            continue;
+        }
+        if ((0, design_hash_1.designHashOf)({ product, part: resolved }).hash !== design) {
+            notDrawn('changed while it was drawn');
+            continue;
+        }
+        const changed = baseline ? (0, exports.changedStatesOf)(baseline.states, states) : [];
+        if (baseline && changed.length > 0) {
+            lines.push(`PICTURES CHANGED ${product.name} ${part}: ${changed.join(', ')}`);
+            opened(part, sketch !== null && sketch !== void 0 ? sketch : open(part));
+            continue;
+        }
+        if (sketch)
+            (0, merge_1.discardSketch)({ target, sketch, author: 'design check' });
+        if (baseline) {
+            (0, merged_parts_1.recordMerged)({ product, parts: [part] });
+            lines.push(`HELD ${product.name} ${part}: changed outside a sketch, every state draws as before`);
+        }
+        (0, exports.writePictures)({
+            dir: (0, inventory_approval_1.partOwnerOf)({ product, part: resolved }).dir,
+            part,
+            pictures: { hash: design, states, partHash: (0, baseline_1.partHashOf)({ product, dir: (0, path_1.dirname)(resolved.file) }) },
+        });
+    }
+    return lines;
+});
+exports.autoAcceptOf = autoAcceptOf;
+//# sourceMappingURL=accepted-pictures.js.map