@telorun/cli 0.70.0 → 0.72.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/bundle/partition-layers.d.ts +11 -26
- package/dist/bundle/partition-layers.d.ts.map +1 -1
- package/dist/bundle/partition-layers.js +37 -88
- package/dist/bundle/partition-layers.js.map +1 -1
- package/dist/cli.js +11 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/cel.d.ts +18 -0
- package/dist/commands/cel.d.ts.map +1 -1
- package/dist/commands/cel.js +60 -12
- package/dist/commands/cel.js.map +1 -1
- package/dist/commands/check.d.ts.map +1 -1
- package/dist/commands/check.js +43 -8
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +27 -17
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/module.d.ts.map +1 -1
- package/dist/commands/module.js +36 -31
- package/dist/commands/module.js.map +1 -1
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/publish.js +57 -26
- package/dist/commands/publish.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +15 -4
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/search.d.ts.map +1 -1
- package/dist/commands/search.js +19 -10
- package/dist/commands/search.js.map +1 -1
- package/dist/commands/upgrade.d.ts.map +1 -1
- package/dist/commands/upgrade.js +35 -21
- package/dist/commands/upgrade.js.map +1 -1
- package/dist/controller-progress.d.ts.map +1 -1
- package/dist/controller-progress.js +0 -0
- package/dist/controller-progress.js.map +1 -1
- package/dist/debug-event-subscriber.d.ts.map +1 -1
- package/dist/debug-event-subscriber.js +2 -1
- package/dist/debug-event-subscriber.js.map +1 -1
- package/dist/logger.d.ts +33 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +73 -37
- package/dist/logger.js.map +1 -1
- package/dist/output.d.ts +111 -0
- package/dist/output.d.ts.map +1 -0
- package/dist/output.js +143 -0
- package/dist/output.js.map +1 -0
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/commands/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/commands/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAE1C,MAAM,MAAM,GAAG,CAAC,GAAY,EAAU,EAAE,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAE5F,SAAS,aAAa,CAAC,QAAiB;IACtC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACvF,CAAC;AAiBD,mFAAmF;AACnF,SAAS,eAAe,CAAC,UAAkB;IACzC,OAAO,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;AACxF,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED;;;kFAGkF;AAClF,KAAK,UAAU,WAAW,CACxB,MAAc,EACd,QAAiC,EACjC,KAAa,EACb,GAAW;IAEX,MAAM,GAAG,GAAG,GAAG,MAAM,WAAW,QAAQ,MAAM,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,IAAI,GAAa,CAAC;IAClB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,mCAAmC,MAAM,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QACrD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC,CAAC;QACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,OAAO,GAAG,gBAAgB,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,QAAQ,GAAG,EAAE,CAAC;QAC1E,yEAAyE;QACzE,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,IAKxB;IACC,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE9F,4EAA4E;IAC5E,6EAA6E;IAC7E,4EAA4E;IAC5E,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAC5B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAc,CAAC;QAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5F,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClD,GAAG,CAAC,IAAI,CACN,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAC9F,CAAC;QACJ,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAgB,CAAC;IAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,QAAQ,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACvF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CACvE,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YACjD,GAAG,CAAC,IAAI,CACN,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAC/F,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAW;IACvC,OAAO,KAAK,CAAC,OAAO,CAClB,gBAAgB,EAChB,qEAAqE,EACrE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC;SACE,UAAU,CAAC,OAAO,EAAE;QACnB,QAAQ,EAAE,+DAA+D;QACzE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,0EAA0E;KACrF,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,mDAAmD;KAC9D,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,+BAA+B;KAC1C,CAAC,EACN,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,SAAS,CAAC,IAAW,CAAC,CAAC;IAC/B,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAezD,0BAA0B;AAC1B,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAOxF;AAED,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B;gDAC4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAiBD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;wDACoD;IACpD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAqNjF;AAsED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,OAAO,EAC1B,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,MAAM,EACX,SAAS,UAAQ,EACjB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GAC/B,OAAO,CAAC,aAAa,CAAC,CA8DxB;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DhB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAoChD"}
|
package/dist/commands/upgrade.js
CHANGED
|
@@ -6,6 +6,7 @@ import * as path from "path";
|
|
|
6
6
|
import semver from "semver";
|
|
7
7
|
import { parseAllDocuments } from "yaml";
|
|
8
8
|
import { createLogger } from "../logger.js";
|
|
9
|
+
import { outEmit, outErrLine, outLine } from "../output.js";
|
|
9
10
|
import { findModuleDoc, importSourceRefs } from "./manifest-imports.js";
|
|
10
11
|
const DEFAULT_REGISTRY_URL = "https://registry.telo.run";
|
|
11
12
|
/** The version-independent label for a versioned `source`, for diagnostics —
|
|
@@ -62,7 +63,7 @@ export async function upgradeManifest(args) {
|
|
|
62
63
|
const registry = defaultTransportRegistry(registryUrl);
|
|
63
64
|
const docs = parseAllDocuments(content, { customTags: defaultCustomTags() });
|
|
64
65
|
if (displayName !== undefined) {
|
|
65
|
-
|
|
66
|
+
outLine(`\nUpgrading ${log.dim(displayName)}`);
|
|
66
67
|
}
|
|
67
68
|
const edits = [];
|
|
68
69
|
const moduleDoc = findModuleDoc(docs);
|
|
@@ -75,7 +76,7 @@ export async function upgradeManifest(args) {
|
|
|
75
76
|
// module whose version never moves.
|
|
76
77
|
const ensurePinned = async (importRef, transport, label, version) => {
|
|
77
78
|
if (splitIntegrity(importRef.source).integrity || importRef.integrity) {
|
|
78
|
-
|
|
79
|
+
outLine(` ${log.ok("=")} ${label} ${log.dim(`already at ${version}, pinned`)}`);
|
|
79
80
|
result.unchanged++;
|
|
80
81
|
return;
|
|
81
82
|
}
|
|
@@ -85,20 +86,20 @@ export async function upgradeManifest(args) {
|
|
|
85
86
|
hash = await transport.manifestHash(pinBase);
|
|
86
87
|
}
|
|
87
88
|
catch (err) {
|
|
88
|
-
|
|
89
|
+
outLine(` ${log.warn("!")} ${label} ${log.dim(`already at ${version}, left unpinned (${err instanceof Error ? err.message : String(err)})`)}`);
|
|
89
90
|
result.unchanged++;
|
|
90
91
|
return;
|
|
91
92
|
}
|
|
92
93
|
const edit = buildSourceEdit(importRef.node, content, `${pinBase}#${hash}`);
|
|
93
94
|
if (!edit) {
|
|
94
|
-
|
|
95
|
+
outErrLine(` ${log.err.error("✗")} ${label} source scalar has no range — skipping`);
|
|
95
96
|
result.errors++;
|
|
96
97
|
return;
|
|
97
98
|
}
|
|
98
99
|
edits.push(edit);
|
|
99
100
|
result.changed = true;
|
|
100
101
|
result.pinned++;
|
|
101
|
-
|
|
102
|
+
outLine(` ${log.ok("+")} ${label} ${log.dim(`already at ${version},`)} ${log.ok("pinned")}`);
|
|
102
103
|
};
|
|
103
104
|
for (const importRef of importRefs) {
|
|
104
105
|
const source = importRef.source;
|
|
@@ -107,7 +108,7 @@ export async function upgradeManifest(args) {
|
|
|
107
108
|
// otherwise report it skipped and point at the flag.
|
|
108
109
|
if (isLocalPathSource(source)) {
|
|
109
110
|
if (!recursive) {
|
|
110
|
-
|
|
111
|
+
outLine(` ${log.dim("·")} ${source} ${log.dim("skipped (local import — use --recursive to follow)")}`);
|
|
111
112
|
result.skipped++;
|
|
112
113
|
}
|
|
113
114
|
continue;
|
|
@@ -116,7 +117,7 @@ export async function upgradeManifest(args) {
|
|
|
116
117
|
// reconstruction, and hashing — `upgrade` never branches on ref shape.
|
|
117
118
|
const transport = registry.forRef(source);
|
|
118
119
|
if (!transport) {
|
|
119
|
-
|
|
120
|
+
outLine(` ${log.dim("·")} ${source} ${log.dim("skipped (not a remote ref)")}`);
|
|
120
121
|
result.skipped++;
|
|
121
122
|
continue;
|
|
122
123
|
}
|
|
@@ -124,7 +125,7 @@ export async function upgradeManifest(args) {
|
|
|
124
125
|
if (rawVersion === null) {
|
|
125
126
|
// Remote but not version-pinned — a bare `https://` URL, or an OCI ref
|
|
126
127
|
// with no explicit reference. Nothing to compare against.
|
|
127
|
-
|
|
128
|
+
outLine(` ${log.dim("·")} ${source} ${log.dim("skipped (not version-pinned)")}`);
|
|
128
129
|
result.skipped++;
|
|
129
130
|
continue;
|
|
130
131
|
}
|
|
@@ -134,12 +135,12 @@ export async function upgradeManifest(args) {
|
|
|
134
135
|
published = await transport.listVersions(source);
|
|
135
136
|
}
|
|
136
137
|
catch (err) {
|
|
137
|
-
|
|
138
|
+
outErrLine(` ${log.err.error("✗")} ${label} ` + (err instanceof Error ? err.message : String(err)));
|
|
138
139
|
result.errors++;
|
|
139
140
|
continue;
|
|
140
141
|
}
|
|
141
142
|
if (published === null || published.length === 0) {
|
|
142
|
-
|
|
143
|
+
outLine(` ${log.warn("!")} ${label} ${log.dim("no published versions in registry")}`);
|
|
143
144
|
result.skipped++;
|
|
144
145
|
continue;
|
|
145
146
|
}
|
|
@@ -151,7 +152,7 @@ export async function upgradeManifest(args) {
|
|
|
151
152
|
const best = pickLatest(normalized, includePrerelease);
|
|
152
153
|
if (!best) {
|
|
153
154
|
// Versions exist but none pass the prerelease filter / semver parser.
|
|
154
|
-
|
|
155
|
+
outLine(` ${log.warn("!")} ${label} ${log.dim("no eligible versions in registry")}`);
|
|
155
156
|
result.skipped++;
|
|
156
157
|
continue;
|
|
157
158
|
}
|
|
@@ -159,7 +160,7 @@ export async function upgradeManifest(args) {
|
|
|
159
160
|
if (!currentVersion) {
|
|
160
161
|
// A non-SemVer pin — an OCI `sha256:` digest, a moving tag like `latest`.
|
|
161
162
|
// There is no ordering to upgrade along, so leave it untouched.
|
|
162
|
-
|
|
163
|
+
outLine(` ${log.warn("!")} ${label} ${log.dim(`unparseable current version (${rawVersion})`)}`);
|
|
163
164
|
result.skipped++;
|
|
164
165
|
continue;
|
|
165
166
|
}
|
|
@@ -180,13 +181,13 @@ export async function upgradeManifest(args) {
|
|
|
180
181
|
newPin = `${newBase}#${await transport.manifestHash(newBase)}`;
|
|
181
182
|
}
|
|
182
183
|
catch (err) {
|
|
183
|
-
|
|
184
|
+
outLine(` ${log.warn("!")} ${label} ${log.dim(`left unpinned (${err instanceof Error ? err.message : String(err)})`)}`);
|
|
184
185
|
}
|
|
185
186
|
const edit = buildSourceEdit(importRef.node, content, newPin);
|
|
186
187
|
if (!edit) {
|
|
187
188
|
// No range info — extremely unlikely for a freshly parsed doc, but bail
|
|
188
189
|
// out loudly rather than silently dropping the rewrite.
|
|
189
|
-
|
|
190
|
+
outErrLine(` ${log.err.error("✗")} ${label} source scalar has no range — skipping`);
|
|
190
191
|
result.errors++;
|
|
191
192
|
continue;
|
|
192
193
|
}
|
|
@@ -195,13 +196,13 @@ export async function upgradeManifest(args) {
|
|
|
195
196
|
result.upgrades.push({ packagePath: label, from: currentVersion, to: best });
|
|
196
197
|
if (currentPublished) {
|
|
197
198
|
// Pinned version exists in the registry, just older — straight upgrade.
|
|
198
|
-
|
|
199
|
+
outLine(` ${log.ok("↑")} ${label} ${currentVersion} → ${log.ok(best)}`);
|
|
199
200
|
}
|
|
200
201
|
else {
|
|
201
202
|
// Pinned version NOT in the registry — broken pin, repair to latest
|
|
202
203
|
// regardless of direction.
|
|
203
204
|
const arrow = cmp >= 0 ? log.ok("↑") : log.warn("↓");
|
|
204
|
-
|
|
205
|
+
outLine(` ${arrow} ${label} ${currentVersion} → ${log.ok(best)} ${log.warn("(pinned version not in registry)")}`);
|
|
205
206
|
}
|
|
206
207
|
}
|
|
207
208
|
return { content: applyEdits(content, edits), result, relativeImports };
|
|
@@ -272,7 +273,7 @@ export async function upgradeOne(inputPath, registryUrl, includePrerelease, dryR
|
|
|
272
273
|
const { filePath, error: resolveError } = resolveManifestPath(inputPath);
|
|
273
274
|
const displayPath = path.relative(process.cwd(), filePath);
|
|
274
275
|
if (resolveError) {
|
|
275
|
-
|
|
276
|
+
outErrLine(`${displayPath} ${log.err.error("error")} ${resolveError}`);
|
|
276
277
|
return emptyResult(1);
|
|
277
278
|
}
|
|
278
279
|
// A shared visited set makes recursion cycle-safe and de-dupes a sibling
|
|
@@ -285,7 +286,7 @@ export async function upgradeOne(inputPath, registryUrl, includePrerelease, dryR
|
|
|
285
286
|
content = fs.readFileSync(filePath, "utf-8");
|
|
286
287
|
}
|
|
287
288
|
catch (err) {
|
|
288
|
-
|
|
289
|
+
outErrLine(`${displayPath} ${log.err.error("error")} cannot read file: ` +
|
|
289
290
|
(err instanceof Error ? err.message : String(err)));
|
|
290
291
|
return emptyResult(1);
|
|
291
292
|
}
|
|
@@ -302,7 +303,7 @@ export async function upgradeOne(inputPath, registryUrl, includePrerelease, dryR
|
|
|
302
303
|
}
|
|
303
304
|
if (result.changed && dryRun) {
|
|
304
305
|
const count = result.upgrades.length + result.pinned;
|
|
305
|
-
|
|
306
|
+
outLine(` ${log.dim(`dry-run: ${count} import(s) would be updated`)}`);
|
|
306
307
|
}
|
|
307
308
|
// Descend into local sibling manifests, resolving each relative source against
|
|
308
309
|
// this manifest's directory. Remote imports were already bumped in place above.
|
|
@@ -344,9 +345,22 @@ export async function upgrade(argv) {
|
|
|
344
345
|
parts.push(log.dim(`${totalSkipped} skipped`));
|
|
345
346
|
if (totalErrors > 0)
|
|
346
347
|
parts.push(log.error(`${totalErrors} error${totalErrors !== 1 ? "s" : ""}`));
|
|
347
|
-
|
|
348
|
+
outLine(`\n${parts.join(", ")}`);
|
|
349
|
+
outEmit({
|
|
350
|
+
ok: totalErrors === 0,
|
|
351
|
+
dryRun: argv.dryRun ?? false,
|
|
352
|
+
upgraded: totalUpgrades,
|
|
353
|
+
pinned: totalPinned,
|
|
354
|
+
unchanged: totalUnchanged,
|
|
355
|
+
skipped: totalSkipped,
|
|
356
|
+
errorCount: totalErrors,
|
|
357
|
+
});
|
|
358
|
+
// `process.exitCode`, not `process.exit()`: the structured payload was just
|
|
359
|
+
// written, and on a pipe `write` is asynchronous while `exit` does not flush.
|
|
360
|
+
// Truncated JSON is a parse failure for the one consumer this format exists
|
|
361
|
+
// for. Returning lets the event loop drain.
|
|
348
362
|
if (totalErrors > 0)
|
|
349
|
-
process.
|
|
363
|
+
process.exitCode = 1;
|
|
350
364
|
}
|
|
351
365
|
export function upgradeCommand(yargs) {
|
|
352
366
|
return yargs.command("upgrade <paths..>", "Bump import sources to the latest published version in the registry", (y) => y
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-progress.d.ts","sourceRoot":"","sources":["../src/controller-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"controller-progress.d.ts","sourceRoot":"","sources":["../src/controller-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAc1C;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAChC,IAAI,CAoKN"}
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-progress.js","sourceRoot":"","sources":["../src/controller-progress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"controller-progress.js","sourceRoot":"","sources":["../src/controller-progress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-event-subscriber.d.ts","sourceRoot":"","sources":["../src/debug-event-subscriber.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debug-event-subscriber.d.ts","sourceRoot":"","sources":["../src/debug-event-subscriber.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,qBAAa,oBAAoB;IACnB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,2EAA2E;IACrE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,mFAAmF;IAC7E,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CASzC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as fs from "fs/promises";
|
|
2
2
|
import * as path from "path";
|
|
3
|
+
import { outErrLine } from "./output.js";
|
|
3
4
|
/**
|
|
4
5
|
* The JSONL file sink for `--debug`: one wire-format event per line, appended to
|
|
5
6
|
* `<manifest-dir>/.telo.debug.jsonl`. A pure writer — it does not serialize (that's
|
|
@@ -25,7 +26,7 @@ export class DebugEventSubscriber {
|
|
|
25
26
|
await fs.appendFile(this.filePath, line + "\n", "utf-8");
|
|
26
27
|
}
|
|
27
28
|
catch (error) {
|
|
28
|
-
|
|
29
|
+
outErrLine(`Failed to write event to debug log: ${error instanceof Error ? error.message : String(error)}`);
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-event-subscriber.js","sourceRoot":"","sources":["../src/debug-event-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-event-subscriber.js","sourceRoot":"","sources":["../src/debug-event-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,OAAO,oBAAoB;IACF;IAA7B,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAEjD,2EAA2E;IAC3E,KAAK,CAAC,IAAI;QACR,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG;YAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,mFAAmF;IACnF,KAAK,CAAC,KAAK,CAAC,IAAY;QACtB,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CACR,uCAAuC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAChG,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
|
package/dist/logger.d.ts
CHANGED
|
@@ -1,11 +1,43 @@
|
|
|
1
1
|
import type { AnalysisDiagnostic, LoadedGraph } from "@telorun/analyzer";
|
|
2
2
|
import { type RuntimeDiagnostic } from "@telorun/kernel";
|
|
3
|
+
/** One diagnostic as `-o json` reports it. The shape is the machine contract
|
|
4
|
+
* that replaces parsing the prose form: `code` is what a caller branches on,
|
|
5
|
+
* and the location is pre-resolved because deriving it needs the loaded graph,
|
|
6
|
+
* which the consumer does not have. */
|
|
7
|
+
export interface JsonDiagnostic {
|
|
8
|
+
file: string;
|
|
9
|
+
line: number;
|
|
10
|
+
column: number;
|
|
11
|
+
severity: "error" | "warning";
|
|
12
|
+
code?: string;
|
|
13
|
+
message: string;
|
|
14
|
+
/** `<kind>/<name>` of the resource the diagnostic is pinned to. */
|
|
15
|
+
resource?: string;
|
|
16
|
+
/** Dotted path of the offending value within that resource. */
|
|
17
|
+
path?: string;
|
|
18
|
+
/** A mechanically applicable repair: the whole corrected value at `path`.
|
|
19
|
+
* Present only when the repair is decidable, so a consumer can apply it
|
|
20
|
+
* without re-deriving it from the message. */
|
|
21
|
+
fix?: {
|
|
22
|
+
replacement: string;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** The logger's colouring delegates to `Output`'s per-stream palettes.
|
|
26
|
+
*
|
|
27
|
+
* Its methods paint text destined for STDOUT; `log.err` is the same palette
|
|
28
|
+
* bound to stderr. Which one a caller wants is decided by where it writes, not
|
|
29
|
+
* by the process — `formatDiagnostics` writes to stderr and `check`'s summary
|
|
30
|
+
* to stdout, and one shared decision was wrong for whichever stream was
|
|
31
|
+
* redirected. Under `-o json` both palettes are plain, so structured output
|
|
32
|
+
* cannot carry escapes. */
|
|
3
33
|
export declare function createLogger(verbose: boolean): {
|
|
4
34
|
info: (...args: any[]) => void;
|
|
5
35
|
ok: (text: string) => string;
|
|
6
36
|
warn: (text: string) => string;
|
|
7
37
|
error: (text: string) => string;
|
|
8
38
|
dim: (text: string) => string;
|
|
39
|
+
/** Palette for text written to stderr. */
|
|
40
|
+
err: import("./output.js").Palette;
|
|
9
41
|
verbose: boolean;
|
|
10
42
|
};
|
|
11
43
|
export type Logger = ReturnType<typeof createLogger>;
|
|
@@ -27,5 +59,6 @@ export declare function formatDiagnostics(diagnostics: RuntimeDiagnostic[], log:
|
|
|
27
59
|
export declare function formatAnalysisDiagnostics(diagnostics: AnalysisDiagnostic[], graph: LoadedGraph, log: Logger, entryPath: string): {
|
|
28
60
|
errorCount: number;
|
|
29
61
|
warnCount: number;
|
|
62
|
+
diagnostics: JsonDiagnostic[];
|
|
30
63
|
};
|
|
31
64
|
//# sourceMappingURL=logger.d.ts.map
|
package/dist/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGzE,OAAO,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGzE,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAwDzB;;;wCAGwC;AACxC,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;mDAE+C;IAC/C,GAAG,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B;AAED;;;;;;;4BAO4B;AAC5B,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO;oBAGzB,GAAG,EAAE;eAGV,MAAM;iBACJ,MAAM;kBACL,MAAM;gBACR,MAAM;IAClB,0CAA0C;;;EAI7C;AAED,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAErD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,iBAAiB,EAAE,EAChC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,WAAW,GAClB,IAAI,CAuEN;AAED;;yBAEyB;AACzB,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,kBAAkB,EAAE,EACjC,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,CA4C1E"}
|
package/dist/logger.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { DiagnosticSeverity } from "@telorun/analyzer";
|
|
1
|
+
import { DiagnosticSeverity, diagnosticFix } from "@telorun/analyzer";
|
|
2
2
|
import { findPositions, resolveRange } from "@telorun/ide-support";
|
|
3
|
-
import {
|
|
3
|
+
import { describeBlockedGroup, groupBlockedResources, } from "@telorun/kernel";
|
|
4
4
|
import * as path from "path";
|
|
5
5
|
import { fileURLToPath } from "url";
|
|
6
|
+
import { output } from "./output.js";
|
|
6
7
|
/** Render a manifest source for display: a local `file://` URL (how the loader
|
|
7
8
|
* canonicalizes on-disk manifests) becomes a CWD-relative path, a real remote
|
|
8
9
|
* URL (`http(s)://`) is kept absolute, and a bare path is made relative. */
|
|
@@ -26,7 +27,7 @@ function displaySourcePath(raw) {
|
|
|
26
27
|
* Undefined when nothing located it — a diagnostic whose resource is synthetic
|
|
27
28
|
* and whose file matches no graph source. A pointer to line 1 would be worse
|
|
28
29
|
* than none: it sends the reader somewhere the error is not. */
|
|
29
|
-
function
|
|
30
|
+
function resolveLocationParts(graph, d, fallbackSource) {
|
|
30
31
|
const located = findPositions(graph, d.data);
|
|
31
32
|
if (!located && !d.range)
|
|
32
33
|
return undefined;
|
|
@@ -34,28 +35,38 @@ function resolveLocation(graph, d, fallbackSource) {
|
|
|
34
35
|
positionIndex: located?.positionIndex,
|
|
35
36
|
sourceLine: located?.sourceLine,
|
|
36
37
|
});
|
|
37
|
-
|
|
38
|
+
// 1-based for display; the analyzer's own range is 0-based.
|
|
39
|
+
return {
|
|
40
|
+
file: displaySourcePath(located?.file ?? fallbackSource),
|
|
41
|
+
line: range.start.line + 1,
|
|
42
|
+
column: range.start.character + 1,
|
|
43
|
+
};
|
|
38
44
|
}
|
|
45
|
+
function resolveLocation(graph, d, fallbackSource) {
|
|
46
|
+
const parts = resolveLocationParts(graph, d, fallbackSource);
|
|
47
|
+
return parts && `${parts.file}:${parts.line}:${parts.column}`;
|
|
48
|
+
}
|
|
49
|
+
/** The logger's colouring delegates to `Output`'s per-stream palettes.
|
|
50
|
+
*
|
|
51
|
+
* Its methods paint text destined for STDOUT; `log.err` is the same palette
|
|
52
|
+
* bound to stderr. Which one a caller wants is decided by where it writes, not
|
|
53
|
+
* by the process — `formatDiagnostics` writes to stderr and `check`'s summary
|
|
54
|
+
* to stdout, and one shared decision was wrong for whichever stream was
|
|
55
|
+
* redirected. Under `-o json` both palettes are plain, so structured output
|
|
56
|
+
* cannot carry escapes. */
|
|
39
57
|
export function createLogger(verbose) {
|
|
40
|
-
|
|
41
|
-
// order exactly, shared with the `pretty` log encoding rather than
|
|
42
|
-
// reimplemented here. Notably this adds `NO_COLOR` support, which the CLI
|
|
43
|
-
// previously ignored, and stops treating a bare `FORCE_COLOR=0` as "on" —
|
|
44
|
-
// both behavior changes, both required by the spec.
|
|
45
|
-
//
|
|
46
|
-
// The decision is made against stdout, which is where this logger writes.
|
|
47
|
-
const useColor = decideColor({
|
|
48
|
-
setting: "auto",
|
|
49
|
-
env: process.env,
|
|
50
|
-
isTTY: Boolean(process.stdout.isTTY),
|
|
51
|
-
});
|
|
52
|
-
const wrap = (code, text) => (useColor ? `\x1b[${code}m${text}\x1b[0m` : text);
|
|
58
|
+
const out = output();
|
|
53
59
|
return {
|
|
54
|
-
info: (...args) =>
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
60
|
+
info: (...args) => {
|
|
61
|
+
if (!out.isJson)
|
|
62
|
+
out.line(args.map((a) => String(a)).join(" "));
|
|
63
|
+
},
|
|
64
|
+
ok: (text) => out.stdout.ok(text),
|
|
65
|
+
warn: (text) => out.stdout.warn(text),
|
|
66
|
+
error: (text) => out.stdout.error(text),
|
|
67
|
+
dim: (text) => out.stdout.dim(text),
|
|
68
|
+
/** Palette for text written to stderr. */
|
|
69
|
+
err: out.stderr,
|
|
59
70
|
verbose,
|
|
60
71
|
};
|
|
61
72
|
}
|
|
@@ -74,12 +85,16 @@ export function formatDiagnostics(diagnostics, log, displayPath, graph) {
|
|
|
74
85
|
// Column the `error`/`warning` label occupies, so a collapsed group line sits
|
|
75
86
|
// under the resource names it summarizes rather than under the label.
|
|
76
87
|
const NAME_COLUMN = " ".repeat(" error ".length);
|
|
88
|
+
const out = output();
|
|
89
|
+
// This renderer writes to stderr throughout, so it paints with the stderr
|
|
90
|
+
// palette — the stdout one may be coloured when stderr is redirected.
|
|
91
|
+
const paint = log.err;
|
|
77
92
|
const render = (entries, indent) => {
|
|
78
93
|
for (const d of entries) {
|
|
79
94
|
const skip = d.derived && !log.verbose;
|
|
80
95
|
if (!skip) {
|
|
81
|
-
const severityLabel = d.severity === "warning" ?
|
|
82
|
-
const code = d.code ? ` ${
|
|
96
|
+
const severityLabel = d.severity === "warning" ? paint.warn("warning") : paint.error("error");
|
|
97
|
+
const code = d.code ? ` ${paint.dim(d.code)}` : "";
|
|
83
98
|
// A static failure that nothing could locate falls through to the
|
|
84
99
|
// resource / bare-path branches below, which at least name what failed.
|
|
85
100
|
const location = d.origin && graph
|
|
@@ -91,28 +106,28 @@ export function formatDiagnostics(diagnostics, log, displayPath, graph) {
|
|
|
91
106
|
if (!d.details)
|
|
92
107
|
return;
|
|
93
108
|
for (const line of d.details.split("\n")) {
|
|
94
|
-
|
|
109
|
+
out.errLine(`${detailIndent}${paint.dim(line)}`);
|
|
95
110
|
}
|
|
96
111
|
};
|
|
97
112
|
if (location) {
|
|
98
113
|
// Static-analysis failure — the position names the exact spot, so it
|
|
99
114
|
// renders exactly as `telo check` does. Repeating the resource here
|
|
100
115
|
// would duplicate it: an analyzer message already names its own.
|
|
101
|
-
|
|
116
|
+
out.errLine(`${indent}${location} ${severityLabel} ${d.message}${code}`);
|
|
102
117
|
printDetails(`${indent} `);
|
|
103
118
|
}
|
|
104
119
|
else if (d.resource) {
|
|
105
120
|
// Runtime diagnostic — the failure is pinned to a resource, so the
|
|
106
121
|
// entry manifest path adds no information. Show kind + name + message
|
|
107
122
|
// and any structured details indented below.
|
|
108
|
-
const who = `${d.kind ? `${
|
|
109
|
-
|
|
123
|
+
const who = `${d.kind ? `${paint.dim(d.kind)} ` : ""}${d.resource}`;
|
|
124
|
+
out.errLine(`${indent} ${severityLabel} ${who}: ${d.message}${code}`);
|
|
110
125
|
printDetails(`${indent}${NAME_COLUMN} `);
|
|
111
126
|
}
|
|
112
127
|
else {
|
|
113
128
|
// Non-resource diagnostic (e.g. loader/parse failure) — keep the file
|
|
114
129
|
// path since it is the only location cue we have.
|
|
115
|
-
|
|
130
|
+
out.errLine(`${indent}${displayPath} ${severityLabel} ${d.message}${code}`);
|
|
116
131
|
printDetails(`${indent} `);
|
|
117
132
|
}
|
|
118
133
|
}
|
|
@@ -124,7 +139,7 @@ export function formatDiagnostics(diagnostics, log, displayPath, graph) {
|
|
|
124
139
|
}
|
|
125
140
|
if (!log.verbose) {
|
|
126
141
|
for (const [blockedBy, names] of groupBlockedResources(entries)) {
|
|
127
|
-
|
|
142
|
+
out.errLine(`${indent}${NAME_COLUMN}${paint.dim(describeBlockedGroup(blockedBy, names))}`);
|
|
128
143
|
}
|
|
129
144
|
}
|
|
130
145
|
};
|
|
@@ -136,20 +151,41 @@ export function formatDiagnostics(diagnostics, log, displayPath, graph) {
|
|
|
136
151
|
export function formatAnalysisDiagnostics(diagnostics, graph, log, entryPath) {
|
|
137
152
|
let errorCount = 0;
|
|
138
153
|
let warnCount = 0;
|
|
154
|
+
const out = output();
|
|
155
|
+
const collected = [];
|
|
139
156
|
for (const d of diagnostics) {
|
|
140
157
|
// `check` prints one line per diagnostic and has no resource-named form to
|
|
141
158
|
// fall back to, so an unlocatable one still leads with the entry manifest.
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
:
|
|
159
|
+
const parts = resolveLocationParts(graph, d, entryPath) ?? {
|
|
160
|
+
file: displaySourcePath(entryPath),
|
|
161
|
+
line: 1,
|
|
162
|
+
column: 1,
|
|
163
|
+
};
|
|
164
|
+
const isError = (d.severity ?? DiagnosticSeverity.Warning) <= DiagnosticSeverity.Error;
|
|
165
|
+
const severityLabel = isError ? log.error("error") : log.warn("warning");
|
|
146
166
|
const code = d.code ? ` ${log.dim(String(d.code))}` : "";
|
|
147
|
-
|
|
148
|
-
|
|
167
|
+
// Silent under `-o json`: the structured payload carries the same
|
|
168
|
+
// diagnostics with their location resolved, so printing here too would
|
|
169
|
+
// interleave prose into a document a consumer parses.
|
|
170
|
+
out.line(`${parts.file}:${parts.line}:${parts.column} ${severityLabel} ${d.message}${code}`);
|
|
171
|
+
// stdout under `-o json` is the machine surface, and a repair the analyzer
|
|
172
|
+
// already computed is the most actionable thing on it — dropping it forced
|
|
173
|
+
// every consumer to re-derive the fix by parsing prose.
|
|
174
|
+
const stamp = d.data;
|
|
175
|
+
collected.push({
|
|
176
|
+
...parts,
|
|
177
|
+
severity: isError ? "error" : "warning",
|
|
178
|
+
...(d.code === undefined ? {} : { code: String(d.code) }),
|
|
179
|
+
message: d.message,
|
|
180
|
+
...(stamp?.resource ? { resource: `${stamp.resource.kind}/${stamp.resource.name}` } : {}),
|
|
181
|
+
...(stamp?.path ? { path: stamp.path } : {}),
|
|
182
|
+
...(diagnosticFix(d) ? { fix: diagnosticFix(d) } : {}),
|
|
183
|
+
});
|
|
184
|
+
if (isError)
|
|
149
185
|
errorCount++;
|
|
150
186
|
else
|
|
151
187
|
warnCount++;
|
|
152
188
|
}
|
|
153
|
-
return { errorCount, warnCount };
|
|
189
|
+
return { errorCount, warnCount, diagnostics: collected };
|
|
154
190
|
}
|
|
155
191
|
//# sourceMappingURL=logger.js.map
|