@ethlete/cli 3.0.0-next.22 → 3.0.0-next.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +66 -0
- package/design/contrast.ts +49 -0
- package/design/define-call.ts +5 -8
- package/design/define-part.ts +63 -1
- package/design/morph.ts +67 -0
- package/design/motion-runtime.ts +200 -0
- package/design/web/env.d.ts +6 -2
- package/design/web/frame.ts +39 -1
- package/package.json +2 -1
- package/playwright/failure-reporter.d.ts +2 -0
- package/playwright/failure-reporter.js +1 -0
- package/src/lib/design/changed-parts.d.ts +4 -4
- package/src/lib/design/changed-parts.js +10 -6
- package/src/lib/design/changed-parts.js.map +1 -1
- package/src/lib/design/check.js +1 -1
- package/src/lib/design/check.js.map +1 -1
- package/src/lib/design/contact-sheet.d.ts +39 -8
- package/src/lib/design/contact-sheet.js +131 -21
- package/src/lib/design/contact-sheet.js.map +1 -1
- package/src/lib/design/design-command.js +22 -2
- package/src/lib/design/design-command.js.map +1 -1
- package/src/lib/design/generated-stylesheets.d.ts +15 -0
- package/src/lib/design/generated-stylesheets.js +52 -0
- package/src/lib/design/generated-stylesheets.js.map +1 -0
- package/src/lib/design/inbox-command.d.ts +1 -0
- package/src/lib/design/inbox-command.js +15 -0
- package/src/lib/design/inbox-command.js.map +1 -1
- package/src/lib/design/merge-compare.d.ts +10 -0
- package/src/lib/design/merge-compare.js +17 -4
- package/src/lib/design/merge-compare.js.map +1 -1
- package/src/lib/design/paths.d.ts +11 -0
- package/src/lib/design/paths.js.map +1 -1
- package/src/lib/design/render.d.ts +3 -1
- package/src/lib/design/render.js +17 -1
- package/src/lib/design/render.js.map +1 -1
- package/src/lib/design/serve.js +317 -254
- package/src/lib/design/serve.js.map +1 -1
- package/src/lib/design/shot-command.d.ts +25 -0
- package/src/lib/design/shot-command.js +162 -62
- package/src/lib/design/shot-command.js.map +1 -1
- package/src/lib/design/shot.d.ts +14 -4
- package/src/lib/design/shot.js +71 -50
- package/src/lib/design/shot.js.map +1 -1
- package/src/lib/design/sketch-command.d.ts +7 -1
- package/src/lib/design/sketch-command.js +108 -31
- package/src/lib/design/sketch-command.js.map +1 -1
- package/src/lib/design/sketch-stylesheets.d.ts +7 -0
- package/src/lib/design/sketch-stylesheets.js +63 -0
- package/src/lib/design/sketch-stylesheets.js.map +1 -0
- package/src/lib/design/studio-api.d.ts +20 -7
- package/src/lib/design/studio-api.js +99 -28
- package/src/lib/design/studio-api.js.map +1 -1
- package/src/lib/design/system/check-system.js +8 -0
- package/src/lib/design/system/check-system.js.map +1 -1
- package/src/lib/design/system/comments/comment.d.ts +18 -1
- package/src/lib/design/system/comments/comment.js +35 -1
- package/src/lib/design/system/comments/comment.js.map +1 -1
- package/src/lib/design/system/comments/complete.js +4 -2
- package/src/lib/design/system/comments/complete.js.map +1 -1
- package/src/lib/design/system/complete-command.d.ts +9 -0
- package/src/lib/design/system/complete-command.js +64 -0
- package/src/lib/design/system/complete-command.js.map +1 -0
- package/src/lib/design/system/complete.d.ts +73 -0
- package/src/lib/design/system/complete.js +655 -0
- package/src/lib/design/system/complete.js.map +1 -0
- package/src/lib/design/system/contrast-check.d.ts +26 -0
- package/src/lib/design/system/contrast-check.js +153 -0
- package/src/lib/design/system/contrast-check.js.map +1 -0
- package/src/lib/design/system/imports.d.ts +28 -3
- package/src/lib/design/system/imports.js +84 -7
- package/src/lib/design/system/imports.js.map +1 -1
- package/src/lib/design/system/list-system.d.ts +11 -0
- package/src/lib/design/system/list-system.js +17 -1
- package/src/lib/design/system/list-system.js.map +1 -1
- package/src/lib/design/system/product-stylesheets.d.ts +3 -0
- package/src/lib/design/system/product-stylesheets.js +40 -0
- package/src/lib/design/system/product-stylesheets.js.map +1 -0
- package/src/lib/design/system/render-check.js +11 -3
- package/src/lib/design/system/render-check.js.map +1 -1
- package/src/lib/design/system/rules/canonical-class.d.ts +9 -0
- package/src/lib/design/system/rules/canonical-class.js +132 -0
- package/src/lib/design/system/rules/canonical-class.js.map +1 -0
- package/src/lib/design/system/rules/inline-svg.d.ts +7 -0
- package/src/lib/design/system/rules/inline-svg.js +28 -0
- package/src/lib/design/system/rules/inline-svg.js.map +1 -0
- package/src/lib/design/system/rules/motion.d.ts +4 -0
- package/src/lib/design/system/rules/motion.js +46 -2
- package/src/lib/design/system/rules/motion.js.map +1 -1
- package/src/lib/design/system/rules/utility-css.d.ts +11 -0
- package/src/lib/design/system/rules/utility-css.js +290 -0
- package/src/lib/design/system/rules/utility-css.js.map +1 -0
- package/src/lib/design/system/sketch/baseline.d.ts +3 -2
- package/src/lib/design/system/sketch/baseline.js +10 -4
- package/src/lib/design/system/sketch/baseline.js.map +1 -1
- package/src/lib/design/system/sketch/merge-preview.d.ts +4 -2
- package/src/lib/design/system/sketch/merge-preview.js +20 -3
- package/src/lib/design/system/sketch/merge-preview.js.map +1 -1
- package/src/lib/design/system/sketch/merge-shared.d.ts +42 -6
- package/src/lib/design/system/sketch/merge-shared.js +122 -24
- package/src/lib/design/system/sketch/merge-shared.js.map +1 -1
- package/src/lib/design/system/sketch/merge.d.ts +3 -3
- package/src/lib/design/system/sketch/merge.js +57 -29
- package/src/lib/design/system/sketch/merge.js.map +1 -1
- package/src/lib/design/system/sketch/merged-parts.d.ts +7 -0
- package/src/lib/design/system/sketch/merged-parts.js +13 -1
- package/src/lib/design/system/sketch/merged-parts.js.map +1 -1
- package/src/lib/design/system/sketch/no-visible-change.d.ts +4 -3
- package/src/lib/design/system/sketch/no-visible-change.js +50 -19
- package/src/lib/design/system/sketch/no-visible-change.js.map +1 -1
- package/src/lib/design/system/sketch/overlay.js +7 -2
- package/src/lib/design/system/sketch/overlay.js.map +1 -1
- package/src/lib/design/system/sketch/part-definition.d.ts +12 -0
- package/src/lib/design/system/sketch/part-definition.js +40 -1
- package/src/lib/design/system/sketch/part-definition.js.map +1 -1
- package/src/lib/design/system/sketch/sketch.d.ts +63 -12
- package/src/lib/design/system/sketch/sketch.js +165 -36
- package/src/lib/design/system/sketch/sketch.js.map +1 -1
- package/src/lib/design/system/sketch/unchanged-states.d.ts +11 -5
- package/src/lib/design/system/sketch/unchanged-states.js +39 -25
- package/src/lib/design/system/sketch/unchanged-states.js.map +1 -1
- package/src/lib/design/system/system-modules.d.ts +5 -1
- package/src/lib/design/system/system-modules.js +26 -8
- package/src/lib/design/system/system-modules.js.map +1 -1
- package/src/lib/design/system/system-tsconfig.js +2 -1
- package/src/lib/design/system/system-tsconfig.js.map +1 -1
- package/src/lib/design/thumb.d.ts +6 -2
- package/src/lib/design/thumb.js +36 -15
- package/src/lib/design/thumb.js.map +1 -1
- package/src/lib/design/typecheck.d.ts +2 -0
- package/src/lib/design/typecheck.js +19 -2
- package/src/lib/design/typecheck.js.map +1 -1
- package/src/lib/design/variant-diff.d.ts +24 -6
- package/src/lib/design/variant-diff.js +26 -10
- package/src/lib/design/variant-diff.js.map +1 -1
- package/src/lib/design/warm-pages.d.ts +20 -0
- package/src/lib/design/warm-pages.js +78 -0
- package/src/lib/design/warm-pages.js.map +1 -0
- package/src/lib/playwright/failure-reporter.d.ts +35 -0
- package/src/lib/playwright/failure-reporter.js +66 -0
- package/src/lib/playwright/failure-reporter.js.map +1 -0
- package/src/lib/update/commits.d.ts +9 -0
- package/src/lib/update/commits.js +15 -1
- package/src/lib/update/commits.js.map +1 -1
- package/src/lib/update/migration-manifest.d.ts +6 -0
- package/src/lib/update/migration-manifest.js +7 -0
- package/src/lib/update/migration-manifest.js.map +1 -1
- package/src/lib/update/migrations-command.js +1 -0
- package/src/lib/update/migrations-command.js.map +1 -1
- package/src/lib/update/run-migrations.d.ts +22 -0
- package/src/lib/update/run-migrations.js +60 -1
- package/src/lib/update/run-migrations.js.map +1 -1
- package/src/lib/update/update-command.d.ts +10 -0
- package/src/lib/update/update-command.js +28 -2
- package/src/lib/update/update-command.js.map +1 -1
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createGeneratedStylesheets = void 0;
|
|
4
|
+
const child_process_1 = require("child_process");
|
|
5
|
+
const util_1 = require("util");
|
|
6
|
+
const crypto_1 = require("crypto");
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const paths_1 = require("./paths");
|
|
10
|
+
/**
|
|
11
|
+
* Each stylesheet a product generates from a part (`generated` in its config) mapped to the output of the
|
|
12
|
+
* generator run against one sketch variant's own stylesheet of that part. Empty for a merged frame and for a
|
|
13
|
+
* variant that keeps the merged part stylesheet.
|
|
14
|
+
*/
|
|
15
|
+
const createGeneratedStylesheets = (options) => {
|
|
16
|
+
const { target, config, system } = options;
|
|
17
|
+
const runs = new Map();
|
|
18
|
+
const textOf = (file) => ((0, fs_1.existsSync)(file) ? (0, fs_1.readFileSync)(file, 'utf8') : null);
|
|
19
|
+
const generate = (entry, partCss) => {
|
|
20
|
+
const key = (0, crypto_1.createHash)('sha1')
|
|
21
|
+
.update(JSON.stringify([entry.command, entry.stylesheets, (0, fs_1.readFileSync)(partCss, 'utf8')]))
|
|
22
|
+
.digest('hex')
|
|
23
|
+
.slice(0, 16);
|
|
24
|
+
const known = runs.get(key);
|
|
25
|
+
if (known)
|
|
26
|
+
return known;
|
|
27
|
+
// Per process, so two servers of one checkout never read a folder the other is writing.
|
|
28
|
+
const out = (0, path_1.resolve)((0, paths_1.workRootOf)(target), 'generated', `${key}-${process.pid}`);
|
|
29
|
+
const [command = '', ...args] = entry.command;
|
|
30
|
+
const run = (0, util_1.promisify)(child_process_1.execFile)(command, [...args, '--part', partCss, '--out', out], { cwd: target }).then(() => out, (error) => {
|
|
31
|
+
throw new Error(`design-explore: \`${entry.command.join(' ')}\` failed for ${partCss}: ${error.stderr || error.message}`);
|
|
32
|
+
});
|
|
33
|
+
runs.set(key, run);
|
|
34
|
+
run.catch(() => runs.delete(key));
|
|
35
|
+
return run;
|
|
36
|
+
};
|
|
37
|
+
return (options) => {
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const { product, sketch } = options;
|
|
40
|
+
const entries = (sketch && ((_b = (_a = config.products) === null || _a === void 0 ? void 0 : _a[product]) === null || _b === void 0 ? void 0 : _b.generated)) || [];
|
|
41
|
+
return Promise.all(entries.map((entry) => {
|
|
42
|
+
var _a, _b;
|
|
43
|
+
const merged = (_a = system.partOf({ product, part: entry.part })) === null || _a === void 0 ? void 0 : _a.css;
|
|
44
|
+
const drawn = (_b = system.partOf({ product, part: entry.part, sketch })) === null || _b === void 0 ? void 0 : _b.css;
|
|
45
|
+
if (!merged || !drawn || !(0, fs_1.existsSync)(drawn) || (0, fs_1.readFileSync)(drawn, 'utf8') === textOf(merged))
|
|
46
|
+
return [];
|
|
47
|
+
return generate(entry, drawn).then((out) => entry.stylesheets.map((stylesheet) => [(0, path_1.resolve)(target, stylesheet), (0, path_1.resolve)(out, stylesheet)]));
|
|
48
|
+
})).then((pairs) => new Map(pairs.flat()));
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
exports.createGeneratedStylesheets = createGeneratedStylesheets;
|
|
52
|
+
//# sourceMappingURL=generated-stylesheets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generated-stylesheets.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/generated-stylesheets.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare const designInbox: (options: {
|
|
|
12
12
|
}) => number;
|
|
13
13
|
/**
|
|
14
14
|
* `et design comment …` writes a comment on a state of a part, as Studio does from the canvas.
|
|
15
|
+
* `et design comment resolve-ended` resolves the addressed comments of sketches that no longer exist.
|
|
15
16
|
* `et design comment reply <id> <text>` answers a comment thread as the agent; `--question` marks a reply that waits for the user's answer.
|
|
16
17
|
*/
|
|
17
18
|
export declare const designComment: (options: {
|
|
@@ -11,6 +11,7 @@ exports.INBOX_USAGE = ['inbox [--product <name>] [--json]', 'inbox done <id> --n
|
|
|
11
11
|
exports.COMMENT_USAGE = [
|
|
12
12
|
'comment <layer>/<name> <state> --size <preset|px|fitted> <text> [--interaction <name>] [--at <x>,<y>] [--sketch <layer>/<name> --variant <key>] [--product <name>]',
|
|
13
13
|
'comment reply <id> --by <model id> <text> [--question] [--product <name>]',
|
|
14
|
+
'comment resolve-ended [--product <name>]',
|
|
14
15
|
];
|
|
15
16
|
const fail = (message, code = 1) => {
|
|
16
17
|
console.error(message);
|
|
@@ -106,6 +107,7 @@ const designCommentReply = (options) => {
|
|
|
106
107
|
};
|
|
107
108
|
/**
|
|
108
109
|
* `et design comment …` writes a comment on a state of a part, as Studio does from the canvas.
|
|
110
|
+
* `et design comment resolve-ended` resolves the addressed comments of sketches that no longer exist.
|
|
109
111
|
* `et design comment reply <id> <text>` answers a comment thread as the agent; `--question` marks a reply that waits for the user's answer.
|
|
110
112
|
*/
|
|
111
113
|
const designComment = (options) => {
|
|
@@ -122,6 +124,19 @@ const designComment = (options) => {
|
|
|
122
124
|
question: args.flags.has('--question'),
|
|
123
125
|
invocation,
|
|
124
126
|
});
|
|
127
|
+
if (args.positional[0] === 'resolve-ended') {
|
|
128
|
+
if (args.positional.length > 1)
|
|
129
|
+
return usage(invocation, exports.COMMENT_USAGE);
|
|
130
|
+
const config = (0, cli_args_1.configOf)(target);
|
|
131
|
+
if (typeof config === 'string')
|
|
132
|
+
return fail(config);
|
|
133
|
+
const product = (0, cli_args_1.oneProductOf)({ target, config, asked: args.values['--product'] });
|
|
134
|
+
if (typeof product === 'string')
|
|
135
|
+
return fail(product);
|
|
136
|
+
const resolved = (0, comment_1.resolveEndedSketchComments)({ product });
|
|
137
|
+
console.log(`resolved ${resolved.length} addressed comment(s) of ended sketches in ${product.name}`);
|
|
138
|
+
return 0;
|
|
139
|
+
}
|
|
125
140
|
const [part, state, ...words] = args.positional;
|
|
126
141
|
const size = sizeOf(args.values['--size']);
|
|
127
142
|
const point = pointOf(args.values['--at']);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox-command.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/inbox-command.ts"],"names":[],"mappings":";;;AAAA,+BAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"inbox-command.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/inbox-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,17 @@ export type PictureOf = (options: {
|
|
|
35
35
|
sketch: SketchVariant | null;
|
|
36
36
|
interaction: string | null;
|
|
37
37
|
params: URLSearchParams;
|
|
38
|
+
fresh?: boolean;
|
|
38
39
|
}) => Promise<Picture>;
|
|
40
|
+
/**
|
|
41
|
+
* Draws a state without and with `merged`. A pair that differs is drawn once more, bypassing any kept picture,
|
|
42
|
+
* and only that second pair counts, so one odd picture under load is not taken for a change.
|
|
43
|
+
*/
|
|
44
|
+
export declare const drawnPair: (draw: (sketch: SketchVariant | null, fresh: boolean) => Promise<Picture>, merged: SketchVariant) => Promise<{
|
|
45
|
+
now: Picture;
|
|
46
|
+
after: Picture;
|
|
47
|
+
same: boolean;
|
|
48
|
+
}>;
|
|
39
49
|
export type PartModuleLoader = (options: {
|
|
40
50
|
file: string;
|
|
41
51
|
product: string;
|
|
@@ -9,10 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.compareMerge = void 0;
|
|
12
|
+
exports.compareMerge = exports.drawnPair = void 0;
|
|
13
13
|
const list_system_1 = require("./system/list-system");
|
|
14
14
|
const resolve_product_1 = require("./system/resolve-product");
|
|
15
15
|
const merge_preview_1 = require("./system/sketch/merge-preview");
|
|
16
|
+
/**
|
|
17
|
+
* Draws a state without and with `merged`. A pair that differs is drawn once more, bypassing any kept picture,
|
|
18
|
+
* and only that second pair counts, so one odd picture under load is not taken for a change.
|
|
19
|
+
*/
|
|
20
|
+
const drawnPair = (draw, merged) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
const both = (fresh) => Promise.all([draw(null, fresh), draw(merged, fresh)]);
|
|
22
|
+
let [now, after] = yield both(false);
|
|
23
|
+
if (!now.png.equals(after.png))
|
|
24
|
+
[now, after] = yield both(true);
|
|
25
|
+
return { now, after, same: now.png.equals(after.png) };
|
|
26
|
+
});
|
|
27
|
+
exports.drawnPair = drawnPair;
|
|
16
28
|
const outlinesOf = (picture, target) => picture.marks
|
|
17
29
|
.filter((mark) => mark.parts.includes(target))
|
|
18
30
|
.map(({ x, y, width, height }) => ({ x, y, width, height }));
|
|
@@ -40,7 +52,7 @@ const compareMerge = (options) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
40
52
|
const picked = (_b = offered.map(String).find((entry) => entry === size)) !== null && _b !== void 0 ? _b : offered[0];
|
|
41
53
|
const at = picked === undefined ? {} : part.layer === 'pages' ? { preset: String(picked) } : { width: Number(picked) };
|
|
42
54
|
return Promise.all(read.states.map((state) => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
|
-
const draw = (drawn) => {
|
|
55
|
+
const draw = (drawn, fresh) => {
|
|
44
56
|
var _a, _b;
|
|
45
57
|
return pictureOf({
|
|
46
58
|
product: product.name,
|
|
@@ -51,13 +63,14 @@ const compareMerge = (options) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
51
63
|
sketch: drawn,
|
|
52
64
|
interaction: null,
|
|
53
65
|
params,
|
|
66
|
+
fresh,
|
|
54
67
|
});
|
|
55
68
|
};
|
|
56
69
|
try {
|
|
57
|
-
const
|
|
70
|
+
const { now, after, same } = yield (0, exports.drawnPair)(draw, merged);
|
|
58
71
|
return {
|
|
59
72
|
row: Object.assign(Object.assign({ part: key, state }, at), { outlines: { now: outlinesOf(now, target), merged: outlinesOf(after, target) } }),
|
|
60
|
-
changed: !
|
|
73
|
+
changed: !same,
|
|
61
74
|
};
|
|
62
75
|
}
|
|
63
76
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-compare.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/merge-compare.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAAsD;AACtD,8DAAsE;AACtE,iEAA+D;
|
|
1
|
+
{"version":3,"file":"merge-compare.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/merge-compare.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAAsD;AACtD,8DAAsE;AACtE,iEAA+D;AAmC/D;;;GAGG;AACI,MAAM,SAAS,GAAG,CACvB,IAAwE,EACxE,MAAqB,EACrB,EAAE;IACF,MAAM,IAAI,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACvF,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;IAErC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;AACzD,CAAC,CAAA,CAAC;AAVW,QAAA,SAAS,aAUpB;AAIF,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,MAAc,EAAa,EAAE,CACjE,OAAO,CAAC,KAAK;KACV,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC7C,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAEjE,MAAM,SAAS,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AAE/F;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAO,OAQlC,EAAyB,EAAE;IAC1B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,MAAM,MAAM,GAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,8BAAc,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,CAAO,GAAW,EAAoD,EAAE;;QACrF,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,2BAAS,EAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;QAE7E,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAc,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzE,IAAI,IAAI,CAAC,OAAO;YACd,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpH,MAAM,OAAO,GACX,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,mCAAI,EAAE,CAAC,CAAC;QAC/G,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,mCAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACjF,MAAM,EAAE,GACN,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAE9G,OAAO,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE;YAC9B,MAAM,IAAI,GAAG,CAAC,KAA2B,EAAE,KAAc,EAAE,EAAE;;gBAC3D,OAAA,SAAS,CAAC;oBACR,OAAO,EAAE,OAAO,CAAC,IAAI;oBACrB,IAAI,EAAE,GAAG;oBACT,KAAK;oBACL,MAAM,EAAE,MAAA,EAAE,CAAC,MAAM,mCAAI,IAAI;oBACzB,KAAK,EAAE,MAAA,EAAE,CAAC,KAAK,mCAAI,IAAI;oBACvB,MAAM,EAAE,KAAK;oBACb,WAAW,EAAE,IAAI;oBACjB,MAAM;oBACN,KAAK;iBACN,CAAC,CAAA;aAAA,CAAC;YAEL,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,iBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAE3D,OAAO;oBACL,GAAG,gCACD,IAAI,EAAE,GAAG,EACT,KAAK,IACF,EAAE,KACL,QAAQ,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,GAC9E;oBACD,OAAO,EAAE,CAAC,IAAI;iBACf,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO;oBACL,GAAG,gCAAI,IAAI,EAAE,GAAG,EAAE,KAAK,IAAK,EAAE,KAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,GAAE;oBAC5F,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;QACH,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC,CAAA,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE9D,OAAO;QACL,MAAM;QACN,OAAO;QACP,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;QACxE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;KAC5E,CAAC;AACJ,CAAC,CAAA,CAAC;AA3EW,QAAA,YAAY,gBA2EvB"}
|
|
@@ -42,6 +42,17 @@ export type DesignProduct = DesignProject & {
|
|
|
42
42
|
tokens?: string[];
|
|
43
43
|
/** Inherited parts to omit; a product's own part with the same key remains visible. */
|
|
44
44
|
hideBaseParts?: string[];
|
|
45
|
+
generated?: DesignGeneratedStylesheets[];
|
|
46
|
+
};
|
|
47
|
+
/**
|
|
48
|
+
* Stylesheets a command generates from one part's stylesheet. A frame of a sketch variant that changes `part`
|
|
49
|
+
* runs `command` (checkout-relative, from the checkout root) with `--part <the variant's part stylesheet>
|
|
50
|
+
* --out <folder>` and loads each of `stylesheets` from `<folder>/<its checkout path>` instead.
|
|
51
|
+
*/
|
|
52
|
+
export type DesignGeneratedStylesheets = {
|
|
53
|
+
part: string;
|
|
54
|
+
command: string[];
|
|
55
|
+
stylesheets: string[];
|
|
45
56
|
};
|
|
46
57
|
export type DesignConfig = {
|
|
47
58
|
port?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/paths.ts"],"names":[],"mappings":";;;AAAA,2BAA2E;AAC3E,mCAAoC;AACpC,+BAAkD;AAElD,iGAAiG;AACpF,QAAA,UAAU,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,9 @@ export type RenderAsk = {
|
|
|
20
20
|
export declare const createRenderer: (options: {
|
|
21
21
|
target: string;
|
|
22
22
|
config: DesignConfig;
|
|
23
|
-
}) => (ask: RenderAsk) => Promise<RenderResult
|
|
23
|
+
}) => ((ask: RenderAsk) => Promise<RenderResult>) & {
|
|
24
|
+
close: () => Promise<void>;
|
|
25
|
+
};
|
|
24
26
|
/**
|
|
25
27
|
* Answers `POST /__design/render` with the rendered markup and styles, the styles rewritten so a frame
|
|
26
28
|
* can force their interactions, or a 500 with the error.
|
package/src/lib/design/render.js
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
12
|
var t = {};
|
|
4
13
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
@@ -75,7 +84,7 @@ const createRenderer = (options) => {
|
|
|
75
84
|
watched = {};
|
|
76
85
|
return started;
|
|
77
86
|
};
|
|
78
|
-
|
|
87
|
+
const render = (ask) => {
|
|
79
88
|
var _a, _b, _c, _d, _e, _f;
|
|
80
89
|
if (worker && ((0, exports.isStale)(watched) || startedWith !== JSON.stringify(workerDataOf()))) {
|
|
81
90
|
void worker.terminate();
|
|
@@ -96,6 +105,13 @@ const createRenderer = (options) => {
|
|
|
96
105
|
worker.postMessage(request);
|
|
97
106
|
return result;
|
|
98
107
|
};
|
|
108
|
+
const close = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
109
|
+
const stopped = worker;
|
|
110
|
+
worker = null;
|
|
111
|
+
settleAll('design-explore: the renderer closed');
|
|
112
|
+
yield (stopped === null || stopped === void 0 ? void 0 : stopped.terminate());
|
|
113
|
+
});
|
|
114
|
+
return Object.assign(render, { close });
|
|
99
115
|
};
|
|
100
116
|
exports.createRenderer = createRenderer;
|
|
101
117
|
const readBody = (request) => new Promise((settle, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/render.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/design/render.ts"],"names":[],"mappings":"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"}
|