@kongyo2/ts-comment-scanner 1.19.0 → 1.20.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/README.md +2 -2
- package/dist/imports.d.ts +34 -10
- package/dist/imports.d.ts.map +1 -1
- package/dist/imports.js +193 -25
- package/dist/imports.js.map +1 -1
- package/dist/remove.d.ts +4 -1
- package/dist/remove.d.ts.map +1 -1
- package/dist/remove.js +26 -17
- package/dist/remove.js.map +1 -1
- package/dist/scanner.d.ts +5 -1
- package/dist/scanner.d.ts.map +1 -1
- package/dist/scanner.js.map +1 -1
- package/package.json +1 -1
- package/src/imports.ts +219 -25
- package/src/remove.ts +27 -17
- package/src/scanner.ts +5 -1
package/README.md
CHANGED
|
@@ -129,7 +129,7 @@ ts-comment-scanner --remove --diff main...HEAD
|
|
|
129
129
|
|
|
130
130
|
削除した後のコードは次のように整えます。
|
|
131
131
|
|
|
132
|
-
- コメントだけの行は行ごと、行末のコメントは手前の空白ごと削除します。空行に挟まれたコメント行を消したときは空行を 1 行にまとめ、ファイルやブロックの先頭・末尾でコメントとコードを隔てていた空行は一緒に削除します。import・export
|
|
132
|
+
- コメントだけの行は行ごと、行末のコメントは手前の空白ごと削除します。空行に挟まれたコメント行を消したときは空行を 1 行にまとめ、ファイルやブロックの先頭・末尾でコメントとコードを隔てていた空行は一緒に削除します。import・export のグループの間や、import・require とその次の文の間にあるコメントを消すと間の空行がなくなるときは、空行に置き換えて organizeImports や dprint のグループと、newline-after-import が求める空行を保ちます。
|
|
133
133
|
- トークンがつながる位置には空白を入れます(`a/* x */b` → `a b`)。コードに挟まれた、改行を含むブロックコメントは改行に置き換え、自動セミコロン挿入による文の区切りを保ちます。
|
|
134
134
|
- JSX の `{/* … */}` は波かっこごと削除します。波かっこを外すと表示されるテキストが変わる位置では、`{" "}` か `{}` を残します。
|
|
135
135
|
|
|
@@ -374,7 +374,7 @@ Files deleted within the range are skipped, and renamed files are handled at the
|
|
|
374
374
|
|
|
375
375
|
The code left behind is tidied up:
|
|
376
376
|
|
|
377
|
-
- Comment-only lines go entirely, and trailing comments go with the whitespace before them. Removing a comment line between two blank lines leaves one blank line, and at the start or end of the file or of a block, the blank lines that only separated the comment from the code go with it. Where removing the comments between two groups of imports or exports would leave no empty line between them, an empty line takes their place, so organizeImports and dprint keep the groups apart.
|
|
377
|
+
- Comment-only lines go entirely, and trailing comments go with the whitespace before them. Removing a comment line between two blank lines leaves one blank line, and at the start or end of the file or of a block, the blank lines that only separated the comment from the code go with it. Where removing the comments between two groups of imports or exports, or between an import or require and the statement after it, would leave no empty line between them, an empty line takes their place, so organizeImports and dprint keep the groups apart and newline-after-import keeps its empty line.
|
|
378
378
|
- A space is inserted where tokens would otherwise join (`a/* x */b` → `a b`). A multi-line block comment with code on both sides is replaced with a line break, so automatic semicolon insertion still splits the statements the same way.
|
|
379
379
|
- A JSX `{/* … */}` goes with its braces. Where dropping the braces would change the rendered text, `{" "}` or `{}` takes their place.
|
|
380
380
|
|
package/dist/imports.d.ts
CHANGED
|
@@ -1,20 +1,33 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { type Range } from "./ranges.js";
|
|
3
3
|
type ImportSorter = "typescript" | "dprint";
|
|
4
|
+
/**
|
|
5
|
+
* The linters whose newline-after-import rule wants an empty line between
|
|
6
|
+
* the imports and the code after them: eslint-plugin-import ("eslint"),
|
|
7
|
+
* whose rule eslint-plugin-import-x and eslint-plugin-import-lite carry
|
|
8
|
+
* over, and oxlint, which ports it ("oxlint").
|
|
9
|
+
*/
|
|
10
|
+
type ImportLinter = "eslint" | "oxlint";
|
|
4
11
|
/**
|
|
5
12
|
* The gap in front of an import or export declaration that an import sorter
|
|
6
13
|
* reads to tell whether the declaration starts a new group, which it sorts
|
|
7
|
-
* and merges apart from the group before it
|
|
8
|
-
*
|
|
14
|
+
* and merges apart from the group before it, or in front of the statement
|
|
15
|
+
* after an import that a linter reads to tell whether an empty line ends the
|
|
16
|
+
* imports: the statement's leading trivia, from the end of the token before
|
|
17
|
+
* it to its first token — for a class, to its first decorator, which the
|
|
18
|
+
* linters measure from, past an `export` in front of it.
|
|
9
19
|
*/
|
|
10
20
|
export interface ImportGroupGap extends Range {
|
|
11
21
|
/** The sorters that start a new group at the declaration after the gap. */
|
|
12
22
|
splits: ImportSorter[];
|
|
23
|
+
/** The linters that find the empty line they want in the gap. */
|
|
24
|
+
spaced: ImportLinter[];
|
|
13
25
|
}
|
|
14
26
|
/**
|
|
15
|
-
* The gaps the import sorters read, in document order — one for
|
|
16
|
-
* declaration past the first of a run a sorter sorts,
|
|
17
|
-
*
|
|
27
|
+
* The gaps the import sorters and linters read, in document order — one for
|
|
28
|
+
* every declaration past the first of a run a sorter sorts, and one for every
|
|
29
|
+
* statement a linter measures from the import before it, so that the same
|
|
30
|
+
* statements have gaps however the comments around them change:
|
|
18
31
|
*
|
|
19
32
|
* - TypeScript's organizeImports (`groupByNewlineContiguous` in tsc 6 and in
|
|
20
33
|
* tsc 7's port; tsserver and VS Code, prettier-plugin-organize-imports)
|
|
@@ -32,12 +45,23 @@ export interface ImportGroupGap extends Range {
|
|
|
32
45
|
* A declaration a `dprint-ignore` comment exempts ends dprint's run, and
|
|
33
46
|
* stays in it here, which only reads more gaps. `deno fmt`, which runs the
|
|
34
47
|
* plugin, keeps the order.
|
|
48
|
+
* - The newline-after-import rules (see ImportLinter), with their default
|
|
49
|
+
* options, want the statement after an import declaration, or after an
|
|
50
|
+
* `import x = …` that is not exported, to start two or more lines below
|
|
51
|
+
* the import's end, unless it is one of those itself — so a comment line
|
|
52
|
+
* in between holds one of the lines. In the file's own statements they
|
|
53
|
+
* want the same after a statement holding a require (see holdsRequire),
|
|
54
|
+
* unless the next one holds one too. eslint-plugin-import counts the line
|
|
55
|
+
* breaks its parsers number lines by, U+2028 and U+2029 included, and reads
|
|
56
|
+
* the imports in the bodies of modules and namespaces as well (see
|
|
57
|
+
* moduleBodies); oxlint counts line feeds alone, in the file's own
|
|
58
|
+
* statements.
|
|
35
59
|
*
|
|
36
|
-
*
|
|
37
|
-
* deletes the comments that held
|
|
38
|
-
* starts a chunk only at a comment that
|
|
39
|
-
* empty line
|
|
40
|
-
* and they are not read.
|
|
60
|
+
* The sorters start a group at an empty line, and the linters find theirs
|
|
61
|
+
* there, which is what removal leaves where it deletes the comments that held
|
|
62
|
+
* a gap open. Biome's organizeImports starts a chunk only at a comment that
|
|
63
|
+
* an empty line follows, never at the empty line alone, so no layout without
|
|
64
|
+
* the comment keeps its chunks apart, and they are not read.
|
|
41
65
|
*/
|
|
42
66
|
export declare function importGroupGaps(source: string, sourceFile: ts.SourceFile, comments: readonly Range[]): ImportGroupGap[];
|
|
43
67
|
export {};
|
package/dist/imports.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../src/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../src/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAuB,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAE9D,KAAK,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE5C;;;;;GAKG;AACH,KAAK,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,KAAK;IAC3C,2EAA2E;IAC3E,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,iEAAiE;IACjE,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,QAAQ,EAAE,SAAS,KAAK,EAAE,GACzB,cAAc,EAAE,CA+BlB"}
|
package/dist/imports.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
|
+
import { LINE_BREAK } from "./lines.js";
|
|
2
3
|
import { firstIndexAtOrAfter } from "./ranges.js";
|
|
3
4
|
/**
|
|
4
|
-
* The gaps the import sorters read, in document order — one for
|
|
5
|
-
* declaration past the first of a run a sorter sorts,
|
|
6
|
-
*
|
|
5
|
+
* The gaps the import sorters and linters read, in document order — one for
|
|
6
|
+
* every declaration past the first of a run a sorter sorts, and one for every
|
|
7
|
+
* statement a linter measures from the import before it, so that the same
|
|
8
|
+
* statements have gaps however the comments around them change:
|
|
7
9
|
*
|
|
8
10
|
* - TypeScript's organizeImports (`groupByNewlineContiguous` in tsc 6 and in
|
|
9
11
|
* tsc 7's port; tsserver and VS Code, prettier-plugin-organize-imports)
|
|
@@ -21,43 +23,209 @@ import { firstIndexAtOrAfter } from "./ranges.js";
|
|
|
21
23
|
* A declaration a `dprint-ignore` comment exempts ends dprint's run, and
|
|
22
24
|
* stays in it here, which only reads more gaps. `deno fmt`, which runs the
|
|
23
25
|
* plugin, keeps the order.
|
|
26
|
+
* - The newline-after-import rules (see ImportLinter), with their default
|
|
27
|
+
* options, want the statement after an import declaration, or after an
|
|
28
|
+
* `import x = …` that is not exported, to start two or more lines below
|
|
29
|
+
* the import's end, unless it is one of those itself — so a comment line
|
|
30
|
+
* in between holds one of the lines. In the file's own statements they
|
|
31
|
+
* want the same after a statement holding a require (see holdsRequire),
|
|
32
|
+
* unless the next one holds one too. eslint-plugin-import counts the line
|
|
33
|
+
* breaks its parsers number lines by, U+2028 and U+2029 included, and reads
|
|
34
|
+
* the imports in the bodies of modules and namespaces as well (see
|
|
35
|
+
* moduleBodies); oxlint counts line feeds alone, in the file's own
|
|
36
|
+
* statements.
|
|
24
37
|
*
|
|
25
|
-
*
|
|
26
|
-
* deletes the comments that held
|
|
27
|
-
* starts a chunk only at a comment that
|
|
28
|
-
* empty line
|
|
29
|
-
* and they are not read.
|
|
38
|
+
* The sorters start a group at an empty line, and the linters find theirs
|
|
39
|
+
* there, which is what removal leaves where it deletes the comments that held
|
|
40
|
+
* a gap open. Biome's organizeImports starts a chunk only at a comment that
|
|
41
|
+
* an empty line follows, never at the empty line alone, so no layout without
|
|
42
|
+
* the comment keeps its chunks apart, and they are not read.
|
|
30
43
|
*/
|
|
31
44
|
export function importGroupGaps(source, sourceFile, comments) {
|
|
32
|
-
const
|
|
33
|
-
const
|
|
34
|
-
const sorters = readers.get(declaration) ?? new Set();
|
|
35
|
-
sorters.add(sorter);
|
|
36
|
-
readers.set(declaration, sorters);
|
|
37
|
-
};
|
|
45
|
+
const sorters = new Map();
|
|
46
|
+
const linters = new Map();
|
|
38
47
|
for (const statements of [sourceFile.statements, ...ambientModuleBodies(sourceFile)]) {
|
|
39
|
-
for (const declaration of statements.filter(ts.isImportDeclaration).slice(1))
|
|
40
|
-
|
|
48
|
+
for (const declaration of statements.filter(ts.isImportDeclaration).slice(1)) {
|
|
49
|
+
addReader(sorters, declaration, "typescript");
|
|
50
|
+
}
|
|
41
51
|
}
|
|
42
52
|
for (const run of exportRuns(sourceFile.statements)) {
|
|
43
53
|
for (const declaration of run.slice(1))
|
|
44
|
-
|
|
54
|
+
addReader(sorters, declaration, "typescript");
|
|
55
|
+
}
|
|
56
|
+
for (const declaration of adjacentOfOneKind(sourceFile.statements, dprintKind)) {
|
|
57
|
+
addReader(sorters, declaration, "dprint");
|
|
58
|
+
}
|
|
59
|
+
for (const statement of statementsAfterImports(sourceFile.statements, true)) {
|
|
60
|
+
addReader(linters, statement, "eslint");
|
|
61
|
+
addReader(linters, statement, "oxlint");
|
|
45
62
|
}
|
|
46
|
-
for (const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
63
|
+
for (const statements of moduleBodies(sourceFile.statements)) {
|
|
64
|
+
for (const statement of statementsAfterImports(statements, false))
|
|
65
|
+
addReader(linters, statement, "eslint");
|
|
66
|
+
}
|
|
67
|
+
return [...new Set([...sorters.keys(), ...linters.keys()])]
|
|
68
|
+
.sort((a, b) => a.pos - b.pos)
|
|
69
|
+
.map((statement) => {
|
|
70
|
+
const gap = { start: statement.pos, end: gapEnd(statement, sourceFile) };
|
|
71
|
+
const splits = [...(sorters.get(statement) ?? [])].filter((sorter) => STARTS_GROUP[sorter](source, gap, comments));
|
|
72
|
+
const spaced = [...(linters.get(statement) ?? [])].filter((linter) => FINDS_EMPTY_LINE[linter](source, gap));
|
|
73
|
+
return { ...gap, splits, spaced };
|
|
54
74
|
});
|
|
55
75
|
}
|
|
76
|
+
/** Records that the tool reads the gap in front of the statement. */
|
|
77
|
+
function addReader(readers, statement, reader) {
|
|
78
|
+
const statementReaders = readers.get(statement) ?? new Set();
|
|
79
|
+
statementReaders.add(reader);
|
|
80
|
+
readers.set(statement, statementReaders);
|
|
81
|
+
}
|
|
56
82
|
// Whether the sorter starts a new group at the declaration after the gap.
|
|
57
83
|
const STARTS_GROUP = {
|
|
58
84
|
typescript: (source, gap, comments) => newLineTrivia(source, gap, comments) >= 2,
|
|
59
85
|
dprint: (source, gap) => source.slice(gap.start, gap.end).split("\n").length > 2,
|
|
60
86
|
};
|
|
87
|
+
// Whether the linter finds its empty line in the gap: two line breaks or
|
|
88
|
+
// more, those inside comments included.
|
|
89
|
+
const FINDS_EMPTY_LINE = {
|
|
90
|
+
eslint: (source, gap) => source.slice(gap.start, gap.end).split(LINE_BREAK).length > 2,
|
|
91
|
+
oxlint: (source, gap) => source.slice(gap.start, gap.end).split("\n").length > 2,
|
|
92
|
+
};
|
|
93
|
+
/**
|
|
94
|
+
* Where the gap in front of the statement ends: at its first token, or at the
|
|
95
|
+
* first decorator of a class, which the linters measure the class from —
|
|
96
|
+
* past an `export` in front of it, too.
|
|
97
|
+
*/
|
|
98
|
+
function gapEnd(statement, sourceFile) {
|
|
99
|
+
const decorator = ts.isClassDeclaration(statement) ? ts.getDecorators(statement)?.[0] : undefined;
|
|
100
|
+
return (decorator ?? statement).getStart(sourceFile);
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* The statements the newline-after-import rules measure from the statement
|
|
104
|
+
* before them: the ones after an import that are none (see isImport), and,
|
|
105
|
+
* where `requires` asks, the ones after a statement holding a require that
|
|
106
|
+
* hold none (see holdsRequire).
|
|
107
|
+
*/
|
|
108
|
+
function statementsAfterImports(statements, requires) {
|
|
109
|
+
const holding = statements.map((statement) => requires && holdsRequire(statement));
|
|
110
|
+
return statements.filter((statement, index) => index > 0 &&
|
|
111
|
+
((isImport(statements[index - 1]) && !isImport(statement)) ||
|
|
112
|
+
(holding[index - 1] === true && !holding[index])));
|
|
113
|
+
}
|
|
114
|
+
/** Whether the linters read the statement as an import: an import declaration, or an `import x = …` not exported. */
|
|
115
|
+
function isImport(statement) {
|
|
116
|
+
return (ts.isImportDeclaration(statement) ||
|
|
117
|
+
(ts.isImportEqualsDeclaration(statement) &&
|
|
118
|
+
statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) !== true));
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Whether the statement holds a call eslint-plugin-import reads as a require
|
|
122
|
+
* (see isRequireCall) outside the nodes it looks for none in: functions with
|
|
123
|
+
* a body, blocks, object literals and decorators, which it counts as levels.
|
|
124
|
+
* A class static block is no block to it, a method's computed name lies
|
|
125
|
+
* outside its function, an object literal that an assignment destructures
|
|
126
|
+
* into is a pattern, no object (see isAssignmentTarget), and overloads and
|
|
127
|
+
* the other function-likes without a body are no functions, so the defaults
|
|
128
|
+
* of their parameters count, though tsc rejects them. oxlint stops at the
|
|
129
|
+
* same nodes among a call's ancestors and at functions without a body, and
|
|
130
|
+
* takes only the global `require`, called without parentheses around it or
|
|
131
|
+
* its string; the requires it leaves out are read for it all the same, as
|
|
132
|
+
* eslint-plugin-import reads the gaps after them anyway. Walked without
|
|
133
|
+
* recursion, as the deeply nested expressions of generated code need, and
|
|
134
|
+
* over the syntax tree alone, so that removing comments never changes which
|
|
135
|
+
* statements hold one.
|
|
136
|
+
*/
|
|
137
|
+
function holdsRequire(statement) {
|
|
138
|
+
const pending = [statement];
|
|
139
|
+
for (let node = pending.pop(); node !== undefined; node = pending.pop()) {
|
|
140
|
+
if (ts.isCallExpression(node) && isRequireCall(node))
|
|
141
|
+
return true;
|
|
142
|
+
if (ts.isFunctionLike(node) && "body" in node && node.body !== undefined) {
|
|
143
|
+
if (node.name !== undefined && ts.isComputedPropertyName(node.name))
|
|
144
|
+
pending.push(node.name);
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
if ((ts.isBlock(node) && !ts.isClassStaticBlockDeclaration(node.parent)) ||
|
|
148
|
+
(ts.isObjectLiteralExpression(node) && !isAssignmentTarget(node)) ||
|
|
149
|
+
ts.isDecorator(node)) {
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
// forEachChild stops at a callback that returns a value, so this one returns none.
|
|
153
|
+
ts.forEachChild(node, (child) => {
|
|
154
|
+
pending.push(child);
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Whether the object literal is what an assignment destructures into — the
|
|
161
|
+
* left of an `=`, the target of a `for … of` or `for … in`, or an element, a
|
|
162
|
+
* rest or a property's value in one — which ESTree reads as a pattern.
|
|
163
|
+
*/
|
|
164
|
+
function isAssignmentTarget(literal) {
|
|
165
|
+
let node = literal;
|
|
166
|
+
for (;;) {
|
|
167
|
+
const parent = node.parent;
|
|
168
|
+
if (ts.isBinaryExpression(parent)) {
|
|
169
|
+
return parent.operatorToken.kind === ts.SyntaxKind.EqualsToken && parent.left === node;
|
|
170
|
+
}
|
|
171
|
+
if (ts.isForOfStatement(parent) || ts.isForInStatement(parent))
|
|
172
|
+
return parent.initializer === node;
|
|
173
|
+
if (ts.isArrayLiteralExpression(parent) || ts.isSpreadElement(parent)) {
|
|
174
|
+
node = parent;
|
|
175
|
+
}
|
|
176
|
+
else if (ts.isPropertyAssignment(parent) && parent.initializer === node) {
|
|
177
|
+
node = parent.parent;
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
return false;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Whether the call is a require to eslint-plugin-import: `require` with a
|
|
186
|
+
* single string literal, the parentheses around either part aside, as
|
|
187
|
+
* ESLint's parsers drop them.
|
|
188
|
+
*/
|
|
189
|
+
function isRequireCall(call) {
|
|
190
|
+
const callee = unparenthesized(call.expression);
|
|
191
|
+
const [argument] = call.arguments;
|
|
192
|
+
return (ts.isIdentifier(callee) &&
|
|
193
|
+
callee.text === "require" &&
|
|
194
|
+
call.arguments.length === 1 &&
|
|
195
|
+
ts.isStringLiteral(unparenthesized(argument)));
|
|
196
|
+
}
|
|
197
|
+
function unparenthesized(expression) {
|
|
198
|
+
let inner = expression;
|
|
199
|
+
while (ts.isParenthesizedExpression(inner))
|
|
200
|
+
inner = inner.expression;
|
|
201
|
+
return inner;
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* The statements of every module and namespace body in the file (`declare
|
|
205
|
+
* module "m" { … }`, `declare global { … }`, `namespace N { … }`, the ones
|
|
206
|
+
* nested in them included), whose imports eslint-plugin-import reads too:
|
|
207
|
+
* an `import x = N.y` is at home in a namespace.
|
|
208
|
+
*/
|
|
209
|
+
function moduleBodies(statements) {
|
|
210
|
+
const bodies = [];
|
|
211
|
+
const pending = [statements];
|
|
212
|
+
for (let list = pending.pop(); list !== undefined; list = pending.pop()) {
|
|
213
|
+
for (const statement of list) {
|
|
214
|
+
if (!ts.isModuleDeclaration(statement))
|
|
215
|
+
continue;
|
|
216
|
+
// `namespace A.B { … }` nests the declaration of B in A's.
|
|
217
|
+
let body = statement.body;
|
|
218
|
+
while (body !== undefined && ts.isModuleDeclaration(body))
|
|
219
|
+
body = body.body;
|
|
220
|
+
if (body === undefined)
|
|
221
|
+
continue;
|
|
222
|
+
const inner = body.statements;
|
|
223
|
+
bodies.push(inner);
|
|
224
|
+
pending.push(inner);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
return bodies;
|
|
228
|
+
}
|
|
61
229
|
/** The statements past the first of each run of adjacent ones that `kindOf` puts in one kind. */
|
|
62
230
|
function adjacentOfOneKind(statements, kindOf) {
|
|
63
231
|
return statements.filter((statement, index) => {
|
package/dist/imports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../src/imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAc,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../src/imports.ts"],"names":[],"mappings":"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"}
|
package/dist/remove.d.ts
CHANGED
|
@@ -63,7 +63,10 @@ export interface RemoveResult {
|
|
|
63
63
|
* lines already against that edge stay.
|
|
64
64
|
* - Imports and exports stay in the groups TypeScript's organizeImports and
|
|
65
65
|
* dprint sort apart: where deleting the comments between two groups would
|
|
66
|
-
* leave no empty line between them, an empty line takes their place.
|
|
66
|
+
* leave no empty line between them, an empty line takes their place. So it
|
|
67
|
+
* does where deleting the comments after an import or a require would
|
|
68
|
+
* bring the code after it up to the line below, keeping the empty line the
|
|
69
|
+
* newline-after-import rules of eslint-plugin-import and oxlint want.
|
|
67
70
|
* - A leading byte-order mark is preserved. Reported positions index into the
|
|
68
71
|
* `source` string exactly as `scanComments(source)` reports them (a BOM
|
|
69
72
|
* counts as its first character).
|
package/dist/remove.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../src/remove.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,wFAAwF;IACxF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4EAA4E;IAC5E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACrC,oFAAoF;IACpF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,sEAAsE;IACtE,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED
|
|
1
|
+
{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../src/remove.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,wFAAwF;IACxF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4EAA4E;IAC5E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACrC,oFAAoF;IACpF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,sEAAsE;IACtE,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CA4FxF"}
|
package/dist/remove.js
CHANGED
|
@@ -31,7 +31,10 @@ import { applyEdits, blankLineEdits } from "./splice.js";
|
|
|
31
31
|
* lines already against that edge stay.
|
|
32
32
|
* - Imports and exports stay in the groups TypeScript's organizeImports and
|
|
33
33
|
* dprint sort apart: where deleting the comments between two groups would
|
|
34
|
-
* leave no empty line between them, an empty line takes their place.
|
|
34
|
+
* leave no empty line between them, an empty line takes their place. So it
|
|
35
|
+
* does where deleting the comments after an import or a require would
|
|
36
|
+
* bring the code after it up to the line below, keeping the empty line the
|
|
37
|
+
* newline-after-import rules of eslint-plugin-import and oxlint want.
|
|
35
38
|
* - A leading byte-order mark is preserved. Reported positions index into the
|
|
36
39
|
* `source` string exactly as `scanComments(source)` reports them (a BOM
|
|
37
40
|
* counts as its first character).
|
|
@@ -74,7 +77,8 @@ export function removeComments(source, options = {}) {
|
|
|
74
77
|
// without the collapse before any removal is given up.
|
|
75
78
|
let tidyBlankLines = true;
|
|
76
79
|
// The removals that leave an empty line in their place, holding two groups
|
|
77
|
-
// of imports or exports apart
|
|
80
|
+
// of imports or exports apart, or the code after the imports two lines
|
|
81
|
+
// below them (see gapHolders).
|
|
78
82
|
const holders = new Set();
|
|
79
83
|
for (;;) {
|
|
80
84
|
const shielding = shieldNextLineDirectives(source, removed, kept, skipped, context);
|
|
@@ -92,8 +96,9 @@ export function removeComments(source, options = {}) {
|
|
|
92
96
|
if (search.adjust(changedSegments(analysis.jsx.segments, output.jsx.segments)))
|
|
93
97
|
continue;
|
|
94
98
|
// Where the output joins two groups of imports or exports that a sorter
|
|
95
|
-
// sorts apart,
|
|
96
|
-
// and the attempt
|
|
99
|
+
// sorts apart, or loses the empty line a linter finds after the imports,
|
|
100
|
+
// a removal in the gap leaves an empty line in its place, and the attempt
|
|
101
|
+
// is repeated.
|
|
97
102
|
const holding = gapHolders(source, analysis.importGroups, output.importGroups, removed, holders);
|
|
98
103
|
if (holding.length > 0) {
|
|
99
104
|
for (const holder of holding)
|
|
@@ -193,25 +198,29 @@ function closestRemovalBefore(removals, comment) {
|
|
|
193
198
|
/**
|
|
194
199
|
* The removals that are to leave an empty line in their place (see
|
|
195
200
|
* Edit.blankLine), so that the output starts every group of imports and
|
|
196
|
-
* exports the source starts
|
|
197
|
-
*
|
|
198
|
-
*
|
|
199
|
-
*
|
|
200
|
-
*
|
|
201
|
-
*
|
|
202
|
-
*
|
|
203
|
-
*
|
|
201
|
+
* exports the source starts, and keeps every empty line the linters find
|
|
202
|
+
* after its imports. The gaps belong to the same statements in both texts,
|
|
203
|
+
* since removing comments leaves the statements as they are. Where the
|
|
204
|
+
* output joins two groups at a gap, or a linter no longer finds its empty
|
|
205
|
+
* line there, the deleted comments took the gap's line breaks along, and the
|
|
206
|
+
* last of them that held any — one spanning lines, or one on a line below
|
|
207
|
+
* the token the gap follows — leaves an empty line, which starts a group for
|
|
208
|
+
* both sorters and is the empty line both linters want. A group the output
|
|
209
|
+
* starts where the source starts none can stand, for both parts of a sorted
|
|
210
|
+
* group are sorted, and so can an empty line only the output has.
|
|
204
211
|
*/
|
|
205
212
|
function gapHolders(source, before, after, removals, holders) {
|
|
206
213
|
if (before.length !== after.length)
|
|
207
214
|
throw unexpectedResult();
|
|
208
215
|
const found = [];
|
|
209
216
|
for (const [index, gap] of before.entries()) {
|
|
210
|
-
const splits = after[index]
|
|
211
|
-
|
|
217
|
+
const { splits, spaced } = after[index];
|
|
218
|
+
const intact = gap.splits.every((sorter) => splits.includes(sorter)) && gap.spaced.every((linter) => spaced.includes(linter));
|
|
219
|
+
if (intact)
|
|
212
220
|
continue;
|
|
213
221
|
const inGap = removals.filter((comment) => comment.start >= gap.start && comment.end <= gap.end);
|
|
214
|
-
// An empty line in the gap already starts a group for both sorters
|
|
222
|
+
// An empty line in the gap already starts a group for both sorters and
|
|
223
|
+
// is the empty line both linters want.
|
|
215
224
|
if (inGap.some((comment) => holders.has(comment)))
|
|
216
225
|
throw unexpectedResult();
|
|
217
226
|
const holder = inGap.findLast((comment) => comment.endLine > comment.line || LINE_TERMINATOR.test(source.slice(gap.start, comment.start)));
|
|
@@ -318,8 +327,8 @@ function skippableRanges(comments, containerOf, candidates) {
|
|
|
318
327
|
}
|
|
319
328
|
/**
|
|
320
329
|
* The edits that remove the comments: one per comment, or one per container
|
|
321
|
-
* going with its braces. A holder of a gap
|
|
322
|
-
* empty line in its place.
|
|
330
|
+
* going with its braces. A holder of a gap around the imports (see
|
|
331
|
+
* gapHolders) leaves an empty line in its place.
|
|
323
332
|
*/
|
|
324
333
|
function removalEdits(removed, containerOf, droppable, holders) {
|
|
325
334
|
const edits = [];
|
package/dist/remove.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../src/remove.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../src/remove.ts"],"names":[],"mappings":"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"}
|
package/dist/scanner.d.ts
CHANGED
|
@@ -12,7 +12,11 @@ export interface SourceAnalysis {
|
|
|
12
12
|
jsx: JsxLayout;
|
|
13
13
|
/** What stands in front of each comment carrying an ast-grep suppression (see precedingNode). */
|
|
14
14
|
preceding: ReadonlyMap<Comment, PrecedingNode>;
|
|
15
|
-
/**
|
|
15
|
+
/**
|
|
16
|
+
* The gaps in front of the import and export declarations the import
|
|
17
|
+
* sorters group, and in front of the statements after the imports, where
|
|
18
|
+
* the linters want an empty line (see importGroupGaps).
|
|
19
|
+
*/
|
|
16
20
|
importGroups: ImportGroupGap[];
|
|
17
21
|
}
|
|
18
22
|
export declare function analyzeSource(source: string, options?: ScanOptions): SourceAnalysis;
|
package/dist/scanner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../src/scanner.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,YAAY,CAAC;AAEvD,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,EAAE,CAEjF;AAED,6FAA6F;AAC7F,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,iGAAiG;IACjG,SAAS,EAAE,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/C
|
|
1
|
+
{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../src/scanner.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,YAAY,CAAC;AAEvD,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,EAAE,CAEjF;AAED,6FAA6F;AAC7F,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,iGAAiG;IACjG,SAAS,EAAE,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/C;;;;OAIG;IACH,YAAY,EAAE,cAAc,EAAE,CAAC;CAChC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,cAAc,CAgKvF"}
|
package/dist/scanner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../src/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAsB,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,eAAe,EAA2B,MAAM,iBAAiB,CAAC;AACvH,OAAO,EAAE,eAAe,EAAuB,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,SAAS,EAAkB,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAc,MAAM,aAAa,CAAC;AAOvE,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,UAAuB,EAAE;IACpE,OAAO,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC;AACjD,CAAC;
|
|
1
|
+
{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../src/scanner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/imports.ts
CHANGED
|
@@ -1,23 +1,38 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
|
+
import { LINE_BREAK } from "./lines.js";
|
|
2
3
|
import { firstIndexAtOrAfter, type Range } from "./ranges.js";
|
|
3
4
|
|
|
4
5
|
type ImportSorter = "typescript" | "dprint";
|
|
5
6
|
|
|
7
|
+
/**
|
|
8
|
+
* The linters whose newline-after-import rule wants an empty line between
|
|
9
|
+
* the imports and the code after them: eslint-plugin-import ("eslint"),
|
|
10
|
+
* whose rule eslint-plugin-import-x and eslint-plugin-import-lite carry
|
|
11
|
+
* over, and oxlint, which ports it ("oxlint").
|
|
12
|
+
*/
|
|
13
|
+
type ImportLinter = "eslint" | "oxlint";
|
|
14
|
+
|
|
6
15
|
/**
|
|
7
16
|
* The gap in front of an import or export declaration that an import sorter
|
|
8
17
|
* reads to tell whether the declaration starts a new group, which it sorts
|
|
9
|
-
* and merges apart from the group before it
|
|
10
|
-
*
|
|
18
|
+
* and merges apart from the group before it, or in front of the statement
|
|
19
|
+
* after an import that a linter reads to tell whether an empty line ends the
|
|
20
|
+
* imports: the statement's leading trivia, from the end of the token before
|
|
21
|
+
* it to its first token — for a class, to its first decorator, which the
|
|
22
|
+
* linters measure from, past an `export` in front of it.
|
|
11
23
|
*/
|
|
12
24
|
export interface ImportGroupGap extends Range {
|
|
13
25
|
/** The sorters that start a new group at the declaration after the gap. */
|
|
14
26
|
splits: ImportSorter[];
|
|
27
|
+
/** The linters that find the empty line they want in the gap. */
|
|
28
|
+
spaced: ImportLinter[];
|
|
15
29
|
}
|
|
16
30
|
|
|
17
31
|
/**
|
|
18
|
-
* The gaps the import sorters read, in document order — one for
|
|
19
|
-
* declaration past the first of a run a sorter sorts,
|
|
20
|
-
*
|
|
32
|
+
* The gaps the import sorters and linters read, in document order — one for
|
|
33
|
+
* every declaration past the first of a run a sorter sorts, and one for every
|
|
34
|
+
* statement a linter measures from the import before it, so that the same
|
|
35
|
+
* statements have gaps however the comments around them change:
|
|
21
36
|
*
|
|
22
37
|
* - TypeScript's organizeImports (`groupByNewlineContiguous` in tsc 6 and in
|
|
23
38
|
* tsc 7's port; tsserver and VS Code, prettier-plugin-organize-imports)
|
|
@@ -35,40 +50,68 @@ export interface ImportGroupGap extends Range {
|
|
|
35
50
|
* A declaration a `dprint-ignore` comment exempts ends dprint's run, and
|
|
36
51
|
* stays in it here, which only reads more gaps. `deno fmt`, which runs the
|
|
37
52
|
* plugin, keeps the order.
|
|
53
|
+
* - The newline-after-import rules (see ImportLinter), with their default
|
|
54
|
+
* options, want the statement after an import declaration, or after an
|
|
55
|
+
* `import x = …` that is not exported, to start two or more lines below
|
|
56
|
+
* the import's end, unless it is one of those itself — so a comment line
|
|
57
|
+
* in between holds one of the lines. In the file's own statements they
|
|
58
|
+
* want the same after a statement holding a require (see holdsRequire),
|
|
59
|
+
* unless the next one holds one too. eslint-plugin-import counts the line
|
|
60
|
+
* breaks its parsers number lines by, U+2028 and U+2029 included, and reads
|
|
61
|
+
* the imports in the bodies of modules and namespaces as well (see
|
|
62
|
+
* moduleBodies); oxlint counts line feeds alone, in the file's own
|
|
63
|
+
* statements.
|
|
38
64
|
*
|
|
39
|
-
*
|
|
40
|
-
* deletes the comments that held
|
|
41
|
-
* starts a chunk only at a comment that
|
|
42
|
-
* empty line
|
|
43
|
-
* and they are not read.
|
|
65
|
+
* The sorters start a group at an empty line, and the linters find theirs
|
|
66
|
+
* there, which is what removal leaves where it deletes the comments that held
|
|
67
|
+
* a gap open. Biome's organizeImports starts a chunk only at a comment that
|
|
68
|
+
* an empty line follows, never at the empty line alone, so no layout without
|
|
69
|
+
* the comment keeps its chunks apart, and they are not read.
|
|
44
70
|
*/
|
|
45
71
|
export function importGroupGaps(
|
|
46
72
|
source: string,
|
|
47
73
|
sourceFile: ts.SourceFile,
|
|
48
74
|
comments: readonly Range[],
|
|
49
75
|
): ImportGroupGap[] {
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const sorters = readers.get(declaration) ?? new Set();
|
|
53
|
-
sorters.add(sorter);
|
|
54
|
-
readers.set(declaration, sorters);
|
|
55
|
-
};
|
|
76
|
+
const sorters = new Map<ts.Statement, Set<ImportSorter>>();
|
|
77
|
+
const linters = new Map<ts.Statement, Set<ImportLinter>>();
|
|
56
78
|
for (const statements of [sourceFile.statements, ...ambientModuleBodies(sourceFile)]) {
|
|
57
|
-
for (const declaration of statements.filter(ts.isImportDeclaration).slice(1))
|
|
79
|
+
for (const declaration of statements.filter(ts.isImportDeclaration).slice(1)) {
|
|
80
|
+
addReader(sorters, declaration, "typescript");
|
|
81
|
+
}
|
|
58
82
|
}
|
|
59
83
|
for (const run of exportRuns(sourceFile.statements)) {
|
|
60
|
-
for (const declaration of run.slice(1))
|
|
84
|
+
for (const declaration of run.slice(1)) addReader(sorters, declaration, "typescript");
|
|
85
|
+
}
|
|
86
|
+
for (const declaration of adjacentOfOneKind(sourceFile.statements, dprintKind)) {
|
|
87
|
+
addReader(sorters, declaration, "dprint");
|
|
88
|
+
}
|
|
89
|
+
for (const statement of statementsAfterImports(sourceFile.statements, true)) {
|
|
90
|
+
addReader(linters, statement, "eslint");
|
|
91
|
+
addReader(linters, statement, "oxlint");
|
|
92
|
+
}
|
|
93
|
+
for (const statements of moduleBodies(sourceFile.statements)) {
|
|
94
|
+
for (const statement of statementsAfterImports(statements, false)) addReader(linters, statement, "eslint");
|
|
61
95
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
.
|
|
65
|
-
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
96
|
+
return [...new Set([...sorters.keys(), ...linters.keys()])]
|
|
97
|
+
.sort((a, b) => a.pos - b.pos)
|
|
98
|
+
.map((statement) => {
|
|
99
|
+
const gap = { start: statement.pos, end: gapEnd(statement, sourceFile) };
|
|
100
|
+
const splits = [...(sorters.get(statement) ?? [])].filter((sorter) =>
|
|
101
|
+
STARTS_GROUP[sorter](source, gap, comments),
|
|
102
|
+
);
|
|
103
|
+
const spaced = [...(linters.get(statement) ?? [])].filter((linter) => FINDS_EMPTY_LINE[linter](source, gap));
|
|
104
|
+
return { ...gap, splits, spaced };
|
|
69
105
|
});
|
|
70
106
|
}
|
|
71
107
|
|
|
108
|
+
/** Records that the tool reads the gap in front of the statement. */
|
|
109
|
+
function addReader<T>(readers: Map<ts.Statement, Set<T>>, statement: ts.Statement, reader: T): void {
|
|
110
|
+
const statementReaders = readers.get(statement) ?? new Set();
|
|
111
|
+
statementReaders.add(reader);
|
|
112
|
+
readers.set(statement, statementReaders);
|
|
113
|
+
}
|
|
114
|
+
|
|
72
115
|
// Whether the sorter starts a new group at the declaration after the gap.
|
|
73
116
|
const STARTS_GROUP: Readonly<
|
|
74
117
|
Record<ImportSorter, (source: string, gap: Range, comments: readonly Range[]) => boolean>
|
|
@@ -77,6 +120,157 @@ const STARTS_GROUP: Readonly<
|
|
|
77
120
|
dprint: (source, gap) => source.slice(gap.start, gap.end).split("\n").length > 2,
|
|
78
121
|
};
|
|
79
122
|
|
|
123
|
+
// Whether the linter finds its empty line in the gap: two line breaks or
|
|
124
|
+
// more, those inside comments included.
|
|
125
|
+
const FINDS_EMPTY_LINE: Readonly<Record<ImportLinter, (source: string, gap: Range) => boolean>> = {
|
|
126
|
+
eslint: (source, gap) => source.slice(gap.start, gap.end).split(LINE_BREAK).length > 2,
|
|
127
|
+
oxlint: (source, gap) => source.slice(gap.start, gap.end).split("\n").length > 2,
|
|
128
|
+
};
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* Where the gap in front of the statement ends: at its first token, or at the
|
|
132
|
+
* first decorator of a class, which the linters measure the class from —
|
|
133
|
+
* past an `export` in front of it, too.
|
|
134
|
+
*/
|
|
135
|
+
function gapEnd(statement: ts.Statement, sourceFile: ts.SourceFile): number {
|
|
136
|
+
const decorator = ts.isClassDeclaration(statement) ? ts.getDecorators(statement)?.[0] : undefined;
|
|
137
|
+
return (decorator ?? statement).getStart(sourceFile);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/**
|
|
141
|
+
* The statements the newline-after-import rules measure from the statement
|
|
142
|
+
* before them: the ones after an import that are none (see isImport), and,
|
|
143
|
+
* where `requires` asks, the ones after a statement holding a require that
|
|
144
|
+
* hold none (see holdsRequire).
|
|
145
|
+
*/
|
|
146
|
+
function statementsAfterImports(statements: readonly ts.Statement[], requires: boolean): ts.Statement[] {
|
|
147
|
+
const holding = statements.map((statement) => requires && holdsRequire(statement));
|
|
148
|
+
return statements.filter(
|
|
149
|
+
(statement, index) =>
|
|
150
|
+
index > 0 &&
|
|
151
|
+
((isImport(statements[index - 1] as ts.Statement) && !isImport(statement)) ||
|
|
152
|
+
(holding[index - 1] === true && !holding[index])),
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/** Whether the linters read the statement as an import: an import declaration, or an `import x = …` not exported. */
|
|
157
|
+
function isImport(statement: ts.Statement): boolean {
|
|
158
|
+
return (
|
|
159
|
+
ts.isImportDeclaration(statement) ||
|
|
160
|
+
(ts.isImportEqualsDeclaration(statement) &&
|
|
161
|
+
statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) !== true)
|
|
162
|
+
);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/**
|
|
166
|
+
* Whether the statement holds a call eslint-plugin-import reads as a require
|
|
167
|
+
* (see isRequireCall) outside the nodes it looks for none in: functions with
|
|
168
|
+
* a body, blocks, object literals and decorators, which it counts as levels.
|
|
169
|
+
* A class static block is no block to it, a method's computed name lies
|
|
170
|
+
* outside its function, an object literal that an assignment destructures
|
|
171
|
+
* into is a pattern, no object (see isAssignmentTarget), and overloads and
|
|
172
|
+
* the other function-likes without a body are no functions, so the defaults
|
|
173
|
+
* of their parameters count, though tsc rejects them. oxlint stops at the
|
|
174
|
+
* same nodes among a call's ancestors and at functions without a body, and
|
|
175
|
+
* takes only the global `require`, called without parentheses around it or
|
|
176
|
+
* its string; the requires it leaves out are read for it all the same, as
|
|
177
|
+
* eslint-plugin-import reads the gaps after them anyway. Walked without
|
|
178
|
+
* recursion, as the deeply nested expressions of generated code need, and
|
|
179
|
+
* over the syntax tree alone, so that removing comments never changes which
|
|
180
|
+
* statements hold one.
|
|
181
|
+
*/
|
|
182
|
+
function holdsRequire(statement: ts.Statement): boolean {
|
|
183
|
+
const pending: ts.Node[] = [statement];
|
|
184
|
+
for (let node = pending.pop(); node !== undefined; node = pending.pop()) {
|
|
185
|
+
if (ts.isCallExpression(node) && isRequireCall(node)) return true;
|
|
186
|
+
if (ts.isFunctionLike(node) && "body" in node && node.body !== undefined) {
|
|
187
|
+
if (node.name !== undefined && ts.isComputedPropertyName(node.name)) pending.push(node.name);
|
|
188
|
+
continue;
|
|
189
|
+
}
|
|
190
|
+
if (
|
|
191
|
+
(ts.isBlock(node) && !ts.isClassStaticBlockDeclaration(node.parent)) ||
|
|
192
|
+
(ts.isObjectLiteralExpression(node) && !isAssignmentTarget(node)) ||
|
|
193
|
+
ts.isDecorator(node)
|
|
194
|
+
) {
|
|
195
|
+
continue;
|
|
196
|
+
}
|
|
197
|
+
// forEachChild stops at a callback that returns a value, so this one returns none.
|
|
198
|
+
ts.forEachChild(node, (child) => {
|
|
199
|
+
pending.push(child);
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
return false;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
/**
|
|
206
|
+
* Whether the object literal is what an assignment destructures into — the
|
|
207
|
+
* left of an `=`, the target of a `for … of` or `for … in`, or an element, a
|
|
208
|
+
* rest or a property's value in one — which ESTree reads as a pattern.
|
|
209
|
+
*/
|
|
210
|
+
function isAssignmentTarget(literal: ts.ObjectLiteralExpression): boolean {
|
|
211
|
+
let node: ts.Node = literal;
|
|
212
|
+
for (;;) {
|
|
213
|
+
const parent = node.parent;
|
|
214
|
+
if (ts.isBinaryExpression(parent)) {
|
|
215
|
+
return parent.operatorToken.kind === ts.SyntaxKind.EqualsToken && parent.left === node;
|
|
216
|
+
}
|
|
217
|
+
if (ts.isForOfStatement(parent) || ts.isForInStatement(parent)) return parent.initializer === node;
|
|
218
|
+
if (ts.isArrayLiteralExpression(parent) || ts.isSpreadElement(parent)) {
|
|
219
|
+
node = parent;
|
|
220
|
+
} else if (ts.isPropertyAssignment(parent) && parent.initializer === node) {
|
|
221
|
+
node = parent.parent;
|
|
222
|
+
} else {
|
|
223
|
+
return false;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
/**
|
|
229
|
+
* Whether the call is a require to eslint-plugin-import: `require` with a
|
|
230
|
+
* single string literal, the parentheses around either part aside, as
|
|
231
|
+
* ESLint's parsers drop them.
|
|
232
|
+
*/
|
|
233
|
+
function isRequireCall(call: ts.CallExpression): boolean {
|
|
234
|
+
const callee = unparenthesized(call.expression);
|
|
235
|
+
const [argument] = call.arguments;
|
|
236
|
+
return (
|
|
237
|
+
ts.isIdentifier(callee) &&
|
|
238
|
+
callee.text === "require" &&
|
|
239
|
+
call.arguments.length === 1 &&
|
|
240
|
+
ts.isStringLiteral(unparenthesized(argument as ts.Expression))
|
|
241
|
+
);
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
function unparenthesized(expression: ts.Expression): ts.Expression {
|
|
245
|
+
let inner = expression;
|
|
246
|
+
while (ts.isParenthesizedExpression(inner)) inner = inner.expression;
|
|
247
|
+
return inner;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
/**
|
|
251
|
+
* The statements of every module and namespace body in the file (`declare
|
|
252
|
+
* module "m" { … }`, `declare global { … }`, `namespace N { … }`, the ones
|
|
253
|
+
* nested in them included), whose imports eslint-plugin-import reads too:
|
|
254
|
+
* an `import x = N.y` is at home in a namespace.
|
|
255
|
+
*/
|
|
256
|
+
function moduleBodies(statements: readonly ts.Statement[]): Array<readonly ts.Statement[]> {
|
|
257
|
+
const bodies: Array<readonly ts.Statement[]> = [];
|
|
258
|
+
const pending: Array<readonly ts.Statement[]> = [statements];
|
|
259
|
+
for (let list = pending.pop(); list !== undefined; list = pending.pop()) {
|
|
260
|
+
for (const statement of list) {
|
|
261
|
+
if (!ts.isModuleDeclaration(statement)) continue;
|
|
262
|
+
// `namespace A.B { … }` nests the declaration of B in A's.
|
|
263
|
+
let body = statement.body;
|
|
264
|
+
while (body !== undefined && ts.isModuleDeclaration(body)) body = body.body;
|
|
265
|
+
if (body === undefined) continue;
|
|
266
|
+
const inner = (body as ts.ModuleBlock).statements;
|
|
267
|
+
bodies.push(inner);
|
|
268
|
+
pending.push(inner);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return bodies;
|
|
272
|
+
}
|
|
273
|
+
|
|
80
274
|
/** The statements past the first of each run of adjacent ones that `kindOf` puts in one kind. */
|
|
81
275
|
function adjacentOfOneKind(
|
|
82
276
|
statements: readonly ts.Statement[],
|
package/src/remove.ts
CHANGED
|
@@ -80,7 +80,10 @@ export interface RemoveResult {
|
|
|
80
80
|
* lines already against that edge stay.
|
|
81
81
|
* - Imports and exports stay in the groups TypeScript's organizeImports and
|
|
82
82
|
* dprint sort apart: where deleting the comments between two groups would
|
|
83
|
-
* leave no empty line between them, an empty line takes their place.
|
|
83
|
+
* leave no empty line between them, an empty line takes their place. So it
|
|
84
|
+
* does where deleting the comments after an import or a require would
|
|
85
|
+
* bring the code after it up to the line below, keeping the empty line the
|
|
86
|
+
* newline-after-import rules of eslint-plugin-import and oxlint want.
|
|
84
87
|
* - A leading byte-order mark is preserved. Reported positions index into the
|
|
85
88
|
* `source` string exactly as `scanComments(source)` reports them (a BOM
|
|
86
89
|
* counts as its first character).
|
|
@@ -122,7 +125,8 @@ export function removeComments(source: string, options: RemoveOptions = {}): Rem
|
|
|
122
125
|
// without the collapse before any removal is given up.
|
|
123
126
|
let tidyBlankLines = true;
|
|
124
127
|
// The removals that leave an empty line in their place, holding two groups
|
|
125
|
-
// of imports or exports apart
|
|
128
|
+
// of imports or exports apart, or the code after the imports two lines
|
|
129
|
+
// below them (see gapHolders).
|
|
126
130
|
const holders = new Set<Comment>();
|
|
127
131
|
|
|
128
132
|
for (;;) {
|
|
@@ -144,8 +148,9 @@ export function removeComments(source: string, options: RemoveOptions = {}): Rem
|
|
|
144
148
|
if (search.adjust(changedSegments(analysis.jsx.segments, output.jsx.segments))) continue;
|
|
145
149
|
|
|
146
150
|
// Where the output joins two groups of imports or exports that a sorter
|
|
147
|
-
// sorts apart,
|
|
148
|
-
// and the attempt
|
|
151
|
+
// sorts apart, or loses the empty line a linter finds after the imports,
|
|
152
|
+
// a removal in the gap leaves an empty line in its place, and the attempt
|
|
153
|
+
// is repeated.
|
|
149
154
|
const holding = gapHolders(source, analysis.importGroups, output.importGroups, removed, holders);
|
|
150
155
|
if (holding.length > 0) {
|
|
151
156
|
for (const holder of holding) holders.add(holder);
|
|
@@ -255,14 +260,16 @@ function closestRemovalBefore(removals: readonly Comment[], comment: Comment): C
|
|
|
255
260
|
/**
|
|
256
261
|
* The removals that are to leave an empty line in their place (see
|
|
257
262
|
* Edit.blankLine), so that the output starts every group of imports and
|
|
258
|
-
* exports the source starts
|
|
259
|
-
*
|
|
260
|
-
*
|
|
261
|
-
*
|
|
262
|
-
*
|
|
263
|
-
*
|
|
264
|
-
*
|
|
265
|
-
*
|
|
263
|
+
* exports the source starts, and keeps every empty line the linters find
|
|
264
|
+
* after its imports. The gaps belong to the same statements in both texts,
|
|
265
|
+
* since removing comments leaves the statements as they are. Where the
|
|
266
|
+
* output joins two groups at a gap, or a linter no longer finds its empty
|
|
267
|
+
* line there, the deleted comments took the gap's line breaks along, and the
|
|
268
|
+
* last of them that held any — one spanning lines, or one on a line below
|
|
269
|
+
* the token the gap follows — leaves an empty line, which starts a group for
|
|
270
|
+
* both sorters and is the empty line both linters want. A group the output
|
|
271
|
+
* starts where the source starts none can stand, for both parts of a sorted
|
|
272
|
+
* group are sorted, and so can an empty line only the output has.
|
|
266
273
|
*/
|
|
267
274
|
function gapHolders(
|
|
268
275
|
source: string,
|
|
@@ -274,10 +281,13 @@ function gapHolders(
|
|
|
274
281
|
if (before.length !== after.length) throw unexpectedResult();
|
|
275
282
|
const found: Comment[] = [];
|
|
276
283
|
for (const [index, gap] of before.entries()) {
|
|
277
|
-
const splits =
|
|
278
|
-
|
|
284
|
+
const { splits, spaced } = after[index] as ImportGroupGap;
|
|
285
|
+
const intact =
|
|
286
|
+
gap.splits.every((sorter) => splits.includes(sorter)) && gap.spaced.every((linter) => spaced.includes(linter));
|
|
287
|
+
if (intact) continue;
|
|
279
288
|
const inGap = removals.filter((comment) => comment.start >= gap.start && comment.end <= gap.end);
|
|
280
|
-
// An empty line in the gap already starts a group for both sorters
|
|
289
|
+
// An empty line in the gap already starts a group for both sorters and
|
|
290
|
+
// is the empty line both linters want.
|
|
281
291
|
if (inGap.some((comment) => holders.has(comment))) throw unexpectedResult();
|
|
282
292
|
const holder = inGap.findLast(
|
|
283
293
|
(comment) => comment.endLine > comment.line || LINE_TERMINATOR.test(source.slice(gap.start, comment.start)),
|
|
@@ -405,8 +415,8 @@ function skippableRanges(
|
|
|
405
415
|
|
|
406
416
|
/**
|
|
407
417
|
* The edits that remove the comments: one per comment, or one per container
|
|
408
|
-
* going with its braces. A holder of a gap
|
|
409
|
-
* empty line in its place.
|
|
418
|
+
* going with its braces. A holder of a gap around the imports (see
|
|
419
|
+
* gapHolders) leaves an empty line in its place.
|
|
410
420
|
*/
|
|
411
421
|
function removalEdits(
|
|
412
422
|
removed: readonly Comment[],
|
package/src/scanner.ts
CHANGED
|
@@ -20,7 +20,11 @@ export interface SourceAnalysis {
|
|
|
20
20
|
jsx: JsxLayout;
|
|
21
21
|
/** What stands in front of each comment carrying an ast-grep suppression (see precedingNode). */
|
|
22
22
|
preceding: ReadonlyMap<Comment, PrecedingNode>;
|
|
23
|
-
/**
|
|
23
|
+
/**
|
|
24
|
+
* The gaps in front of the import and export declarations the import
|
|
25
|
+
* sorters group, and in front of the statements after the imports, where
|
|
26
|
+
* the linters want an empty line (see importGroupGaps).
|
|
27
|
+
*/
|
|
24
28
|
importGroups: ImportGroupGap[];
|
|
25
29
|
}
|
|
26
30
|
|