@trebired/code-discipline 4.2.4 → 4.3.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/CHANGELOG.md +12 -0
- package/README.md +7 -1
- package/dist/checks/fix-folderization.d.ts.map +1 -1
- package/dist/checks/fix-folderization.js +3 -2
- package/dist/checks/fix-folderization.js.map +1 -1
- package/dist/checks/index.d.ts.map +1 -1
- package/dist/checks/index.js +25 -18
- package/dist/checks/index.js.map +1 -1
- package/dist/checks/sync-options.d.ts +1 -1
- package/dist/checks/sync-options.d.ts.map +1 -1
- package/dist/checks/sync-options.js +8 -14
- package/dist/checks/sync-options.js.map +1 -1
- package/dist/checks/types.d.ts +24 -12
- package/dist/checks/types.d.ts.map +1 -1
- package/dist/cli/logging.d.ts +10 -2
- package/dist/cli/logging.d.ts.map +1 -1
- package/dist/cli/logging.js +50 -3
- package/dist/cli/logging.js.map +1 -1
- package/dist/cli/output.d.ts +9 -4
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +8 -7
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/progress.d.ts +2 -1
- package/dist/cli/progress.d.ts.map +1 -1
- package/dist/cli/progress.js +4 -4
- package/dist/cli/progress.js.map +1 -1
- package/dist/cli/run-cli.d.ts.map +1 -1
- package/dist/cli/run-cli.js +28 -10
- package/dist/cli/run-cli.js.map +1 -1
- package/dist/config/normalize/exclusions.d.ts +11 -0
- package/dist/config/normalize/exclusions.d.ts.map +1 -0
- package/dist/config/normalize/exclusions.js +79 -0
- package/dist/config/normalize/exclusions.js.map +1 -0
- package/dist/config/normalize/rule-options.d.ts +12 -6
- package/dist/config/normalize/rule-options.d.ts.map +1 -1
- package/dist/config/normalize/rule-options.js +12 -2
- package/dist/config/normalize/rule-options.js.map +1 -1
- package/dist/config/normalize/source-options.d.ts +2 -2
- package/dist/config/normalize/source-options.d.ts.map +1 -1
- package/dist/config/normalize/source-options.js +7 -5
- package/dist/config/normalize/source-options.js.map +1 -1
- package/dist/config/normalize/sync-imports-options.d.ts.map +1 -1
- package/dist/config/normalize/sync-imports-options.js +11 -1
- package/dist/config/normalize/sync-imports-options.js.map +1 -1
- package/dist/imports/aliases.d.ts.map +1 -1
- package/dist/imports/aliases.js +5 -4
- package/dist/imports/aliases.js.map +1 -1
- package/dist/imports/folder.d.ts.map +1 -1
- package/dist/imports/folder.js +4 -2
- package/dist/imports/folder.js.map +1 -1
- package/dist/imports/rewrite.d.ts.map +1 -1
- package/dist/imports/rewrite.js +3 -2
- package/dist/imports/rewrite.js.map +1 -1
- package/dist/imports/scan.d.ts.map +1 -1
- package/dist/imports/scan.js +29 -7
- package/dist/imports/scan.js.map +1 -1
- package/dist/imports/sync-imports.d.ts.map +1 -1
- package/dist/imports/sync-imports.js +8 -5
- package/dist/imports/sync-imports.js.map +1 -1
- package/dist/imports/types.d.ts +8 -3
- package/dist/imports/types.d.ts.map +1 -1
- package/dist/shared/log-groups.d.ts +7 -0
- package/dist/shared/log-groups.d.ts.map +1 -0
- package/dist/shared/log-groups.js +15 -0
- package/dist/shared/log-groups.js.map +1 -0
- package/dist/shared/logging-types.d.ts +11 -8
- package/dist/shared/logging-types.d.ts.map +1 -1
- package/dist/shared/logging.d.ts.map +1 -1
- package/dist/shared/logging.js +14 -14
- package/dist/shared/logging.js.map +1 -1
- package/dist/shared/rule-exclusions.d.ts +9 -0
- package/dist/shared/rule-exclusions.d.ts.map +1 -0
- package/dist/shared/rule-exclusions.js +36 -0
- package/dist/shared/rule-exclusions.js.map +1 -0
- 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 +5 -5
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DEFAULT_ALLOW_RELATIVE, DEFAULT_FOLDERIZE_COMPOUND_FILE_SEPARATORS, } from "../../shared/constants.js";
|
|
2
2
|
import { InvalidCodeDisciplineConfigError } from "../../shared/errors.js";
|
|
3
3
|
import { normalizeRelativePath, uniqueStrings } from "../../shared/utils.js";
|
|
4
|
+
import { normalizeRuleExclusions } from "./exclusions.js";
|
|
4
5
|
import { normalizeLoggingOptions } from "./logging-options.js";
|
|
5
6
|
const DEFAULT_MIN_FILE_LINES = 1;
|
|
6
7
|
const DEFAULT_MAX_CHARACTERS_PER_LINE = 150;
|
|
@@ -51,6 +52,7 @@ function normalizeMinFileLinesRule(rule) {
|
|
|
51
52
|
const source = rule;
|
|
52
53
|
assertRemovedKeys("minFileLines", source, ["enabled", "stop", "fix"]);
|
|
53
54
|
return {
|
|
55
|
+
...normalizeRuleExclusions("minFileLines", source),
|
|
54
56
|
min: normalizeThreshold(rule.min, DEFAULT_MIN_FILE_LINES, "minFileLines.min"),
|
|
55
57
|
severity: normalizeSeverity(rule.severity, "minFileLines"),
|
|
56
58
|
};
|
|
@@ -67,6 +69,7 @@ function normalizeMaxFileLinesRule(rule) {
|
|
|
67
69
|
});
|
|
68
70
|
}
|
|
69
71
|
return {
|
|
72
|
+
...normalizeRuleExclusions("maxFileLines", source),
|
|
70
73
|
max: Math.max(1, Math.floor(rule.max)),
|
|
71
74
|
severity: normalizeSeverity(rule.severity, "maxFileLines"),
|
|
72
75
|
};
|
|
@@ -103,6 +106,7 @@ function normalizeBannedPatternsRule(rule) {
|
|
|
103
106
|
};
|
|
104
107
|
});
|
|
105
108
|
return {
|
|
109
|
+
...normalizeRuleExclusions("bannedPatterns", source),
|
|
106
110
|
patterns,
|
|
107
111
|
severity: normalizeSeverity(rule.severity, "bannedPatterns"),
|
|
108
112
|
};
|
|
@@ -134,6 +138,7 @@ function normalizeBannedFilesRule(rule) {
|
|
|
134
138
|
};
|
|
135
139
|
});
|
|
136
140
|
return {
|
|
141
|
+
...normalizeRuleExclusions("bannedFiles", source),
|
|
137
142
|
patterns,
|
|
138
143
|
severity: normalizeSeverity(rule.severity, "bannedFiles"),
|
|
139
144
|
};
|
|
@@ -144,6 +149,7 @@ function normalizeMaxCharactersPerLineRule(rule) {
|
|
|
144
149
|
const source = rule;
|
|
145
150
|
assertRemovedKeys("maxCharactersPerLine", source, ["enabled", "stop", "fix"]);
|
|
146
151
|
return {
|
|
152
|
+
...normalizeRuleExclusions("maxCharactersPerLine", source),
|
|
147
153
|
max: normalizeThreshold(rule.max, DEFAULT_MAX_CHARACTERS_PER_LINE, "maxCharactersPerLine.max"),
|
|
148
154
|
severity: normalizeSeverity(rule.severity, "maxCharactersPerLine"),
|
|
149
155
|
};
|
|
@@ -160,6 +166,7 @@ function normalizeMaxFunctionLinesRule(rule) {
|
|
|
160
166
|
});
|
|
161
167
|
}
|
|
162
168
|
return {
|
|
169
|
+
...normalizeRuleExclusions("maxFunctionLines", source),
|
|
163
170
|
max: Math.max(1, Math.floor(rule.max)),
|
|
164
171
|
severity: normalizeSeverity(rule.severity, "maxFunctionLines"),
|
|
165
172
|
};
|
|
@@ -176,6 +183,7 @@ function normalizeFolderizeCompoundFilesRule(rule) {
|
|
|
176
183
|
});
|
|
177
184
|
}
|
|
178
185
|
return {
|
|
186
|
+
...normalizeRuleExclusions("folderizeCompoundFiles", source),
|
|
179
187
|
separators,
|
|
180
188
|
severity: normalizeSeverity(rule.severity, "folderizeCompoundFiles"),
|
|
181
189
|
};
|
|
@@ -201,10 +209,10 @@ function normalizeSyncImportsRule(rule) {
|
|
|
201
209
|
sourceRoot: rule?.sourceRoot,
|
|
202
210
|
tsconfigPath: rule?.tsconfigPath,
|
|
203
211
|
excludeSourceExtensions: rule?.excludeSourceExtensions,
|
|
204
|
-
excludeDirs: rule?.excludeDirs,
|
|
205
212
|
gitignorePath: rule?.gitignorePath,
|
|
206
213
|
alias: rule?.alias,
|
|
207
214
|
allowRelative: rule?.allowRelative ?? DEFAULT_ALLOW_RELATIVE,
|
|
215
|
+
...normalizeRuleExclusions("syncImports", source),
|
|
208
216
|
importsFolder: rule?.importsFolder,
|
|
209
217
|
generatedTsconfig: rule?.generatedTsconfig,
|
|
210
218
|
packageJsonImports: rule?.packageJsonImports,
|
|
@@ -218,6 +226,7 @@ function normalizeDryRule(rule) {
|
|
|
218
226
|
const source = rule;
|
|
219
227
|
assertRemovedKeys("dry", source, ["enabled", "stop", "fix", "helpers"]);
|
|
220
228
|
return {
|
|
229
|
+
...normalizeRuleExclusions("dry", source),
|
|
221
230
|
minDuplicateCharacters: normalizeMinDuplicateCharacters(rule.minDuplicateCharacters),
|
|
222
231
|
severity: normalizeSeverity(rule.severity, "dry"),
|
|
223
232
|
};
|
|
@@ -227,7 +236,7 @@ function normalizeRemoveCommentsRule(rule) {
|
|
|
227
236
|
return undefined;
|
|
228
237
|
const source = rule;
|
|
229
238
|
assertRemovedKeys("removeComments", source, ["enabled", "stop", "fix"]);
|
|
230
|
-
const unsupportedKeys = Object.keys(source).filter((key) =>
|
|
239
|
+
const unsupportedKeys = Object.keys(source).filter((key) => !["severity", "exclude", "excludeDirs", "excludeFiles", "excludeFolders"].includes(key));
|
|
231
240
|
if (unsupportedKeys.length > 0) {
|
|
232
241
|
throw new InvalidCodeDisciplineConfigError("removeComments does not accept rule options", {
|
|
233
242
|
rule: "removeComments",
|
|
@@ -241,6 +250,7 @@ function normalizeRemoveCommentsRule(rule) {
|
|
|
241
250
|
});
|
|
242
251
|
}
|
|
243
252
|
return {
|
|
253
|
+
...normalizeRuleExclusions("removeComments", source),
|
|
244
254
|
severity: normalizeSeverity(rule.severity, "removeComments"),
|
|
245
255
|
exclude: uniqueStrings((rule.exclude ?? []).map((pattern) => String(pattern).trim()).filter(Boolean)),
|
|
246
256
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-options.js","sourceRoot":"","sources":["../../../src/config/normalize/rule-options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rule-options.js","sourceRoot":"","sources":["../../../src/config/normalize/rule-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ExcludeDirsOptions, SourceScanObserver } from "../../imports/types.js";
|
|
1
|
+
import type { ExcludeDirEntry, ExcludeDirsOptions, SourceScanObserver } from "../../imports/types.js";
|
|
2
2
|
type NormalizedSourceOptions = {
|
|
3
3
|
projectRoot: string;
|
|
4
4
|
sourceRoot: string;
|
|
5
5
|
sourceRootRelative: string;
|
|
6
6
|
sourceExtensions: string[];
|
|
7
|
-
excludeDirs:
|
|
7
|
+
excludeDirs: ExcludeDirEntry[];
|
|
8
8
|
excludeGitignoreDirs: boolean;
|
|
9
9
|
gitignorePath: string;
|
|
10
10
|
scanObserver?: SourceScanObserver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-options.d.ts","sourceRoot":"","sources":["../../../src/config/normalize/source-options.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"source-options.d.ts","sourceRoot":"","sources":["../../../src/config/normalize/source-options.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAOtG,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC,CAAC;AA6CF,iBAAe,sBAAsB,CAAC,OAAO,EAAE;IAC7C,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAkCnC;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAClC,YAAY,EAAE,uBAAuB,EAAE,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { DEFAULT_EXCLUDE_DIRS, DEFAULT_SOURCE_EXTENSIONS, DEFAULT_SOURCE_ROOT }
|
|
|
3
3
|
import { readGitignoreExcludedDirs } from "../../shared/gitignore.js";
|
|
4
4
|
import { InvalidCodeDisciplineConfigError, InvalidProjectRootError, InvalidSourceRootError } from "../../shared/errors.js";
|
|
5
5
|
import { ensureDotExtension, isDirectory, isInsideDirectory, normalizeRelativePath, uniqueStrings } from "../../shared/utils.js";
|
|
6
|
+
import { mergeExcludeDirEntries, normalizeExcludeDirEntries, normalizeFolderExclusionEntries, } from "./exclusions.js";
|
|
6
7
|
function assertLegacySourceOptionsRemoved(source) {
|
|
7
8
|
if ("sourceExtensions" in source) {
|
|
8
9
|
throw new InvalidCodeDisciplineConfigError("sourceExtensions is no longer supported; use excludeSourceExtensions", {
|
|
@@ -14,6 +15,11 @@ function assertLegacySourceOptionsRemoved(source) {
|
|
|
14
15
|
key: "includeDefaultSourceExtensions",
|
|
15
16
|
});
|
|
16
17
|
}
|
|
18
|
+
if ("excludeFolders" in source) {
|
|
19
|
+
throw new InvalidCodeDisciplineConfigError("excludeFolders is no longer supported; use excludeDirs", {
|
|
20
|
+
key: "excludeFolders",
|
|
21
|
+
});
|
|
22
|
+
}
|
|
17
23
|
}
|
|
18
24
|
function resolveSourceRoot(projectRoot, sourceRootInput) {
|
|
19
25
|
return path.isAbsolute(sourceRootInput)
|
|
@@ -44,11 +50,7 @@ async function normalizeSourceOptions(options) {
|
|
|
44
50
|
const { excludeGitignoreDirs, gitignoreDirs, gitignorePath } = await readNormalizedGitignoreDirs(projectRoot, options);
|
|
45
51
|
const excludedExtensions = new Set((options.excludeSourceExtensions ?? []).map(ensureDotExtension));
|
|
46
52
|
const sourceExtensions = uniqueStrings(DEFAULT_SOURCE_EXTENSIONS.filter((extension) => !excludedExtensions.has(extension)));
|
|
47
|
-
const excludeDirs =
|
|
48
|
-
...DEFAULT_EXCLUDE_DIRS,
|
|
49
|
-
...(options.excludeDirs?.dirs ?? []),
|
|
50
|
-
...gitignoreDirs,
|
|
51
|
-
]);
|
|
53
|
+
const excludeDirs = mergeExcludeDirEntries(normalizeFolderExclusionEntries(DEFAULT_EXCLUDE_DIRS), normalizeExcludeDirEntries(options.excludeDirs?.entries, "excludeDirs.entries"), normalizeFolderExclusionEntries(gitignoreDirs));
|
|
52
54
|
return {
|
|
53
55
|
projectRoot,
|
|
54
56
|
sourceRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-options.js","sourceRoot":"","sources":["../../../src/config/normalize/source-options.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACjH,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,gCAAgC,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC3H,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"source-options.js","sourceRoot":"","sources":["../../../src/config/normalize/source-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-imports-options.d.ts","sourceRoot":"","sources":["../../../src/config/normalize/sync-imports-options.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"sync-imports-options.d.ts","sourceRoot":"","sources":["../../../src/config/normalize/sync-imports-options.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAmC/F,iBAAe,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAoC7G;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { InvalidCodeDisciplineConfigError, InvalidTsconfigPathError } from "../.
|
|
|
4
4
|
import { isDirectory } from "../../shared/utils.js";
|
|
5
5
|
import { normalizeLoggingOptions } from "./logging-options.js";
|
|
6
6
|
import { normalizeSourceOptions } from "./source-options.js";
|
|
7
|
-
|
|
7
|
+
function assertValidSyncImportsOptions(options) {
|
|
8
8
|
if ("imports" in options) {
|
|
9
9
|
throw new InvalidCodeDisciplineConfigError("syncImports.imports is no longer supported; use allowRelative instead", {
|
|
10
10
|
key: "imports",
|
|
@@ -22,6 +22,16 @@ async function normalizeSyncImportsOptions(options) {
|
|
|
22
22
|
key: "severity",
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
|
+
for (const key of ["excludeFiles", "excludeFolders"]) {
|
|
26
|
+
if (key in options) {
|
|
27
|
+
throw new InvalidCodeDisciplineConfigError(`${key} is no longer supported; use excludeDirs.entries with type "file" or "folder"`, {
|
|
28
|
+
key,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
async function normalizeSyncImportsOptions(options) {
|
|
34
|
+
assertValidSyncImportsOptions(options);
|
|
25
35
|
const source = await normalizeSourceOptions(options);
|
|
26
36
|
const tsconfigInput = options.tsconfigPath ?? path.join(source.projectRoot, "tsconfig.json");
|
|
27
37
|
const tsconfigPath = path.isAbsolute(tsconfigInput) ? path.resolve(tsconfigInput) : path.resolve(source.projectRoot, tsconfigInput);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-imports-options.js","sourceRoot":"","sources":["../../../src/config/normalize/sync-imports-options.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gCAAgC,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAEpG,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,
|
|
1
|
+
{"version":3,"file":"sync-imports-options.js","sourceRoot":"","sources":["../../../src/config/normalize/sync-imports-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliases.d.ts","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACb,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"aliases.d.ts","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AA2EjF,iBAAe,YAAY,CACzB,OAAO,EAAE,4BAA4B,EACrC,MAAM,CAAC,EAAE,8BAA8B,GACtC,OAAO,CAAC;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,cAAc,EAAE,YAAY,CAAA;CAAE,CAAC,CAuCjE;AAED,iBAAe,mBAAmB,CAChC,OAAO,EAAE,4BAA4B,EACrC,WAAW,EAAE,iBAAiB,EAAE,EAChC,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAqB5B;AAED,iBAAe,mBAAmB,CAChC,OAAO,EAAE,4BAA4B,EACrC,WAAW,EAAE,iBAAiB,EAAE,EAChC,MAAM,CAAC,EAAE,8BAA8B,GACtC,OAAO,CAAC,iBAAiB,CAAC,CAyD5B;AAED,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
package/dist/imports/aliases.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { ruleLogGroup } from "../shared/log-groups.js";
|
|
3
4
|
import { resolveProjectPathTarget } from "./resolve.js";
|
|
4
5
|
import { generateAliasId } from "./strategies.js";
|
|
5
6
|
import { isInsideDirectory, parseTsconfigJson, pathExists, stableSerialize, toPosixPath, toStableJson, wait } from "../shared/utils.js";
|
|
@@ -71,7 +72,7 @@ async function readTsconfig(options, logger) {
|
|
|
71
72
|
logger?.warn("tsconfig-read-recovered", `tsconfig recovered after retries=${attempt - 1}`, {
|
|
72
73
|
tsconfigPath: options.tsconfigPath,
|
|
73
74
|
retries: attempt - 1,
|
|
74
|
-
});
|
|
75
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
75
76
|
}
|
|
76
77
|
return {
|
|
77
78
|
config: parsed,
|
|
@@ -86,7 +87,7 @@ async function readTsconfig(options, logger) {
|
|
|
86
87
|
tsconfigPath: options.tsconfigPath,
|
|
87
88
|
retry: attempt,
|
|
88
89
|
maxRetries: TSCONFIG_READ_RETRY_ATTEMPTS - 1,
|
|
89
|
-
});
|
|
90
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
90
91
|
await wait(TSCONFIG_READ_RETRY_DELAY_MS);
|
|
91
92
|
}
|
|
92
93
|
}
|
|
@@ -102,13 +103,13 @@ async function syncTsconfigAliases(options, sourceFiles, logger) {
|
|
|
102
103
|
logger.success("aliases-written", `aliases written count=${result.aliasesCount}`, {
|
|
103
104
|
tsconfigPath: options.tsconfigPath,
|
|
104
105
|
aliasesCount: result.aliasesCount,
|
|
105
|
-
});
|
|
106
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
106
107
|
}
|
|
107
108
|
else {
|
|
108
109
|
logger.info("aliases-unchanged", `aliases unchanged count=${result.aliasesCount}`, {
|
|
109
110
|
tsconfigPath: options.tsconfigPath,
|
|
110
111
|
aliasesCount: result.aliasesCount,
|
|
111
|
-
});
|
|
112
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
112
113
|
}
|
|
113
114
|
return result;
|
|
114
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliases.js","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"aliases.js","sourceRoot":"","sources":["../../src/imports/aliases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.d.ts","sourceRoot":"","sources":["../../src/imports/folder.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAmOjF,iBAAe,yBAAyB,CACtC,OAAO,EAAE,4BAA4B,EACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,iBAAe,wBAAwB,CACrC,OAAO,EAAE,4BAA4B,EACrC,WAAW,EAAE,iBAAiB,EAAE,EAChC,MAAM,CAAC,EAAE,8BAA8B,GACtC,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"folder.d.ts","sourceRoot":"","sources":["../../src/imports/folder.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAmOjF,iBAAe,yBAAyB,CACtC,OAAO,EAAE,4BAA4B,EACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,iBAAe,wBAAwB,CACrC,OAAO,EAAE,4BAA4B,EACrC,WAAW,EAAE,iBAAiB,EAAE,EAChC,MAAM,CAAC,EAAE,8BAA8B,GACtC,OAAO,CAAC,iBAAiB,CAAC,CA6E5B;AAED,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,CAAC"}
|
package/dist/imports/folder.js
CHANGED
|
@@ -192,16 +192,18 @@ async function planImportsFolderAliases(options, sourceFiles, logger) {
|
|
|
192
192
|
}),
|
|
193
193
|
...importsFolderState.map,
|
|
194
194
|
});
|
|
195
|
+
const preservedAliasPathMap = {};
|
|
195
196
|
const preservedAliasesByPath = new Map();
|
|
196
197
|
for (const [aliasId, targetPath] of Object.entries(migratedAliasPathMap)) {
|
|
197
198
|
const resolvedTarget = await resolveAliasTargetToSourcePath(options, targetPath);
|
|
198
199
|
if (resolvedTarget && sourceFilesByPath.has(resolvedTarget) && !preservedAliasesByPath.has(resolvedTarget)) {
|
|
199
200
|
preservedAliasesByPath.set(resolvedTarget, aliasId);
|
|
201
|
+
preservedAliasPathMap[aliasId] = normalizeDotPrefixedTarget(sourceFilesByPath.get(resolvedTarget).relativeFromProjectRoot);
|
|
200
202
|
}
|
|
201
203
|
}
|
|
202
|
-
const reservedIds = new Set(Object.keys(
|
|
204
|
+
const reservedIds = new Set(Object.keys(preservedAliasPathMap));
|
|
203
205
|
const aliasRecords = [];
|
|
204
|
-
const managedAliasPathMap = { ...
|
|
206
|
+
const managedAliasPathMap = { ...preservedAliasPathMap };
|
|
205
207
|
for (const file of sourceFiles) {
|
|
206
208
|
const preservedAlias = preservedAliasesByPath.get(file.absolutePath);
|
|
207
209
|
const aliasId = preservedAlias ?? generateAliasId(file, options, Array.from(reservedIds));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../src/imports/folder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../src/imports/folder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,WAAW,EACX,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAgB5C,SAAS,wBAAwB,CAAC,OAAqC;IACrE,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AACjG,CAAC;AAED,SAAS,4BAA4B,CAAC,OAAqC;IACzE,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;IAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AACjG,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA8B;IACtD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAC5E,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,WAAmB,EAAE,qBAA6B,EAAE,UAAkB;IACvG,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACjG,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChD,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,2BAA2B,CAAC,YAAoB,EAAE,qBAA6B;IACtF,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC/F,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChD,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,8BAA8B,CAAC,YAAoB,EAAE,MAAc;IAC1E,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAsB,EAAE,YAAoB,EAAE,qBAA6B;IACtG,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,8BAA8B,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,qBAAqB,CAAC;IACzF,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,8BAA8B,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,qBAAqB,CAAC,CAAC;IAC7I,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAsB,EAAE,YAAoB,EAAE,qBAA6B;IACtG,IAAI,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,qBAAqB,CAAC;QAAE,OAAO,QAAQ,CAAC;IAExF,MAAM,eAAe,GAAG,2BAA2B,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAEjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO;YACL,GAAG,QAAQ;YACX,OAAO,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC;SACpC,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,GAAG,QAAQ;YACX,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,EAAE,eAAe,CAAC;SACrG,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,eAAe;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,QAAsB;IACvD,MAAM,eAAe,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,CAAC;IAChE,OAAO,eAAe,CAAC,KAAK,CAAC;IAC7B,OAAO,eAAe,CAAC,OAAO,CAAC;IAE/B,OAAO;QACL,GAAG,QAAQ;QACX,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAqC,EAAE,YAAoC;IACzG,MAAM,qBAAqB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,KAAK,GAA6B,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACtH,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,CAAC,WAAW,EAAE,qBAAqB,EAAE,UAAU,CAAC,CAAC,CAAC;IACvG,CAAC;IAED,OAAO;QACL,eAAe,EAAE;YACf,KAAK;SACN;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,QAAgB;IAC5C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC;IAE3C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,6BAA6B,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,MAAiC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAAqC;IACzE,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,MAAM,WAAW,GAA2C,EAAE,CAAC;IAC/D,MAAM,WAAW,GAA+C,EAAE,CAAC;IAEnE,IAAI,CAAC,MAAM,UAAU,CAAC,iBAAiB,CAAC;QAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;IAEnF,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3E,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAC/E,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SAC1B,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAElF,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,cAAc,GAA2B,EAAE,CAAC;QAElD,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5G,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,UAAU,OAAO,qCAAqC,CAAC,CAAC;YACrF,CAAC;YAED,cAAc,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAC7D,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC;gBAAE,GAAG,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QAED,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,WAAW,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,WAAW;QACX,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC;QAC1B,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,YAAoC,EACpC,iBAAyB;IAEzB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAClG,MAAM,KAAK,GAA2C,EAAE,CAAC;IAEzD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACvE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,CAAC;QAC9D,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAAqC;IACxE,MAAM,qBAAqB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACpE,IAAI,CAAC,MAAM,UAAU,CAAC,qBAAqB,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1D,OAAO,iBAAiB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,EAAE,qBAAqB,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,yBAAyB,CAAC,QAAsB;IACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;IACpD,MAAM,YAAY,GAA2B,EAAE,CAAC;IAEhD,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC5G,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,OAAO,WAAW,KAAK,QAAQ;YAAE,YAAY,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,OAAqC,EACrC,YAAoC;IAEpC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SACrF,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAC/E,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5D,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;QAC3H,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACpF,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAqC,EACrC,YAAoC;IAEpC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO;QAAE,OAAO;IAE/C,MAAM,qBAAqB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,MAAM,EAAE,CAAC,SAAS,CAAC,qBAAqB,EAAE,YAAY,CAAC,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,OAAqC,EACrC,UAAkB;IAElB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChG,IAAI,CAAC,cAAc,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3F,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,OAAqC,EACrC,YAAoC;IAEpC,MAAM,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChD,MAAM,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACtD,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,OAAqC,EACrC,WAAgC,EAChC,MAAuC;IAEvC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvE,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACjE,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACxF,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;QAC5C,GAAG,yBAAyB,CAAC,MAAM,CAAC;QACpC,GAAG,MAAM,8BAA8B,CAAC;YACtC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,kBAAkB;YACnC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;QACF,GAAG,kBAAkB,CAAC,GAAG;KAC1B,CAAC,CAAC;IACH,MAAM,qBAAqB,GAA2B,EAAE,CAAC;IACzD,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzD,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACzE,MAAM,cAAc,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACjF,IAAI,cAAc,IAAI,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3G,sBAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACpD,qBAAqB,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC,uBAAuB,CAAC,CAAC;QAC9H,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACxE,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,mBAAmB,GAA2B,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAEjF,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,cAAc,IAAI,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1F,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,mBAAmB,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACxF,YAAY,CAAC,IAAI,CAAC;YAChB,EAAE,EAAE,OAAO;YACX,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;SACtD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClG,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnH,MAAM,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjH,MAAM,wBAAwB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO;QACxD,CAAC,CAAC,mBAAmB,CAAC,wBAAwB,EAAE,OAAO,CAAC,YAAY,EAAE,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAC5G,CAAC,CAAC,wBAAwB,CAAC;IAC7B,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,WAAW;SACtD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC;SACxE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;IACpH,MAAM,qBAAqB,GAAG,eAAe,CAAC,cAAc,CAAC,KAAK,eAAe,CAAC,gBAAgB,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG;QACZ,wBAAwB,EAAE,OAAO,CAAC,iBAAiB,CAAC,OAAO;YACzD,CAAC,CAAC,eAAe,CAAC,wBAAwB,IAAI,EAAE,CAAC,KAAK,eAAe,CAAC,iBAAiB,CAAC;YACxF,CAAC,CAAC,KAAK;QACT,oBAAoB,EAAE,eAAe,CAAC,kBAAkB,CAAC,WAAW,CAAC,KAAK,eAAe,CAAC,gBAAgB,CAAC;QAC3G,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC;QAC3D,kBAAkB;QAClB,kBAAkB,EAAE,qBAAqB;eACpC,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,4BAA4B,CAAC,OAAO,CAAC,CAAC;mBAC7H,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC;mBACtC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;KACjD,CAAC;IAEF,OAAO;QACL,cAAc,EAAE,KAAK,CAAC,oBAAoB;eACrC,KAAK,CAAC,wBAAwB;eAC9B,KAAK,CAAC,mBAAmB;eACzB,KAAK,CAAC,kBAAkB;eACxB,kBAAkB,CAAC,MAAM,GAAG,CAAC;QAClC,YAAY,EAAE,YAAY,CAAC,MAAM;QACjC,YAAY;QACZ,YAAY;QACZ,KAAK;QACL,QAAQ,EAAE,gBAAgB;KAC3B,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite.d.ts","sourceRoot":"","sources":["../../src/imports/rewrite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rewrite.d.ts","sourceRoot":"","sources":["../../src/imports/rewrite.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAGjF,OAAO,KAAK,EACV,WAAW,EAEX,4BAA4B,EAE5B,aAAa,EACb,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,iBAAS,iBAAiB,CACxB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAaT;AAoED,iBAAe,oBAAoB,CACjC,WAAW,EAAE,iBAAiB,EAAE,EAChC,YAAY,EAAE,WAAW,EAAE,EAC3B,OAAO,EAAE,4BAA4B,EACrC,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,aAAa,CAAC,CAwBxB;AAED,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC"}
|
package/dist/imports/rewrite.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import { createRuleProgress, emitRuleChunk, emitRuleCompleted } from "../checks/progress.js";
|
|
3
3
|
import { RewriteFailureError } from "../shared/errors.js";
|
|
4
|
+
import { ruleLogGroup } from "../shared/log-groups.js";
|
|
4
5
|
import { applyTextReplacements, collectModuleSpecifiers } from "./module-specifiers.js";
|
|
5
6
|
import { resolveRelativeImport } from "./resolve.js";
|
|
6
7
|
function isAllowedRelative(specifier, sourceFile, resolvedFile, options) {
|
|
@@ -33,13 +34,13 @@ async function rewriteSourceFile(file, options, aliasIdsByFilePath, logger) {
|
|
|
33
34
|
logger.debug("rewrite-removed-unresolved", `removed unresolved import ${occurrence.specifier}`, {
|
|
34
35
|
sourceFile: file.absolutePath,
|
|
35
36
|
specifier: occurrence.specifier,
|
|
36
|
-
});
|
|
37
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
37
38
|
continue;
|
|
38
39
|
}
|
|
39
40
|
logger.debug("rewrite-skipped-unresolved", `skipped unresolved import ${occurrence.specifier}`, {
|
|
40
41
|
sourceFile: file.absolutePath,
|
|
41
42
|
specifier: occurrence.specifier,
|
|
42
|
-
});
|
|
43
|
+
}, { group: ruleLogGroup("sync-imports") });
|
|
43
44
|
continue;
|
|
44
45
|
}
|
|
45
46
|
if (isAllowedRelative(occurrence.specifier, file.absolutePath, resolvedFile, options))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite.js","sourceRoot":"","sources":["../../src/imports/rewrite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"rewrite.js","sourceRoot":"","sources":["../../src/imports/rewrite.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../src/imports/scan.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../src/imports/scan.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,iBAAiB,EAGjB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAoNpB,iBAAe,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA2BvF;AAED,OAAO,EAAE,eAAe,EAAE,CAAC"}
|
package/dist/imports/scan.js
CHANGED
|
@@ -3,6 +3,7 @@ import os from "node:os";
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { performance } from "node:perf_hooks";
|
|
5
5
|
import { loadNativeBinding } from "../native/native.js";
|
|
6
|
+
import { matchesGlob } from "../shared/globs.js";
|
|
6
7
|
import { normalizeRelativePath, toPosixPath, uniqueStrings } from "../shared/utils.js";
|
|
7
8
|
function resolveScanConcurrency() {
|
|
8
9
|
const override = Number.parseInt(process.env.TB_CODE_DISCIPLINE_SCAN_CONCURRENCY ?? "", 10);
|
|
@@ -14,8 +15,11 @@ function resolveScanConcurrency() {
|
|
|
14
15
|
: os.cpus().length;
|
|
15
16
|
return Math.min(64, Math.max(8, parallelism * 4));
|
|
16
17
|
}
|
|
17
|
-
function createExcludeMatcher(excludeDirs) {
|
|
18
|
-
const normalizedEntries = uniqueStrings(excludeDirs
|
|
18
|
+
function createExcludeMatcher(excludeDirs, type) {
|
|
19
|
+
const normalizedEntries = uniqueStrings(excludeDirs
|
|
20
|
+
.filter((entry) => entry.type === type)
|
|
21
|
+
.map((entry) => normalizeRelativePath(entry.pattern).replace(/\/+$/g, ""))
|
|
22
|
+
.filter(Boolean));
|
|
19
23
|
const excludedDirectoryNames = new Set(normalizedEntries.filter((entry) => !entry.includes("/")));
|
|
20
24
|
const excludedPaths = normalizedEntries
|
|
21
25
|
.filter((entry) => entry.includes("/"))
|
|
@@ -27,6 +31,11 @@ function createExcludeMatcher(excludeDirs) {
|
|
|
27
31
|
if (excludedDirectoryNames.has(directoryName)) {
|
|
28
32
|
return true;
|
|
29
33
|
}
|
|
34
|
+
for (const entry of normalizedEntries) {
|
|
35
|
+
if (matchesGlob(directoryName, entry) || matchesGlob(normalizedRelativeDir, entry) || matchesGlob(normalizedProjectRelativeDir, entry)) {
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
30
39
|
for (const entry of excludedPaths) {
|
|
31
40
|
if (normalizedRelativeDir === entry.exact
|
|
32
41
|
|| normalizedRelativeDir.startsWith(entry.prefix)
|
|
@@ -39,6 +48,17 @@ function createExcludeMatcher(excludeDirs) {
|
|
|
39
48
|
},
|
|
40
49
|
};
|
|
41
50
|
}
|
|
51
|
+
function shouldExcludeFile(file, options) {
|
|
52
|
+
const relativeFromProjectRoot = normalizeRelativePath(file.relativeFromProjectRoot);
|
|
53
|
+
return options.excludeDirs
|
|
54
|
+
.filter((entry) => entry.type === "file")
|
|
55
|
+
.some((entry) => matchesGlob(relativeFromProjectRoot, entry.pattern));
|
|
56
|
+
}
|
|
57
|
+
function filterExcludedFiles(files, options) {
|
|
58
|
+
if (!options.excludeDirs.some((entry) => entry.type === "file"))
|
|
59
|
+
return files;
|
|
60
|
+
return files.filter((file) => !shouldExcludeFile(file, options));
|
|
61
|
+
}
|
|
42
62
|
function emitScanCompleted(options, backend, metrics) {
|
|
43
63
|
options.scanObserver?.({
|
|
44
64
|
phase: "completed",
|
|
@@ -80,7 +100,7 @@ async function scanSourceFilesWithFallback(options) {
|
|
|
80
100
|
const startedAt = performance.now();
|
|
81
101
|
const concurrency = resolveScanConcurrency();
|
|
82
102
|
const extensionSet = new Set(options.sourceExtensions.map((extension) => extension.toLowerCase()));
|
|
83
|
-
const excludeMatcher = createExcludeMatcher(options.excludeDirs);
|
|
103
|
+
const excludeMatcher = createExcludeMatcher(options.excludeDirs, "folder");
|
|
84
104
|
const rows = [];
|
|
85
105
|
const queue = [{ absolutePath: options.sourceRoot, relativeDir: "" }];
|
|
86
106
|
let completedDirectories = 0;
|
|
@@ -111,7 +131,8 @@ async function scanSourceFilesWithFallback(options) {
|
|
|
111
131
|
concurrency,
|
|
112
132
|
});
|
|
113
133
|
}
|
|
114
|
-
const sortedRows = rows
|
|
134
|
+
const sortedRows = filterExcludedFiles(rows, options)
|
|
135
|
+
.sort((left, right) => left.relativeFromProjectRoot.localeCompare(right.relativeFromProjectRoot));
|
|
115
136
|
emitScanCompleted(options, "ts", {
|
|
116
137
|
chunkCount: chunkIndex,
|
|
117
138
|
directoryCount: completedDirectories,
|
|
@@ -138,16 +159,17 @@ async function scanSourceFiles(options) {
|
|
|
138
159
|
projectRoot: options.projectRoot,
|
|
139
160
|
sourceRoot: options.sourceRoot,
|
|
140
161
|
sourceExtensions: options.sourceExtensions,
|
|
141
|
-
excludeDirs: options.excludeDirs,
|
|
162
|
+
excludeDirs: options.excludeDirs.filter((entry) => entry.type === "folder").map((entry) => entry.pattern),
|
|
142
163
|
}))));
|
|
164
|
+
const rows = filterExcludedFiles(parsed.rows.filter((file) => !createExcludeMatcher(options.excludeDirs, "folder").shouldExcludeDirectory(path.dirname(file.relativeFromSourceRoot), path.dirname(file.relativeFromProjectRoot), path.basename(path.dirname(file.relativeFromProjectRoot)))), options);
|
|
143
165
|
emitScanCompleted(options, "native", parsed.metrics ?? {
|
|
144
166
|
chunkCount: 1,
|
|
145
167
|
directoryCount: 0,
|
|
146
|
-
fileCount:
|
|
168
|
+
fileCount: rows.length,
|
|
147
169
|
elapsedMs: performance.now() - startedAt,
|
|
148
170
|
concurrency: 1,
|
|
149
171
|
});
|
|
150
|
-
return
|
|
172
|
+
return rows;
|
|
151
173
|
}
|
|
152
174
|
return scanSourceFilesWithFallback(options);
|
|
153
175
|
}
|
package/dist/imports/scan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/imports/scan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/imports/scan.ts"],"names":[],"mappings":"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"}
|