@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.
Files changed (59) hide show
  1. package/README.md +2 -2
  2. package/dist/args.d.ts.map +1 -1
  3. package/dist/args.js +23 -19
  4. package/dist/args.js.map +1 -1
  5. package/dist/astgrep.d.ts +1 -1
  6. package/dist/astgrep.d.ts.map +1 -1
  7. package/dist/astgrep.js +3 -8
  8. package/dist/astgrep.js.map +1 -1
  9. package/dist/directives.d.ts +8 -0
  10. package/dist/directives.d.ts.map +1 -1
  11. package/dist/directives.js +27 -20
  12. package/dist/directives.js.map +1 -1
  13. package/dist/files.d.ts +2 -3
  14. package/dist/files.d.ts.map +1 -1
  15. package/dist/files.js +45 -60
  16. package/dist/files.js.map +1 -1
  17. package/dist/imports.d.ts +34 -10
  18. package/dist/imports.d.ts.map +1 -1
  19. package/dist/imports.js +202 -28
  20. package/dist/imports.js.map +1 -1
  21. package/dist/jsx.d.ts.map +1 -1
  22. package/dist/jsx.js +5 -6
  23. package/dist/jsx.js.map +1 -1
  24. package/dist/lines.d.ts +13 -5
  25. package/dist/lines.d.ts.map +1 -1
  26. package/dist/lines.js +20 -16
  27. package/dist/lines.js.map +1 -1
  28. package/dist/ranges.d.ts +8 -0
  29. package/dist/ranges.d.ts.map +1 -1
  30. package/dist/ranges.js +12 -0
  31. package/dist/ranges.js.map +1 -1
  32. package/dist/remove.d.ts +10 -7
  33. package/dist/remove.d.ts.map +1 -1
  34. package/dist/remove.js +254 -219
  35. package/dist/remove.js.map +1 -1
  36. package/dist/run.d.ts.map +1 -1
  37. package/dist/run.js +11 -19
  38. package/dist/run.js.map +1 -1
  39. package/dist/scanner.d.ts +10 -1
  40. package/dist/scanner.d.ts.map +1 -1
  41. package/dist/scanner.js +15 -26
  42. package/dist/scanner.js.map +1 -1
  43. package/dist/splice.d.ts +6 -0
  44. package/dist/splice.d.ts.map +1 -1
  45. package/dist/splice.js +22 -5
  46. package/dist/splice.js.map +1 -1
  47. package/package.json +1 -1
  48. package/src/args.ts +21 -21
  49. package/src/astgrep.ts +4 -8
  50. package/src/directives.ts +24 -17
  51. package/src/files.ts +43 -59
  52. package/src/imports.ts +229 -28
  53. package/src/jsx.ts +5 -6
  54. package/src/lines.ts +23 -14
  55. package/src/ranges.ts +17 -0
  56. package/src/remove.ts +287 -235
  57. package/src/run.ts +11 -24
  58. package/src/scanner.ts +25 -28
  59. package/src/splice.ts +29 -6
package/dist/ranges.d.ts CHANGED
@@ -3,8 +3,16 @@ export interface Range {
3
3
  start: number;
4
4
  end: number;
5
5
  }
6
+ /** Sort comparator for document order: ranges are ordered by where they start. */
7
+ export declare function byStart(a: Range, b: Range): number;
6
8
  /** Index of the first item whose key is at least `value`, by binary search over ascending keys. */
7
9
  export declare function firstIndexAtOrAfter<T>(items: readonly T[], value: number, key: (item: T) => number): number;
8
10
  /** The range among sorted, non-overlapping ones that contains the offset, if any. */
9
11
  export declare function rangeAt<T extends Range>(ranges: readonly T[], offset: number): T | undefined;
12
+ /**
13
+ * The ranges among sorted, non-overlapping ones that lie within the span.
14
+ * Their ends ascend as their starts do, so they are the ones from the first
15
+ * starting at or after the span's start up to the first ending past its end.
16
+ */
17
+ export declare function rangesWithin<T extends Range>(ranges: readonly T[], span: Range): T[];
10
18
  //# sourceMappingURL=ranges.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ranges.d.ts","sourceRoot":"","sources":["../src/ranges.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,MAAM,WAAW,KAAK;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,GAAG,MAAM,CAS3G;AAED,qFAAqF;AACrF,wBAAgB,OAAO,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAG5F"}
1
+ {"version":3,"file":"ranges.d.ts","sourceRoot":"","sources":["../src/ranges.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,MAAM,WAAW,KAAK;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,kFAAkF;AAClF,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAElD;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,GAAG,MAAM,CAS3G;AAED,qFAAqF;AACrF,wBAAgB,OAAO,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAG5F;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAKpF"}
package/dist/ranges.js CHANGED
@@ -1,3 +1,7 @@
1
+ /** Sort comparator for document order: ranges are ordered by where they start. */
2
+ export function byStart(a, b) {
3
+ return a.start - b.start;
4
+ }
1
5
  /** Index of the first item whose key is at least `value`, by binary search over ascending keys. */
2
6
  export function firstIndexAtOrAfter(items, value, key) {
3
7
  let low = 0;
@@ -16,4 +20,12 @@ export function rangeAt(ranges, offset) {
16
20
  const range = ranges[firstIndexAtOrAfter(ranges, offset + 1, (candidate) => candidate.start) - 1];
17
21
  return range !== undefined && offset < range.end ? range : undefined;
18
22
  }
23
+ /**
24
+ * The ranges among sorted, non-overlapping ones that lie within the span.
25
+ * Their ends ascend as their starts do, so they are the ones from the first
26
+ * starting at or after the span's start up to the first ending past its end.
27
+ */
28
+ export function rangesWithin(ranges, span) {
29
+ return ranges.slice(firstIndexAtOrAfter(ranges, span.start, (range) => range.start), firstIndexAtOrAfter(ranges, span.end + 1, (range) => range.end));
30
+ }
19
31
  //# sourceMappingURL=ranges.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ranges.js","sourceRoot":"","sources":["../src/ranges.ts"],"names":[],"mappings":"AAMA,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CAAI,KAAmB,EAAE,KAAa,EAAE,GAAwB;IACjG,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IACxB,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAM,CAAC,GAAG,KAAK;YAAE,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC;;YACjD,IAAI,GAAG,MAAM,CAAC;IACrB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,OAAO,CAAkB,MAAoB,EAAE,MAAc;IAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAClG,OAAO,KAAK,KAAK,SAAS,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC"}
1
+ {"version":3,"file":"ranges.js","sourceRoot":"","sources":["../src/ranges.ts"],"names":[],"mappings":"AAMA,kFAAkF;AAClF,MAAM,UAAU,OAAO,CAAC,CAAQ,EAAE,CAAQ;IACxC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;AAC3B,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CAAI,KAAmB,EAAE,KAAa,EAAE,GAAwB;IACjG,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IACxB,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAM,CAAC,GAAG,KAAK;YAAE,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC;;YACjD,IAAI,GAAG,MAAM,CAAC;IACrB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,OAAO,CAAkB,MAAoB,EAAE,MAAc;IAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAClG,OAAO,KAAK,KAAK,SAAS,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAkB,MAAoB,EAAE,IAAW;IAC7E,OAAO,MAAM,CAAC,KAAK,CACjB,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/D,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAChE,CAAC;AACJ,CAAC"}
package/dist/remove.d.ts CHANGED
@@ -24,12 +24,12 @@ export interface RemoveResult {
24
24
  * comments the `keep` predicate claims, comments whose removal would
25
25
  * change what an ast-grep suppression covers (the ones in front of it on
26
26
  * its row decide which node it trails), comments whose removal would shift
27
- * code under a next-line directive or join another line to one a directive
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
30
- * would move a position-dependent directive
31
- * (prettier's first-comment pragma, Deno's coverage file pragma, Bun's
32
- * file-start marker) into effect.
27
+ * code under a next-line directive, JSX comment containers whose removal
28
+ * would join another line to one a directive covers, comments that sit
29
+ * between a directive and the code it reaches past them for (or the JSX
30
+ * sibling it applies to), and comments whose removal would move a
31
+ * position-dependent directive (prettier's first-comment pragma, Deno's
32
+ * coverage file pragma, Bun's file-start marker) into effect.
33
33
  */
34
34
  kept: Comment[];
35
35
  /** Comments excluded from removal by the `shouldRemove` predicate. */
@@ -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).
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CA0FxF"}
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,CA6FxF"}