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

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

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -11,9 +20,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editRound = exports.editVariantNote = exports.addVariant = exports.rebaseSketch = exports.decideSketch = exports.releaseSketch = exports.holdSketch = exports.heldProblemOf = exports.markSketchReady = exports.finishSketchReport = exports.clearSketchReport = exports.readSketchReport = exports.reportSketch = exports.sketchReportPath = exports.withAuthor = exports.addTarget = exports.createSketch = exports.sketchSourceOf = exports.writeSketchFile = exports.findSketch = exports.listSketches = exports.readSketch = exports.authorsOf = exports.rejectedProblemOf = exports.rejectionOf = exports.runningRoundOf = exports.isVariantName = exports.parseTarget = exports.sourceFilesIn = exports.variantSharedDirOf = exports.sharedDirOf = exports.SHARED_FOLDER = exports.variantDirOf = exports.sketchDirOf = exports.sketchFolderOf = exports.sketchesDirOf = exports.SKETCH_FILE = exports.SKETCH_MERGES = exports.SKETCH_STATUSES = void 0;
+exports.addVariant = exports.rebaseSketch = exports.decideSketch = exports.withdrawVariant = exports.releaseSketch = exports.holdSketch = exports.heldProblemOf = exports.reopenChangedReady = exports.variantContentHashOf = exports.markSketchReady = exports.finishSketchReport = exports.clearSketchReport = exports.readSketchReport = exports.reportSketch = exports.sketchReportPath = exports.withAuthor = exports.removeTarget = exports.addTarget = exports.createSketch = exports.sketchSourceOf = exports.writeSketchFile = exports.findSketch = exports.listSketchesInTurns = exports.listSketches = exports.readSketch = exports.authorsOf = exports.rejectedProblemOf = exports.rejectionOf = exports.runningRoundOf = exports.removeSketchDir = exports.isVariantName = exports.sketchIdOfName = exports.parseTarget = exports.rewriteSharedImports = exports.rebaseOutsideImports = exports.relativeSpecifierOf = exports.withSharedImports = exports.sourceFilesIn = exports.SOURCE_FILE = exports.variantSharedDirOf = exports.sharedDirOf = exports.SHARED_FOLDER = exports.variantDirOf = exports.sketchDirOf = exports.sketchIdOf = exports.sketchFolderOf = exports.sketchesDirOf = exports.SKETCH_FILE = exports.SKETCH_MERGES = exports.SKETCH_STATUSES = void 0;
+exports.editRound = exports.editVariantNote = void 0;
+const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const promises_1 = require("timers/promises");
 const json_layout_1 = require("../../json-layout");
 const status_1 = require("../../status");
 const assets_1 = require("../assets");
@@ -23,6 +35,7 @@ const base_1 = require("../base");
 const layers_1 = require("../layers");
 const resolve_product_1 = require("../resolve-product");
 const baseline_1 = require("./baseline");
+const write_origin_1 = require("../write-origin");
 const part_definition_1 = require("./part-definition");
 exports.SKETCH_STATUSES = ['in progress', 'ready'];
 exports.SKETCH_MERGES = ['override', 'into-base'];
@@ -30,8 +43,10 @@ const NAME = /^[a-z0-9][a-z0-9-]*$/u;
 exports.SKETCH_FILE = 'sketch.json';
 const sketchesDirOf = (productDir) => (0, path_1.resolve)(productDir, 'sketches');
 exports.sketchesDirOf = sketchesDirOf;
-const sketchFolderOf = (target) => `${target.layer}-${target.name}`;
+const sketchFolderOf = (target) => `${target.layer}-${target.name}${target.sketch ? `.${target.sketch}` : ''}`;
 exports.sketchFolderOf = sketchFolderOf;
+const sketchIdOf = (target) => `${(0, resolve_product_1.partKeyOf)(target)}${target.sketch ? `@${target.sketch}` : ''}`;
+exports.sketchIdOf = sketchIdOf;
 const sketchDirOf = (options) => (0, path_1.resolve)((0, exports.sketchesDirOf)(options.productDir), (0, exports.sketchFolderOf)(options.sketch));
 exports.sketchDirOf = sketchDirOf;
 const variantDirOf = (sketch, variant) => (0, path_1.resolve)(sketch.dir, variant);
@@ -41,29 +56,72 @@ exports.sharedDirOf = sharedDirOf;
 /** A variant's own `shared/` folder: a file there wins over the sketch's `shared/` file of the same path. */
 const variantSharedDirOf = (sketch, variant) => (0, path_1.resolve)((0, exports.variantDirOf)(sketch, variant), imports_1.SHARED_FOLDER);
 exports.variantSharedDirOf = variantSharedDirOf;
-const SOURCE = /\.(?:ts|js|mjs)$/u;
+exports.SOURCE_FILE = /\.(?:ts|js|mjs)$/u;
 const sourceFilesIn = (dir) => (0, fs_1.existsSync)(dir)
     ? (0, fs_1.readdirSync)(dir, { recursive: true })
-        .filter((path) => SOURCE.test(path))
+        .filter((path) => exports.SOURCE_FILE.test(path))
         .map((path) => (0, path_1.resolve)(dir, path))
     : [];
 exports.sourceFilesIn = sourceFilesIn;
-const liftShared = (options) => {
-    const { partDir, sketchSharedDir } = options;
+/** `source`, the file `file` of the part in `partDir`, with its relative imports of the part's own `shared/` folder as `@shared/`. */
+const withSharedImports = (options) => {
+    const { source, file, partDir } = options;
     const shared = (0, path_1.resolve)(partDir, imports_1.SHARED_FOLDER);
-    if (!(0, fs_1.existsSync)(shared))
-        return;
-    for (const file of (0, exports.sourceFilesIn)(partDir)) {
+    return source.replace(/(['"])(\.{1,2}\/[^'"]+)\1/gu, (...[match = '', quote = '', specifier = '']) => {
+        const path = (0, path_1.relative)(shared, (0, path_1.resolve)((0, path_1.dirname)(file), specifier));
+        return path.startsWith('..') || (0, path_1.isAbsolute)(path)
+            ? match
+            : `${quote}${imports_1.SHARED_PREFIX}${path.split(path_1.sep).join('/')}${quote}`;
+    });
+};
+exports.withSharedImports = withSharedImports;
+const insideOf = (dir, path) => {
+    const rest = (0, path_1.relative)(dir, path);
+    return !rest.startsWith('..') && !(0, path_1.isAbsolute)(rest);
+};
+const relativeSpecifierOf = (options) => {
+    const path = (0, path_1.relative)((0, path_1.dirname)(options.from), options.to).split(path_1.sep).join('/');
+    return path.startsWith('.') ? path : `./${path}`;
+};
+exports.relativeSpecifierOf = relativeSpecifierOf;
+/**
+ * Rewrites the relative imports of the files in `dir`, a copy of the folder `from`, that leave `from` - and `within`,
+ * when given - so they reach the same files from `dir`.
+ */
+const rebaseOutsideImports = (options) => {
+    const { dir, from, within, settledIn, skip } = options;
+    for (const file of (0, exports.sourceFilesIn)(dir)) {
+        if (skip !== undefined && insideOf((0, path_1.resolve)(dir, skip), file))
+            continue;
+        const original = (0, path_1.resolve)(from, (0, path_1.relative)(dir, file));
         const source = (0, fs_1.readFileSync)(file, 'utf8');
         const rewritten = source.replace(/(['"])(\.{1,2}\/[^'"]+)\1/gu, (...[match = '', quote = '', specifier = '']) => {
-            const path = (0, path_1.relative)(shared, (0, path_1.resolve)((0, path_1.dirname)(file), specifier));
-            return path.startsWith('..') || (0, path_1.isAbsolute)(path)
+            const path = (0, path_1.resolve)((0, path_1.dirname)(original), specifier);
+            return insideOf(from, path) || (within !== undefined && insideOf(within, path))
                 ? match
-                : `${quote}${imports_1.SHARED_PREFIX}${path.split(path_1.sep).join('/')}${quote}`;
+                : `${quote}${(0, exports.relativeSpecifierOf)({ from: settledIn ? (0, path_1.resolve)(settledIn, (0, path_1.relative)(dir, file)) : file, to: path })}${quote}`;
         });
         if (rewritten !== source)
             (0, fs_1.writeFileSync)(file, rewritten);
     }
+};
+exports.rebaseOutsideImports = rebaseOutsideImports;
+/** Rewrites the relative imports of the part's own `shared/` folder in its files to `@shared/`. */
+const rewriteSharedImports = (partDir) => {
+    for (const file of (0, exports.sourceFilesIn)(partDir)) {
+        const source = (0, fs_1.readFileSync)(file, 'utf8');
+        const rewritten = (0, exports.withSharedImports)({ source, file, partDir });
+        if (rewritten !== source)
+            (0, fs_1.writeFileSync)(file, rewritten);
+    }
+};
+exports.rewriteSharedImports = rewriteSharedImports;
+const liftShared = (options) => {
+    const { partDir, sketchSharedDir } = options;
+    const shared = (0, path_1.resolve)(partDir, imports_1.SHARED_FOLDER);
+    if (!(0, fs_1.existsSync)(shared))
+        return;
+    (0, exports.rewriteSharedImports)(partDir);
     (0, fs_1.cpSync)(shared, sketchSharedDir, { recursive: true });
     (0, fs_1.rmSync)(shared, { recursive: true });
 };
@@ -86,12 +144,25 @@ const sharedClashOf = (parts) => {
 };
 /** Reads `<layer>/<name>` as a sketch target, or answers with why it is not one. */
 const parseTarget = (value) => {
-    const [layer = '', name = '', ...rest] = (value !== null && value !== void 0 ? value : '').split('/');
-    if (!(0, layers_1.isLayer)(layer) || !NAME.test(name) || rest.length > 0)
-        return `"${value !== null && value !== void 0 ? value : ''}" is no target - pass <layer>/<name>, the layer one of foundations, components, elements, pages`;
-    return { layer, name };
+    const [asked = '', sketch, ...more] = (value !== null && value !== void 0 ? value : '').split('@');
+    const [layer = '', name = '', ...rest] = asked.split('/');
+    if (!(0, layers_1.isLayer)(layer) ||
+        !NAME.test(name) ||
+        rest.length > 0 ||
+        more.length > 0 ||
+        (sketch !== undefined && !NAME.test(sketch)))
+        return `"${value !== null && value !== void 0 ? value : ''}" is no target - pass <layer>/<name>[@<sketch name>], the layer one of foundations, components, elements, pages`;
+    return sketch === undefined ? { layer, name } : { layer, name, sketch };
 };
 exports.parseTarget = parseTarget;
+/** Reads a sketch id (`<layer>/<name>[@<sketch>]`), `<layer>/<name>.<sketch>` or a sketch folder name (`<layer>-<name>[.<sketch>]`) as a sketch id, or `null` when it is none of them. */
+const sketchIdOfName = (value) => {
+    const dotted = value.includes('/')
+        ? value.replace(/\.([^./@]+)$/u, '@$1')
+        : value.replace(/^([^-/]+)-/u, '$1/').replace(/\.([^./@]+)$/u, '@$1');
+    return typeof (0, exports.parseTarget)(dotted) === 'string' ? null : dotted;
+};
+exports.sketchIdOfName = sketchIdOfName;
 const isVariantName = (name) => NAME.test(name) && name !== imports_1.SHARED_FOLDER;
 exports.isVariantName = isVariantName;
 const foldersOf = (dir) => (0, fs_1.existsSync)(dir)
@@ -99,6 +170,18 @@ const foldersOf = (dir) => (0, fs_1.existsSync)(dir)
         .filter((name) => { var _a; return (_a = (0, fs_1.statSync)((0, path_1.resolve)(dir, name), { throwIfNoEntry: false })) === null || _a === void 0 ? void 0 : _a.isDirectory(); })
         .sort()
     : [];
+const GENERATED_FILE = 'tsconfig.json';
+const holdsFiles = (dir) => (0, fs_1.readdirSync)(dir, { recursive: true, withFileTypes: true }).some((entry) => entry.isFile() && !(entry.name === GENERATED_FILE && (0, path_1.resolve)(entry.parentPath) === (0, path_1.resolve)(dir)));
+const sketchFoldersOf = (productDir) => foldersOf((0, exports.sketchesDirOf)(productDir)).filter((folder) => holdsFiles((0, path_1.resolve)((0, exports.sketchesDirOf)(productDir), folder)));
+const isOpenSketchDir = (dir) => (0, fs_1.existsSync)(dir) && holdsFiles(dir);
+/** Deletes a sketch folder, then its `sketches/` folder when nothing else is left in it. */
+const removeSketchDir = (dir) => {
+    (0, fs_1.rmSync)(dir, { recursive: true, force: true });
+    const parent = (0, path_1.resolve)(dir, '..');
+    if ((0, fs_1.existsSync)(parent) && (0, fs_1.readdirSync)(parent).length === 0)
+        (0, fs_1.rmSync)(parent, { recursive: true, force: true });
+};
+exports.removeSketchDir = removeSketchDir;
 const isStatus = (value) => exports.SKETCH_STATUSES.includes(value);
 const isAuthors = (value) => value === undefined || (Array.isArray(value) && value.every((author) => typeof author === 'string' && author !== ''));
 const isVariantInfo = (value) => typeof value === 'object' &&
@@ -128,6 +211,8 @@ const isRejection = (value) => {
         typeof rejection.decidedAt === 'string' &&
         isOptionalText(rejection.reason) &&
         (rejection.reasonBy === undefined || isVerdictBy(rejection.reasonBy)) &&
+        (rejection.status === undefined || rejection.status === 'withdrawn') &&
+        (rejection.withdrawnBy === undefined || typeof rejection.withdrawnBy === 'string') &&
         (rejection.reopened === undefined || isReopening(rejection.reopened)));
 };
 const isRejections = (value) => typeof value === 'object' &&
@@ -154,6 +239,24 @@ const isHold = (value) => {
         typeof hold.by === 'string' &&
         typeof hold.heldAt === 'string');
 };
+const isStringList = (value) => Array.isArray(value) && value.every((entry) => typeof entry === 'string');
+const isMergeHold = (value) => {
+    const hold = value;
+    return (typeof hold === 'object' &&
+        hold !== null &&
+        typeof hold.reason === 'string' &&
+        typeof hold.at === 'string' &&
+        (hold.dirty === undefined || isStringList(hold.dirty)));
+};
+const isPortMark = (value) => {
+    const mark = value;
+    return (typeof mark === 'object' &&
+        mark !== null &&
+        isStringList(mark.merged) &&
+        isStringList(mark.parts) &&
+        isStringList(mark.reasons) &&
+        typeof mark.at === 'string');
+};
 const FIRST_ROUND = 'r1';
 const firstRoundOf = (title = '', note = '') => ({ key: FIRST_ROUND, title, note: note.trim() });
 const nextRoundKeyOf = (rounds) => `r${Math.max(0, ...rounds.map((round) => { var _a, _b; return Number((_b = (_a = /^r(\d+)$/u.exec(round.key)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 0); })) + 1}`;
@@ -207,7 +310,7 @@ const readSketch = (options) => {
     if (parsed.variantInfo !== undefined && !isVariantInfo(parsed.variantInfo))
         return `${file}: variantInfo must be { <variant>: { authors?: string[], round?: string, note?: string } }`;
     if (parsed.rejections !== undefined && !isRejections(parsed.rejections))
-        return `${file}: rejections must be { <variant>: [{ by: designer | agent, decidedAt, reason?, reasonBy?, reopened?: { by, decidedAt, reason? } }] }, each but the last reopened`;
+        return `${file}: rejections must be { <variant>: [{ by: designer | agent, decidedAt, reason?, reasonBy?, status?: withdrawn, withdrawnBy?, reopened?: { by, decidedAt, reason? } }] }, each but the last reopened`;
     if (parsed.rounds !== undefined && !isRounds(parsed.rounds))
         return `${file}: rounds must be a non-empty list of { key, title, note } with unique keys`;
     if (parsed.merge !== undefined && !exports.SKETCH_MERGES.includes(parsed.merge))
@@ -216,6 +319,17 @@ const readSketch = (options) => {
         return `${file}: hold must be { until, by, heldAt }`;
     if (parsed.hold !== undefined && parsed.status !== 'in progress')
         return `${file}: a held sketch must be in progress`;
+    if (parsed.readyContent !== undefined &&
+        (!parsed.readyContent ||
+            typeof parsed.readyContent !== 'object' ||
+            Object.values(parsed.readyContent).some((hash) => typeof hash !== 'string')))
+        return `${file}: readyContent must be { <variant>: <content hash> }`;
+    if (parsed.portAfterMerge !== undefined && !isPortMark(parsed.portAfterMerge))
+        return `${file}: portAfterMerge must be { merged: string[], parts: string[], reasons: string[], at }`;
+    if (parsed.mergeHold !== undefined && !isMergeHold(parsed.mergeHold))
+        return `${file}: mergeHold must be { reason, at }`;
+    if (parsed.covers !== undefined && !isStringList(parsed.covers))
+        return `${file}: covers must be a list of <state> or <state>@<x>,<y>,<w>,<h>`;
     const rounds = (_b = parsed.rounds) !== null && _b !== void 0 ? _b : [firstRoundOf()];
     const running = (0, exports.runningRoundOf)({ rounds }).key;
     const variants = foldersOf(dir).filter((folder) => folder !== imports_1.SHARED_FOLDER);
@@ -233,20 +347,33 @@ const readSketch = (options) => {
 };
 exports.readSketch = readSketch;
 /** Every sketch folder of a product, read; a folder that cannot be read answers with its problem. */
-const listSketches = (options) => foldersOf((0, exports.sketchesDirOf)(options.productDir)).map((folder) => (0, exports.readSketch)({ product: options.product, dir: (0, path_1.resolve)((0, exports.sketchesDirOf)(options.productDir), folder) }));
+const listSketches = (options) => sketchFoldersOf(options.productDir).map((folder) => (0, exports.readSketch)({ product: options.product, dir: (0, path_1.resolve)((0, exports.sketchesDirOf)(options.productDir), folder) }));
 exports.listSketches = listSketches;
+/** `listSketches`, letting the server answer other requests before each sketch it reads. */
+const listSketchesInTurns = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const listed = [];
+    for (const folder of sketchFoldersOf(options.productDir)) {
+        yield (0, promises_1.setImmediate)();
+        listed.push((0, exports.readSketch)({ product: options.product, dir: (0, path_1.resolve)((0, exports.sketchesDirOf)(options.productDir), folder) }));
+    }
+    return listed;
+});
+exports.listSketchesInTurns = listSketchesInTurns;
 /** The open sketch that targets `sketch`, found by its first target or by any other it names; `null` when none does. */
 const findSketch = (options) => {
     var _a;
     const dir = (0, exports.sketchDirOf)(options);
-    if ((0, fs_1.existsSync)(dir))
+    if (isOpenSketchDir(dir))
         return (0, exports.readSketch)({ product: options.product, dir });
     const key = (0, resolve_product_1.partKeyOf)(options.sketch);
-    return ((_a = (0, exports.listSketches)(options).find((sketch) => typeof sketch !== 'string' && sketch.targets.includes(key))) !== null && _a !== void 0 ? _a : null);
+    return ((_a = (0, exports.listSketches)(options).find((sketch) => typeof sketch !== 'string' &&
+        sketch.targets.includes(key) &&
+        parseSketchName(sketch.target) === options.sketch.sketch)) !== null && _a !== void 0 ? _a : null);
 };
 exports.findSketch = findSketch;
+const parseSketchName = (target) => target.split('@')[1];
 const writeSketchFile = (sketch) => {
-    const file = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ target: (0, resolve_product_1.partKeyOf)(sketch) }, (sketch.targets.length > 1 ? { targets: sketch.targets } : {})), { status: sketch.status, createdAt: sketch.createdAt }), (sketch.baseline ? { baseline: sketch.baseline } : {})), (sketch.decision ? { decision: sketch.decision } : {})), { rounds: sketch.rounds }), (Object.keys(sketch.variantInfo).length > 0 ? { variantInfo: sketch.variantInfo } : {})), (sketch.rejections && Object.keys(sketch.rejections).length > 0 ? { rejections: sketch.rejections } : {})), (sketch.merge ? { merge: sketch.merge } : {})), (sketch.hold ? { hold: sketch.hold } : {}));
+    const file = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ target: sketch.target }, (sketch.targets.length > 1 ? { targets: sketch.targets } : {})), { status: sketch.status, createdAt: sketch.createdAt }), (sketch.baseline ? { baseline: sketch.baseline } : {})), (sketch.decision ? { decision: sketch.decision } : {})), { rounds: sketch.rounds }), (Object.keys(sketch.variantInfo).length > 0 ? { variantInfo: sketch.variantInfo } : {})), (sketch.rejections && Object.keys(sketch.rejections).length > 0 ? { rejections: sketch.rejections } : {})), (sketch.merge ? { merge: sketch.merge } : {})), (sketch.hold ? { hold: sketch.hold } : {})), (sketch.readyContent && sketch.status === 'ready' ? { readyContent: sketch.readyContent } : {})), (sketch.covers && sketch.covers.length > 0 ? { covers: sketch.covers } : {})), (sketch.portAfterMerge ? { portAfterMerge: sketch.portAfterMerge } : {})), (sketch.mergeHold && sketch.status === 'ready' ? { mergeHold: sketch.mergeHold } : {}));
     (0, fs_1.writeFileSync)((0, path_1.resolve)(sketch.dir, exports.SKETCH_FILE), (0, json_layout_1.jsonLayoutOf)(file));
 };
 exports.writeSketchFile = writeSketchFile;
@@ -349,13 +476,24 @@ const seedTarget = (options) => {
     const folder = (0, path_1.resolve)(dir, variant, target.layer, target.name);
     const existing = product.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === (0, resolve_product_1.partKeyOf)(target));
     (0, fs_1.mkdirSync)(folder, { recursive: true });
+    const seeded = (from) => {
+        const sketchSharedDir = (0, path_1.resolve)(dir, imports_1.SHARED_FOLDER);
+        (0, exports.rebaseOutsideImports)({ dir: folder, from, skip: imports_1.SHARED_FOLDER });
+        if ((0, fs_1.existsSync)((0, path_1.resolve)(folder, imports_1.SHARED_FOLDER)))
+            (0, exports.rebaseOutsideImports)({
+                dir: (0, path_1.resolve)(folder, imports_1.SHARED_FOLDER),
+                from: (0, path_1.resolve)(from, imports_1.SHARED_FOLDER),
+                settledIn: sketchSharedDir,
+            });
+        liftShared({ partDir: folder, sketchSharedDir });
+    };
     if (like) {
         copyPartAs({ from: like, to: folder, name: target.name });
-        liftShared({ partDir: folder, sketchSharedDir: (0, path_1.resolve)(dir, imports_1.SHARED_FOLDER) });
+        seeded(like.folder);
     }
     else if (existing) {
         (0, fs_1.cpSync)((0, path_1.resolve)(existing.file, '..'), folder, { recursive: true });
-        liftShared({ partDir: folder, sketchSharedDir: (0, path_1.resolve)(dir, imports_1.SHARED_FOLDER) });
+        seeded((0, path_1.resolve)(existing.file, '..'));
     }
     else if (target.layer === 'pages') {
         const widths = [...new Set(Object.values(product.presets).map((preset) => preset.width))].sort((a, b) => a - b);
@@ -366,28 +504,28 @@ const seedTarget = (options) => {
         (0, fs_1.writeFileSync)((0, path_1.resolve)(folder, `${target.name}.css`), '');
     }
 };
+const alreadySketched = (target) => `${target} already has an open sketch - merge or discard it first, or extract the region into a part and sketch that`;
 /**
  * Opens a sketch on a target, in progress, with one folder per variant, all in round 1 and with `author` as their
  * author. Each variant starts from `like` when given - renamed to the target, without its `madeBy`, and with its
  * sketch's `shared/` folder - else from the part the product resolves for the target, or from an empty part when the
  * target is new. A part's own `shared/` folder becomes the sketch's, imported as `@shared/`. A target holds one open
- * sketch at a time. Each of `others` joins every variant the same way, as a further target; `like` takes one target only.
+ * sketch at a time, or one per sketch name when `sketch.sketch` names it. Each of `others` joins every variant the same way, as a further target; `like` takes one target only.
  * A target the product overrides in its base needs `merge`: `override` or `into-base`.
  */
 const createSketch = (options) => {
     var _a;
     const { product, sketch, variants, roundTitle, roundNote, author, like, variantNotes, merge } = options;
     const dir = (0, exports.sketchDirOf)({ productDir: product.dir, sketch });
-    const key = (0, resolve_product_1.partKeyOf)(sketch);
-    const all = [sketch, ...((_a = options.others) !== null && _a !== void 0 ? _a : [])];
+    const all = [sketch, ...((_a = options.others) !== null && _a !== void 0 ? _a : []).map((other) => (Object.assign(Object.assign({}, other), { sketch: sketch.sketch })))];
     const targets = all.map(resolve_product_1.partKeyOf);
     if (new Set(targets).size !== targets.length)
         return 'name each target once';
     if (like && all.length > 1)
         return '--like starts one target - open a sketch with several targets without it';
     const taken = all.find((target) => (0, exports.findSketch)({ productDir: product.dir, product: product.name, sketch: target }) !== null);
-    if ((0, fs_1.existsSync)(dir) || taken)
-        return `${(0, resolve_product_1.partKeyOf)(taken !== null && taken !== void 0 ? taken : sketch)} already has an open sketch - merge or discard it first`;
+    if (isOpenSketchDir(dir) || taken)
+        return alreadySketched((0, exports.sketchIdOf)(taken !== null && taken !== void 0 ? taken : sketch));
     if (variants.length === 0)
         return 'name at least one variant';
     const mergeProblem = mergeProblemOf({ product, targets, merge });
@@ -410,7 +548,7 @@ const createSketch = (options) => {
     }
     if (like === null || like === void 0 ? void 0 : like.shared)
         (0, fs_1.cpSync)(like.shared, (0, path_1.resolve)(dir, imports_1.SHARED_FOLDER), { recursive: true });
-    const created = Object.assign({ target: key, targets, status: 'in progress', createdAt: new Date().toISOString(), baseline: (0, baseline_1.baselineOf)(product), rounds: [firstRoundOf(roundTitle, roundNote)], variantInfo: Object.fromEntries(variants.map((variant) => [
+    const created = Object.assign({ target: (0, exports.sketchIdOf)(sketch), targets, status: 'in progress', createdAt: new Date().toISOString(), baseline: (0, baseline_1.baselineOf)(product), rounds: [firstRoundOf(roundTitle, roundNote)], variantInfo: Object.fromEntries(variants.map((variant) => [
             variant,
             variantInfoOf({ round: FIRST_ROUND, author, note: variantNotes === null || variantNotes === void 0 ? void 0 : variantNotes.get(variant) }),
         ])), product: product.name, layer: sketch.layer, name: sketch.name, dir, variants: [...variants].sort() }, (merge ? { merge } : {}));
@@ -427,9 +565,16 @@ const addTarget = (options) => {
     const key = (0, resolve_product_1.partKeyOf)(part);
     if (sketch.targets.includes(key))
         return `${sketch.target} targets ${key} already`;
-    const taken = (0, exports.findSketch)({ productDir: product.dir, product: product.name, sketch: part });
+    const layerProblem = layerProblemOf({ sketch, part });
+    if (layerProblem)
+        return layerProblem;
+    const taken = (0, exports.findSketch)({
+        productDir: product.dir,
+        product: product.name,
+        sketch: Object.assign(Object.assign({}, part), { sketch: parseSketchName(sketch.target) }),
+    });
     if (taken !== null)
-        return `${key} already has an open sketch - merge or discard it first`;
+        return alreadySketched(key);
     const mergeProblem = mergeProblemOf({ product, targets: [key], merge: sketch.merge });
     if (mergeProblem)
         return mergeProblem;
@@ -443,6 +588,34 @@ const addTarget = (options) => {
     return added;
 };
 exports.addTarget = addTarget;
+const layerProblemOf = (options) => {
+    const { sketch, part } = options;
+    const layers = sketch.targets.map((key) => { var _a; return (_a = key.split('/')[0]) !== null && _a !== void 0 ? _a : ''; }).filter(layers_1.isLayer);
+    if (!(0, layers_1.isLayer)(part.layer) ||
+        layers.some((layer) => (0, layers_1.mayUse)({ from: layer, to: part.layer }) || (0, layers_1.mayUse)({ from: part.layer, to: layer }))) {
+        return undefined;
+    }
+    const [first = part.layer] = layers;
+    return `${sketch.target} cannot target ${(0, resolve_product_1.partKeyOf)(part)} (UPWARD-DEPENDENCY): ${first} may use ${layers_1.LAYER_USES[first].join(', ')}, not ${part.layer}`;
+};
+/**
+ * Removes `part` from the targets of an open sketch and deletes its folder in every variant. The first target
+ * cannot be removed.
+ */
+const removeTarget = (options) => {
+    const { sketch, part } = options;
+    const key = (0, resolve_product_1.partKeyOf)(part);
+    if (!sketch.targets.includes(key))
+        return `${sketch.target} does not target ${key}`;
+    if (sketch.targets[0] === key)
+        return `${key} is the main target of ${sketch.target} - discard the sketch instead`;
+    for (const variant of sketch.variants)
+        (0, fs_1.rmSync)((0, path_1.resolve)(sketch.dir, variant, part.layer, part.name), { recursive: true, force: true });
+    const removed = Object.assign(Object.assign({}, sketch), { targets: sketch.targets.filter((target) => target !== key) });
+    (0, exports.writeSketchFile)(removed);
+    return removed;
+};
+exports.removeTarget = removeTarget;
 const reportSlugOf = (sketch) => `sketches/${sketch.product}/${(0, exports.sketchFolderOf)(sketch)}`;
 /** The sketch with `author` among the authors of `variant`; the same sketch when it is there already. */
 const withAuthor = (options) => {
@@ -460,16 +633,19 @@ exports.sketchReportPath = sketchReportPath;
 const REPORT_LIMIT = 400;
 /**
  * Records what an agent builds on a variant of a sketch right now ("phone, outline state"), for Studio to show,
- * and adds the agent's model id to the variant's authors in `sketch.json` unless it is there already.
+ * and adds the agent's model id to the variant's authors in `sketch.json` unless it is there already. A ready sketch
+ * refuses a report unless `reopen` moves it back to in progress.
  */
 const reportSketch = (options) => {
-    const { checkout, sketch, variant, author, message } = options;
+    const { checkout, sketch, variant, author, message, reopen } = options;
     if (!sketch.variants.includes(variant))
         return `${sketch.target} has no variant "${variant}" - it has ${sketch.variants.join(', ') || 'none'}`;
     if (author.trim() === '')
         return 'a report needs --by <model id>';
     if (sketch.status === 'ready' && sketch.decision)
         return `${sketch.target} is decided (${sketch.decision.kind}) - a report would reopen it, so nothing was recorded`;
+    if (sketch.status === 'ready' && !reopen)
+        return `${sketch.target} is ready - a report moves it back to in progress, so nothing was recorded; add --reopen if the user asked for a change`;
     const open = sketch.status === 'ready' ? Object.assign(Object.assign({}, sketch), { status: 'in progress' }) : sketch;
     const reported = (0, exports.withAuthor)({ sketch: open, variant, author });
     if (reported !== sketch)
@@ -535,14 +711,51 @@ const markSketchReady = (options) => {
             .filter((variant) => (0, exports.authorsOf)(sketch, variant).length === 0)
             .reduce((current, variant) => (0, exports.withAuthor)({ sketch: current, variant, author }), sketch)
         : sketch;
-    const ready = Object.assign(Object.assign({}, authored), { status: 'ready' });
+    const ready = Object.assign(Object.assign({}, authored), { status: 'ready', readyContent: readyContentOf(sketch) });
     (0, exports.writeSketchFile)(ready);
     (0, exports.clearSketchReport)({ checkout, sketch });
     return ready;
 };
 exports.markSketchReady = markSketchReady;
+const filesIn = (dir) => (0, fs_1.existsSync)(dir)
+    ? (0, fs_1.readdirSync)(dir, { recursive: true })
+        .map((path) => (0, path_1.resolve)(dir, path))
+        .filter((file) => (0, fs_1.statSync)(file).isFile())
+    : [];
+/** The content hash of every file a variant draws from: its folder and the `shared/` folder of the sketch. */
+const variantContentHashOf = (sketch, variant) => {
+    const hash = (0, crypto_1.createHash)('sha256');
+    const files = [...filesIn((0, exports.variantDirOf)(sketch, variant)), ...filesIn((0, exports.sharedDirOf)(sketch))].sort();
+    for (const file of files)
+        hash
+            .update(`${(0, path_1.relative)(sketch.dir, file)}\0`)
+            .update((0, fs_1.readFileSync)(file))
+            .update('\0');
+    return hash.digest('hex').slice(0, 16);
+};
+exports.variantContentHashOf = variantContentHashOf;
+const readyContentOf = (sketch) => Object.fromEntries(sketch.variants.map((variant) => [variant, (0, exports.variantContentHashOf)(sketch, variant)]));
+/**
+ * Moves an undecided ready sketch back to in progress when a variant changed since `sketch ready` judged it, and
+ * answers the changed variants, or `null` when nothing changed or the sketch recorded no content.
+ */
+const reopenChangedReady = (sketch) => {
+    if (sketch.status !== 'ready' || sketch.decision || !sketch.readyContent)
+        return null;
+    const judged = sketch.readyContent;
+    const changed = sketch.variants.filter((variant) => judged[variant] !== (0, exports.variantContentHashOf)(sketch, variant));
+    if (changed.length === 0)
+        return null;
+    const { readyContent: _readyContent, mergeHold: _mergeHold } = sketch, rest = __rest(sketch, ["readyContent", "mergeHold"]);
+    const reopened = Object.assign(Object.assign({}, rest), { status: 'in progress' });
+    (0, exports.writeSketchFile)(reopened);
+    return { sketch: reopened, changed };
+};
+exports.reopenChangedReady = reopenChangedReady;
 /** Why a held sketch cannot be ready, or `null` when it holds nothing. */
-const heldProblemOf = (sketch) => sketch.hold ? `${sketch.target} is held until: ${sketch.hold.until} - make the change, then sketch release it` : null;
+const heldProblemOf = (sketch) => sketch.hold
+    ? `${sketch.target} is held until: ${sketch.hold.until} - make the change, then run \`et design sketch release ${sketch.target} --by <name>\``
+    : null;
 exports.heldProblemOf = heldProblemOf;
 /**
  * Holds a sketch until a change that waits on something is made: it goes back to in progress, which drops a pick
@@ -599,6 +812,33 @@ const withVerdict = (sketch, verdict) => {
     const { decision } = sketch, rest = __rest(sketch, ["decision"]);
     return Object.assign(Object.assign(Object.assign({}, rest), (decision && !unpicked ? { decision } : {})), { rejections: Object.assign(Object.assign({}, sketch.rejections), { [variant]: next }) });
 };
+/**
+ * Takes a variant out of the open set as `withdrawn` by the agent `by`, with `reason`; refused when `by` did not draw
+ * the variant or it is rejected already. Writes sketch.json.
+ */
+const withdrawVariant = (options) => {
+    var _a, _b;
+    const { sketch, variant, by, reason } = options;
+    if (!sketch.variants.includes(variant))
+        return `${sketch.target} has no variant "${variant}" - it has ${sketch.variants.join(', ')}`;
+    if ((0, exports.rejectionOf)(sketch, variant))
+        return `${sketch.target} variant ${variant} is rejected or withdrawn already`;
+    if (!(0, exports.authorsOf)(sketch, variant).includes(by))
+        return `${sketch.target} variant ${variant} was not drawn by ${by}${drawerNote(sketch, variant)} - only its author withdraws it`;
+    const withdrawn = withVerdict(sketch, { kind: 'reject', variant, reason, by: 'agent' });
+    if (typeof withdrawn === 'string')
+        return withdrawn;
+    const history = (_b = (_a = withdrawn.rejections) === null || _a === void 0 ? void 0 : _a[variant]) !== null && _b !== void 0 ? _b : [];
+    const last = history[history.length - 1];
+    const marked = Object.assign(Object.assign({}, withdrawn), { rejections: Object.assign(Object.assign({}, withdrawn.rejections), { [variant]: [...history.slice(0, -1), Object.assign(Object.assign({}, last), { status: 'withdrawn', withdrawnBy: by })] }) });
+    (0, exports.writeSketchFile)(marked);
+    return marked;
+};
+exports.withdrawVariant = withdrawVariant;
+const drawerNote = (sketch, variant) => {
+    const authors = (0, exports.authorsOf)(sketch, variant);
+    return authors.length > 0 ? ` (drawn by ${authors.join(', ')})` : '';
+};
 /**
  * Records the user's pick or discard on a sketch, the decision Studio writes and the agent acts on, or a verdict on
  * one variant. A rejected variant cannot be picked; rejecting the picked variant clears the pick.
@@ -611,6 +851,8 @@ const decideSketch = (options) => {
             (0, exports.writeSketchFile)(judged);
         return judged;
     }
+    if (!(0, write_origin_1.hasActor)(decision))
+        return `${sketch.target}: a ${decision.kind} needs the actor that writes it (by)`;
     if (decision.kind === 'pick') {
         if (sketch.status !== 'ready')
             return `${sketch.target} is ${sketch.status} - a variant is picked once it is ready`;
@@ -630,7 +872,8 @@ exports.decideSketch = decideSketch;
  * up to date with the parts that changed in the product since the sketch was created.
  */
 const rebaseSketch = (options) => {
-    const rebased = Object.assign(Object.assign({}, options.sketch), { baseline: (0, baseline_1.baselineOf)(options.product) });
+    const _a = options.sketch, { portAfterMerge: _ported } = _a, sketch = __rest(_a, ["portAfterMerge"]);
+    const rebased = Object.assign(Object.assign({}, sketch), { baseline: (0, baseline_1.baselineOf)(options.product) });
     (0, exports.writeSketchFile)(rebased);
     return rebased;
 };