zedbee 0.1.0-beta.5 → 0.1.0-beta.6
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/checks/eslint/lint-adapter.d.ts.map +1 -1
- package/dist/checks/eslint/lint-adapter.js +74 -15
- package/dist/checks/eslint/lint-adapter.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/init.d.ts +3 -2
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +32 -8
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/scan.d.ts.map +1 -1
- package/dist/commands/scan.js +7 -0
- package/dist/commands/scan.js.map +1 -1
- package/dist/config/schema.d.ts +2 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +4 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/hooks/command.d.ts +2 -0
- package/dist/hooks/command.d.ts.map +1 -1
- package/dist/hooks/command.js +12 -0
- package/dist/hooks/command.js.map +1 -1
- package/dist/init/format-proposal.d.ts +4 -0
- package/dist/init/format-proposal.d.ts.map +1 -0
- package/dist/init/format-proposal.js +48 -0
- package/dist/init/format-proposal.js.map +1 -0
- package/dist/init/recommend.d.ts.map +1 -1
- package/dist/init/recommend.js +45 -7
- package/dist/init/recommend.js.map +1 -1
- package/dist/init/types.d.ts +5 -0
- package/dist/init/types.d.ts.map +1 -1
- package/dist/init/types.js.map +1 -1
- package/dist/renderers/json.d.ts.map +1 -1
- package/dist/renderers/json.js +10 -5
- package/dist/renderers/json.js.map +1 -1
- package/dist/renderers/sarif.d.ts.map +1 -1
- package/dist/renderers/sarif.js +6 -3
- package/dist/renderers/sarif.js.map +1 -1
- package/dist/renderers/text.d.ts.map +1 -1
- package/dist/renderers/text.js +9 -6
- package/dist/renderers/text.js.map +1 -1
- package/dist/reporting/fix-command.d.ts +5 -0
- package/dist/reporting/fix-command.d.ts.map +1 -0
- package/dist/reporting/fix-command.js +27 -0
- package/dist/reporting/fix-command.js.map +1 -0
- package/dist/reporting/next-steps.d.ts +2 -1
- package/dist/reporting/next-steps.d.ts.map +1 -1
- package/dist/reporting/next-steps.js +4 -3
- package/dist/reporting/next-steps.js.map +1 -1
- package/dist/scan/report.d.ts +2 -0
- package/dist/scan/report.d.ts.map +1 -1
- package/dist/ui/init-app.d.ts +5 -4
- package/dist/ui/init-app.d.ts.map +1 -1
- package/dist/ui/init-app.js +77 -16
- package/dist/ui/init-app.js.map +1 -1
- package/dist/ui/scan-app.d.ts.map +1 -1
- package/dist/ui/scan-app.js +4 -1
- package/dist/ui/scan-app.js.map +1 -1
- package/docs/checks.md +1 -1
- package/docs/cli-reference.md +5 -1
- package/licenses/production-inventory.json +492 -492
- package/node_modules/prettier/LICENSE +7 -0
- package/node_modules/prettier/README.md +104 -0
- package/node_modules/prettier/THIRD-PARTY-NOTICES.md +8019 -0
- package/node_modules/prettier/bin/prettier.cjs +84 -0
- package/node_modules/prettier/doc.d.ts +254 -0
- package/node_modules/prettier/doc.js +1575 -0
- package/node_modules/prettier/doc.mjs +1544 -0
- package/node_modules/prettier/index.cjs +790 -0
- package/node_modules/prettier/index.d.ts +959 -0
- package/node_modules/prettier/index.mjs +19074 -0
- package/node_modules/prettier/internal/experimental-cli-worker.mjs +2756 -0
- package/node_modules/prettier/internal/experimental-cli.mjs +12572 -0
- package/node_modules/prettier/internal/legacy-cli.mjs +7059 -0
- package/node_modules/prettier/package.json +207 -0
- package/node_modules/prettier/plugins/acorn.d.ts +6 -0
- package/node_modules/prettier/plugins/acorn.js +17 -0
- package/node_modules/prettier/plugins/acorn.mjs +17 -0
- package/node_modules/prettier/plugins/angular.d.ts +8 -0
- package/node_modules/prettier/plugins/angular.js +5 -0
- package/node_modules/prettier/plugins/angular.mjs +5 -0
- package/node_modules/prettier/plugins/babel.d.ts +18 -0
- package/node_modules/prettier/plugins/babel.js +16 -0
- package/node_modules/prettier/plugins/babel.mjs +16 -0
- package/node_modules/prettier/plugins/estree.d.ts +6 -0
- package/node_modules/prettier/plugins/estree.js +44 -0
- package/node_modules/prettier/plugins/estree.mjs +44 -0
- package/node_modules/prettier/plugins/flow.d.ts +5 -0
- package/node_modules/prettier/plugins/flow.js +7 -0
- package/node_modules/prettier/plugins/flow.mjs +7 -0
- package/node_modules/prettier/plugins/glimmer.d.ts +9 -0
- package/node_modules/prettier/plugins/glimmer.js +37 -0
- package/node_modules/prettier/plugins/glimmer.mjs +37 -0
- package/node_modules/prettier/plugins/graphql.d.ts +9 -0
- package/node_modules/prettier/plugins/graphql.js +17 -0
- package/node_modules/prettier/plugins/graphql.mjs +17 -0
- package/node_modules/prettier/plugins/html.d.ts +13 -0
- package/node_modules/prettier/plugins/html.js +25 -0
- package/node_modules/prettier/plugins/html.mjs +25 -0
- package/node_modules/prettier/plugins/markdown.d.ts +11 -0
- package/node_modules/prettier/plugins/markdown.js +70 -0
- package/node_modules/prettier/plugins/markdown.mjs +70 -0
- package/node_modules/prettier/plugins/meriyah.d.ts +5 -0
- package/node_modules/prettier/plugins/meriyah.js +6 -0
- package/node_modules/prettier/plugins/meriyah.mjs +6 -0
- package/node_modules/prettier/plugins/postcss.d.ts +11 -0
- package/node_modules/prettier/plugins/postcss.js +62 -0
- package/node_modules/prettier/plugins/postcss.mjs +62 -0
- package/node_modules/prettier/plugins/typescript.d.ts +5 -0
- package/node_modules/prettier/plugins/typescript.js +22 -0
- package/node_modules/prettier/plugins/typescript.mjs +22 -0
- package/node_modules/prettier/plugins/yaml.d.ts +9 -0
- package/node_modules/prettier/plugins/yaml.js +141 -0
- package/node_modules/prettier/plugins/yaml.mjs +154 -0
- package/node_modules/prettier/standalone.d.ts +33 -0
- package/node_modules/prettier/standalone.js +29 -0
- package/node_modules/prettier/standalone.mjs +29 -0
- package/package.json +4 -1
- package/schema/zedbee.schema.json +1 -1
package/dist/renderers/json.js
CHANGED
|
@@ -3,7 +3,8 @@ import { compareFindings } from "../core/summarize.js";
|
|
|
3
3
|
import { validateReportDisplayStrings } from "../checks/sanitize-result.js";
|
|
4
4
|
import { compareCodeUnits } from "../core/compare.js";
|
|
5
5
|
import { sanitizeScanSourceIdentity } from "../scan/source-mode.js";
|
|
6
|
-
|
|
6
|
+
import { fixCommandArguments } from "../reporting/fix-command.js";
|
|
7
|
+
function serializeFinding(finding, installedCliCommand) {
|
|
7
8
|
const sourceExcerpt = finding.sourceExcerpt === undefined
|
|
8
9
|
? undefined
|
|
9
10
|
: {
|
|
@@ -29,7 +30,9 @@ function serializeFinding(finding) {
|
|
|
29
30
|
: {
|
|
30
31
|
automaticFix: {
|
|
31
32
|
available: true,
|
|
32
|
-
command: [
|
|
33
|
+
command: [
|
|
34
|
+
...fixCommandArguments(finding.automaticFix, installedCliCommand),
|
|
35
|
+
],
|
|
33
36
|
scope: finding.automaticFix.scope,
|
|
34
37
|
writes: finding.automaticFix.writes,
|
|
35
38
|
stagesChanges: false,
|
|
@@ -43,7 +46,7 @@ function serializeFinding(finding) {
|
|
|
43
46
|
},
|
|
44
47
|
};
|
|
45
48
|
}
|
|
46
|
-
function serializeCheck(check) {
|
|
49
|
+
function serializeCheck(check, installedCliCommand) {
|
|
47
50
|
const error = check.error === undefined
|
|
48
51
|
? undefined
|
|
49
52
|
: {
|
|
@@ -74,7 +77,9 @@ function serializeCheck(check) {
|
|
|
74
77
|
...(check.target === undefined ? {} : { target: check.target }),
|
|
75
78
|
status: check.status,
|
|
76
79
|
durationMs: check.durationMs,
|
|
77
|
-
findings: [...check.findings]
|
|
80
|
+
findings: [...check.findings]
|
|
81
|
+
.sort(compareFindings)
|
|
82
|
+
.map((finding) => serializeFinding(finding, installedCliCommand)),
|
|
78
83
|
...(error === undefined ? {} : { error }),
|
|
79
84
|
...(check.skipReason === undefined ? {} : { skipReason: check.skipReason }),
|
|
80
85
|
...(check.incompleteDisposition === undefined
|
|
@@ -136,7 +141,7 @@ export function renderJson(report) {
|
|
|
136
141
|
checks: [...sanitized.checks]
|
|
137
142
|
.sort((left, right) => compareCodeUnits(left.checkId, right.checkId) ||
|
|
138
143
|
compareCodeUnits(left.target ?? "", right.target ?? ""))
|
|
139
|
-
.map(serializeCheck),
|
|
144
|
+
.map((check) => serializeCheck(check, report.installedCliCommand)),
|
|
140
145
|
};
|
|
141
146
|
return `${JSON.stringify(payload, null, 2)}\n`;
|
|
142
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/renderers/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/renderers/json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif.d.ts","sourceRoot":"","sources":["../../src/renderers/sarif.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sarif.d.ts","sourceRoot":"","sources":["../../src/renderers/sarif.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAqB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAoQvE,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CA2BtD"}
|
package/dist/renderers/sarif.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { validateReportDisplayStrings } from "../checks/sanitize-result.js";
|
|
2
|
+
import { fixCommandArguments } from "../reporting/fix-command.js";
|
|
2
3
|
import { compareCodeUnits } from "../core/compare.js";
|
|
3
4
|
import { ZEDBEE_VERSION } from "../core/package-version.js";
|
|
4
5
|
import { compareFindings } from "../core/summarize.js";
|
|
@@ -82,7 +83,7 @@ function createLocation(finding) {
|
|
|
82
83
|
},
|
|
83
84
|
];
|
|
84
85
|
}
|
|
85
|
-
function createResult(finding, ruleIndexes) {
|
|
86
|
+
function createResult(finding, ruleIndexes, installedCliCommand) {
|
|
86
87
|
const id = ruleId(finding);
|
|
87
88
|
const locations = createLocation(finding);
|
|
88
89
|
return {
|
|
@@ -104,7 +105,9 @@ function createResult(finding, ruleIndexes) {
|
|
|
104
105
|
...(finding.automaticFix === undefined
|
|
105
106
|
? {}
|
|
106
107
|
: {
|
|
107
|
-
"zedbee/automaticFixCommand": [
|
|
108
|
+
"zedbee/automaticFixCommand": [
|
|
109
|
+
...fixCommandArguments(finding.automaticFix, installedCliCommand),
|
|
110
|
+
],
|
|
108
111
|
"zedbee/automaticFixScope": finding.automaticFix.scope,
|
|
109
112
|
"zedbee/automaticFixWrites": finding.automaticFix.writes,
|
|
110
113
|
"zedbee/automaticFixStagesChanges": false,
|
|
@@ -212,7 +215,7 @@ export function renderSarif(report) {
|
|
|
212
215
|
rules,
|
|
213
216
|
},
|
|
214
217
|
},
|
|
215
|
-
results: findings.map((finding) => createResult(finding, ruleIndexes)),
|
|
218
|
+
results: findings.map((finding) => createResult(finding, ruleIndexes, report.installedCliCommand)),
|
|
216
219
|
invocations: [createInvocation(report, sanitized.checks)],
|
|
217
220
|
},
|
|
218
221
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/renderers/sarif.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/renderers/sarif.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/renderers/text.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkBpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAYzE,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC;
|
|
1
|
+
{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/renderers/text.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkBpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAYzE,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC;AAofD,wBAAgB,UAAU,CACxB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAqCR"}
|
package/dist/renderers/text.js
CHANGED
|
@@ -233,8 +233,8 @@ function reportWarningsSectionLines(warnings, width) {
|
|
|
233
233
|
]),
|
|
234
234
|
];
|
|
235
235
|
}
|
|
236
|
-
function calloutLines(callouts, width, automaticFixes = []) {
|
|
237
|
-
const managedFixes = managedFixGuidanceLines(automaticFixes);
|
|
236
|
+
function calloutLines(callouts, width, automaticFixes = [], installedCliCommand) {
|
|
237
|
+
const managedFixes = managedFixGuidanceLines(automaticFixes, installedCliCommand);
|
|
238
238
|
const hasCompleteReport = callouts.some((line) => line.kind === "text" && line.value === "COMPLETE REPORT");
|
|
239
239
|
return [
|
|
240
240
|
...callouts.flatMap((line) => [
|
|
@@ -250,8 +250,8 @@ function calloutLines(callouts, width, automaticFixes = []) {
|
|
|
250
250
|
: managedFixes.flatMap((value) => wrapWords(value, width))),
|
|
251
251
|
];
|
|
252
252
|
}
|
|
253
|
-
function completeManagedFixLines(findings, width) {
|
|
254
|
-
const managedFixes = managedFixGuidanceLines(findings.flatMap((finding) => finding.automaticFix === undefined ? [] : [finding.automaticFix]));
|
|
253
|
+
function completeManagedFixLines(findings, width, installedCliCommand) {
|
|
254
|
+
const managedFixes = managedFixGuidanceLines(findings.flatMap((finding) => finding.automaticFix === undefined ? [] : [finding.automaticFix]), installedCliCommand);
|
|
255
255
|
return managedFixes.length === 0
|
|
256
256
|
? []
|
|
257
257
|
: [
|
|
@@ -314,7 +314,7 @@ function automaticTextLines(report, sanitized, presentation, width, verbose) {
|
|
|
314
314
|
"SCAN RESULT",
|
|
315
315
|
...automaticHeadline(report, presentation).flatMap((line) => wrapWords(line, width)),
|
|
316
316
|
"",
|
|
317
|
-
...calloutLines(callouts.closing, width, sections.automaticFixes),
|
|
317
|
+
...calloutLines(callouts.closing, width, sections.automaticFixes, report.installedCliCommand),
|
|
318
318
|
];
|
|
319
319
|
}
|
|
320
320
|
function guidanceLines(report, presentation, width) {
|
|
@@ -333,6 +333,9 @@ function guidanceLines(report, presentation, width) {
|
|
|
333
333
|
maximumAge: presentation.maximumAge,
|
|
334
334
|
automaticFixes: buildScanResultSections(report, presentation)
|
|
335
335
|
.automaticFixes,
|
|
336
|
+
...(report.installedCliCommand === undefined
|
|
337
|
+
? {}
|
|
338
|
+
: { installedCliCommand: report.installedCliCommand }),
|
|
336
339
|
}).flatMap((line) => line === ""
|
|
337
340
|
? [""]
|
|
338
341
|
: line.startsWith("Full report: ")
|
|
@@ -369,7 +372,7 @@ export function renderText(report, options) {
|
|
|
369
372
|
...incompleteSectionLines(sanitized.checks, width),
|
|
370
373
|
...renderedFindings(displayedFindings, width, options.verbose === true),
|
|
371
374
|
...disclosureLines(report, width),
|
|
372
|
-
...completeManagedFixLines(sanitized.summaryFindings, width),
|
|
375
|
+
...completeManagedFixLines(sanitized.summaryFindings, width, report.installedCliCommand),
|
|
373
376
|
...guidanceLines(report, options.presentation, width),
|
|
374
377
|
...maintenanceWarningLines(options.presentation?.warnings ?? [], width),
|
|
375
378
|
...deliveryFallbackLines(options.presentation, width),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/renderers/text.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/renderers/text.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ManagedAutomaticFix } from "../core/types.js";
|
|
2
|
+
/** Bind only validated managed fix actions to the host's installed CLI. */
|
|
3
|
+
export declare function fixCommandArguments(automaticFix: ManagedAutomaticFix, installedCliCommand?: readonly string[]): readonly string[];
|
|
4
|
+
export declare function fixCommandText(automaticFix: ManagedAutomaticFix, installedCliCommand?: readonly string[]): string;
|
|
5
|
+
//# sourceMappingURL=fix-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-command.d.ts","sourceRoot":"","sources":["../../src/reporting/fix-command.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,2EAA2E;AAC3E,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,GACtC,SAAS,MAAM,EAAE,CAkBnB;AAED,wBAAgB,cAAc,CAC5B,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,GACtC,MAAM,CAKR"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { normalizeManagedAutomaticFix, normalizeRepositoryRelativePath, } from "../attribution/fingerprint.js";
|
|
2
|
+
/** Bind only validated managed fix actions to the host's installed CLI. */
|
|
3
|
+
export function fixCommandArguments(automaticFix, installedCliCommand) {
|
|
4
|
+
const canonical = normalizeManagedAutomaticFix(automaticFix);
|
|
5
|
+
if (installedCliCommand?.length !== 2 ||
|
|
6
|
+
installedCliCommand[0] !== "node" ||
|
|
7
|
+
!installedCliCommand[1]?.startsWith("./")) {
|
|
8
|
+
return canonical.command;
|
|
9
|
+
}
|
|
10
|
+
const path = installedCliCommand[1];
|
|
11
|
+
try {
|
|
12
|
+
if (`./${normalizeRepositoryRelativePath(path)}` !== path) {
|
|
13
|
+
return canonical.command;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
return canonical.command;
|
|
18
|
+
}
|
|
19
|
+
return Object.freeze([...installedCliCommand, ...canonical.command.slice(3)]);
|
|
20
|
+
}
|
|
21
|
+
export function fixCommandText(automaticFix, installedCliCommand) {
|
|
22
|
+
const args = fixCommandArguments(automaticFix, installedCliCommand);
|
|
23
|
+
return args[0] === "node"
|
|
24
|
+
? `(cd "$(git rev-parse --show-toplevel)" && node '${args[1].replaceAll("'", "'\\''")}' ${args.slice(2).join(" ")})`
|
|
25
|
+
: args.join(" ");
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=fix-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-command.js","sourceRoot":"","sources":["../../src/reporting/fix-command.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,GAChC,MAAM,+BAA+B,CAAC;AAGvC,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CACjC,YAAiC,EACjC,mBAAuC;IAEvC,MAAM,SAAS,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;IAC7D,IACE,mBAAmB,EAAE,MAAM,KAAK,CAAC;QACjC,mBAAmB,CAAC,CAAC,CAAC,KAAK,MAAM;QACjC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,EACzC,CAAC;QACD,OAAO,SAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IACD,MAAM,IAAI,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACpC,IAAI,CAAC;QACH,IAAI,KAAK,+BAA+B,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;YAC1D,OAAO,SAAS,CAAC,OAAO,CAAC;QAC3B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,YAAiC,EACjC,mBAAuC;IAEvC,MAAM,IAAI,GAAG,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM;QACvB,CAAC,CAAC,mDAAmD,IAAI,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;QACrH,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -7,7 +7,8 @@ export interface NextStepsInput {
|
|
|
7
7
|
readonly reportPath: string;
|
|
8
8
|
readonly maximumAge: string;
|
|
9
9
|
readonly automaticFixes?: readonly ManagedAutomaticFix[];
|
|
10
|
+
readonly installedCliCommand?: readonly string[];
|
|
10
11
|
}
|
|
11
|
-
export declare function managedFixGuidanceLines(automaticFixes: readonly ManagedAutomaticFix[]): readonly string[];
|
|
12
|
+
export declare function managedFixGuidanceLines(automaticFixes: readonly ManagedAutomaticFix[], installedCliCommand?: readonly string[]): readonly string[];
|
|
12
13
|
export declare function nextStepsLines(input: NextStepsInput): readonly string[];
|
|
13
14
|
//# sourceMappingURL=next-steps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next-steps.d.ts","sourceRoot":"","sources":["../../src/reporting/next-steps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"next-steps.d.ts","sourceRoot":"","sources":["../../src/reporting/next-steps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAM5D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACzD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAClD;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,SAAS,mBAAmB,EAAE,EAC9C,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,GACtC,SAAS,MAAM,EAAE,CAgBnB;AAqBD,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,MAAM,EAAE,CAkBvE"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { compareCodeUnits } from "../core/compare.js";
|
|
2
2
|
import { formatTemporaryReportMaxAge } from "./report-age.js";
|
|
3
3
|
import { opaqueTemporaryReportPath } from "./report-path.js";
|
|
4
|
-
|
|
4
|
+
import { fixCommandText } from "./fix-command.js";
|
|
5
|
+
export function managedFixGuidanceLines(automaticFixes, installedCliCommand) {
|
|
5
6
|
const commands = [
|
|
6
|
-
...new Set(automaticFixes.map((automaticFix) => automaticFix
|
|
7
|
+
...new Set(automaticFixes.map((automaticFix) => fixCommandText(automaticFix, installedCliCommand))),
|
|
7
8
|
].sort(compareCodeUnits);
|
|
8
9
|
return Object.freeze(commands.length === 0
|
|
9
10
|
? []
|
|
@@ -30,7 +31,7 @@ function outcomeInstructions(outcome) {
|
|
|
30
31
|
}
|
|
31
32
|
export function nextStepsLines(input) {
|
|
32
33
|
const age = formatTemporaryReportMaxAge(input.maximumAge);
|
|
33
|
-
const managedFixes = managedFixGuidanceLines(input.automaticFixes ?? []);
|
|
34
|
+
const managedFixes = managedFixGuidanceLines(input.automaticFixes ?? [], input.installedCliCommand);
|
|
34
35
|
return Object.freeze([
|
|
35
36
|
"NEXT STEPS",
|
|
36
37
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next-steps.js","sourceRoot":"","sources":["../../src/reporting/next-steps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"next-steps.js","sourceRoot":"","sources":["../../src/reporting/next-steps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAYlD,MAAM,UAAU,uBAAuB,CACrC,cAA8C,EAC9C,mBAAuC;IAEvC,MAAM,QAAQ,GAAG;QACf,GAAG,IAAI,GAAG,CACR,cAAc,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAClC,cAAc,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAClD,CACF;KACF,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzB,OAAO,MAAM,CAAC,MAAM,CAClB,QAAQ,CAAC,MAAM,KAAK,CAAC;QACnB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,yEAAyE;YACzE,GAAG,QAAQ;SACZ,CACN,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAA8B;IAE9B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO;YACL,uEAAuE;SACxE,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;QAC7B,OAAO;YACL,iEAAiE;YACjE,iCAAiC;SAClC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,iGAAiG;KAClG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAqB;IAClD,MAAM,GAAG,GAAG,2BAA2B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,uBAAuB,CAC1C,KAAK,CAAC,cAAc,IAAI,EAAE,EAC1B,KAAK,CAAC,mBAAmB,CAC1B,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,YAAY;QACZ,EAAE;QACF,WAAW,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC,KAAK,YAAY;QACpD,gBAAgB,yBAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;QAC7D,yDAAyD,GAAG,GAAG;QAC/D,4CAA4C;QAC5C,EAAE;QACF,GAAG,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC;QACrC,GAAG,YAAY;QACf,6EAA6E;KAC9E,CAAC,CAAC;AACL,CAAC"}
|
package/dist/scan/report.d.ts
CHANGED
|
@@ -19,6 +19,8 @@ export interface ScanReport {
|
|
|
19
19
|
outcome: "pass" | "blocked" | "incomplete";
|
|
20
20
|
exitCode: 0 | 1 | 2;
|
|
21
21
|
repositoryRoot: string;
|
|
22
|
+
/** Host-resolved output guidance only; analyzer/cache commands stay canonical. */
|
|
23
|
+
readonly installedCliCommand?: readonly string[];
|
|
22
24
|
readonly mode: ScanMode;
|
|
23
25
|
readonly baseline: "HEAD" | string | null;
|
|
24
26
|
readonly target: "index" | string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/scan/report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9C,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACvC;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;IAC3C,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qEAAqE;IACrE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACjD,QAAQ,CAAC,wBAAwB,EAAE,SAAS,aAAa,EAAE,CAAC;IAC5D,QAAQ,CAAC,qBAAqB,EAAE,SAAS,aAAa,EAAE,CAAC;IACzD,QAAQ,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;IACpD,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;CAChC"}
|
|
1
|
+
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/scan/report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9C,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACvC;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;IAC3C,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,kFAAkF;IAClF,QAAQ,CAAC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,qEAAqE;IACrE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACjD,QAAQ,CAAC,wBAAwB,EAAE,SAAS,aAAa,EAAE,CAAC;IAC5D,QAAQ,CAAC,qBAAqB,EAAE,SAAS,aAAa,EAAE,CAAC;IACzD,QAAQ,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;IACpD,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;CAChC"}
|
package/dist/ui/init-app.d.ts
CHANGED
|
@@ -2,17 +2,18 @@ import { type RefObject } from "react";
|
|
|
2
2
|
import { type DOMElement } from "ink";
|
|
3
3
|
import { type CheckId, type ProfileId } from "../config/schema.js";
|
|
4
4
|
import type { InitPromptOptions } from "../commands/init.js";
|
|
5
|
-
import type { InitFormattingChoice, InitFormattingImport, InitHookChoice, InitOsvUnavailable, InitProposal } from "../init/types.js";
|
|
5
|
+
import type { InitFormattingChoice, InitFormattingScope, InitFormattingImport, InitHookChoice, InitOsvUnavailable, InitProposal } from "../init/types.js";
|
|
6
6
|
export interface InitAppProps extends InitPromptOptions {
|
|
7
7
|
readonly proposal: InitProposal;
|
|
8
8
|
readonly terminalSize?: Readonly<{
|
|
9
9
|
columns: number;
|
|
10
10
|
rows: number;
|
|
11
11
|
}>;
|
|
12
|
-
readonly proposalForSelection: (profile: ProfileId, checks: readonly CheckId[] | undefined, osvUnavailable: InitOsvUnavailable, hook?: InitHookChoice, formatting?: InitFormattingChoice, projectTrust?: boolean, evaluatedImport?: InitFormattingImport) => InitProposal;
|
|
12
|
+
readonly proposalForSelection: (profile: ProfileId, checks: readonly CheckId[] | undefined, osvUnavailable: InitOsvUnavailable, hook?: InitHookChoice, formatting?: InitFormattingChoice, projectTrust?: boolean, evaluatedImport?: InitFormattingImport, scope?: InitFormattingScope) => InitProposal;
|
|
13
13
|
/** Present only when an executable configuration can be consented evaluated. */
|
|
14
14
|
readonly evaluateExecutableImport?: () => Promise<InitFormattingImport | undefined>;
|
|
15
15
|
onDecision(decision: false | InitProposal): void;
|
|
16
|
+
readonly prepareReview?: (proposal: InitProposal) => Promise<InitProposal>;
|
|
16
17
|
readonly onMouseCleanupReady?: (cleanup: () => void) => void;
|
|
17
18
|
}
|
|
18
19
|
export declare const PROJECT_PRETTIER_DISCLOSURE = "The project formatter, its configuration, and its plugins are executable code. Trusting them covers every detected Prettier project's formatter across this repository's branches and worktrees, including its future versions and edits.";
|
|
@@ -30,6 +31,6 @@ export declare function InitActionButton({ label, focused, activeTargetRef, colo
|
|
|
30
31
|
readonly activeTargetRef?: RefObject<DOMElement | null>;
|
|
31
32
|
readonly color: boolean;
|
|
32
33
|
}): import("react").JSX.Element;
|
|
33
|
-
export declare function InitApp({ proposal, proposalForSelection, evaluateExecutableImport, projectPrettierTrustStored, width, terminalSize, color, onDecision, onMouseCleanupReady, }: InitAppProps): import("react").JSX.Element;
|
|
34
|
-
export declare function runInitPrompt(proposal: InitProposal, options: InitPromptOptions, proposalForSelection: (profile: ProfileId, checks: readonly CheckId[] | undefined, osvUnavailable: InitOsvUnavailable, hook?: InitHookChoice, formatting?: InitFormattingChoice, projectTrust?: boolean, evaluatedImport?: InitFormattingImport) => InitProposal, evaluateExecutableImport?: () => Promise<InitFormattingImport | undefined>): Promise<false | InitProposal>;
|
|
34
|
+
export declare function InitApp({ proposal, proposalForSelection, evaluateExecutableImport, projectPrettierTrustStored, width, terminalSize, color, onDecision, onMouseCleanupReady, prepareReview, }: InitAppProps): import("react").JSX.Element;
|
|
35
|
+
export declare function runInitPrompt(proposal: InitProposal, options: InitPromptOptions, proposalForSelection: (profile: ProfileId, checks: readonly CheckId[] | undefined, osvUnavailable: InitOsvUnavailable, hook?: InitHookChoice, formatting?: InitFormattingChoice, projectTrust?: boolean, evaluatedImport?: InitFormattingImport, scope?: InitFormattingScope) => InitProposal, evaluateExecutableImport?: () => Promise<InitFormattingImport | undefined>, prepareReview?: (proposal: InitProposal) => Promise<InitProposal>): Promise<false | InitProposal>;
|
|
35
36
|
//# sourceMappingURL=init-app.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-app.d.ts","sourceRoot":"","sources":["../../src/ui/init-app.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7E,OAAO,EASL,KAAK,UAAU,EAChB,MAAM,KAAK,CAAC;AACb,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAEV,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EACd,kBAAkB,EAClB,YAAY,EAEb,MAAM,kBAAkB,CAAC;AAqB1B,MAAM,WAAW,YAAa,SAAQ,iBAAiB;IACrD,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,QAAQ,CAAC,oBAAoB,EAAE,CAC7B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,EACtC,cAAc,EAAE,kBAAkB,EAClC,IAAI,CAAC,EAAE,cAAc,EACrB,UAAU,CAAC,EAAE,oBAAoB,EACjC,YAAY,CAAC,EAAE,OAAO,EACtB,eAAe,CAAC,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"init-app.d.ts","sourceRoot":"","sources":["../../src/ui/init-app.tsx"],"names":[],"mappings":"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"}
|