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

package/src/lib/design/system/sketch/sketch-check-worker.js

@@ -0,0 +1,27 @@
+"use strict";
+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)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_threads_1 = require("worker_threads");
+const sketch_checker_1 = require("./sketch-checker");
+const answerOf = (_a) => {
+    var { id } = _a, request = __rest(_a, ["id"]);
+    try {
+        const listing = (0, sketch_checker_1.openSketchListingAt)(request);
+        return typeof listing === 'string' ? { id, error: listing } : { id, result: listing };
+    }
+    catch (error) {
+        return { id, error: error instanceof Error ? error.message : String(error) };
+    }
+};
+worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.on('message', (request) => worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage(answerOf(request)));
+//# sourceMappingURL=sketch-check-worker.js.map

package/src/lib/design/system/sketch/sketch-check-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sketch-check-worker.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/sketch-check-worker.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mDAA4C;AAC5C,qDAAgG;AAEhG,MAAM,QAAQ,GAAG,CAAC,EAAsC,EAAuB,EAAE;QAA/D,EAAE,EAAE,OAAkC,EAA7B,OAAO,cAAhB,MAAkB,CAAF;IAChC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAC;QAE7C,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACxF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/E,CAAC;AACH,CAAC,CAAC;AAEF,2BAAU,aAAV,2BAAU,uBAAV,2BAAU,CAAE,EAAE,CAAC,SAAS,EAAE,CAAC,OAA2B,EAAE,EAAE,CAAC,2BAAU,aAAV,2BAAU,uBAAV,2BAAU,CAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC"}

package/src/lib/design/system/sketch/sketch-checker.d.ts

@@ -0,0 +1,27 @@
+import { OpenSketchListing } from './check-sketches';
+export type SketchCheckRequest = {
+    id: number;
+    target: string;
+    product: string;
+};
+export type SketchCheckResponse = {
+    id: number;
+    result?: OpenSketchListing;
+    error?: string;
+};
+export type CheckSketches = (options: {
+    target: string;
+    product: string;
+}) => Promise<OpenSketchListing>;
+/** The rule checks of `product`'s open sketches in `target`, on this thread; a string when the product does not resolve. */
+export declare const openSketchListingAt: ({ target, product }: {
+    target: string;
+    product: string;
+}) => string | OpenSketchListing;
+/**
+ * Runs the rule checks of a product's open sketches in a worker, so the server keeps answering
+ * while they run. A listing asked while one for the same product runs gets that one's result.
+ */
+export declare const createSketchChecker: () => CheckSketches & {
+    close: () => Promise<void>;
+};

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

@@ -0,0 +1,99 @@
+"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.createSketchChecker = exports.openSketchListingAt = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const url_1 = require("url");
+const worker_threads_1 = require("worker_threads");
+const paths_1 = require("../../paths");
+const check_sketches_1 = require("./check-sketches");
+const cli_args_1 = require("./cli-args");
+/** The rule checks of `product`'s open sketches in `target`, on this thread; a string when the product does not resolve. */
+const openSketchListingAt = ({ target, product }) => {
+    const config = (0, paths_1.readConfig)(target);
+    const resolved = config ? (0, cli_args_1.oneProductOf)({ target, config, asked: product }) : 'no design config';
+    return typeof resolved === 'string' ? resolved : (0, check_sketches_1.openSketchListingOf)(resolved);
+};
+exports.openSketchListingAt = openSketchListingAt;
+const startWorker = () => {
+    const built = (0, paths_1.packageFileOf)((0, path_1.resolve)(__dirname, 'sketch-check-worker.js'));
+    // Specs run this file from source, where only the `.ts` worker exists.
+    return (0, fs_1.existsSync)(built)
+        ? new worker_threads_1.Worker(built)
+        : new worker_threads_1.Worker((0, path_1.resolve)(__dirname, 'sketch-check-worker.ts'), {
+            execArgv: [
+                '--import',
+                (0, url_1.pathToFileURL)((0, path_1.resolve)(require.resolve('jiti/package.json'), '../lib/jiti-register.mjs')).href,
+            ],
+        });
+};
+/**
+ * Runs the rule checks of a product's open sketches in a worker, so the server keeps answering
+ * while they run. A listing asked while one for the same product runs gets that one's result.
+ */
+const createSketchChecker = () => {
+    const pending = new Map();
+    const running = new Map();
+    let worker = null;
+    let nextId = 0;
+    const failAll = (error) => {
+        for (const [id, settle] of pending)
+            settle({ id, error });
+        pending.clear();
+        worker = null;
+    };
+    const start = () => {
+        const started = startWorker();
+        started.unref();
+        started.on('message', (response) => {
+            var _a;
+            (_a = pending.get(response.id)) === null || _a === void 0 ? void 0 : _a(response);
+            pending.delete(response.id);
+        });
+        started.on('error', (error) => {
+            if (started === worker)
+                failAll(`the sketch check worker failed: ${error.message}`);
+        });
+        started.on('exit', () => {
+            if (started === worker)
+                failAll('the sketch check worker exited before it answered');
+        });
+        return started;
+    };
+    const run = (request) => __awaiter(void 0, void 0, void 0, function* () {
+        worker !== null && worker !== void 0 ? worker : (worker = start());
+        const id = nextId++;
+        const answered = new Promise((settle) => pending.set(id, settle));
+        worker.postMessage(Object.assign(Object.assign({}, request), { id }));
+        const { result, error } = yield answered;
+        if (!result)
+            throw new Error(error !== null && error !== void 0 ? error : 'the sketch check worker answered nothing');
+        return result;
+    });
+    const check = (request) => {
+        const key = `${request.target}\n${request.product}`;
+        const known = running.get(key);
+        if (known)
+            return known;
+        const started = run(request).finally(() => running.delete(key));
+        running.set(key, started);
+        return started;
+    };
+    const close = () => __awaiter(void 0, void 0, void 0, function* () {
+        const stopping = worker;
+        failAll('the sketch checker closed');
+        yield (stopping === null || stopping === void 0 ? void 0 : stopping.terminate());
+    });
+    return Object.assign(check, { close });
+};
+exports.createSketchChecker = createSketchChecker;
+//# sourceMappingURL=sketch-checker.js.map

package/src/lib/design/system/sketch/sketch-checker.js.map

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

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

@@ -3,9 +3,11 @@ import { Layer } from '../layers';
 import { ResolvedProduct } from '../resolve-product';
 export declare const SKETCH_STATUSES: readonly ["in progress", "ready"];
 export type SketchStatus = (typeof SKETCH_STATUSES)[number];
+/** A part, and `sketch` when it names one of several sketches on that part; a sketch without a name is the part's only one. */
 export type SketchTarget = {
     layer: Layer;
     name: string;
+    sketch?: string;
 };
 /** What the user decided in Studio: a variant to merge, or the whole sketch to drop. */
 export type SketchDecision = {
@@ -45,6 +47,9 @@ export type SketchRejection = {
     reason?: string;
     reasonBy?: SketchVerdictBy;
     reopened?: SketchReopening;
+    /** `withdrawn`: the agent that drew the variant took it out of the open set, `withdrawnBy` is its model id. Absent on a rejection. */
+    status?: 'withdrawn';
+    withdrawnBy?: string;
 };
 /** One round of variants: its title, the note on what it shows, and why its variants lost once a newer round runs. */
 export type SketchRound = {
@@ -60,6 +65,13 @@ export type SketchHold = {
     by: string;
     heldAt: string;
 };
+/** A rebase after the merge of `merged` that could not port `parts` by itself; the sketch's agent ports `reasons` by hand. */
+export type SketchPortMark = {
+    merged: string[];
+    parts: string[];
+    reasons: string[];
+    at: string;
+};
 export type SketchFile = {
     target: string;
     /** Every part the sketch targets, `target` first; absent on a sketch with one target. */
@@ -79,6 +91,7 @@ export type SketchFile = {
      */
     merge?: SketchMerge;
     hold?: SketchHold;
+    portAfterMerge?: SketchPortMark;
 };
 export declare const SKETCH_MERGES: readonly ["override", "into-base"];
 export type SketchMerge = (typeof SKETCH_MERGES)[number];
@@ -96,6 +109,7 @@ export type Sketch = SketchFile & {
 export declare const SKETCH_FILE = "sketch.json";
 export declare const sketchesDirOf: (productDir: string) => string;
 export declare const sketchFolderOf: (target: SketchTarget) => string;
+export declare const sketchIdOf: (target: SketchTarget) => string;
 export declare const sketchDirOf: (options: {
     productDir: string;
     sketch: SketchTarget;
@@ -105,7 +119,29 @@ export { SHARED_FOLDER };
 export declare const sharedDirOf: (sketch: Pick<Sketch, "dir">) => string;
 /** A variant's own `shared/` folder: a file there wins over the sketch's `shared/` file of the same path. */
 export declare const variantSharedDirOf: (sketch: Sketch, variant: string) => string;
+export declare const SOURCE_FILE: RegExp;
 export declare const sourceFilesIn: (dir: string) => string[];
+/** `source`, the file `file` of the part in `partDir`, with its relative imports of the part's own `shared/` folder as `@shared/`. */
+export declare const withSharedImports: (options: {
+    source: string;
+    file: string;
+    partDir: string;
+}) => string;
+export declare const relativeSpecifierOf: (options: {
+    from: string;
+    to: string;
+}) => string;
+/**
+ * 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`.
+ */
+export declare const rebaseOutsideImports: (options: {
+    dir: string;
+    from: string;
+    within?: string;
+}) => void;
+/** Rewrites the relative imports of the part's own `shared/` folder in its files to `@shared/`. */
+export declare const rewriteSharedImports: (partDir: string) => void;
 /** Reads `<layer>/<name>` as a sketch target, or answers with why it is not one. */
 export declare const parseTarget: (value: string | undefined) => SketchTarget | string;
 export declare const isVariantName: (name: string) => boolean;
@@ -127,6 +163,11 @@ export declare const listSketches: (options: {
     productDir: string;
     product: string;
 }) => (string | Sketch)[];
+/** `listSketches`, letting the server answer other requests before each sketch it reads. */
+export declare const listSketchesInTurns: (options: {
+    productDir: string;
+    product: string;
+}) => Promise<(string | Sketch)[]>;
 /** The open sketch that targets `sketch`, found by its first target or by any other it names; `null` when none does. */
 export declare const findSketch: (options: {
     productDir: string;
@@ -153,7 +194,7 @@ export declare const sketchSourceOf: (options: {
  * 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`.
  */
 export declare const createSketch: (options: {
@@ -178,6 +219,14 @@ export declare const addTarget: (options: {
     part: SketchTarget;
     author?: string;
 }) => Sketch | string;
+/**
+ * Removes `part` from the targets of an open sketch and deletes its folder in every variant. The first target
+ * cannot be removed.
+ */
+export declare const removeTarget: (options: {
+    sketch: Sketch;
+    part: SketchTarget;
+}) => Sketch | string;
 /** The sketch with `author` among the authors of `variant`; the same sketch when it is there already. */
 export declare const withAuthor: (options: {
     sketch: Sketch;
@@ -191,7 +240,8 @@ export declare const sketchReportPath: (options: {
 }) => string;
 /**
  * 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.
  */
 export declare const reportSketch: (options: {
     checkout: string;
@@ -199,6 +249,7 @@ export declare const reportSketch: (options: {
     variant: string;
     author: string;
     message: string;
+    reopen?: boolean;
 }) => Sketch | string;
 /** The live report of an agent on a sketch: its message, the variant and the model id it named. `variant` and `author` are `null` in a report written before they were recorded. */
 export type SketchReport = {
@@ -272,6 +323,16 @@ export type SketchDecisionInput = {
     kind: 'discard';
     comment?: string;
 } | SketchVariantVerdict;
+/**
+ * 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.
+ */
+export declare const withdrawVariant: (options: {
+    sketch: Sketch;
+    variant: string;
+    by: string;
+    reason: string;
+}) => Sketch | string;
 /**
  * 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.