@kongyo2/ts-comment-scanner 1.15.0 → 1.18.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.
@@ -1 +1 @@
1
- {"version":3,"file":"directives.d.ts","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAyqB9C;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,2FAA2F;IAC3F,YAAY,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAsHD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS,CAkCnH;AAgED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAanH;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKpD"}
1
+ {"version":3,"file":"directives.d.ts","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA2rB9C;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,2FAA2F;IAC3F,YAAY,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAsHD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS,CAkCnH;AAgED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAanH;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKpD"}
@@ -357,14 +357,31 @@ const RULES = [
357
357
  },
358
358
  // Bundlers. webpack's gate regex requires the colon to follow the key
359
359
  // immediately and evaluates the body as an object literal, which JSDoc
360
- // stars break. Turbopack reads the whole trimmed comment as one `key:
361
- // value` pair instead — blanks before the colon allowed — and honours
362
- // webpackIgnore and webpackExports as well as its own keys.
360
+ // stars break. Turbopack reads the whole comment as one `key: value` pair
361
+ // instead, split at its first colon and trimmed of Rust's whitespace,
362
+ // which takes in U+0085 — so blanks and line breaks may stand before the
363
+ // colon — and honours webpackIgnore and webpackExports as well as its own
364
+ // keys.
363
365
  { pattern: /^webpack[A-Z][A-Za-z]+:/, name: "webpack-magic-comment", keepStars: true },
364
366
  {
365
- pattern: /^(?:turbopack[A-Z][A-Za-z]+|webpack(?:Ignore|Exports))\s*:/,
367
+ pattern: /^[\s\u0085]*(?:turbopack[A-Z][A-Za-z]+|webpack(?:Ignore|Exports))[\s\u0085]*:/,
368
+ value: true,
366
369
  name: "turbopack-magic-comment",
367
- keepStars: true,
370
+ },
371
+ // Rspack reads block comments only, and has found the keys three ways. 1.x
372
+ // pulls `webpack<Name>: value` pairs out of the text wherever they stand —
373
+ // glued to other words, behind prose or JSDoc stars — with any whitespace
374
+ // before the colon, U+0085 included. 2.0 parses the whole comment as an
375
+ // object literal, so a key may be quoted. Since 2.1 the `rspack` prefix
376
+ // works too (`rspackChunkName`, `rspackIgnore`), and the text is parsed
377
+ // from the first key, quoted or not, that no word character (Rust's
378
+ // Unicode `\w`) precedes. The value is not checked: Rspack 2 leaves a
379
+ // `new URL()` alone when its ignore key holds anything but a boolean.
380
+ {
381
+ pattern: /webpack[A-Z][A-Za-z]+[\s\u0085]*:|(?<![\p{Alphabetic}\p{M}\p{Nd}\p{Pc}\p{Join_Control}])(?:rspack[A-Z][A-Za-z]+|(["'])(?:webpack|rspack)[A-Z][A-Za-z]+\1)[\s\u0085]*:/u,
382
+ rawText: true,
383
+ blockOnly: true,
384
+ name: "rspack-magic-comment",
368
385
  },
369
386
  // Vite tests the source of an `import()` call (or of a `new URL()` or
370
387
  // worker argument) against /\/\*\s*@vite-ignore\s*\*\// (hasViteIgnoreRE
@@ -1 +1 @@
1
- {"version":3,"file":"directives.js","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"directives.js","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,55 @@
1
+ import ts from "typescript";
2
+ import { type Range } from "./ranges.js";
3
+ type ImportSorter = "typescript" | "dprint" | "biome";
4
+ /**
5
+ * The gap in front of an import or export declaration that an import sorter
6
+ * reads to tell whether the declaration starts a new group, which it sorts
7
+ * and merges apart from the group before it: the declaration's leading
8
+ * trivia, from the end of the token before it to its first token.
9
+ */
10
+ export interface ImportGroupGap extends Range {
11
+ /** The sorters that start a new group at the declaration after the gap. */
12
+ splits: ImportSorter[];
13
+ }
14
+ /**
15
+ * The gaps the import sorters read, in document order — one for every
16
+ * declaration past the first of a run a sorter sorts, so that the same
17
+ * declarations have gaps however the comments around them change:
18
+ *
19
+ * - TypeScript's organizeImports (`groupByNewlineContiguous` in tsc 6 and in
20
+ * tsc 7's port; tsserver and VS Code, prettier-plugin-organize-imports)
21
+ * sorts the import declarations of the file, and those of each ambient
22
+ * module, across whatever stands between them, and the file's export
23
+ * declarations in the runs of exportRuns. A declaration starts a group
24
+ * when its leading trivia holds two line breaks outside comments: `\n`,
25
+ * `\r` or `\r\n`, its scanner's NewLineTrivia — U+2028 and U+2029 are
26
+ * skipped as whitespace.
27
+ * - dprint's TypeScript plugin (`module.sortImportDeclarations` and
28
+ * `sortExportDeclarations`, on by default; `get_stmt_groups`) sorts runs of
29
+ * adjacent top-level declarations of one kind, imports with specifiers or
30
+ * `export … from`s, and starts a group where a declaration starts two or
31
+ * more lines below the end of the one before it, counting line feeds alone.
32
+ * A declaration a `dprint-ignore` comment exempts ends dprint's run, and
33
+ * stays in it here, which only reads more gaps. `deno fmt`, which runs the
34
+ * plugin, keeps the order.
35
+ * - Biome's organizeImports (`assist/source/organizeImports`, on by default,
36
+ * and enforced by `biome check` and `biome ci`) sorts chunks of adjacent
37
+ * imports, and of adjacent `export … from`s and local `export { … }`s, in
38
+ * the file and in each ambient module, and starts a new chunk at a
39
+ * declaration whose leading trivia holds a detached comment (see
40
+ * detachedComments); a blank line alone starts none. Bare imports end its
41
+ * chunks unless its `sortBareImports` option sorts them too, and are read
42
+ * here either way.
43
+ */
44
+ export declare function importGroupGaps(source: string, sourceFile: ts.SourceFile, comments: readonly Range[]): ImportGroupGap[];
45
+ /**
46
+ * The comments that Biome's organizeImports reads as detached in front of the
47
+ * declaration after the gap, and that start a new chunk there
48
+ * (`has_detached_leading_comment`): those of the declaration's leading
49
+ * trivia that an empty line comes after, outside comments. The leading trivia
50
+ * starts at the first line break outside comments; the comments in front of
51
+ * it trail the token before the gap.
52
+ */
53
+ export declare function detachedComments<T extends Range>(source: string, gap: Range, comments: readonly T[]): T[];
54
+ export {};
55
+ //# sourceMappingURL=imports.d.ts.map
@@ -0,0 +1 @@
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,GAAG,OAAO,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,cAAe,SAAQ,KAAK;IAC3C,2EAA2E;IAC3E,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,QAAQ,EAAE,SAAS,KAAK,EAAE,GACzB,cAAc,EAAE,CAwBlB;AAyFD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,CAmBzG"}
@@ -0,0 +1,178 @@
1
+ import ts from "typescript";
2
+ import { LINE_TERMINATOR } from "./lines.js";
3
+ import { firstIndexAtOrAfter } from "./ranges.js";
4
+ /**
5
+ * The gaps the import sorters read, in document order — one for every
6
+ * declaration past the first of a run a sorter sorts, so that the same
7
+ * declarations have gaps however the comments around them change:
8
+ *
9
+ * - TypeScript's organizeImports (`groupByNewlineContiguous` in tsc 6 and in
10
+ * tsc 7's port; tsserver and VS Code, prettier-plugin-organize-imports)
11
+ * sorts the import declarations of the file, and those of each ambient
12
+ * module, across whatever stands between them, and the file's export
13
+ * declarations in the runs of exportRuns. A declaration starts a group
14
+ * when its leading trivia holds two line breaks outside comments: `\n`,
15
+ * `\r` or `\r\n`, its scanner's NewLineTrivia — U+2028 and U+2029 are
16
+ * skipped as whitespace.
17
+ * - dprint's TypeScript plugin (`module.sortImportDeclarations` and
18
+ * `sortExportDeclarations`, on by default; `get_stmt_groups`) sorts runs of
19
+ * adjacent top-level declarations of one kind, imports with specifiers or
20
+ * `export … from`s, and starts a group where a declaration starts two or
21
+ * more lines below the end of the one before it, counting line feeds alone.
22
+ * A declaration a `dprint-ignore` comment exempts ends dprint's run, and
23
+ * stays in it here, which only reads more gaps. `deno fmt`, which runs the
24
+ * plugin, keeps the order.
25
+ * - Biome's organizeImports (`assist/source/organizeImports`, on by default,
26
+ * and enforced by `biome check` and `biome ci`) sorts chunks of adjacent
27
+ * imports, and of adjacent `export … from`s and local `export { … }`s, in
28
+ * the file and in each ambient module, and starts a new chunk at a
29
+ * declaration whose leading trivia holds a detached comment (see
30
+ * detachedComments); a blank line alone starts none. Bare imports end its
31
+ * chunks unless its `sortBareImports` option sorts them too, and are read
32
+ * here either way.
33
+ */
34
+ export function importGroupGaps(source, sourceFile, comments) {
35
+ const readers = new Map();
36
+ const read = (declaration, sorter) => {
37
+ const sorters = readers.get(declaration) ?? new Set();
38
+ sorters.add(sorter);
39
+ readers.set(declaration, sorters);
40
+ };
41
+ for (const statements of [sourceFile.statements, ...ambientModuleBodies(sourceFile)]) {
42
+ for (const declaration of statements.filter(ts.isImportDeclaration).slice(1))
43
+ read(declaration, "typescript");
44
+ }
45
+ for (const run of exportRuns(sourceFile.statements)) {
46
+ for (const declaration of run.slice(1))
47
+ read(declaration, "typescript");
48
+ }
49
+ for (const declaration of adjacentOfOneKind(sourceFile.statements, dprintKind))
50
+ read(declaration, "dprint");
51
+ for (const statements of [sourceFile.statements, ...ambientModuleBodies(sourceFile)]) {
52
+ for (const declaration of adjacentOfOneKind(statements, biomeKind))
53
+ read(declaration, "biome");
54
+ }
55
+ return [...readers]
56
+ .sort(([a], [b]) => a.pos - b.pos)
57
+ .map(([declaration, sorters]) => {
58
+ const gap = { start: declaration.pos, end: declaration.getStart(sourceFile) };
59
+ const splits = [...sorters].filter((sorter) => STARTS_GROUP[sorter](source, gap, comments));
60
+ return { ...gap, splits };
61
+ });
62
+ }
63
+ // Whether the sorter starts a new group at the declaration after the gap.
64
+ const STARTS_GROUP = {
65
+ typescript: (source, gap, comments) => newLineTrivia(source, gap, comments) >= 2,
66
+ dprint: (source, gap) => source.slice(gap.start, gap.end).split("\n").length > 2,
67
+ biome: (source, gap, comments) => detachedComments(source, gap, comments).length > 0,
68
+ };
69
+ /** The statements past the first of each run of adjacent ones that `kindOf` puts in one kind. */
70
+ function adjacentOfOneKind(statements, kindOf) {
71
+ return statements.filter((statement, index) => {
72
+ const kind = kindOf(statement);
73
+ return index > 0 && kind !== undefined && kindOf(statements[index - 1]) === kind;
74
+ });
75
+ }
76
+ /**
77
+ * The statements of the ambient modules (`declare module "m" { … }`,
78
+ * `declare global { … }`) at the top of the file, whose imports
79
+ * organizeImports sorts too (it leaves their exports in one run), and whose
80
+ * imports and exports Biome sorts. Biome sorts those of a `namespace` too,
81
+ * where no import or export declaration is valid TypeScript.
82
+ */
83
+ function ambientModuleBodies(sourceFile) {
84
+ return sourceFile.statements.flatMap((statement) => ts.isModuleDeclaration(statement) &&
85
+ statement.body !== undefined &&
86
+ (ts.isStringLiteral(statement.name) || (statement.flags & ts.NodeFlags.GlobalAugmentation) !== 0)
87
+ ? [statement.body.statements]
88
+ : []);
89
+ }
90
+ /**
91
+ * The runs of top-level export declarations that tsc 6's organizeImports
92
+ * sorts (`getTopLevelExportGroups`): `export … from`s join the run across
93
+ * the statements between them, and a local `export { … }` takes the export
94
+ * declarations right after it into the run and ends it. tsc 7 also ends a run
95
+ * at any other statement, so its runs divide these and it reads no gap tsc 6
96
+ * does not.
97
+ */
98
+ function exportRuns(statements) {
99
+ const runs = [];
100
+ let run = [];
101
+ let ending = false;
102
+ for (const statement of statements) {
103
+ if (ts.isExportDeclaration(statement)) {
104
+ run.push(statement);
105
+ ending ||= statement.moduleSpecifier === undefined;
106
+ }
107
+ else if (ending) {
108
+ runs.push(run);
109
+ run = [];
110
+ ending = false;
111
+ }
112
+ }
113
+ runs.push(run);
114
+ return runs;
115
+ }
116
+ /** What dprint sorts the statement among: imports with specifiers, `export … from`s, or neither. */
117
+ function dprintKind(statement) {
118
+ if (ts.isImportDeclaration(statement)) {
119
+ const clause = statement.importClause;
120
+ const bindings = clause?.namedBindings;
121
+ const specified = clause?.name !== undefined ||
122
+ (bindings !== undefined && (ts.isNamespaceImport(bindings) || bindings.elements.length > 0));
123
+ return specified ? "imports" : undefined;
124
+ }
125
+ return ts.isExportDeclaration(statement) && statement.moduleSpecifier !== undefined ? "exports" : undefined;
126
+ }
127
+ /** What Biome sorts the statement among: imports, exports (`export … from`s and local `export { … }`s), or neither. */
128
+ function biomeKind(statement) {
129
+ if (ts.isImportDeclaration(statement))
130
+ return "imports";
131
+ return ts.isExportDeclaration(statement) ? "exports" : undefined;
132
+ }
133
+ // An empty line as Biome reads one: a line break right after another, of its
134
+ // `\r\n`, `\n`, `\r`, U+2028 and U+2029 each, so the CR of a CRLF is never one
135
+ // on its own. A line holding spaces or tabs is no empty line to it.
136
+ const EMPTY_LINE = /(?:\r\n|\r(?!\n)|[\n\u2028\u2029])[\n\r\u2028\u2029]/;
137
+ /**
138
+ * The comments that Biome's organizeImports reads as detached in front of the
139
+ * declaration after the gap, and that start a new chunk there
140
+ * (`has_detached_leading_comment`): those of the declaration's leading
141
+ * trivia that an empty line comes after, outside comments. The leading trivia
142
+ * starts at the first line break outside comments; the comments in front of
143
+ * it trail the token before the gap.
144
+ */
145
+ export function detachedComments(source, gap, comments) {
146
+ const leading = [];
147
+ let detached = 0;
148
+ let inLeadingTrivia = false;
149
+ let from = gap.start;
150
+ for (let index = firstIndexAtOrAfter(comments, gap.start, (comment) => comment.start); (comments[index]?.start ?? gap.end) < gap.end; index += 1) {
151
+ const comment = comments[index];
152
+ const text = source.slice(from, comment.start);
153
+ if (EMPTY_LINE.test(text))
154
+ detached = leading.length;
155
+ inLeadingTrivia ||= LINE_TERMINATOR.test(text);
156
+ if (inLeadingTrivia)
157
+ leading.push(comment);
158
+ from = comment.end;
159
+ }
160
+ if (EMPTY_LINE.test(source.slice(from, gap.end)))
161
+ detached = leading.length;
162
+ return leading.slice(0, detached);
163
+ }
164
+ /** The line breaks TypeScript's scanner reads as NewLineTrivia in the gap, past its (sorted) comments. */
165
+ function newLineTrivia(source, gap, comments) {
166
+ let count = 0;
167
+ let from = gap.start;
168
+ for (let index = firstIndexAtOrAfter(comments, gap.start, (comment) => comment.start); (comments[index]?.start ?? gap.end) < gap.end; index += 1) {
169
+ const comment = comments[index];
170
+ count += lineBreaks(source.slice(from, comment.start));
171
+ from = comment.end;
172
+ }
173
+ return count + lineBreaks(source.slice(from, gap.end));
174
+ }
175
+ function lineBreaks(text) {
176
+ return text.match(/\r\n?|\n/g)?.length ?? 0;
177
+ }
178
+ //# sourceMappingURL=imports.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"imports.js","sourceRoot":"","sources":["../src/imports.ts"],"names":[],"mappings":"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"}
package/dist/remove.d.ts CHANGED
@@ -26,10 +26,12 @@ export interface RemoveResult {
26
26
  * its row decide which node it trails), comments whose removal would shift
27
27
  * code under a next-line directive or join another line to one a directive
28
28
  * covers, or that sit between a directive and the code it reaches past
29
- * them for (or the JSX sibling it applies to), and comments whose removal
29
+ * them for (or the JSX sibling it applies to), comments whose removal
30
30
  * would move a position-dependent directive
31
31
  * (prettier's first-comment pragma, Deno's coverage file pragma, Bun's
32
- * file-start marker) into effect.
32
+ * file-start marker) into effect, and comments whose removal would join
33
+ * two groups of imports or exports that TypeScript's organizeImports,
34
+ * dprint or Biome sorts apart, or split one.
33
35
  */
34
36
  kept: Comment[];
35
37
  /** Comments excluded from removal by the `shouldRemove` predicate. */
@@ -61,6 +63,10 @@ export interface RemoveResult {
61
63
  * go with it: no pile-up of blank lines where a comment stood between two
62
64
  * of them, and at the start or end of the file or of a block only the blank
63
65
  * lines already against that edge stay.
66
+ * - Imports and exports stay in the groups the import sorters read: where
67
+ * deleting a comment would join two groups that TypeScript's
68
+ * organizeImports, dprint or Biome sorts apart, or split one, the comment
69
+ * stays.
64
70
  * - A leading byte-order mark is preserved. Reported positions index into the
65
71
  * `source` string exactly as `scanComments(source)` reports them (a BOM
66
72
  * counts as its first character).
@@ -1 +1 @@
1
- {"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../src/remove.ts"],"names":[],"mappings":"AAaA,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CA8ExF"}
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;;;;;;;;;;;;;OAaG;IACH,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,sEAAsE;IACtE,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CA2FxF"}
package/dist/remove.js CHANGED
@@ -1,7 +1,8 @@
1
1
  import { astGrepReach, isFileWidePosition, rowStartOffsets } from "./astgrep.js";
2
2
  import { activePositionalDirectives, bunMarkerOffset, carriesAstGrepSuppression, isLegalComment, } from "./directives.js";
3
+ import { detachedComments } from "./imports.js";
3
4
  import { LINE_TERMINATOR, isBlank, lineStartOffsets } from "./lines.js";
4
- import { firstIndexAtOrAfter } from "./ranges.js";
5
+ import { firstIndexAtOrAfter, rangeAt } from "./ranges.js";
5
6
  import { analyzeSource } from "./scanner.js";
6
7
  import { applyEdits, blankLineEdits } from "./splice.js";
7
8
  /**
@@ -29,6 +30,10 @@ import { applyEdits, blankLineEdits } from "./splice.js";
29
30
  * go with it: no pile-up of blank lines where a comment stood between two
30
31
  * of them, and at the start or end of the file or of a block only the blank
31
32
  * lines already against that edge stay.
33
+ * - Imports and exports stay in the groups the import sorters read: where
34
+ * deleting a comment would join two groups that TypeScript's
35
+ * organizeImports, dprint or Biome sorts apart, or split one, the comment
36
+ * stays.
32
37
  * - A leading byte-order mark is preserved. Reported positions index into the
33
38
  * `source` string exactly as `scanComments(source)` reports them (a BOM
34
39
  * counts as its first character).
@@ -85,6 +90,18 @@ export function removeComments(source, options = {}) {
85
90
  const output = analyzeSource(code, { jsx });
86
91
  if (search.adjust(changedSegments(analysis.jsx.segments, output.jsx.segments)))
87
92
  continue;
93
+ // Where the output joins two groups of imports or exports, or splits one,
94
+ // a sorter would sort them differently: the removal that does it is
95
+ // re-protected, and the attempt repeated.
96
+ const holders = importGroupHolders(source, comments, analysis.importGroups, output.importGroups, removed);
97
+ if (holders.length > 0) {
98
+ const holding = new Set(holders);
99
+ removed = removed.filter((comment) => !holding.has(comment));
100
+ kept.push(...holders);
101
+ kept.sort(byStart);
102
+ tidyBlankLines = true;
103
+ continue;
104
+ }
88
105
  const survivor = firstChangedSurvivor(source, code, output.comments, kept, skipped);
89
106
  if (survivor === undefined) {
90
107
  return { code, removed, kept, skipped, changed: true };
@@ -175,6 +192,96 @@ function closestRemovalBefore(removals, comment) {
175
192
  }
176
193
  return closest;
177
194
  }
195
+ /**
196
+ * The removals to re-protect so that the output starts exactly the groups of
197
+ * imports and exports the source starts. The gaps belong to the same
198
+ * declarations in both texts, since removing comments leaves the statements
199
+ * as they are. Where the output joins two groups at a gap for some sorter,
200
+ * the removal holding the gap open stays (see joiningRemoval, and
201
+ * detachedRemoval for Biome's chunks); where it splits one there, the
202
+ * multi-line comment a line break took the place of stays (see
203
+ * partingRemoval).
204
+ */
205
+ function importGroupHolders(source, comments, before, after, removals) {
206
+ if (before.length !== after.length)
207
+ throw unexpectedResult();
208
+ const holders = new Set();
209
+ const hold = (holder) => {
210
+ if (holder === undefined)
211
+ throw unexpectedResult();
212
+ holders.add(holder);
213
+ };
214
+ for (const [index, gap] of before.entries()) {
215
+ const splits = after[index].splits;
216
+ const joined = gap.splits.filter((sorter) => !splits.includes(sorter));
217
+ const parted = splits.some((sorter) => !gap.splits.includes(sorter));
218
+ if (joined.length === 0 && !parted)
219
+ continue;
220
+ const inGap = removals.filter((comment) => comment.start >= gap.start && comment.end <= gap.end);
221
+ // TypeScript and dprint count the gap's line breaks, Biome reads its comments.
222
+ const linesJoined = joined.filter((sorter) => sorter !== "biome");
223
+ if (linesJoined.length > 0)
224
+ hold(joiningRemoval(source, gap, inGap, linesJoined.includes("typescript")));
225
+ if (joined.includes("biome"))
226
+ hold(detachedRemoval(source, gap, comments, inGap));
227
+ if (parted)
228
+ hold(partingRemoval(source, gap, inGap, removals));
229
+ }
230
+ return [...holders];
231
+ }
232
+ /**
233
+ * The removal that Biome's chunk boundary at the gap rests on: the last of
234
+ * the gap's detached comments that goes (see detachedComments). Kept, it is
235
+ * detached again, for the empty line after it stays: the removals past it all
236
+ * come after the gap's last empty line, and a run of blank lines keeps the
237
+ * ones in front of its first vanishing line (see blankLineEdits).
238
+ */
239
+ function detachedRemoval(source, gap, comments, inGap) {
240
+ return detachedComments(source, gap, comments).findLast((comment) => inGap.includes(comment));
241
+ }
242
+ /**
243
+ * The removal in the gap whose deletion takes line breaks out of it: one
244
+ * spanning lines, or one on a line below the token the gap follows. When only
245
+ * dprint joins the groups, it counted line breaks inside a comment, and the
246
+ * first comment spanning lines stays: the removals after it then trail it
247
+ * and go without their line breaks, while in front of a later one a line
248
+ * break would take their place. Otherwise the last of them that ends above
249
+ * the declaration's line stays, holding a line of its own with the line break
250
+ * TypeScript counts and the line dprint counts; failing that, the last of
251
+ * them, which still keeps the declaration's line down.
252
+ */
253
+ function joiningRemoval(source, gap, inGap, typescriptJoins) {
254
+ const breaking = inGap.filter((comment) => comment.endLine > comment.line || LINE_TERMINATOR.test(source.slice(gap.start, comment.start)));
255
+ const spanning = typescriptJoins ? undefined : breaking.find((comment) => comment.endLine > comment.line);
256
+ return (spanning ??
257
+ breaking.findLast((comment) => LINE_TERMINATOR.test(source.slice(comment.end, gap.end))) ??
258
+ breaking.at(-1));
259
+ }
260
+ /**
261
+ * The removal in the gap that a line break takes the place of (see
262
+ * applyEdits): a multi-line comment with something that survives the
263
+ * removals in front of it on its first line, and anything after it on its
264
+ * last line — the token before the gap and the declaration after it count.
265
+ * Its own line breaks are no NewLineTrivia to TypeScript, but the one put in
266
+ * its place is.
267
+ */
268
+ function partingRemoval(source, gap, inGap, removals) {
269
+ // Whether the line holds what `stands` accepts, from `from` on, stepping by `step` until `to`.
270
+ const onLine = (from, to, step, stands) => {
271
+ for (let index = from; index !== to; index += step) {
272
+ if (LINE_TERMINATOR.test(source[index]))
273
+ return false;
274
+ if (stands(index))
275
+ return true;
276
+ }
277
+ return true;
278
+ };
279
+ const content = (index) => !isBlank(source[index]);
280
+ const survivor = (index) => content(index) && rangeAt(removals, index) === undefined;
281
+ return inGap.findLast((comment) => comment.endLine > comment.line &&
282
+ onLine(comment.start - 1, gap.start - 1, -1, survivor) &&
283
+ onLine(comment.end, gap.end, 1, content));
284
+ }
178
285
  /**
179
286
  * Applies the edits, restoring the byte-order mark when dropping a
180
287
  * comment-only first line took it along: the mark is an encoding artifact,