@decocms/blocks 8.1.0-next.6 → 8.1.0
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/dist/v8/cli/check/index.d.ts +6 -2
- package/dist/v8/cli/check/index.d.ts.map +1 -1
- package/dist/v8/cli/check/index.js +34 -7
- package/dist/v8/cli/check/index.js.map +1 -1
- package/dist/v8/cli/color.d.ts +14 -0
- package/dist/v8/cli/color.d.ts.map +1 -0
- package/dist/v8/cli/color.js +14 -0
- package/dist/v8/cli/color.js.map +1 -0
- package/dist/v8/cli/content.d.ts +24 -3
- package/dist/v8/cli/content.d.ts.map +1 -1
- package/dist/v8/cli/content.js +70 -5
- package/dist/v8/cli/content.js.map +1 -1
- package/dist/v8/cli/log.d.ts +4 -0
- package/dist/v8/cli/log.d.ts.map +1 -1
- package/dist/v8/cli/log.js +9 -0
- package/dist/v8/cli/log.js.map +1 -1
- package/dist/v8/cli/run.d.ts +1 -0
- package/dist/v8/cli/run.d.ts.map +1 -1
- package/dist/v8/cli/run.js +18 -4
- package/dist/v8/cli/run.js.map +1 -1
- package/dist/v8/cli/schema/index.d.ts.map +1 -1
- package/dist/v8/cli/schema/index.js +5 -3
- package/dist/v8/cli/schema/index.js.map +1 -1
- package/dist/v8/cli/schema/tsProgram.d.ts +1 -0
- package/dist/v8/cli/schema/tsProgram.d.ts.map +1 -1
- package/dist/v8/cli/schema/tsProgram.js +1 -0
- package/dist/v8/cli/schema/tsProgram.js.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.js +50 -7
- package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +16 -19
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/content.d.ts +4 -5
- package/dist/v8/content.d.ts.map +1 -1
- package/dist/v8/content.js +46 -44
- package/dist/v8/content.js.map +1 -1
- package/dist/v8/draftChanges.d.ts +37 -14
- package/dist/v8/draftChanges.d.ts.map +1 -1
- package/dist/v8/draftChanges.js +66 -44
- package/dist/v8/draftChanges.js.map +1 -1
- package/dist/v8/identity.d.ts +0 -2
- package/dist/v8/identity.d.ts.map +1 -1
- package/dist/v8/identity.js +0 -10
- package/dist/v8/identity.js.map +1 -1
- package/dist/v8/matchRoute.d.ts +12 -10
- package/dist/v8/matchRoute.d.ts.map +1 -1
- package/dist/v8/matchRoute.js +60 -86
- package/dist/v8/matchRoute.js.map +1 -1
- package/dist/v8/remoteLoader.d.ts +4 -4
- package/dist/v8/remoteLoader.d.ts.map +1 -1
- package/dist/v8/remoteLoader.js +106 -96
- package/dist/v8/remoteLoader.js.map +1 -1
- package/dist/v8/routeTrie.d.ts +43 -0
- package/dist/v8/routeTrie.d.ts.map +1 -0
- package/dist/v8/routeTrie.js +88 -0
- package/dist/v8/routeTrie.js.map +1 -0
- package/dist/v8/telemetry.d.ts +7 -7
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +24 -100
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +59 -17
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/v8/cli/check/index.ts +32 -7
- package/src/v8/cli/color.ts +29 -0
- package/src/v8/cli/content.ts +85 -5
- package/src/v8/cli/log.ts +12 -0
- package/src/v8/cli/run.ts +19 -4
- package/src/v8/cli/schema/index.ts +5 -3
- package/src/v8/cli/schema/tsProgram.ts +2 -1
- package/src/v8/cli/schema/typeToSchema.ts +47 -7
- package/src/v8/cms.ts +17 -20
- package/src/v8/content.ts +54 -46
- package/src/v8/draftChanges.ts +79 -43
- package/src/v8/identity.ts +0 -10
- package/src/v8/matchRoute.ts +70 -106
- package/src/v8/remoteLoader.ts +112 -111
- package/src/v8/routeTrie.ts +103 -0
- package/src/v8/telemetry.ts +27 -108
- package/src/v8/types.ts +60 -15
package/dist/v8/telemetry.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
* Telemetry: OpenTelemetry over OTLP/HTTP (JSON, gzipped), with no SDK. See
|
|
3
3
|
* /next/telemetry and /next/telemetry-internals.
|
|
4
4
|
*
|
|
5
|
-
* - **Where** comes from code: `createCMS({ telemetry
|
|
6
|
-
* `
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* wins when both are set. `false` sends nothing.
|
|
5
|
+
* - **Where** comes from code only: `createCMS({ telemetry: { endpoint,
|
|
6
|
+
* headers } })`, else the hosted Deco CMS collector when `createCMS` has a
|
|
7
|
+
* `token` (sent as a Bearer token), else nowhere. `false` sends nothing.
|
|
8
|
+
* Nothing is read from the environment.
|
|
10
9
|
* - **How much** comes from content: the `telemetry` section of the CMS
|
|
11
10
|
* settings (`cms.settings()`, the release's `CMS` block), capped by
|
|
12
11
|
* `telemetry.limits`. The CMS reads it outside any request, when the
|
|
@@ -21,8 +20,7 @@
|
|
|
21
20
|
import { hasBackgroundHook, later, runInBackground } from "./background.js";
|
|
22
21
|
import { rate, TELEMETRY_DEFAULTS } from "./builtins/data.js";
|
|
23
22
|
import { isResolutionError } from "./errors.js";
|
|
24
|
-
|
|
25
|
-
/** The hosted Deco CMS collector, for `telemetry: { site, token }`. */
|
|
23
|
+
/** The hosted Deco CMS collector, for `createCMS({ token })`. */
|
|
26
24
|
const HOSTED_TELEMETRY_ENDPOINT = "https://otel.decocms.com";
|
|
27
25
|
const SINK = Symbol.for("decocms.blocks.telemetry");
|
|
28
26
|
const FLUSH_MS = 10_000;
|
|
@@ -42,64 +40,29 @@ export function telemetryLimits(config) {
|
|
|
42
40
|
};
|
|
43
41
|
}
|
|
44
42
|
/**
|
|
45
|
-
* Where telemetry goes, or `null` for nowhere
|
|
46
|
-
* `
|
|
43
|
+
* Where telemetry goes, or `null` for nowhere: `false` is off; a non-empty
|
|
44
|
+
* `endpoint` is that collector, with `headers`; otherwise a `token` is the
|
|
45
|
+
* hosted Deco CMS collector, with the token as a Bearer credential.
|
|
47
46
|
*/
|
|
48
|
-
export function resolveDestination(config, site) {
|
|
47
|
+
export function resolveDestination(config, site, token) {
|
|
49
48
|
if (config === false)
|
|
50
49
|
return null;
|
|
51
|
-
|
|
52
|
-
return destinationFromEnv(site);
|
|
50
|
+
// OPEN: no per-signal URLs (v7's OTEL_EXPORTER_OTLP_<SIGNAL>_ENDPOINT): every signal goes to `<endpoint>/v1/<signal>`.
|
|
53
51
|
const limits = telemetryLimits(config);
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return { endpoint: config.endpoint, headers: { ...config.headers }, site, limits };
|
|
52
|
+
const resource = { ...config?.resource };
|
|
53
|
+
if (typeof config?.endpoint === "string" && config.endpoint) {
|
|
54
|
+
return { endpoint: config.endpoint, headers: { ...config.headers }, site, resource, limits };
|
|
58
55
|
}
|
|
59
|
-
if (!
|
|
56
|
+
if (!token)
|
|
60
57
|
return null;
|
|
61
58
|
return {
|
|
62
59
|
endpoint: HOSTED_TELEMETRY_ENDPOINT,
|
|
63
|
-
headers: { authorization: `Bearer ${
|
|
64
|
-
site
|
|
60
|
+
headers: { authorization: `Bearer ${token}` },
|
|
61
|
+
site,
|
|
62
|
+
resource,
|
|
65
63
|
limits,
|
|
66
64
|
};
|
|
67
65
|
}
|
|
68
|
-
/** v7's names for the standard OTLP variables, read when the standard one is unset. */
|
|
69
|
-
const V7_ALIASES = {
|
|
70
|
-
OTEL_EXPORTER_OTLP_HEADERS: "DECO_OTEL_HEADERS",
|
|
71
|
-
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "DECO_OTEL_METRICS_ENDPOINT",
|
|
72
|
-
OTEL_EXPORTER_OTLP_LOGS_ENDPOINT: "DECO_OTEL_LOGS_ENDPOINT",
|
|
73
|
-
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "DECO_OTEL_TRACES_ENDPOINT",
|
|
74
|
-
};
|
|
75
|
-
/** The standard variable, else its v7 alias. */
|
|
76
|
-
function readOtlpEnv(name) {
|
|
77
|
-
return (readEnv(name) ||
|
|
78
|
-
(name in V7_ALIASES ? readEnv(V7_ALIASES[name]) : undefined));
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* The destination the environment names: the standard OTLP variables, with
|
|
82
|
-
* v7's `DECO_OTEL_*` names as aliases. `DECO_OTEL_AUTH_TOKEN` (v7's secret
|
|
83
|
-
* for the collector) becomes the `authorization` header unless the headers
|
|
84
|
-
* set one. `null` when no endpoint is set.
|
|
85
|
-
*/
|
|
86
|
-
function destinationFromEnv(site) {
|
|
87
|
-
const endpoint = readOtlpEnv("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "";
|
|
88
|
-
const signals = {};
|
|
89
|
-
for (const signal of ["metrics", "logs", "traces"]) {
|
|
90
|
-
const url = readOtlpEnv(`OTEL_EXPORTER_OTLP_${signal.toUpperCase()}_ENDPOINT`);
|
|
91
|
-
if (url)
|
|
92
|
-
signals[signal] = url;
|
|
93
|
-
}
|
|
94
|
-
if (!endpoint && Object.keys(signals).length === 0)
|
|
95
|
-
return null;
|
|
96
|
-
const token = readEnv("DECO_OTEL_AUTH_TOKEN");
|
|
97
|
-
const headers = {
|
|
98
|
-
...(token ? { authorization: token } : {}),
|
|
99
|
-
...parseKeyValues(readOtlpEnv("OTEL_EXPORTER_OTLP_HEADERS")),
|
|
100
|
-
};
|
|
101
|
-
return { endpoint, signals, headers, site, limits: DEFAULT_LIMITS };
|
|
102
|
-
}
|
|
103
66
|
export class TelemetryPipeline {
|
|
104
67
|
#destination;
|
|
105
68
|
#settings = { ...TELEMETRY_DEFAULTS };
|
|
@@ -354,22 +317,18 @@ export class TelemetryPipeline {
|
|
|
354
317
|
#resource() {
|
|
355
318
|
const site = this.#destination.site;
|
|
356
319
|
return {
|
|
357
|
-
"service.name":
|
|
358
|
-
"service.version":
|
|
359
|
-
|
|
360
|
-
|
|
320
|
+
"service.name": site || "decocms-site",
|
|
321
|
+
"service.version": "unknown",
|
|
322
|
+
// OPEN: the environment name defaults to "production"; `telemetry.resource` overrides it.
|
|
323
|
+
"deployment.environment.name": "production",
|
|
361
324
|
...(site ? { "deco.site": site } : {}),
|
|
362
325
|
...(this.#release ? { "deco.release": this.#release } : {}),
|
|
363
|
-
//
|
|
364
|
-
|
|
365
|
-
...parseKeyValues(readEnv("OTEL_RESOURCE_ATTRIBUTES")),
|
|
326
|
+
// `telemetry.resource` wins: service.version=<commit>, deployment.environment.name=preview, …
|
|
327
|
+
...this.#destination.resource,
|
|
366
328
|
};
|
|
367
329
|
}
|
|
368
330
|
async #send(signal, payload) {
|
|
369
|
-
const
|
|
370
|
-
const url = signals?.[signal] ?? (endpoint ? `${endpoint.replace(/\/+$/, "")}/v1/${signal}` : "");
|
|
371
|
-
if (!url)
|
|
372
|
-
return; // this signal has no destination
|
|
331
|
+
const url = `${this.#destination.endpoint.replace(/\/+$/, "")}/v1/${signal}`;
|
|
373
332
|
const { body, gzipped } = await gzip(JSON.stringify(payload));
|
|
374
333
|
const headers = {
|
|
375
334
|
...this.#destination.headers,
|
|
@@ -405,25 +364,6 @@ export function setCurrentTelemetry(pipeline) {
|
|
|
405
364
|
// ---------------------------------------------------------------------------
|
|
406
365
|
// Helpers
|
|
407
366
|
// ---------------------------------------------------------------------------
|
|
408
|
-
/** Where hosts put the deployed commit, tried in order (`service.version`). */
|
|
409
|
-
const COMMIT_VARIABLES = [
|
|
410
|
-
"DECO_COMMIT_SHA",
|
|
411
|
-
"WORKERS_CI_COMMIT_SHA",
|
|
412
|
-
"CF_PAGES_COMMIT_SHA",
|
|
413
|
-
"VERCEL_GIT_COMMIT_SHA",
|
|
414
|
-
"GITHUB_SHA",
|
|
415
|
-
"RENDER_GIT_COMMIT",
|
|
416
|
-
"SOURCE_VERSION",
|
|
417
|
-
"COMMIT_SHA",
|
|
418
|
-
];
|
|
419
|
-
function firstEnv(names) {
|
|
420
|
-
for (const name of names) {
|
|
421
|
-
const value = readEnv(name);
|
|
422
|
-
if (value)
|
|
423
|
-
return value;
|
|
424
|
-
}
|
|
425
|
-
return undefined;
|
|
426
|
-
}
|
|
427
367
|
const QUERY = /(https?:\/\/[^\s?#"'<>]+)\?[^\s#"'<>]*/gi;
|
|
428
368
|
const CREDENTIAL = /\b(Bearer|Basic)\s+[\w~+/.=-]+/gi;
|
|
429
369
|
const SENSITIVE = /\b(authorization|cookie|set-cookie|x-api-key|api[-_]?key|app[-_]?key|app[-_]?token|token|secret|password)(["']?\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;&]+)/gi;
|
|
@@ -452,22 +392,6 @@ function randomHex(bytes) {
|
|
|
452
392
|
const values = crypto.getRandomValues(new Uint8Array(bytes));
|
|
453
393
|
return Array.from(values, (b) => b.toString(16).padStart(2, "0")).join("");
|
|
454
394
|
}
|
|
455
|
-
/** `k1=v1,k2=v2` with URL-encoded values, the format of the OTEL_* environment variables. */
|
|
456
|
-
function parseKeyValues(raw) {
|
|
457
|
-
const out = {};
|
|
458
|
-
for (const pair of raw?.split(",") ?? []) {
|
|
459
|
-
const at = pair.indexOf("=");
|
|
460
|
-
if (at <= 0)
|
|
461
|
-
continue;
|
|
462
|
-
try {
|
|
463
|
-
out[decodeURIComponent(pair.slice(0, at).trim())] = decodeURIComponent(pair.slice(at + 1).trim());
|
|
464
|
-
}
|
|
465
|
-
catch {
|
|
466
|
-
// A malformed pair is skipped.
|
|
467
|
-
}
|
|
468
|
-
}
|
|
469
|
-
return out;
|
|
470
|
-
}
|
|
471
395
|
function encodeAttributes(attributes, scrub) {
|
|
472
396
|
return Object.entries(attributes)
|
|
473
397
|
.filter(([, value]) => value !== undefined)
|
package/dist/v8/telemetry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/v8/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,uEAAuE;AACvE,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAE7D,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AACpD,MAAM,QAAQ,GAAG,MAAM,CAAC;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAC;AACrB,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,WAAW,GAAG,KAAK,CAAC;AAC1B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACrD,iFAAiF;AACjF,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAC3F,MAAM,cAAc,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC;AAEpE,kFAAkF;AAClF,MAAM,UAAU,eAAe,CAAC,MAA2C;IAIzE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,OAAO;QACL,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC;QAC9E,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC;KAC/E,CAAC;AACJ,CAAC;AAkDD;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA2C,EAC3C,IAAa;IAEb,IAAI,MAAM,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrF,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAC/C,OAAO;QACL,QAAQ,EAAE,yBAAyB;QACnC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,CAAC,KAAK,EAAE,EAAE;QACpD,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM;KACP,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,GAAG;IACjB,0BAA0B,EAAE,mBAAmB;IAC/C,mCAAmC,EAAE,4BAA4B;IACjE,gCAAgC,EAAE,yBAAyB;IAC3D,kCAAkC,EAAE,2BAA2B;CACvD,CAAC;AAEX,gDAAgD;AAChD,SAAS,WAAW,CAAC,IAA6D;IAChF,OAAO,CACL,OAAO,CAAC,IAAI,CAAC;QACb,CAAC,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAA+B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACxF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,IAAwB;IAClD,MAAM,QAAQ,GAAG,WAAW,CAAC,6BAA6B,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,OAAO,GAAoC,EAAE,CAAC;IACpD,KAAK,MAAM,MAAM,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,EAAE,CAAC;QAC5D,MAAM,GAAG,GAAG,WAAW,CACrB,sBAAsB,MAAM,CAAC,WAAW,EAAuB,WAAW,CAC3E,CAAC;QACF,IAAI,GAAG;YAAE,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,MAAM,KAAK,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,GAAG,cAAc,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;KAC7D,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,OAAO,iBAAiB;IACnB,YAAY,CAAc;IACnC,SAAS,GAAwB,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3D,QAAQ,CAAqB;IAC7B,WAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC3C,KAAK,GAAgB,EAAE,CAAC;IACxB,MAAM,GAAuC,EAAE,CAAC;IAChD,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,UAAU,GAAG,KAAK,CAAC;IACnB,0FAA0F;IACjF,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,YAAY,WAAwB;QAClC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,CAAC;IAED,wFAAwF;IACxF,MAAM,CAAC,KAAa;QAClB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW;YAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC;IAED,6DAA6D;IAC7D,UAAU,CAAC,QAAkB;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAkB;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG;YACf,OAAO,EAAE,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO;YAC5F,OAAO,EAAE,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO;YAC5F,eAAe,EAAE,IAAI,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,eAAe,CAAC,EACjE,MAAM,CAAC,eAAe,CACvB;YACD,eAAe,EAAE,IAAI,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,eAAe,CAAC,EACjE,MAAM,CAAC,eAAe,CACvB;SACF,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,UAAsB,EAAE,OAAe;QAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAO;QAC/D,MAAM,GAAG,GAAG,GAAG,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAS,GAAG;gBACV,IAAI;gBACJ,UAAU;gBACV,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,MAAM,CAAC,iBAAiB;gBAC7B,GAAG,EAAE,MAAM,CAAC,iBAAiB;gBAC7B,OAAO,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC9C,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,SAAS,CAAC,GAAG,IAAI,OAAO,CAAC;QACzB,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACjD,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;QAC7D,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,mDAAmD;IACnD,KAAK,CAAC,OAAe,EAAE,UAAsB;QAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe;YAAE,OAAO;QACvF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ;YAAE,OAAO;QAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,qFAAqF;IACrF,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;IAClF,CAAC;IAED,IAAI,CAAC,IAAe;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS;YAAE,OAAO;QACvE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,SAAS;QACP,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,OAA2B,CAAC;QAChC,OAAO;YACL,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACjC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,GAAG,IAAI,CAAC;oBACf,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC1D,CAAC;gBACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC;wBACR,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,UAAU;wBAChB,OAAO;wBACP,KAAK;wBACL,GAAG;wBACH,UAAU,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;wBACvC,KAAK,EAAE,KAAK,KAAK,SAAS;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACD,2DAA2D;gBAC3D,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,aAAa,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE;wBACvD,YAAY,EAAE,cAAc;wBAC5B,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,qEAAqE;gBACrE,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;oBAAE,OAAO;gBACxE,+EAA+E;gBAC/E,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;gBACzF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvF,CAAC;SACF,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,KAAK;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QACxB,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,CAAC,UAAsB,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;YAC9C,KAAK,MAAM,CAAC,IAAI,UAAU;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACnF,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACpB,eAAe,EAAE;oBACf;wBACE,QAAQ;wBACR,YAAY,EAAE;4BACZ;gCACE,KAAK;gCACL,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;oCAC5C,IAAI;oCACJ,IAAI,EAAE,GAAG;oCACT,SAAS,EAAE;wCACT,sBAAsB,EAAE,CAAC,EAAE,QAAQ;wCACnC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4CAC7B,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;4CAChC,iBAAiB,EAAE,KAAK,CAAC,KAAK,CAAC;4CAC/B,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC;4CACxB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;4CACtB,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;4CACnC,cAAc,EAAE,MAAM;yCACvB,CAAC,CAAC;qCACJ;iCACF,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjB,YAAY,EAAE;oBACZ;wBACE,QAAQ;wBACR,SAAS,EAAE;4BACT;gCACE,KAAK;gCACL,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oCAC7B,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;oCAC7B,cAAc,EAAE,EAAE;oCAClB,YAAY,EAAE,OAAO;oCACrB,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oCACzC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;iCACnC,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YACpD,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACnB,aAAa,EAAE;oBACb;wBACE,QAAQ;wBACR,UAAU,EAAE;4BACV;gCACE,KAAK;gCACL,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;oCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;oCACnB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oCACjE,IAAI,EAAE,IAAI,CAAC,IAAI;oCACf,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;oCACtB,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oCACpC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oCAChC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;oCACnC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;iCACrC,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,IAAY;QACjB,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ;YAAE,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/E,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACzB,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,oEAAoE;QACpE,uEAAuE;QACvE,wDAAwD;QACxD,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,GAAG,QAAQ;gBAAE,OAAO;YACtD,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;QACpC,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,mBAAmB,CAAC,IAAI,IAAI,IAAI,cAAc;YACtE,iBAAiB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,IAAI,SAAS;YAC1D,6BAA6B,EAC3B,OAAO,CAAC,YAAY,CAAC;gBACrB,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;YACxE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,6DAA6D;YAC7D,sDAAsD;YACtD,GAAG,cAAc,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;SACvD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAAgB;QAC1C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAChD,MAAM,GAAG,GACP,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG;YAAE,OAAO,CAAC,iCAAiC;QACnD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,MAAM,OAAO,GAA2B;YACtC,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO;YAC5B,cAAc,EAAE,kBAAkB;SACnC,CAAC;QACF,IAAI,OAAO;YAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;QAClD,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;YAClC,IAAI,QAAkB,CAAC;YACvB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,2CAA2C;YACrD,CAAC;YACD,KAAK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC7C,IAAI,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO;YAChF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;CACF;AAED,8EAA8E;AAC9E,yEAAyE;AACzE,8EAA8E;AAE9E,6FAA6F;AAC7F,MAAM,UAAU,gBAAgB;IAC9B,OAAQ,UAA4D,CAAC,IAAI,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAuC;IACxE,UAA4D,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjF,CAAC;AAED,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,+EAA+E;AAC/E,MAAM,gBAAgB,GAAG;IACvB,iBAAiB;IACjB,uBAAuB;IACvB,qBAAqB;IACrB,uBAAuB;IACvB,YAAY;IACZ,mBAAmB;IACnB,gBAAgB;IAChB,YAAY;CACb,CAAC;AAEF,SAAS,QAAQ,CAAC,KAAwB;IACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;IAC1B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,KAAK,GAAG,0CAA0C,CAAC;AACzD,MAAM,UAAU,GAAG,kCAAkC,CAAC;AACtD,MAAM,SAAS,GACb,yJAAyJ,CAAC;AAE5J,6FAA6F;AAC7F,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI;SACR,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC;SAC/B,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC;SACpC,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC;SACpC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,6FAA6F;AAC7F,SAAS,cAAc,CAAC,GAAuB;IAC7C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,IAAI,CAAC;YAAE,SAAS;QACtB,IAAI,CAAC;YACH,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,kBAAkB,CACpE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAC1B,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAsB,EAAE,KAA+B;IAC/E,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,GAAG;QACH,KAAK,EACH,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,CAAC,CAAC,OAAO,KAAK,KAAK,SAAS;gBAC1B,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;gBACtB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;oBACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC7B,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE;KACjC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;AACnC,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAY;IAC9B,IAAI,OAAO,iBAAiB,KAAK,UAAU;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpF,OAAO,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3F,CAAC"}
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/v8/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,iEAAiE;AACjE,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAE7D,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AACpD,MAAM,QAAQ,GAAG,MAAM,CAAC;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAC;AACrB,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,WAAW,GAAG,KAAK,CAAC;AAC1B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACrD,iFAAiF;AACjF,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAC3F,MAAM,cAAc,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC;AAEpE,kFAAkF;AAClF,MAAM,UAAU,eAAe,CAAC,MAA2C;IAIzE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,OAAO;QACL,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC;QAC9E,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC;KAC/E,CAAC;AACJ,CAAC;AAkDD;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA2C,EAC3C,IAAa,EACb,KAAc;IAEd,IAAI,MAAM,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAClC,uHAAuH;IACvH,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC;IACzC,IAAI,OAAO,MAAM,EAAE,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC/F,CAAC;IACD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO;QACL,QAAQ,EAAE,yBAAyB;QACnC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;QAC7C,IAAI;QACJ,QAAQ;QACR,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,iBAAiB;IACnB,YAAY,CAAc;IACnC,SAAS,GAAwB,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3D,QAAQ,CAAqB;IAC7B,WAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC3C,KAAK,GAAgB,EAAE,CAAC;IACxB,MAAM,GAAuC,EAAE,CAAC;IAChD,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,UAAU,GAAG,KAAK,CAAC;IACnB,0FAA0F;IACjF,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,YAAY,WAAwB;QAClC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,CAAC;IAED,wFAAwF;IACxF,MAAM,CAAC,KAAa;QAClB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW;YAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC;IAED,6DAA6D;IAC7D,UAAU,CAAC,QAAkB;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAkB;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG;YACf,OAAO,EAAE,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO;YAC5F,OAAO,EAAE,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO;YAC5F,eAAe,EAAE,IAAI,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,eAAe,CAAC,EACjE,MAAM,CAAC,eAAe,CACvB;YACD,eAAe,EAAE,IAAI,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,eAAe,CAAC,EACjE,MAAM,CAAC,eAAe,CACvB;SACF,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,UAAsB,EAAE,OAAe;QAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAO;QAC/D,MAAM,GAAG,GAAG,GAAG,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAS,GAAG;gBACV,IAAI;gBACJ,UAAU;gBACV,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,MAAM,CAAC,iBAAiB;gBAC7B,GAAG,EAAE,MAAM,CAAC,iBAAiB;gBAC7B,OAAO,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC9C,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,SAAS,CAAC,GAAG,IAAI,OAAO,CAAC;QACzB,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACjD,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;QAC7D,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,mDAAmD;IACnD,KAAK,CAAC,OAAe,EAAE,UAAsB;QAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe;YAAE,OAAO;QACvF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ;YAAE,OAAO;QAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,qFAAqF;IACrF,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;IAClF,CAAC;IAED,IAAI,CAAC,IAAe;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS;YAAE,OAAO;QACvE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,SAAS;QACP,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,OAA2B,CAAC;QAChC,OAAO;YACL,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACjC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,GAAG,IAAI,CAAC;oBACf,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC1D,CAAC;gBACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC;wBACR,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,UAAU;wBAChB,OAAO;wBACP,KAAK;wBACL,GAAG;wBACH,UAAU,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;wBACvC,KAAK,EAAE,KAAK,KAAK,SAAS;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACD,2DAA2D;gBAC3D,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,aAAa,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE;wBACvD,YAAY,EAAE,cAAc;wBAC5B,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,qEAAqE;gBACrE,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;oBAAE,OAAO;gBACxE,+EAA+E;gBAC/E,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;gBACzF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvF,CAAC;SACF,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,KAAK;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QACxB,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,CAAC,UAAsB,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;YAC9C,KAAK,MAAM,CAAC,IAAI,UAAU;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACnF,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACpB,eAAe,EAAE;oBACf;wBACE,QAAQ;wBACR,YAAY,EAAE;4BACZ;gCACE,KAAK;gCACL,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;oCAC5C,IAAI;oCACJ,IAAI,EAAE,GAAG;oCACT,SAAS,EAAE;wCACT,sBAAsB,EAAE,CAAC,EAAE,QAAQ;wCACnC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4CAC7B,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;4CAChC,iBAAiB,EAAE,KAAK,CAAC,KAAK,CAAC;4CAC/B,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC;4CACxB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;4CACtB,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,GAAG,EAAE,CAAC,CAAC,GAAG;4CACV,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;4CACnC,cAAc,EAAE,MAAM;yCACvB,CAAC,CAAC;qCACJ;iCACF,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjB,YAAY,EAAE;oBACZ;wBACE,QAAQ;wBACR,SAAS,EAAE;4BACT;gCACE,KAAK;gCACL,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oCAC7B,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;oCAC7B,cAAc,EAAE,EAAE;oCAClB,YAAY,EAAE,OAAO;oCACrB,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oCACzC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;iCACnC,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YACpD,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACnB,aAAa,EAAE;oBACb;wBACE,QAAQ;wBACR,UAAU,EAAE;4BACV;gCACE,KAAK;gCACL,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;oCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;oCACnB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oCACjE,IAAI,EAAE,IAAI,CAAC,IAAI;oCACf,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;oCACtB,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oCACpC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oCAChC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;oCACnC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;iCACrC,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,IAAY;QACjB,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ;YAAE,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/E,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACzB,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,oEAAoE;QACpE,uEAAuE;QACvE,wDAAwD;QACxD,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,GAAG,QAAQ;gBAAE,OAAO;YACtD,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;QACpC,OAAO;YACL,cAAc,EAAE,IAAI,IAAI,cAAc;YACtC,iBAAiB,EAAE,SAAS;YAC5B,0FAA0F;YAC1F,6BAA6B,EAAE,YAAY;YAC3C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,8FAA8F;YAC9F,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ;SAC9B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,OAAgB;QAC1C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC;QAC7E,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,MAAM,OAAO,GAA2B;YACtC,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO;YAC5B,cAAc,EAAE,kBAAkB;SACnC,CAAC;QACF,IAAI,OAAO;YAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;QAClD,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;YAClC,IAAI,QAAkB,CAAC;YACvB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,2CAA2C;YACrD,CAAC;YACD,KAAK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC7C,IAAI,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO;YAChF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;CACF;AAED,8EAA8E;AAC9E,yEAAyE;AACzE,8EAA8E;AAE9E,6FAA6F;AAC7F,MAAM,UAAU,gBAAgB;IAC9B,OAAQ,UAA4D,CAAC,IAAI,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAuC;IACxE,UAA4D,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;AACjF,CAAC;AAED,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,MAAM,KAAK,GAAG,0CAA0C,CAAC;AACzD,MAAM,UAAU,GAAG,kCAAkC,CAAC;AACtD,MAAM,SAAS,GACb,yJAAyJ,CAAC;AAE5J,6FAA6F;AAC7F,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI;SACR,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC;SAC/B,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC;SACpC,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC;SACpC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAsB,EAAE,KAA+B;IAC/E,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,GAAG;QACH,KAAK,EACH,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,CAAC,CAAC,OAAO,KAAK,KAAK,SAAS;gBAC1B,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;gBACtB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;oBACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC7B,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE;KACjC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;AACnC,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAY;IAC9B,IAAI,OAAO,iBAAiB,KAAK,UAAU;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpF,OAAO,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3F,CAAC"}
|
package/dist/v8/types.d.ts
CHANGED
|
@@ -23,6 +23,19 @@ export type Snapshot = {
|
|
|
23
23
|
blocks: Record<string, unknown>;
|
|
24
24
|
/** The alias table `deco content` writes: old type name → your type. */
|
|
25
25
|
aliases?: Record<string, string>;
|
|
26
|
+
/**
|
|
27
|
+
* The hash of the `.deco/schema.gen.json` this content was built with, which
|
|
28
|
+
* `deco content` writes. A hosted release is swapped in only when its
|
|
29
|
+
* `schemaHash` equals the bundled content's; without one, never.
|
|
30
|
+
*/
|
|
31
|
+
schemaHash?: string;
|
|
32
|
+
/**
|
|
33
|
+
* The commit time of the git HEAD `deco content` built this content from
|
|
34
|
+
* (committer date, ISO 8601). A hosted release is swapped in only when its
|
|
35
|
+
* `publishedAt` is later; without one (a custom loader, an older content
|
|
36
|
+
* module, a build outside git), the bundled content counts as the oldest.
|
|
37
|
+
*/
|
|
38
|
+
committedAt?: string;
|
|
26
39
|
};
|
|
27
40
|
/**
|
|
28
41
|
* The content module `deco content` writes: a snapshot plus `root`, the
|
|
@@ -44,11 +57,11 @@ export interface Loader {
|
|
|
44
57
|
}
|
|
45
58
|
/** The parts of a draft pointer, `<host[:port]><path[?query]>@<version>`. */
|
|
46
59
|
export interface DraftPointer {
|
|
47
|
-
/** `host[:port]`
|
|
60
|
+
/** `host[:port]` that serves the draft's changes. */
|
|
48
61
|
host: string;
|
|
49
62
|
/** Starts with `/`; opaque to the app. Never carries the `__variant` parameters. */
|
|
50
63
|
path: string;
|
|
51
|
-
/** Opaque:
|
|
64
|
+
/** Opaque: identifies the editor's last save. `"local"` names no draft (`deco serve`). */
|
|
52
65
|
version: string;
|
|
53
66
|
/** The variants this preview forces (the query's `__variant` parameters); absent when none. */
|
|
54
67
|
variants?: ForcedVariant[];
|
|
@@ -81,7 +94,12 @@ export interface Page extends Route {
|
|
|
81
94
|
}
|
|
82
95
|
/** The built-in `redirect` block. */
|
|
83
96
|
export interface Redirect {
|
|
84
|
-
/**
|
|
97
|
+
/**
|
|
98
|
+
* Literal path or template (`:name` segments, an optional trailing `/*`),
|
|
99
|
+
* optionally scoped to a query (`/calcados?map=c,ft`): then it matches only
|
|
100
|
+
* a request whose query string is exactly that one, and wins over a
|
|
101
|
+
* path-only `from` for the same URL.
|
|
102
|
+
*/
|
|
85
103
|
from: string;
|
|
86
104
|
to: string;
|
|
87
105
|
/** `true` for a 301, `false` for a 302. */
|
|
@@ -185,18 +203,26 @@ export type Match<T> = {
|
|
|
185
203
|
} | {
|
|
186
204
|
kind: "not-found";
|
|
187
205
|
};
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
206
|
+
/**
|
|
207
|
+
* Where telemetry goes. With `endpoint`, to that OTLP/HTTP collector, with
|
|
208
|
+
* `headers`; without one, to the hosted Deco CMS collector when `createCMS`
|
|
209
|
+
* has a `token`, and nowhere otherwise.
|
|
210
|
+
*/
|
|
211
|
+
export interface TelemetryConfig {
|
|
212
|
+
/** An OTLP/HTTP base URL; each signal is sent to `<endpoint>/v1/<signal>`. */
|
|
213
|
+
endpoint?: string;
|
|
214
|
+
/** Headers sent with every batch to `endpoint`. */
|
|
193
215
|
headers?: Record<string, string>;
|
|
194
|
-
|
|
216
|
+
/**
|
|
217
|
+
* Resource attributes, merged over the defaults (`service.name`,
|
|
218
|
+
* `service.version`, `deployment.environment.name`, …).
|
|
219
|
+
*/
|
|
220
|
+
resource?: Record<string, string>;
|
|
195
221
|
limits?: {
|
|
196
222
|
errorSampleRate?: number;
|
|
197
223
|
traceSampleRate?: number;
|
|
198
224
|
};
|
|
199
|
-
}
|
|
225
|
+
}
|
|
200
226
|
export interface CMSConfig {
|
|
201
227
|
/** Your block functions; the CMS uses `{ ...builtIns, ...blocks }`. */
|
|
202
228
|
blocks: Blocks;
|
|
@@ -204,6 +230,12 @@ export interface CMSConfig {
|
|
|
204
230
|
content: ContentModule | Loader;
|
|
205
231
|
/** ms between `update()` checks of a content source that has one; minimum 60 000. */
|
|
206
232
|
interval?: number;
|
|
233
|
+
/**
|
|
234
|
+
* Local development (`import.meta.env.DEV`, `process.env.NODE_ENV === "development"`):
|
|
235
|
+
* hosted releases are never swapped in, so local files win. Drafts still load.
|
|
236
|
+
* The SDK reads no environment variable for it; default `false`.
|
|
237
|
+
*/
|
|
238
|
+
dev?: boolean;
|
|
207
239
|
/** Where telemetry goes; see /next/telemetry. */
|
|
208
240
|
telemetry?: false | TelemetryConfig;
|
|
209
241
|
preview?: {
|
|
@@ -212,14 +244,26 @@ export interface CMSConfig {
|
|
|
212
244
|
* (/next/api-reference#host-patterns). Without it, content may allow any host.
|
|
213
245
|
*/
|
|
214
246
|
hosts?: string[];
|
|
247
|
+
/**
|
|
248
|
+
* The hosts a draft pointer may point at; replaces the defaults (v7's
|
|
249
|
+
* list: `.decocms.com` and the loopback hosts). An entry starting with a
|
|
250
|
+
* dot matches any subdomain; any other entry, that exact host.
|
|
251
|
+
*/
|
|
252
|
+
draftHosts?: string[];
|
|
215
253
|
};
|
|
216
254
|
/** The private key that decrypts `secret` blocks. */
|
|
217
255
|
secrets?: {
|
|
218
256
|
key?: string;
|
|
219
257
|
};
|
|
220
|
-
/**
|
|
258
|
+
/**
|
|
259
|
+
* Your site ID (Studio's site slug): turns on hosted releases from
|
|
260
|
+
* `delivery.decocms.com`. Drafts don't need it.
|
|
261
|
+
*/
|
|
221
262
|
site?: string;
|
|
222
|
-
/**
|
|
263
|
+
/**
|
|
264
|
+
* Your site token (server-only secret): sends telemetry to the hosted Deco
|
|
265
|
+
* CMS collector. Releases and drafts don't use it. Needs `site`.
|
|
266
|
+
*/
|
|
223
267
|
token?: string;
|
|
224
268
|
}
|
|
225
269
|
export interface ResolveOptions {
|
|
@@ -256,13 +300,11 @@ export interface CMS {
|
|
|
256
300
|
forRelease(): Client;
|
|
257
301
|
/**
|
|
258
302
|
* A client reading the draft a pointer names: its changes, fetched from a
|
|
259
|
-
*
|
|
260
|
-
* `
|
|
261
|
-
* production content.
|
|
303
|
+
* draft host (`*.decocms.com` and loopback by default;
|
|
304
|
+
* `createCMS({ preview: { draftHosts } })` replaces the list), over this
|
|
305
|
+
* server's production content.
|
|
262
306
|
*/
|
|
263
307
|
forDraft(pointer: string): Client;
|
|
264
|
-
/** A client pinned to a revision this CMS has served; an unknown revision behaves like the release. */
|
|
265
|
-
forRevision(revision: string): Client;
|
|
266
308
|
/** Ask the content source for newer content now; never throws. */
|
|
267
309
|
update(): Promise<{
|
|
268
310
|
updated: boolean;
|
package/dist/v8/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/v8/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAMvC;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAExE,mCAAmC;AACnC,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAExE,oEAAoE;AACpE,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEnD,2FAA2F;AAC3F,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/v8/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,6 +25,7 @@ import { SETTINGS_BLOCK, SETTINGS_TYPE } from "../../builtins/data.ts";
|
|
|
25
25
|
import { isBlock, own } from "../../json.ts";
|
|
26
26
|
import { findRouteConflicts } from "../../matchRoute.ts";
|
|
27
27
|
import { isBuiltIn, storesPlainVariants } from "../builtins.ts";
|
|
28
|
+
import { paint } from "../color.ts";
|
|
28
29
|
import { readSavedBlocks, type SavedBlocks } from "../content.ts";
|
|
29
30
|
import { consoleReporter, type Reporter } from "../log.ts";
|
|
30
31
|
import { CliError, decoPaths, findDecoRoot } from "../root.ts";
|
|
@@ -736,8 +737,13 @@ export function checkContent(meta: DecoMeta, saved: SavedBlocks): Problem[] {
|
|
|
736
737
|
});
|
|
737
738
|
}
|
|
738
739
|
|
|
739
|
-
/**
|
|
740
|
-
|
|
740
|
+
/**
|
|
741
|
+
* Print problems grouped per file, the format the docs show. With colour, the
|
|
742
|
+
* same text plus escapes: file bold, path dim, an error's message red and the
|
|
743
|
+
* word `warning` yellow.
|
|
744
|
+
*/
|
|
745
|
+
export function formatProblems(problems: Problem[], color = false): string {
|
|
746
|
+
const c = paint(color);
|
|
741
747
|
const byFile = new Map<string, Problem[]>();
|
|
742
748
|
for (const p of problems) {
|
|
743
749
|
const list = byFile.get(p.file) ?? [];
|
|
@@ -746,10 +752,12 @@ export function formatProblems(problems: Problem[]): string {
|
|
|
746
752
|
}
|
|
747
753
|
const lines: string[] = [];
|
|
748
754
|
for (const file of [...byFile.keys()].sort()) {
|
|
749
|
-
lines.push(file);
|
|
755
|
+
lines.push(c.bold(file));
|
|
750
756
|
for (const p of byFile.get(file)!) {
|
|
751
|
-
const
|
|
752
|
-
|
|
757
|
+
const warning = p.severity === "warning";
|
|
758
|
+
const prefix = warning ? `${c.yellow("warning")}: ` : "";
|
|
759
|
+
const message = warning ? p.message : c.red(p.message);
|
|
760
|
+
lines.push(` ${prefix}${p.path ? `${c.dim(p.path)}: ` : ""}${message}`);
|
|
753
761
|
}
|
|
754
762
|
}
|
|
755
763
|
return lines.join("\n");
|
|
@@ -808,13 +816,30 @@ export function check(options: CheckOptions = {}): number {
|
|
|
808
816
|
const errors = problems.filter((p) => p.severity === "error").length;
|
|
809
817
|
const warnings = problems.length - errors;
|
|
810
818
|
if (problems.length > 0) {
|
|
811
|
-
const text = formatProblems(problems);
|
|
819
|
+
const text = formatProblems(problems, reporter.color);
|
|
812
820
|
if (errors > 0) reporter.error(text);
|
|
813
821
|
else reporter.warn(text);
|
|
814
822
|
}
|
|
815
823
|
const count = Object.keys(saved.blocks).length;
|
|
816
|
-
const summary =
|
|
824
|
+
const summary = checkSummary(count, errors, warnings, reporter.color);
|
|
817
825
|
if (errors > 0) reporter.error(summary);
|
|
818
826
|
else reporter.info(summary);
|
|
819
827
|
return errors > 0 ? 1 : 0;
|
|
820
828
|
}
|
|
829
|
+
|
|
830
|
+
/**
|
|
831
|
+
* `39 saved blocks checked: 0 errors, 0 warnings`. With colour it leads with
|
|
832
|
+
* a status mark, where the eye lands first (✓ green, ⚠ yellow, ✗ red), and
|
|
833
|
+
* colours the counts that decide it.
|
|
834
|
+
*/
|
|
835
|
+
function checkSummary(count: number, errors: number, warnings: number, color = false): string {
|
|
836
|
+
const c = paint(color);
|
|
837
|
+
const plural = (n: number, word: string) => `${n} ${word}${n === 1 ? "" : "s"}`;
|
|
838
|
+
const head = `${plural(count, "saved block")} checked: `;
|
|
839
|
+
const errorText = plural(errors, "error");
|
|
840
|
+
const warningText = plural(warnings, "warning");
|
|
841
|
+
if (!color) return `${head}${errorText}, ${warningText}`;
|
|
842
|
+
if (errors > 0) return `${c.red("✗")} ${head}${c.red(errorText)}, ${warningText}`;
|
|
843
|
+
if (warnings > 0) return `${c.yellow("⚠")} ${head}${errorText}, ${c.yellow(warningText)}`;
|
|
844
|
+
return `${c.green("✓")} ${head}${c.green(`${errorText}, ${warningText}`)}`;
|
|
845
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ANSI colour for the `deco` CLI's output. Off unless the run asked for it:
|
|
3
|
+
* `--color`, or a terminal on both stdout and stderr (see `runCli`). When off,
|
|
4
|
+
* every function returns its text unchanged, so piped output stays plain.
|
|
5
|
+
*/
|
|
6
|
+
export interface Paint {
|
|
7
|
+
green(text: string): string;
|
|
8
|
+
red(text: string): string;
|
|
9
|
+
yellow(text: string): string;
|
|
10
|
+
dim(text: string): string;
|
|
11
|
+
bold(text: string): string;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
const sgr = (open: number, close: number) => (text: string) => `\x1b[${open}m${text}\x1b[${close}m`;
|
|
15
|
+
|
|
16
|
+
const ON: Paint = {
|
|
17
|
+
green: sgr(32, 39),
|
|
18
|
+
red: sgr(31, 39),
|
|
19
|
+
yellow: sgr(33, 39),
|
|
20
|
+
dim: sgr(2, 22),
|
|
21
|
+
bold: sgr(1, 22),
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
const plain = (text: string) => text;
|
|
25
|
+
const OFF: Paint = { green: plain, red: plain, yellow: plain, dim: plain, bold: plain };
|
|
26
|
+
|
|
27
|
+
export function paint(color: boolean | undefined): Paint {
|
|
28
|
+
return color ? ON : OFF;
|
|
29
|
+
}
|