@kongyo2/ts-comment-scanner 1.19.0 → 1.21.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/args.d.ts.map +1 -1
- package/dist/args.js +23 -19
- package/dist/args.js.map +1 -1
- package/dist/astgrep.d.ts +1 -1
- package/dist/astgrep.d.ts.map +1 -1
- package/dist/astgrep.js +3 -8
- package/dist/astgrep.js.map +1 -1
- package/dist/directives.d.ts +8 -0
- package/dist/directives.d.ts.map +1 -1
- package/dist/directives.js +27 -20
- package/dist/directives.js.map +1 -1
- package/dist/files.d.ts +2 -3
- package/dist/files.d.ts.map +1 -1
- package/dist/files.js +45 -60
- package/dist/files.js.map +1 -1
- package/dist/imports.d.ts +34 -10
- package/dist/imports.d.ts.map +1 -1
- package/dist/imports.js +202 -28
- package/dist/imports.js.map +1 -1
- package/dist/jsx.d.ts.map +1 -1
- package/dist/jsx.js +5 -6
- package/dist/jsx.js.map +1 -1
- package/dist/lines.d.ts +13 -5
- package/dist/lines.d.ts.map +1 -1
- package/dist/lines.js +20 -16
- package/dist/lines.js.map +1 -1
- package/dist/ranges.d.ts +8 -0
- package/dist/ranges.d.ts.map +1 -1
- package/dist/ranges.js +12 -0
- package/dist/ranges.js.map +1 -1
- package/dist/remove.d.ts +10 -7
- package/dist/remove.d.ts.map +1 -1
- package/dist/remove.js +254 -219
- package/dist/remove.js.map +1 -1
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +11 -19
- package/dist/run.js.map +1 -1
- package/dist/scanner.d.ts +10 -1
- package/dist/scanner.d.ts.map +1 -1
- package/dist/scanner.js +15 -26
- package/dist/scanner.js.map +1 -1
- package/dist/splice.d.ts +6 -0
- package/dist/splice.d.ts.map +1 -1
- package/dist/splice.js +22 -5
- package/dist/splice.js.map +1 -1
- package/package.json +1 -1
- package/src/args.ts +21 -21
- package/src/astgrep.ts +4 -8
- package/src/directives.ts +24 -17
- package/src/files.ts +43 -59
- package/src/imports.ts +229 -28
- package/src/jsx.ts +5 -6
- package/src/lines.ts +23 -14
- package/src/ranges.ts +17 -0
- package/src/remove.ts +287 -235
- package/src/run.ts +11 -24
- package/src/scanner.ts +25 -28
- package/src/splice.ts +29 -6
package/dist/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"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"}
|
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,EAAgC,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvE,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 {
|
|
2
|
+
import { LINE_BREAK } from "./lines.js";
|
|
3
|
+
import { byStart, 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,215 @@ 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");
|
|
45
55
|
}
|
|
46
|
-
for (const declaration of adjacentOfOneKind(sourceFile.statements, dprintKind))
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
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");
|
|
62
|
+
}
|
|
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
|
+
.map((statement) => {
|
|
69
|
+
const gap = { start: statement.pos, end: gapEnd(statement, sourceFile) };
|
|
70
|
+
const splits = [...(sorters.get(statement) ?? [])].filter((sorter) => STARTS_GROUP[sorter](source, gap, comments));
|
|
71
|
+
const spaced = [...(linters.get(statement) ?? [])].filter((linter) => FINDS_EMPTY_LINE[linter](source, gap));
|
|
72
|
+
return { ...gap, splits, spaced };
|
|
73
|
+
})
|
|
74
|
+
.sort(byStart);
|
|
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);
|
|
55
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
|
-
dprint: (
|
|
85
|
+
dprint: holdsTwoBreaks("\n"),
|
|
86
|
+
};
|
|
87
|
+
// Whether the linter finds its empty line in the gap.
|
|
88
|
+
const FINDS_EMPTY_LINE = {
|
|
89
|
+
eslint: holdsTwoBreaks(LINE_BREAK),
|
|
90
|
+
oxlint: holdsTwoBreaks("\n"),
|
|
60
91
|
};
|
|
92
|
+
/**
|
|
93
|
+
* Whether a gap holds two line breaks or more, those inside comments
|
|
94
|
+
* included, to a tool that counts what `lineBreak` matches as one.
|
|
95
|
+
*/
|
|
96
|
+
function holdsTwoBreaks(lineBreak) {
|
|
97
|
+
return (source, gap) => source.slice(gap.start, gap.end).split(lineBreak).length > 2;
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Where the gap in front of the statement ends: at its first token, or at the
|
|
101
|
+
* first decorator of a class, which the linters measure the class from —
|
|
102
|
+
* past an `export` in front of it, too.
|
|
103
|
+
*/
|
|
104
|
+
function gapEnd(statement, sourceFile) {
|
|
105
|
+
const decorator = ts.isClassDeclaration(statement) ? ts.getDecorators(statement)?.[0] : undefined;
|
|
106
|
+
return (decorator ?? statement).getStart(sourceFile);
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* The statements the newline-after-import rules measure from the statement
|
|
110
|
+
* before them: the ones after an import that are none (see isImport), and,
|
|
111
|
+
* where `requires` asks, the ones after a statement holding a require that
|
|
112
|
+
* hold none (see holdsRequire).
|
|
113
|
+
*/
|
|
114
|
+
function statementsAfterImports(statements, requires) {
|
|
115
|
+
const holding = statements.map((statement) => requires && holdsRequire(statement));
|
|
116
|
+
return statements.filter((statement, index) => index > 0 &&
|
|
117
|
+
((isImport(statements[index - 1]) && !isImport(statement)) ||
|
|
118
|
+
(holding[index - 1] === true && !holding[index])));
|
|
119
|
+
}
|
|
120
|
+
/** Whether the linters read the statement as an import: an import declaration, or an `import x = …` not exported. */
|
|
121
|
+
function isImport(statement) {
|
|
122
|
+
return (ts.isImportDeclaration(statement) ||
|
|
123
|
+
(ts.isImportEqualsDeclaration(statement) &&
|
|
124
|
+
statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) !== true));
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Whether the statement holds a call eslint-plugin-import reads as a require
|
|
128
|
+
* (see isRequireCall) outside the nodes it looks for none in: functions with
|
|
129
|
+
* a body, blocks, object literals and decorators, which it counts as levels.
|
|
130
|
+
* A class static block is no block to it, a method's computed name lies
|
|
131
|
+
* outside its function, an object literal that an assignment destructures
|
|
132
|
+
* into is a pattern, no object (see isAssignmentTarget), and overloads and
|
|
133
|
+
* the other function-likes without a body are no functions, so the defaults
|
|
134
|
+
* of their parameters count, though tsc rejects them. oxlint stops at the
|
|
135
|
+
* same nodes among a call's ancestors and at functions without a body, and
|
|
136
|
+
* takes only the global `require`, called without parentheses around it or
|
|
137
|
+
* its string; the requires it leaves out are read for it all the same, as
|
|
138
|
+
* eslint-plugin-import reads the gaps after them anyway. Walked without
|
|
139
|
+
* recursion, as the deeply nested expressions of generated code need, and
|
|
140
|
+
* over the syntax tree alone, so that removing comments never changes which
|
|
141
|
+
* statements hold one.
|
|
142
|
+
*/
|
|
143
|
+
function holdsRequire(statement) {
|
|
144
|
+
const pending = [statement];
|
|
145
|
+
for (let node = pending.pop(); node !== undefined; node = pending.pop()) {
|
|
146
|
+
if (ts.isCallExpression(node) && isRequireCall(node))
|
|
147
|
+
return true;
|
|
148
|
+
if (ts.isFunctionLike(node) && "body" in node && node.body !== undefined) {
|
|
149
|
+
if (node.name !== undefined && ts.isComputedPropertyName(node.name))
|
|
150
|
+
pending.push(node.name);
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
if ((ts.isBlock(node) && !ts.isClassStaticBlockDeclaration(node.parent)) ||
|
|
154
|
+
(ts.isObjectLiteralExpression(node) && !isAssignmentTarget(node)) ||
|
|
155
|
+
ts.isDecorator(node)) {
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
// forEachChild stops at a callback that returns a value, so this one returns none.
|
|
159
|
+
ts.forEachChild(node, (child) => {
|
|
160
|
+
pending.push(child);
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
return false;
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* Whether the object literal is what an assignment destructures into — the
|
|
167
|
+
* left of an `=`, the target of a `for … of` or `for … in`, or an element, a
|
|
168
|
+
* rest or a property's value in one — which ESTree reads as a pattern.
|
|
169
|
+
*/
|
|
170
|
+
function isAssignmentTarget(literal) {
|
|
171
|
+
let node = literal;
|
|
172
|
+
for (;;) {
|
|
173
|
+
const parent = node.parent;
|
|
174
|
+
if (ts.isBinaryExpression(parent)) {
|
|
175
|
+
return parent.operatorToken.kind === ts.SyntaxKind.EqualsToken && parent.left === node;
|
|
176
|
+
}
|
|
177
|
+
if (ts.isForOfStatement(parent) || ts.isForInStatement(parent))
|
|
178
|
+
return parent.initializer === node;
|
|
179
|
+
if (ts.isArrayLiteralExpression(parent) || ts.isSpreadElement(parent)) {
|
|
180
|
+
node = parent;
|
|
181
|
+
}
|
|
182
|
+
else if (ts.isPropertyAssignment(parent) && parent.initializer === node) {
|
|
183
|
+
node = parent.parent;
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
return false;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
/**
|
|
191
|
+
* Whether the call is a require to eslint-plugin-import: `require` with a
|
|
192
|
+
* single string literal, the parentheses around either part aside, as
|
|
193
|
+
* ESLint's parsers drop them.
|
|
194
|
+
*/
|
|
195
|
+
function isRequireCall(call) {
|
|
196
|
+
const callee = unparenthesized(call.expression);
|
|
197
|
+
const [argument] = call.arguments;
|
|
198
|
+
return (ts.isIdentifier(callee) &&
|
|
199
|
+
callee.text === "require" &&
|
|
200
|
+
call.arguments.length === 1 &&
|
|
201
|
+
ts.isStringLiteral(unparenthesized(argument)));
|
|
202
|
+
}
|
|
203
|
+
function unparenthesized(expression) {
|
|
204
|
+
let inner = expression;
|
|
205
|
+
while (ts.isParenthesizedExpression(inner))
|
|
206
|
+
inner = inner.expression;
|
|
207
|
+
return inner;
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* The statements of every module and namespace body in the file (`declare
|
|
211
|
+
* module "m" { … }`, `declare global { … }`, `namespace N { … }`, the ones
|
|
212
|
+
* nested in them included), whose imports eslint-plugin-import reads too:
|
|
213
|
+
* an `import x = N.y` is at home in a namespace.
|
|
214
|
+
*/
|
|
215
|
+
function moduleBodies(statements) {
|
|
216
|
+
const bodies = [];
|
|
217
|
+
const pending = [statements];
|
|
218
|
+
for (let list = pending.pop(); list !== undefined; list = pending.pop()) {
|
|
219
|
+
for (const statement of list) {
|
|
220
|
+
if (!ts.isModuleDeclaration(statement))
|
|
221
|
+
continue;
|
|
222
|
+
// `namespace A.B { … }` nests the declaration of B in A's.
|
|
223
|
+
let body = statement.body;
|
|
224
|
+
while (body !== undefined && ts.isModuleDeclaration(body))
|
|
225
|
+
body = body.body;
|
|
226
|
+
if (body === undefined)
|
|
227
|
+
continue;
|
|
228
|
+
const inner = body.statements;
|
|
229
|
+
bodies.push(inner);
|
|
230
|
+
pending.push(inner);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
return bodies;
|
|
234
|
+
}
|
|
61
235
|
/** The statements past the first of each run of adjacent ones that `kindOf` puts in one kind. */
|
|
62
236
|
function adjacentOfOneKind(statements, kindOf) {
|
|
63
237
|
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/jsx.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../src/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,
|
|
1
|
+
{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../src/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAyB,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;;;;;;;GAWG;AAEH,mGAAmG;AACnG,MAAM,WAAW,YAAa,SAAQ,KAAK;IACzC,8FAA8F;IAC9F,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,IAAI,EAAE,YAAY,GAAG,SAAS,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,qEAAqE;IACrE,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,2DAA2D;IAC3D,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,sDAAsD;IACtD,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACvC;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EACpD,QAAQ,EAAE,SAAS,KAAK,EAAE,GACzB,SAAS,CA4CX"}
|
package/dist/jsx.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { LINE_TERMINATOR, isBlank } from "./lines.js";
|
|
3
|
-
import {
|
|
3
|
+
import { byStart, rangesWithin } from "./ranges.js";
|
|
4
4
|
/**
|
|
5
5
|
* Lays out the children of the given JSX elements and fragments. `comments`
|
|
6
6
|
* are the source's comments, sorted, so containers holding nothing but
|
|
@@ -47,7 +47,7 @@ export function jsxLayout(source, sourceFile, parents, comments) {
|
|
|
47
47
|
}
|
|
48
48
|
segments.push(renderParts(parts));
|
|
49
49
|
}
|
|
50
|
-
containers.sort(
|
|
50
|
+
containers.sort(byStart);
|
|
51
51
|
return { segments, containers, openingTagEnds, closingTagStarts };
|
|
52
52
|
}
|
|
53
53
|
const BOUNDARY = Symbol("boundary");
|
|
@@ -82,16 +82,15 @@ function commentOnlyContainer(source, sourceFile, child, comments) {
|
|
|
82
82
|
// merge-conflict marker, which is no comment.
|
|
83
83
|
const start = child.getStart(sourceFile);
|
|
84
84
|
const end = child.end;
|
|
85
|
+
const inside = rangesWithin(comments, { start, end });
|
|
85
86
|
let cursor = start + 1;
|
|
86
87
|
let uncommented = "";
|
|
87
|
-
|
|
88
|
-
for (let comment = comments[index]; comment !== undefined && comment.end < end; comment = comments[index]) {
|
|
88
|
+
for (const comment of inside) {
|
|
89
89
|
uncommented += source.slice(cursor, comment.start);
|
|
90
90
|
cursor = comment.end;
|
|
91
|
-
index += 1;
|
|
92
91
|
}
|
|
93
92
|
uncommented += source.slice(cursor, end - 1);
|
|
94
|
-
return
|
|
93
|
+
return inside.length > 0 && isBlank(uncommented)
|
|
95
94
|
? { start, end, segment: -1, suspect: false, next: undefined }
|
|
96
95
|
: undefined;
|
|
97
96
|
}
|
package/dist/jsx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../src/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../src/jsx.ts"],"names":[],"mappings":"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"}
|
package/dist/lines.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Line handling shared by the scanner's consumers.
|
|
3
|
-
* lines the way the TypeScript scanner does:
|
|
4
|
-
* end a line, and CRLF is a single break.
|
|
2
|
+
* Line handling shared by the scanner's consumers. Unless given another line
|
|
3
|
+
* break, everything here counts lines the way the TypeScript scanner does:
|
|
4
|
+
* LF, CR, U+2028 and U+2029 each end a line, and CRLF is a single break.
|
|
5
5
|
*/
|
|
6
6
|
/** Matches one ECMAScript line terminator character. */
|
|
7
7
|
export declare const LINE_TERMINATOR: RegExp;
|
|
@@ -9,10 +9,18 @@ export declare const LINE_TERMINATOR: RegExp;
|
|
|
9
9
|
export declare const LINE_BREAK: RegExp;
|
|
10
10
|
/** True when the text holds nothing but whitespace (a byte-order mark included). */
|
|
11
11
|
export declare function isBlank(text: string): boolean;
|
|
12
|
+
/** True for a space or a tab, the blanks that hold the tokens on a line apart. */
|
|
13
|
+
export declare function isHorizontalSpace(char: string | undefined): boolean;
|
|
12
14
|
/** Splits on every line break, so exotic terminators never leak into single-line output. */
|
|
13
15
|
export declare function splitLines(text: string): string[];
|
|
14
16
|
/** The literal last line of the text, exactly as tsc slices a block comment's closing line. */
|
|
15
17
|
export declare function lastLine(text: string): string;
|
|
16
|
-
/**
|
|
17
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Start offset of every line, numbered the way the scanner numbers them
|
|
20
|
+
* (line 1 starts at index 0) — or, given another `lineBreak`, the way that
|
|
21
|
+
* pattern breaks lines.
|
|
22
|
+
*/
|
|
23
|
+
export declare function lineStartOffsets(source: string, lineBreak?: RegExp): number[];
|
|
24
|
+
/** Index of the line holding the offset, given every line's start offset (see lineStartOffsets). */
|
|
25
|
+
export declare function lineIndexAt(lineStarts: readonly number[], offset: number): number;
|
|
18
26
|
//# sourceMappingURL=lines.d.ts.map
|
package/dist/lines.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lines.d.ts","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,wDAAwD;AACxD,eAAO,MAAM,eAAe,QAAuB,CAAC;AAEpD,0EAA0E;AAC1E,eAAO,MAAM,UAAU,QAA4B,CAAC;AAEpD,oFAAoF;AACpF,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7C;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEnE;AAED,4FAA4F;AAC5F,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAEjD;AAED,+FAA+F;AAC/F,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAmB,GAAG,MAAM,EAAE,CAMzF;AAED,oGAAoG;AACpG,wBAAgB,WAAW,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjF"}
|
package/dist/lines.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { firstIndexAtOrAfter } from "./ranges.js";
|
|
1
2
|
/**
|
|
2
|
-
* Line handling shared by the scanner's consumers.
|
|
3
|
-
* lines the way the TypeScript scanner does:
|
|
4
|
-
* end a line, and CRLF is a single break.
|
|
3
|
+
* Line handling shared by the scanner's consumers. Unless given another line
|
|
4
|
+
* break, everything here counts lines the way the TypeScript scanner does:
|
|
5
|
+
* LF, CR, U+2028 and U+2029 each end a line, and CRLF is a single break.
|
|
5
6
|
*/
|
|
6
7
|
/** Matches one ECMAScript line terminator character. */
|
|
7
8
|
export const LINE_TERMINATOR = /[\n\r\u2028\u2029]/;
|
|
@@ -11,6 +12,10 @@ export const LINE_BREAK = /\r\n|[\n\r\u2028\u2029]/;
|
|
|
11
12
|
export function isBlank(text) {
|
|
12
13
|
return /^\s*$/.test(text);
|
|
13
14
|
}
|
|
15
|
+
/** True for a space or a tab, the blanks that hold the tokens on a line apart. */
|
|
16
|
+
export function isHorizontalSpace(char) {
|
|
17
|
+
return char === " " || char === "\t";
|
|
18
|
+
}
|
|
14
19
|
/** Splits on every line break, so exotic terminators never leak into single-line output. */
|
|
15
20
|
export function splitLines(text) {
|
|
16
21
|
return text.split(LINE_BREAK);
|
|
@@ -20,21 +25,20 @@ export function lastLine(text) {
|
|
|
20
25
|
const lines = splitLines(text);
|
|
21
26
|
return lines[lines.length - 1];
|
|
22
27
|
}
|
|
23
|
-
/**
|
|
24
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Start offset of every line, numbered the way the scanner numbers them
|
|
30
|
+
* (line 1 starts at index 0) — or, given another `lineBreak`, the way that
|
|
31
|
+
* pattern breaks lines.
|
|
32
|
+
*/
|
|
33
|
+
export function lineStartOffsets(source, lineBreak = LINE_BREAK) {
|
|
25
34
|
const starts = [0];
|
|
26
|
-
for (
|
|
27
|
-
|
|
28
|
-
if (char === "\r") {
|
|
29
|
-
// A CRLF pair is one break: skip the LF so it does not open a second line.
|
|
30
|
-
if (source[index + 1] === "\n")
|
|
31
|
-
index += 1;
|
|
32
|
-
starts.push(index + 1);
|
|
33
|
-
}
|
|
34
|
-
else if (char === "\n" || char === "\u2028" || char === "\u2029") {
|
|
35
|
-
starts.push(index + 1);
|
|
36
|
-
}
|
|
35
|
+
for (const match of source.matchAll(new RegExp(lineBreak, "g"))) {
|
|
36
|
+
starts.push(match.index + match[0].length);
|
|
37
37
|
}
|
|
38
38
|
return starts;
|
|
39
39
|
}
|
|
40
|
+
/** Index of the line holding the offset, given every line's start offset (see lineStartOffsets). */
|
|
41
|
+
export function lineIndexAt(lineStarts, offset) {
|
|
42
|
+
return firstIndexAtOrAfter(lineStarts, offset + 1, (start) => start) - 1;
|
|
43
|
+
}
|
|
40
44
|
//# sourceMappingURL=lines.js.map
|
package/dist/lines.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAEpD,0EAA0E;AAC1E,MAAM,CAAC,MAAM,UAAU,GAAG,yBAAyB,CAAC;AAEpD,oFAAoF;AACpF,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;AAC3C,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../src/lines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;;;GAIG;AAEH,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAEpD,0EAA0E;AAC1E,MAAM,CAAC,MAAM,UAAU,GAAG,yBAAyB,CAAC;AAEpD,oFAAoF;AACpF,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC;AACvC,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,YAAoB,UAAU;IAC7E,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,WAAW,CAAC,UAA6B,EAAE,MAAc;IACvE,OAAO,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC3E,CAAC"}
|