@trebired/code-discipline 6.0.10 → 6.0.12
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/.trebired/logger/config.ts +3 -0
- package/CHANGELOG.md +9 -0
- package/dist/checks/apply-fixes.js +1 -1
- package/dist/checks/apply-fixes.js.map +1 -1
- package/dist/checks/format.d.ts +3 -2
- package/dist/checks/format.d.ts.map +1 -1
- package/dist/checks/format.js +4 -4
- package/dist/checks/format.js.map +1 -1
- package/dist/checks/index.js +2 -2
- package/dist/checks/index.js.map +1 -1
- package/dist/checks/native/dry.d.ts +15 -0
- package/dist/checks/native/dry.d.ts.map +1 -0
- package/dist/checks/native/dry.js +99 -0
- package/dist/checks/native/dry.js.map +1 -0
- package/dist/checks/native/runner.d.ts +6 -0
- package/dist/checks/native/runner.d.ts.map +1 -0
- package/dist/checks/{native-runner.js → native/runner.js} +101 -26
- package/dist/checks/native/runner.js.map +1 -0
- package/dist/checks/progress.d.ts +6 -1
- package/dist/checks/progress.d.ts.map +1 -1
- package/dist/checks/progress.js +17 -2
- package/dist/checks/progress.js.map +1 -1
- package/dist/cli/progress.d.ts.map +1 -1
- package/dist/cli/progress.js +22 -0
- package/dist/cli/progress.js.map +1 -1
- package/dist/formatters/code.d.ts +2 -1
- package/dist/formatters/code.d.ts.map +1 -1
- package/dist/formatters/code.js +62 -15
- package/dist/formatters/code.js.map +1 -1
- package/dist/formatters/files.d.ts +8 -1
- package/dist/formatters/files.d.ts.map +1 -1
- package/dist/formatters/files.js +119 -17
- package/dist/formatters/files.js.map +1 -1
- package/dist/imports/aliases.js +1 -1
- package/dist/imports/aliases.js.map +1 -1
- package/dist/imports/folder.js +1 -1
- package/dist/imports/folder.js.map +1 -1
- package/dist/imports/scan.d.ts.map +1 -1
- package/dist/imports/scan.js +3 -58
- package/dist/imports/scan.js.map +1 -1
- package/dist/imports/strategies.d.ts +2 -1
- package/dist/imports/strategies.d.ts.map +1 -1
- package/dist/imports/strategies.js +8 -4
- package/dist/imports/strategies.js.map +1 -1
- package/dist/imports/types.d.ts +18 -2
- package/dist/imports/types.d.ts.map +1 -1
- package/dist/native/native.d.ts +6 -0
- package/dist/native/native.d.ts.map +1 -1
- package/dist/native/native.js.map +1 -1
- package/native/darwin-arm64.node +0 -0
- package/native/darwin-x64.node +0 -0
- package/native/linux-arm64-gnu.node +0 -0
- package/native/linux-x64-gnu.node +0 -0
- package/package.json +3 -2
- package/dist/checks/native-runner.d.ts +0 -6
- package/dist/checks/native-runner.d.ts.map +0 -1
- package/dist/checks/native-runner.js.map +0 -1
package/dist/cli/progress.js
CHANGED
|
@@ -17,11 +17,24 @@ function formatDuration(milliseconds) {
|
|
|
17
17
|
}
|
|
18
18
|
return `${milliseconds.toFixed(1)}ms`;
|
|
19
19
|
}
|
|
20
|
+
function formatBytes(bytes) {
|
|
21
|
+
if (bytes >= 1024 * 1024)
|
|
22
|
+
return `${(bytes / (1024 * 1024)).toFixed(1)}MiB`;
|
|
23
|
+
if (bytes >= 1024)
|
|
24
|
+
return `${(bytes / 1024).toFixed(1)}KiB`;
|
|
25
|
+
return `${bytes}B`;
|
|
26
|
+
}
|
|
20
27
|
function shouldPrintScanChunk(event) {
|
|
21
28
|
return event.phase === "chunk"
|
|
22
29
|
&& (event.chunkIndex <= 3 || event.chunkIndex % 10 === 0 || event.queuedDirectories === 0);
|
|
23
30
|
}
|
|
24
31
|
function formatRuleProgressDetails(event) {
|
|
32
|
+
const chunkItems = event.phase === "rule-chunk" && typeof event.chunkItems === "number"
|
|
33
|
+
? `${event.chunkItems} files`
|
|
34
|
+
: "";
|
|
35
|
+
const chunkBytes = event.phase === "rule-chunk" && typeof event.chunkBytes === "number"
|
|
36
|
+
? formatBytes(event.chunkBytes)
|
|
37
|
+
: "";
|
|
25
38
|
const details = [
|
|
26
39
|
typeof event.violationCount === "number" ? `${event.violationCount} violations` : "",
|
|
27
40
|
typeof event.deletedFiles === "number" ? `${event.deletedFiles} deleted` : "",
|
|
@@ -32,6 +45,8 @@ function formatRuleProgressDetails(event) {
|
|
|
32
45
|
typeof event.discoveredFunctions === "number" ? `${event.discoveredFunctions} functions` : "",
|
|
33
46
|
typeof event.duplicateGroups === "number" ? `${event.duplicateGroups} groups` : "",
|
|
34
47
|
typeof event.comparedCandidates === "number" ? `${event.comparedCandidates} comparisons` : "",
|
|
48
|
+
chunkItems,
|
|
49
|
+
chunkBytes,
|
|
35
50
|
].filter(Boolean);
|
|
36
51
|
return details.length > 0 ? `, ${details.join(", ")}` : "";
|
|
37
52
|
}
|
|
@@ -56,6 +71,13 @@ function writeRuleEvent(event, writeLine) {
|
|
|
56
71
|
writeLine(`${event.rule} ${event.stage} started: ${event.totalItems} items.\n`, { event: "rule-progress-started", rule: event.rule });
|
|
57
72
|
return;
|
|
58
73
|
}
|
|
74
|
+
if (event.phase === "rule-chunk-started") {
|
|
75
|
+
const currentFile = event.currentFile ? `, next ${event.currentFile}` : "";
|
|
76
|
+
const itemProgress = `${event.completedItems}/${event.totalItems}`;
|
|
77
|
+
writeLine(`${event.rule} ${event.stage} ${event.chunkIndex} started: `
|
|
78
|
+
+ `${itemProgress}, ${event.chunkItems} files, ${formatBytes(event.chunkBytes)}${currentFile}.\n`, { event: "rule-progress-chunk-started", rule: event.rule });
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
59
81
|
if (event.phase === "rule-chunk") {
|
|
60
82
|
const message = `${event.rule} ${event.stage} ${event.chunkIndex}: `
|
|
61
83
|
+ `${event.completedItems}/${event.totalItems}${formatRuleProgressDetails(event)}, ${formatDuration(event.elapsedMs)}.\n`;
|
package/dist/cli/progress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,IAAI,MAAM,WAAW,CAAC;AAgB7B,KAAK,UAAU,QAAQ,CAAI,IAAsB;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,OAAO;QACL,SAAS,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;QACxC,MAAM;KACP,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,YAAoB;IAC1C,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,KAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7E,CAAC;IAED,IAAI,YAAY,IAAI,GAAG,EAAE,CAAC;QACxB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA8B;IAC1D,OAAO,KAAK,CAAC,KAAK,KAAK,OAAO;WAC5B,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,KAAK,CAAC,UAAU,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAyD;IAC1F,MAAM,OAAO,GAAG;QACd,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,cAAc,aAAa,CAAC,CAAC,CAAC,EAAE;QACpF,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,UAAU,CAAC,CAAC,CAAC,EAAE;QAC7E,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,QAAQ,CAAC,CAAC,CAAC,EAAE;QACvE,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,cAAc,kBAAkB,CAAC,CAAC,CAAC,EAAE;QACzF,OAAO,KAAK,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,gBAAgB,oBAAoB,CAAC,CAAC,CAAC,EAAE;QAC/F,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,eAAe,mBAAmB,CAAC,CAAC,CAAC,EAAE;QAC5F,OAAO,KAAK,CAAC,mBAAmB,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,mBAAmB,YAAY,CAAC,CAAC,CAAC,EAAE;QAC7F,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,eAAe,SAAS,CAAC,CAAC,CAAC,EAAE;QAClF,OAAO,KAAK,CAAC,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,kBAAkB,cAAc,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { CodeDisciplineViolation } from "../shared/discipline-types.js";
|
|
2
|
+
import type { ScannedSourceFile } from "../imports/types.js";
|
|
2
3
|
import type { NormalizedCheckCodeDisciplineOptions } from "../checks/types.js";
|
|
3
4
|
type CodeFormatterMode = "check" | "fix";
|
|
4
5
|
type CodeFormatterResult = {
|
|
@@ -11,7 +12,7 @@ type CodeFormatterResult = {
|
|
|
11
12
|
ignored_files: number;
|
|
12
13
|
errored_files: number;
|
|
13
14
|
};
|
|
14
|
-
declare function runCodeFormatter(options: NormalizedCheckCodeDisciplineOptions, mode: CodeFormatterMode): Promise<CodeFormatterResult>;
|
|
15
|
+
declare function runCodeFormatter(options: NormalizedCheckCodeDisciplineOptions, mode: CodeFormatterMode, sourceFiles?: ScannedSourceFile[]): Promise<CodeFormatterResult>;
|
|
15
16
|
export { runCodeFormatter };
|
|
16
17
|
export type { CodeFormatterResult };
|
|
17
18
|
//# sourceMappingURL=code.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/formatters/code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/formatters/code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGvD,OAAO,KAAK,EAAE,oCAAoC,EAA2B,MAAM,eAAe,CAAC;AAGnG,KAAK,iBAAiB,GAAG,OAAO,GAAG,KAAK,CAAC;AAkBzC,KAAK,mBAAmB,GAAG;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AA6HF,iBAAe,gBAAgB,CAC7B,OAAO,EAAE,oCAAoC,EAC7C,IAAI,EAAE,iBAAiB,EACvB,WAAW,CAAC,EAAE,iBAAiB,EAAE,GAChC,OAAO,CAAC,mBAAmB,CAAC,CAwG9B;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
package/dist/formatters/code.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { loadNativeBinding } from "../native/native.js";
|
|
2
|
-
import { createRuleProgress,
|
|
3
|
-
import { collectCodeFormatterFiles } from "./files.js";
|
|
2
|
+
import { createRuleProgress, emitRuleChunkAt, emitRuleChunkStarted, emitRuleCompleted } from "../checks/progress.js";
|
|
3
|
+
import { collectCodeFormatterFiles, collectCodeFormatterFilesFromSourceFiles } from "./files.js";
|
|
4
|
+
const FORMATTER_BATCH_LIMITS = {
|
|
5
|
+
maxBytes: 512 * 1024,
|
|
6
|
+
maxFiles: 64,
|
|
7
|
+
};
|
|
4
8
|
function createFormatViolation(args) {
|
|
5
9
|
return {
|
|
6
10
|
rule: "format",
|
|
@@ -13,6 +17,7 @@ function createFormatViolation(args) {
|
|
|
13
17
|
function toNativeSourceFile(file) {
|
|
14
18
|
return {
|
|
15
19
|
absolutePath: file.absolutePath,
|
|
20
|
+
byteSize: file.byteSize,
|
|
16
21
|
relativeFromProjectRoot: file.relativePath,
|
|
17
22
|
relativeFromSourceRoot: file.relativePath,
|
|
18
23
|
extension: file.extension,
|
|
@@ -72,7 +77,31 @@ function mapNativeResultViolations(result, mode) {
|
|
|
72
77
|
}
|
|
73
78
|
return violations;
|
|
74
79
|
}
|
|
75
|
-
|
|
80
|
+
function createCodeFormatterBatches(files) {
|
|
81
|
+
const batches = [];
|
|
82
|
+
let batchFiles = [];
|
|
83
|
+
let byteSize = 0;
|
|
84
|
+
for (const file of files) {
|
|
85
|
+
const nextSize = Math.max(1, file.byteSize);
|
|
86
|
+
if (batchFiles.length > 0 && (batchFiles.length >= FORMATTER_BATCH_LIMITS.maxFiles || byteSize + nextSize > FORMATTER_BATCH_LIMITS.maxBytes)) {
|
|
87
|
+
batches.push({ byteSize, files: batchFiles });
|
|
88
|
+
batchFiles = [];
|
|
89
|
+
byteSize = 0;
|
|
90
|
+
}
|
|
91
|
+
batchFiles.push(file);
|
|
92
|
+
byteSize += nextSize;
|
|
93
|
+
}
|
|
94
|
+
if (batchFiles.length > 0) {
|
|
95
|
+
batches.push({ byteSize, files: batchFiles });
|
|
96
|
+
}
|
|
97
|
+
return batches;
|
|
98
|
+
}
|
|
99
|
+
function countFormattedFiles(files, mode) {
|
|
100
|
+
return mode === "fix"
|
|
101
|
+
? files.filter((file) => file.checked && file.changed && !file.error).length
|
|
102
|
+
: 0;
|
|
103
|
+
}
|
|
104
|
+
async function runCodeFormatter(options, mode, sourceFiles) {
|
|
76
105
|
const formatting = options.rules.formatting;
|
|
77
106
|
if (!formatting) {
|
|
78
107
|
return {
|
|
@@ -86,7 +115,9 @@ async function runCodeFormatter(options, mode) {
|
|
|
86
115
|
errored_files: 0,
|
|
87
116
|
};
|
|
88
117
|
}
|
|
89
|
-
const collected =
|
|
118
|
+
const collected = sourceFiles
|
|
119
|
+
? await collectCodeFormatterFilesFromSourceFiles(options, formatting, sourceFiles)
|
|
120
|
+
: await collectCodeFormatterFiles(options, formatting);
|
|
90
121
|
const violations = [...collected.violations];
|
|
91
122
|
const progress = createRuleProgress({
|
|
92
123
|
observer: options.progressObserver,
|
|
@@ -109,13 +140,32 @@ async function runCodeFormatter(options, mode) {
|
|
|
109
140
|
errored_files: violations.length,
|
|
110
141
|
};
|
|
111
142
|
}
|
|
112
|
-
|
|
143
|
+
const nativeFiles = [];
|
|
113
144
|
try {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
145
|
+
let completedItems = 0;
|
|
146
|
+
let chunkIndex = 0;
|
|
147
|
+
for (const batch of createCodeFormatterBatches(collected.files)) {
|
|
148
|
+
chunkIndex += 1;
|
|
149
|
+
const extras = {
|
|
150
|
+
chunkBytes: batch.byteSize,
|
|
151
|
+
chunkItems: batch.files.length,
|
|
152
|
+
currentFile: batch.files[0]?.relativePath,
|
|
153
|
+
...(mode === "fix" ? { rewrittenFiles: countFormattedFiles(nativeFiles, mode) } : {}),
|
|
154
|
+
};
|
|
155
|
+
emitRuleChunkStarted(progress, chunkIndex, completedItems, extras);
|
|
156
|
+
const batchResult = parseNativeFormatterResponse(binding.formatSourceFiles(JSON.stringify({
|
|
157
|
+
mode,
|
|
158
|
+
options: toNativeFormatterOptions(formatting),
|
|
159
|
+
sourceFiles: batch.files.map(toNativeSourceFile),
|
|
160
|
+
})));
|
|
161
|
+
nativeFiles.push(...batchResult.files);
|
|
162
|
+
violations.push(...mapNativeResultViolations(batchResult, mode));
|
|
163
|
+
completedItems += batch.files.length;
|
|
164
|
+
emitRuleChunkAt(progress, chunkIndex, completedItems, violations.length, {
|
|
165
|
+
...extras,
|
|
166
|
+
...(mode === "fix" ? { rewrittenFiles: countFormattedFiles(nativeFiles, mode) } : {}),
|
|
167
|
+
});
|
|
168
|
+
}
|
|
119
169
|
}
|
|
120
170
|
catch (caught) {
|
|
121
171
|
violations.push(createNativeErrorViolation(caught, mode));
|
|
@@ -131,15 +181,12 @@ async function runCodeFormatter(options, mode) {
|
|
|
131
181
|
errored_files: violations.length,
|
|
132
182
|
};
|
|
133
183
|
}
|
|
134
|
-
|
|
184
|
+
const nativeResult = { files: nativeFiles };
|
|
135
185
|
const checkedFiles = nativeResult.files.filter((file) => file.checked).length;
|
|
136
|
-
const formattedFiles =
|
|
186
|
+
const formattedFiles = countFormattedFiles(nativeResult.files, mode);
|
|
137
187
|
const unchangedFiles = nativeResult.files.filter((file) => file.checked && !file.changed && !file.error).length;
|
|
138
188
|
const ignoredFiles = collected.ignoredFiles + nativeResult.files.filter((file) => file.ignored).length;
|
|
139
189
|
const erroredFiles = nativeResult.files.filter((file) => file.error).length + collected.violations.length;
|
|
140
|
-
emitRuleChunk(progress, collected.files.length, violations.length, mode === "fix" ? {
|
|
141
|
-
rewrittenFiles: formattedFiles,
|
|
142
|
-
} : {});
|
|
143
190
|
emitRuleCompleted(progress, violations.length, mode === "fix" ? {
|
|
144
191
|
rewrittenFiles: formattedFiles,
|
|
145
192
|
} : {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/formatters/code.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/formatters/code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { CodeDisciplineViolation } from "../shared/discipline-types.js";
|
|
2
|
+
import type { ScannedSourceFile } from "../imports/types.js";
|
|
2
3
|
import type { NormalizedCheckCodeDisciplineOptions, NormalizedFormattingRule } from "../checks/types.js";
|
|
3
4
|
type CodeFormatterFile = {
|
|
4
5
|
absolutePath: string;
|
|
6
|
+
byteSize: number;
|
|
5
7
|
relativePath: string;
|
|
6
8
|
extension: string;
|
|
7
9
|
};
|
|
@@ -10,6 +12,11 @@ declare function collectCodeFormatterFiles(options: NormalizedCheckCodeDisciplin
|
|
|
10
12
|
ignoredFiles: number;
|
|
11
13
|
violations: CodeDisciplineViolation[];
|
|
12
14
|
}>;
|
|
13
|
-
|
|
15
|
+
declare function collectCodeFormatterFilesFromSourceFiles(options: NormalizedCheckCodeDisciplineOptions, formatter: NormalizedFormattingRule, sourceFiles: ScannedSourceFile[]): Promise<{
|
|
16
|
+
files: CodeFormatterFile[];
|
|
17
|
+
ignoredFiles: number;
|
|
18
|
+
violations: CodeDisciplineViolation[];
|
|
19
|
+
}>;
|
|
20
|
+
export { collectCodeFormatterFiles, collectCodeFormatterFilesFromSourceFiles };
|
|
14
21
|
export type { CodeFormatterFile };
|
|
15
22
|
//# sourceMappingURL=files.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/formatters/files.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/formatters/files.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAKvD,OAAO,KAAK,EAAE,oCAAoC,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEpG,KAAK,iBAAiB,GAAG;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8KF,iBAAe,yBAAyB,CACtC,OAAO,EAAE,oCAAoC,EAC7C,SAAS,EAAE,wBAAwB,GAClC,OAAO,CAAC;IAAC,KAAK,EAAC,iBAAiB,EAAE,CAAC;IAAA,YAAY,EAAC,MAAM,CAAC;IAAA,UAAU,EAAC,uBAAuB,EAAE,CAAA;CAAC,CAAC,CA+C/F;AAED,iBAAe,wCAAwC,CACrD,OAAO,EAAE,oCAAoC,EAC7C,SAAS,EAAE,wBAAwB,EACnC,WAAW,EAAE,iBAAiB,EAAE,GAC/B,OAAO,CAAC;IAAC,KAAK,EAAC,iBAAiB,EAAE,CAAC;IAAA,YAAY,EAAC,MAAM,CAAC;IAAA,UAAU,EAAC,uBAAuB,EAAE,CAAA;CAAC,CAAC,CAqD/F;AAeD,OAAO,EAAE,yBAAyB,EAAE,wCAAwC,EAAE,CAAC;AAC/E,YAAY,EAAE,iBAAiB,EAAE,CAAC"}
|
package/dist/formatters/files.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { DEFAULT_EXCLUDE_DIRS } from "../shared/constants.js";
|
|
4
|
-
import {
|
|
4
|
+
import { globToRegExp } from "../shared/globs.js";
|
|
5
5
|
import { supportsFormatter } from "../shared/languages.js";
|
|
6
6
|
import { isInsideDirectory, normalizeRelativePath, toPosixPath, uniqueStrings } from "../shared/utils.js";
|
|
7
7
|
const DEFAULT_FORMATTER_IGNORE = DEFAULT_EXCLUDE_DIRS;
|
|
@@ -24,19 +24,50 @@ function resolveFormatterIgnorePatterns(options, formatter) {
|
|
|
24
24
|
...formatterPatterns,
|
|
25
25
|
]);
|
|
26
26
|
}
|
|
27
|
-
function
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
function hasGlobSyntax(pattern) {
|
|
28
|
+
return pattern.includes("*") || pattern.includes("?");
|
|
29
|
+
}
|
|
30
|
+
function createIgnoreMatcher(patterns) {
|
|
31
|
+
const matcher = {
|
|
32
|
+
basenamePatterns: new Set(),
|
|
33
|
+
basenameGlobs: [],
|
|
34
|
+
pathPatterns: new Set(),
|
|
35
|
+
pathPrefixes: [],
|
|
36
|
+
pathGlobs: [],
|
|
37
|
+
};
|
|
38
|
+
for (const pattern of patterns) {
|
|
39
|
+
if (!pattern.includes("/")) {
|
|
40
|
+
if (hasGlobSyntax(pattern)) {
|
|
41
|
+
matcher.basenameGlobs.push(globToRegExp(pattern));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
matcher.basenamePatterns.add(pattern);
|
|
45
|
+
}
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
if (hasGlobSyntax(pattern)) {
|
|
49
|
+
matcher.pathGlobs.push(globToRegExp(pattern), globToRegExp(`${pattern}/**`));
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
matcher.pathPatterns.add(pattern);
|
|
53
|
+
matcher.pathPrefixes.push(`${pattern}/`);
|
|
54
|
+
}
|
|
30
55
|
}
|
|
31
|
-
return
|
|
32
|
-
|| relativePath.startsWith(`${pattern}/`)
|
|
33
|
-
|| matchesGlob(relativePath, pattern)
|
|
34
|
-
|| matchesGlob(relativePath, `${pattern}/**`);
|
|
56
|
+
return matcher;
|
|
35
57
|
}
|
|
36
|
-
function shouldIgnore(relativePath,
|
|
58
|
+
function shouldIgnore(relativePath, matcher) {
|
|
37
59
|
const normalized = normalizeRelativePath(relativePath);
|
|
38
60
|
const basename = path.posix.basename(normalized);
|
|
39
|
-
|
|
61
|
+
if (matcher.basenamePatterns.has(basename) || matcher.pathPatterns.has(normalized)) {
|
|
62
|
+
return true;
|
|
63
|
+
}
|
|
64
|
+
if (matcher.pathPrefixes.some((prefix) => normalized.startsWith(prefix))) {
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
if (matcher.basenameGlobs.some((pattern) => pattern.test(basename))) {
|
|
68
|
+
return true;
|
|
69
|
+
}
|
|
70
|
+
return matcher.pathGlobs.some((pattern) => pattern.test(normalized));
|
|
40
71
|
}
|
|
41
72
|
function createTargetReadViolation(args) {
|
|
42
73
|
return {
|
|
@@ -52,23 +83,43 @@ function isSupportedFormatterFile(file, options) {
|
|
|
52
83
|
return false;
|
|
53
84
|
return supportsFormatter(file.extension);
|
|
54
85
|
}
|
|
55
|
-
|
|
86
|
+
function createFormatterTargetMatcher(targets) {
|
|
87
|
+
return {
|
|
88
|
+
filePaths: new Set(targets.filter((target) => target.file).map((target) => target.absolutePath)),
|
|
89
|
+
directoryPaths: targets.filter((target) => target.directory).map((target) => `${target.absolutePath}${path.sep}`),
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function matchesFormatterTargets(file, matcher) {
|
|
93
|
+
return matcher.filePaths.has(file.absolutePath)
|
|
94
|
+
|| matcher.directoryPaths.some((directoryPath) => `${file.absolutePath}${path.sep}`.startsWith(directoryPath));
|
|
95
|
+
}
|
|
96
|
+
function sourceFileToFormatterFile(file) {
|
|
97
|
+
return {
|
|
98
|
+
absolutePath: file.absolutePath,
|
|
99
|
+
byteSize: file.byteSize ?? 0,
|
|
100
|
+
extension: file.extension,
|
|
101
|
+
relativePath: file.relativeFromProjectRoot,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
async function collectDirectoryFiles(options, absoluteDir, ignoreMatcher, files) {
|
|
56
105
|
const entries = await fs.readdir(absoluteDir, { withFileTypes: true });
|
|
57
106
|
entries.sort((left, right) => left.name.localeCompare(right.name));
|
|
58
107
|
let ignoredFiles = 0;
|
|
59
108
|
for (const entry of entries) {
|
|
60
109
|
const absolutePath = path.join(absoluteDir, entry.name);
|
|
61
110
|
const relativePath = toPosixPath(path.relative(options.projectRoot, absolutePath));
|
|
62
|
-
if (shouldIgnore(relativePath,
|
|
111
|
+
if (shouldIgnore(relativePath, ignoreMatcher))
|
|
63
112
|
continue;
|
|
64
113
|
if (entry.isDirectory()) {
|
|
65
|
-
ignoredFiles += await collectDirectoryFiles(options, absolutePath,
|
|
114
|
+
ignoredFiles += await collectDirectoryFiles(options, absolutePath, ignoreMatcher, files);
|
|
66
115
|
continue;
|
|
67
116
|
}
|
|
68
117
|
if (!entry.isFile())
|
|
69
118
|
continue;
|
|
119
|
+
const stat = await fs.stat(absolutePath);
|
|
70
120
|
const file = {
|
|
71
121
|
absolutePath,
|
|
122
|
+
byteSize: stat.size,
|
|
72
123
|
relativePath: normalizeRelativePath(relativePath),
|
|
73
124
|
extension: path.extname(entry.name).toLowerCase(),
|
|
74
125
|
};
|
|
@@ -84,23 +135,24 @@ async function collectDirectoryFiles(options, absoluteDir, ignorePatterns, files
|
|
|
84
135
|
async function collectCodeFormatterFiles(options, formatter) {
|
|
85
136
|
const files = [];
|
|
86
137
|
const violations = [];
|
|
87
|
-
const
|
|
138
|
+
const ignoreMatcher = createIgnoreMatcher(resolveFormatterIgnorePatterns(options, formatter));
|
|
88
139
|
let ignoredFiles = 0;
|
|
89
140
|
for (const target of formatter.targets) {
|
|
90
141
|
const absoluteTarget = path.resolve(options.projectRoot, target);
|
|
91
142
|
const relativeTarget = normalizeRelativePath(toPosixPath(path.relative(options.projectRoot, absoluteTarget)));
|
|
92
|
-
if (!isInsideDirectory(absoluteTarget, options.projectRoot) || shouldIgnore(relativeTarget,
|
|
143
|
+
if (!isInsideDirectory(absoluteTarget, options.projectRoot) || shouldIgnore(relativeTarget, ignoreMatcher)) {
|
|
93
144
|
continue;
|
|
94
145
|
}
|
|
95
146
|
try {
|
|
96
147
|
const stat = await fs.stat(absoluteTarget);
|
|
97
148
|
if (stat.isDirectory()) {
|
|
98
|
-
ignoredFiles += await collectDirectoryFiles(options, absoluteTarget,
|
|
149
|
+
ignoredFiles += await collectDirectoryFiles(options, absoluteTarget, ignoreMatcher, files);
|
|
99
150
|
continue;
|
|
100
151
|
}
|
|
101
152
|
if (stat.isFile()) {
|
|
102
153
|
const file = {
|
|
103
154
|
absolutePath: absoluteTarget,
|
|
155
|
+
byteSize: stat.size,
|
|
104
156
|
relativePath: relativeTarget,
|
|
105
157
|
extension: path.extname(absoluteTarget).toLowerCase(),
|
|
106
158
|
};
|
|
@@ -125,6 +177,56 @@ async function collectCodeFormatterFiles(options, formatter) {
|
|
|
125
177
|
violations,
|
|
126
178
|
};
|
|
127
179
|
}
|
|
180
|
+
async function collectCodeFormatterFilesFromSourceFiles(options, formatter, sourceFiles) {
|
|
181
|
+
const files = [];
|
|
182
|
+
const violations = [];
|
|
183
|
+
const targets = [];
|
|
184
|
+
const ignoreMatcher = createIgnoreMatcher(resolveFormatterIgnorePatterns(options, formatter));
|
|
185
|
+
let ignoredFiles = 0;
|
|
186
|
+
for (const target of formatter.targets) {
|
|
187
|
+
const absoluteTarget = path.resolve(options.projectRoot, target);
|
|
188
|
+
const relativeTarget = normalizeRelativePath(toPosixPath(path.relative(options.projectRoot, absoluteTarget)));
|
|
189
|
+
if (!isInsideDirectory(absoluteTarget, options.projectRoot) || shouldIgnore(relativeTarget, ignoreMatcher)) {
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
try {
|
|
193
|
+
const stat = await fs.stat(absoluteTarget);
|
|
194
|
+
targets.push({
|
|
195
|
+
absolutePath: absoluteTarget,
|
|
196
|
+
directory: stat.isDirectory(),
|
|
197
|
+
file: stat.isFile(),
|
|
198
|
+
relativePath: relativeTarget,
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
catch (caught) {
|
|
202
|
+
violations.push(createTargetReadViolation({
|
|
203
|
+
filePath: relativeTarget || target,
|
|
204
|
+
message: `target could not be read: ${caught instanceof Error ? caught.message : String(caught)}`,
|
|
205
|
+
}));
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
const targetMatcher = createFormatterTargetMatcher(targets);
|
|
209
|
+
for (const sourceFile of sourceFiles) {
|
|
210
|
+
const file = sourceFileToFormatterFile(sourceFile);
|
|
211
|
+
if (!matchesFormatterTargets(file, targetMatcher)) {
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
if (shouldIgnore(file.relativePath, ignoreMatcher)) {
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
if (isSupportedFormatterFile(file, options)) {
|
|
218
|
+
files.push(file);
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
ignoredFiles += 1;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
return {
|
|
225
|
+
files: uniqueFiles(files),
|
|
226
|
+
ignoredFiles,
|
|
227
|
+
violations,
|
|
228
|
+
};
|
|
229
|
+
}
|
|
128
230
|
function uniqueFiles(files) {
|
|
129
231
|
const seen = new Set();
|
|
130
232
|
const result = [];
|
|
@@ -136,5 +238,5 @@ function uniqueFiles(files) {
|
|
|
136
238
|
}
|
|
137
239
|
return result.sort((left, right) => left.relativePath.localeCompare(right.relativePath));
|
|
138
240
|
}
|
|
139
|
-
export { collectCodeFormatterFiles };
|
|
241
|
+
export { collectCodeFormatterFiles, collectCodeFormatterFilesFromSourceFiles };
|
|
140
242
|
//# sourceMappingURL=files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/formatters/files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/formatters/files.ts"],"names":[],"mappings":"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"}
|
package/dist/imports/aliases.js
CHANGED
|
@@ -143,7 +143,7 @@ async function planTsconfigAliases(options, sourceFiles, logger) {
|
|
|
143
143
|
const aliasRecords = [];
|
|
144
144
|
for (const file of sourceFiles) {
|
|
145
145
|
const preservedAlias = existingState.preservedAliasesByPath.get(file.absolutePath);
|
|
146
|
-
const aliasId = preservedAlias ?? generateAliasId(file, options,
|
|
146
|
+
const aliasId = preservedAlias ?? generateAliasId(file, options, reservedIds);
|
|
147
147
|
reservedIds.add(aliasId);
|
|
148
148
|
aliasRecords.push({
|
|
149
149
|
id: aliasId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliases.js","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"aliases.js","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"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"}
|
package/dist/imports/folder.js
CHANGED
|
@@ -238,7 +238,7 @@ async function planImportsFolderAliases(options, sourceFiles, logger) {
|
|
|
238
238
|
const managedAliasPathMap = { ...preservedAliasPathMap };
|
|
239
239
|
for (const file of sourceFiles) {
|
|
240
240
|
const preservedAlias = preservedAliasesByPath.get(file.absolutePath);
|
|
241
|
-
const aliasId = preservedAlias ?? generateAliasId(file, options,
|
|
241
|
+
const aliasId = preservedAlias ?? generateAliasId(file, options, reservedIds);
|
|
242
242
|
reservedIds.add(aliasId);
|
|
243
243
|
managedAliasPathMap[aliasId] = normalizeDotPrefixedTarget(file.relativeFromProjectRoot);
|
|
244
244
|
aliasRecords.push({
|