@openrewrite/rewrite 8.69.0 → 8.69.1
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/dist/java/type.d.ts +5 -0
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +12 -0
- package/dist/java/type.js.map +1 -1
- package/dist/javascript/assertions.d.ts.map +1 -1
- package/dist/javascript/assertions.js +9 -0
- package/dist/javascript/assertions.js.map +1 -1
- package/dist/javascript/comparator.d.ts.map +1 -1
- package/dist/javascript/comparator.js +5 -9
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/{format.d.ts → format/format.d.ts} +15 -33
- package/dist/javascript/format/format.d.ts.map +1 -0
- package/dist/javascript/{format.js → format/format.js} +56 -313
- package/dist/javascript/format/format.js.map +1 -0
- package/dist/javascript/format/index.d.ts +3 -0
- package/dist/javascript/format/index.d.ts.map +1 -0
- package/dist/javascript/format/index.js +38 -0
- package/dist/javascript/format/index.js.map +1 -0
- package/dist/javascript/format/minimum-viable-spacing-visitor.d.ts +28 -0
- package/dist/javascript/format/minimum-viable-spacing-visitor.d.ts.map +1 -0
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +308 -0
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -0
- package/dist/javascript/format/normalize-whitespace-visitor.d.ts +14 -0
- package/dist/javascript/format/normalize-whitespace-visitor.d.ts.map +1 -0
- package/dist/javascript/format/normalize-whitespace-visitor.js +65 -0
- package/dist/javascript/format/normalize-whitespace-visitor.js.map +1 -0
- package/dist/javascript/format/prettier-config-loader.d.ts +92 -0
- package/dist/javascript/format/prettier-config-loader.d.ts.map +1 -0
- package/dist/javascript/format/prettier-config-loader.js +419 -0
- package/dist/javascript/format/prettier-config-loader.js.map +1 -0
- package/dist/javascript/format/prettier-format.d.ts +111 -0
- package/dist/javascript/format/prettier-format.d.ts.map +1 -0
- package/dist/javascript/format/prettier-format.js +496 -0
- package/dist/javascript/format/prettier-format.js.map +1 -0
- package/dist/javascript/{tabs-and-indents-visitor.d.ts → format/tabs-and-indents-visitor.d.ts} +4 -4
- package/dist/javascript/format/tabs-and-indents-visitor.d.ts.map +1 -0
- package/dist/javascript/{tabs-and-indents-visitor.js → format/tabs-and-indents-visitor.js} +7 -7
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -0
- package/dist/javascript/format/whitespace-reconciler.d.ts +106 -0
- package/dist/javascript/format/whitespace-reconciler.d.ts.map +1 -0
- package/dist/javascript/format/whitespace-reconciler.js +291 -0
- package/dist/javascript/format/whitespace-reconciler.js.map +1 -0
- package/dist/javascript/markers.d.ts.map +1 -1
- package/dist/javascript/markers.js +21 -0
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/parser.d.ts +15 -3
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +107 -24
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/recipes/auto-format.d.ts +3 -0
- package/dist/javascript/recipes/auto-format.d.ts.map +1 -1
- package/dist/javascript/recipes/auto-format.js +22 -1
- package/dist/javascript/recipes/auto-format.js.map +1 -1
- package/dist/javascript/style.d.ts +52 -1
- package/dist/javascript/style.d.ts.map +1 -1
- package/dist/javascript/style.js +43 -2
- package/dist/javascript/style.js.map +1 -1
- package/dist/test/rewrite-test.d.ts +3 -4
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +6 -18
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/version.txt +1 -1
- package/dist/yaml/assertions.d.ts +4 -0
- package/dist/yaml/assertions.d.ts.map +1 -0
- package/dist/yaml/assertions.js +31 -0
- package/dist/yaml/assertions.js.map +1 -0
- package/dist/yaml/index.d.ts +2 -1
- package/dist/yaml/index.d.ts.map +1 -1
- package/dist/yaml/index.js +2 -1
- package/dist/yaml/index.js.map +1 -1
- package/package.json +5 -4
- package/src/java/type.ts +12 -0
- package/src/javascript/assertions.ts +9 -0
- package/src/javascript/comparator.ts +6 -11
- package/src/javascript/{format.ts → format/format.ts} +59 -267
- package/src/javascript/format/index.ts +21 -0
- package/src/javascript/format/minimum-viable-spacing-visitor.ts +256 -0
- package/src/javascript/format/normalize-whitespace-visitor.ts +42 -0
- package/src/javascript/format/prettier-config-loader.ts +422 -0
- package/src/javascript/format/prettier-format.ts +622 -0
- package/src/javascript/{tabs-and-indents-visitor.ts → format/tabs-and-indents-visitor.ts} +8 -8
- package/src/javascript/format/whitespace-reconciler.ts +345 -0
- package/src/javascript/markers.ts +19 -0
- package/src/javascript/parser.ts +107 -20
- package/src/javascript/recipes/auto-format.ts +28 -1
- package/src/javascript/style.ts +41 -2
- package/src/test/rewrite-test.ts +6 -18
- package/src/yaml/assertions.ts +28 -0
- package/src/yaml/index.ts +2 -1
- package/dist/javascript/format.d.ts.map +0 -1
- package/dist/javascript/format.js.map +0 -1
- package/dist/javascript/tabs-and-indents-visitor.d.ts.map +0 -1
- package/dist/javascript/tabs-and-indents-visitor.js.map +0 -1
|
@@ -23,6 +23,9 @@ interface AutoFormatAccumulator {
|
|
|
23
23
|
* - ES6 import/export brace spacing
|
|
24
24
|
*
|
|
25
25
|
* If no clear style is detected, defaults to IntelliJ IDEA style.
|
|
26
|
+
*
|
|
27
|
+
* Files with existing formatting styles (PrettierStyle or Autodetect markers)
|
|
28
|
+
* are skipped during style detection since they already have their formatting configured.
|
|
26
29
|
*/
|
|
27
30
|
export declare class AutoFormat extends ScanningRecipe<AutoFormatAccumulator> {
|
|
28
31
|
readonly name = "org.openrewrite.javascript.format.auto-format";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-format.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/auto-format.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"auto-format.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/auto-format.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAQnD;;;GAGG;AACH,UAAU,qBAAqB;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC/B;AAoBD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,UAAW,SAAQ,cAAc,CAAC,qBAAqB,CAAC;IACjE,QAAQ,CAAC,IAAI,mDAAmD;IAChE,QAAQ,CAAC,WAAW,4CAA4C;IAChE,QAAQ,CAAC,WAAW,wHAAwH;IAE5I,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,qBAAqB;IAMrD,OAAO,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAYhF,cAAc,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAUhG"}
|
|
@@ -29,6 +29,21 @@ const recipe_1 = require("../../recipe");
|
|
|
29
29
|
const format_1 = require("../format");
|
|
30
30
|
const autodetect_1 = require("../autodetect");
|
|
31
31
|
const visitor_1 = require("../visitor");
|
|
32
|
+
const markers_1 = require("../../markers");
|
|
33
|
+
const style_1 = require("../style");
|
|
34
|
+
/**
|
|
35
|
+
* Checks if a compilation unit already has formatting styles attached.
|
|
36
|
+
* Returns true if either PrettierStyle or Autodetect markers are present.
|
|
37
|
+
*/
|
|
38
|
+
function hasFormattingStyles(cu) {
|
|
39
|
+
// Check for PrettierStyle marker
|
|
40
|
+
if ((0, markers_1.findMarker)(cu, style_1.StyleKind.PrettierStyle)) {
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
// Check for Autodetect marker (NamedStyles with specific name)
|
|
44
|
+
const namedStyles = cu.markers.markers.filter(m => m.kind === markers_1.MarkersKind.NamedStyles);
|
|
45
|
+
return namedStyles.some(s => s.name === "org.openrewrite.javascript.Autodetect");
|
|
46
|
+
}
|
|
32
47
|
/**
|
|
33
48
|
* Formats JavaScript/TypeScript code using a comprehensive set of formatting rules.
|
|
34
49
|
*
|
|
@@ -42,6 +57,9 @@ const visitor_1 = require("../visitor");
|
|
|
42
57
|
* - ES6 import/export brace spacing
|
|
43
58
|
*
|
|
44
59
|
* If no clear style is detected, defaults to IntelliJ IDEA style.
|
|
60
|
+
*
|
|
61
|
+
* Files with existing formatting styles (PrettierStyle or Autodetect markers)
|
|
62
|
+
* are skipped during style detection since they already have their formatting configured.
|
|
45
63
|
*/
|
|
46
64
|
class AutoFormat extends recipe_1.ScanningRecipe {
|
|
47
65
|
constructor() {
|
|
@@ -60,7 +78,10 @@ class AutoFormat extends recipe_1.ScanningRecipe {
|
|
|
60
78
|
return new class extends visitor_1.JavaScriptVisitor {
|
|
61
79
|
visitJsCompilationUnit(cu, ctx) {
|
|
62
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
|
|
81
|
+
// Skip sampling files that already have formatting styles attached
|
|
82
|
+
if (!hasFormattingStyles(cu)) {
|
|
83
|
+
yield acc.detector.sample(cu);
|
|
84
|
+
}
|
|
64
85
|
return cu;
|
|
65
86
|
});
|
|
66
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-format.js","sourceRoot":"","sources":["../../../src/javascript/recipes/auto-format.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;AAEH,yCAA4C;AAG5C,sCAA4C;AAC5C,8CAAmD;AACnD,wCAA6C;
|
|
1
|
+
{"version":3,"file":"auto-format.js","sourceRoot":"","sources":["../../../src/javascript/recipes/auto-format.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;AAEH,yCAA4C;AAG5C,sCAA4C;AAC5C,8CAAmD;AACnD,wCAA6C;AAG7C,2CAAsD;AACtD,oCAAmC;AAYnC;;;GAGG;AACH,SAAS,mBAAmB,CAAC,EAAsB;IAC/C,iCAAiC;IACjC,IAAI,IAAA,oBAAU,EAAC,EAAE,EAAE,iBAAS,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+DAA+D;IAC/D,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CACzC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAW,CAAC,WAAW,CACzB,CAAC;IAEnB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uCAAuC,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,UAAW,SAAQ,uBAAqC;IAArE;;QACa,SAAI,GAAG,+CAA+C,CAAC;QACvD,gBAAW,GAAG,wCAAwC,CAAC;QACvD,gBAAW,GAAG,oHAAoH,CAAC;IA8BhJ,CAAC;IA5BG,YAAY,CAAC,IAAsB;QAC/B,OAAO;YACH,QAAQ,EAAE,uBAAU,CAAC,QAAQ,EAAE;SAClC,CAAC;IACN,CAAC;IAEK,OAAO,CAAC,GAA0B;;YACpC,OAAO,IAAI,KAAM,SAAQ,2BAAmC;gBACxC,sBAAsB,CAAC,EAAsB,EAAE,GAAqB;;wBAChF,mEAAmE;wBACnE,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC;4BAC3B,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAClC,CAAC;wBACD,OAAO,EAAE,CAAC;oBACd,CAAC;iBAAA;aACJ,CAAC;QACN,CAAC;KAAA;IAEK,cAAc,CAAC,GAA0B;;YAC3C,oDAAoD;YACpD,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;gBACtB,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC9C,CAAC;YAED,gDAAgD;YAChD,sDAAsD;YACtD,OAAO,IAAI,0BAAiB,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;QAClE,CAAC;KAAA;CACJ;AAjCD,gCAiCC"}
|
|
@@ -8,7 +8,58 @@ export declare const StyleKind: {
|
|
|
8
8
|
readonly WrappingAndBracesStyle: "org.openrewrite.javascript.style.WrappingAndBracesStyle";
|
|
9
9
|
readonly BlankLinesStyle: "org.openrewrite.javascript.style.BlankLinesStyle";
|
|
10
10
|
readonly TabsAndIndentsStyle: "org.openrewrite.javascript.style.TabsAndIndentsStyle";
|
|
11
|
+
readonly PrettierStyle: "org.openrewrite.javascript.style.PrettierStyle";
|
|
11
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* Style for Prettier-based formatting.
|
|
15
|
+
*
|
|
16
|
+
* This implements NamedStyles so it can be both:
|
|
17
|
+
* - A marker attached to source files (detected from project's .prettierrc)
|
|
18
|
+
* - A style that can be passed via the styles parameter or found via getStyle
|
|
19
|
+
*
|
|
20
|
+
* When this style is present, AutoformatVisitor will use Prettier for formatting
|
|
21
|
+
* instead of the built-in formatting visitors.
|
|
22
|
+
*/
|
|
23
|
+
export declare class PrettierStyle implements NamedStyles<typeof StyleKind.PrettierStyle> {
|
|
24
|
+
readonly id: string;
|
|
25
|
+
/**
|
|
26
|
+
* The resolved Prettier options for this file (with overrides applied).
|
|
27
|
+
*/
|
|
28
|
+
readonly config: Record<string, unknown>;
|
|
29
|
+
/**
|
|
30
|
+
* The Prettier version from the project's package.json.
|
|
31
|
+
* At formatting time, this version of Prettier will be loaded dynamically
|
|
32
|
+
* to ensure consistent formatting.
|
|
33
|
+
*/
|
|
34
|
+
readonly prettierVersion?: string | undefined;
|
|
35
|
+
/**
|
|
36
|
+
* Whether this file is ignored by .prettierignore.
|
|
37
|
+
* When true, Prettier formatting should be skipped for this file.
|
|
38
|
+
*/
|
|
39
|
+
readonly ignored: boolean;
|
|
40
|
+
readonly kind: "org.openrewrite.javascript.style.PrettierStyle";
|
|
41
|
+
readonly name = "org.openrewrite.javascript.Prettier";
|
|
42
|
+
readonly displayName = "Prettier";
|
|
43
|
+
readonly description = "Prettier code formatter configuration.";
|
|
44
|
+
readonly tags: string[];
|
|
45
|
+
readonly styles: Style[];
|
|
46
|
+
constructor(id: string,
|
|
47
|
+
/**
|
|
48
|
+
* The resolved Prettier options for this file (with overrides applied).
|
|
49
|
+
*/
|
|
50
|
+
config: Record<string, unknown>,
|
|
51
|
+
/**
|
|
52
|
+
* The Prettier version from the project's package.json.
|
|
53
|
+
* At formatting time, this version of Prettier will be loaded dynamically
|
|
54
|
+
* to ensure consistent formatting.
|
|
55
|
+
*/
|
|
56
|
+
prettierVersion?: string | undefined,
|
|
57
|
+
/**
|
|
58
|
+
* Whether this file is ignored by .prettierignore.
|
|
59
|
+
* When true, Prettier formatting should be skipped for this file.
|
|
60
|
+
*/
|
|
61
|
+
ignored?: boolean);
|
|
62
|
+
}
|
|
12
63
|
export declare const SpacesStyleDetailKind: {
|
|
13
64
|
readonly SpacesStyleBeforeParentheses: "org.openrewrite.javascript.style.SpacesStyle$BeforeParentheses";
|
|
14
65
|
readonly SpacesStyleAroundOperators: "org.openrewrite.javascript.style.SpacesStyle$AroundOperators";
|
|
@@ -191,5 +242,5 @@ export declare function styleFromSourceFile(styleKind: string, sourceFile: Tree)
|
|
|
191
242
|
* @param sourceFile The source file to check for styles
|
|
192
243
|
* @param styles Optional array of NamedStyles that take precedence over source file styles
|
|
193
244
|
*/
|
|
194
|
-
export declare function getStyle(styleKind: string, sourceFile: Tree, styles?: NamedStyles[]): Style | undefined;
|
|
245
|
+
export declare function getStyle(styleKind: string, sourceFile: Tree, styles?: NamedStyles<string>[]): Style | undefined;
|
|
195
246
|
//# sourceMappingURL=style.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../src/javascript/style.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAG7B,eAAO,MAAM,gBAAgB;;CAE5B,CAAA;AAED,eAAO,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../src/javascript/style.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAG7B,eAAO,MAAM,gBAAgB;;CAE5B,CAAA;AAED,eAAO,MAAM,SAAS;;;;;;CAMZ,CAAC;AAEX;;;;;;;;;GASG;AACH,qBAAa,aAAc,YAAW,WAAW,CAAC,OAAO,SAAS,CAAC,aAAa,CAAC;IASzE,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACxC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM;IACjC;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAvB7B,QAAQ,CAAC,IAAI,mDAA2B;IACxC,QAAQ,CAAC,IAAI,yCAAyC;IACtD,QAAQ,CAAC,WAAW,cAAc;IAClC,QAAQ,CAAC,WAAW,4CAA4C;IAChE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAM;IAC7B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,CAAM;gBAGjB,EAAE,EAAE,MAAM;IACnB;;OAEG;IACM,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACxC;;;;OAIG;IACM,eAAe,CAAC,EAAE,MAAM,YAAA;IACjC;;;OAGG;IACM,OAAO,GAAE,OAAe;CAExC;AAED,eAAO,MAAM,qBAAqB;;;;;;;;CAQxB,CAAC;AAEX,MAAM,WAAW,WAAY,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,WAAW,CAAC;IAC5C,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC;IAC1D,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC;IACtD,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC;IACtD,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,cAAc,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC;CACrC;AAED,yBAAiB,WAAW,CAAC;IACzB,UAAiB,iBAAiB;QAC9B,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,4BAA4B,CAAC;QACzE,QAAQ,CAAC,8BAA8B,EAAE,OAAO,CAAC;QACjD,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;QAC1C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;KAC1C;IAED,UAAiB,eAAe;QAC5B,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,0BAA0B,CAAC;QACvE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;KAC7C;IAED,UAAiB,eAAe;QAC5B,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,0BAA0B,CAAC;QACvE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;QAC9B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;QAC/B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;QAC9B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;QAClC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;QAC/B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,6BAA6B,EAAE,OAAO,CAAC;KACnD;IAED,UAAiB,cAAc;QAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,yBAAyB,CAAC;QACtE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;QAC9B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;QAC/B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;QAC/B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;KACpC;IAED,UAAiB,MAAM;QACnB,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,iBAAiB,CAAC;QAC9D,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;QACtC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;QACtC,QAAQ,CAAC,8BAA8B,EAAE,OAAO,CAAC;QACjD,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;QAC1C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;QACjC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;QACtC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;QACxC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;QAC1C,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAC;QAC5C,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;KACpC;IAED,UAAiB,eAAe;QAC5B,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,0BAA0B,CAAC;QACvE,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;QACrC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;QAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;KAChC;IAED,UAAiB,KAAK;QAClB,QAAQ,CAAC,IAAI,EAAE,OAAO,qBAAqB,CAAC,gBAAgB,CAAC;QAC7D,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;QAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;QACrC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC;QACnD,QAAQ,CAAC,+BAA+B,EAAE,OAAO,CAAC;QAClD,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAC;QAC5C,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAC;QAC5C,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;KAC7C;CACJ;AAED,eAAO,MAAM,gCAAgC;;;CAGnC,CAAC;AAEX,MAAM,WAAW,sBAAuB,SAAQ,KAAK;IAEjD,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,sBAAsB,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,sBAAsB,CAAC,WAAW,CAAC;IACzD,QAAQ,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,oBAAoB,CAAC;CAC9E;AAED,yBAAiB,sBAAsB,CAAC;IACpC,UAAiB,WAAW;QACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,gCAAgC,CAAC,iCAAiC,CAAC;QACzF,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;KACnC;IAED,UAAiB,oBAAoB;QACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,gCAAgC,CAAC,0CAA0C,CAAC;QAClG,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;QACxC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;KAC5C;CACJ;AAED,MAAM,WAAW,eAAgB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,IAAI,EAAE,kDAAkD,CAAC;IAClE,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC;IAClD,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC;CAC7C;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,WAAW;QACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KAC3B;IAED,UAAiB,OAAO;QACpB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QACzC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;KACnC;CACJ;AAED,MAAM,WAAW,mBAAoB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,mBAAmB,CAAC;IACpD,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,6BAA6B,EAAE,OAAO,CAAC;CACnD;AAED,yBAAiB,QAAQ,CAAC;IACtB,UAAiB,UAAU,CAAC;QACjB,MAAM,QAAQ,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,QAAQ,CAQlE,CAAA;QAED,SAAgB,MAAM,IAAI,WAAW,CA2FpC;QAED,SAAgB,iBAAiB,IAAI,sBAAsB,CAa1D;QAED,SAAgB,UAAU,IAAI,eAAe,CAc5C;QAED,SAAgB,cAAc,IAAI,mBAAmB,CAWpD;KACJ;IAED,UAAiB,UAAU,CAAC;QACjB,MAAM,QAAQ,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,QAAQ,CAQlE,CAAA;QAED,SAAgB,MAAM,IAAI,WAAW,CA2FpC;QAED,SAAgB,iBAAiB,IAAI,sBAAsB,CAa1D;QAED,SAAgB,UAAU,IAAI,eAAe,CAgB5C;QAED,SAAgB,cAAc,IAAI,mBAAmB,CAWpD;KACJ;CACJ;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS,CAQ1F;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,GAAG,SAAS,CAsB/G"}
|
package/dist/javascript/style.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.IntelliJ = exports.WrappingAndBracesStyleDetailKind = exports.SpacesStyleDetailKind = exports.StyleKind = exports.JavaScriptStyles = void 0;
|
|
18
|
+
exports.IntelliJ = exports.WrappingAndBracesStyleDetailKind = exports.SpacesStyleDetailKind = exports.PrettierStyle = exports.StyleKind = exports.JavaScriptStyles = void 0;
|
|
19
19
|
exports.styleFromSourceFile = styleFromSourceFile;
|
|
20
20
|
exports.getStyle = getStyle;
|
|
21
21
|
const uuid_1 = require("../uuid");
|
|
@@ -27,8 +27,49 @@ exports.StyleKind = {
|
|
|
27
27
|
SpacesStyle: "org.openrewrite.javascript.style.SpacesStyle",
|
|
28
28
|
WrappingAndBracesStyle: "org.openrewrite.javascript.style.WrappingAndBracesStyle",
|
|
29
29
|
BlankLinesStyle: "org.openrewrite.javascript.style.BlankLinesStyle",
|
|
30
|
-
TabsAndIndentsStyle: "org.openrewrite.javascript.style.TabsAndIndentsStyle"
|
|
30
|
+
TabsAndIndentsStyle: "org.openrewrite.javascript.style.TabsAndIndentsStyle",
|
|
31
|
+
PrettierStyle: "org.openrewrite.javascript.style.PrettierStyle"
|
|
31
32
|
};
|
|
33
|
+
/**
|
|
34
|
+
* Style for Prettier-based formatting.
|
|
35
|
+
*
|
|
36
|
+
* This implements NamedStyles so it can be both:
|
|
37
|
+
* - A marker attached to source files (detected from project's .prettierrc)
|
|
38
|
+
* - A style that can be passed via the styles parameter or found via getStyle
|
|
39
|
+
*
|
|
40
|
+
* When this style is present, AutoformatVisitor will use Prettier for formatting
|
|
41
|
+
* instead of the built-in formatting visitors.
|
|
42
|
+
*/
|
|
43
|
+
class PrettierStyle {
|
|
44
|
+
constructor(id,
|
|
45
|
+
/**
|
|
46
|
+
* The resolved Prettier options for this file (with overrides applied).
|
|
47
|
+
*/
|
|
48
|
+
config,
|
|
49
|
+
/**
|
|
50
|
+
* The Prettier version from the project's package.json.
|
|
51
|
+
* At formatting time, this version of Prettier will be loaded dynamically
|
|
52
|
+
* to ensure consistent formatting.
|
|
53
|
+
*/
|
|
54
|
+
prettierVersion,
|
|
55
|
+
/**
|
|
56
|
+
* Whether this file is ignored by .prettierignore.
|
|
57
|
+
* When true, Prettier formatting should be skipped for this file.
|
|
58
|
+
*/
|
|
59
|
+
ignored = false) {
|
|
60
|
+
this.id = id;
|
|
61
|
+
this.config = config;
|
|
62
|
+
this.prettierVersion = prettierVersion;
|
|
63
|
+
this.ignored = ignored;
|
|
64
|
+
this.kind = exports.StyleKind.PrettierStyle;
|
|
65
|
+
this.name = "org.openrewrite.javascript.Prettier";
|
|
66
|
+
this.displayName = "Prettier";
|
|
67
|
+
this.description = "Prettier code formatter configuration.";
|
|
68
|
+
this.tags = [];
|
|
69
|
+
this.styles = [];
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
exports.PrettierStyle = PrettierStyle;
|
|
32
73
|
exports.SpacesStyleDetailKind = {
|
|
33
74
|
SpacesStyleBeforeParentheses: "org.openrewrite.javascript.style.SpacesStyle$BeforeParentheses",
|
|
34
75
|
SpacesStyleAroundOperators: "org.openrewrite.javascript.style.SpacesStyle$AroundOperators",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style.js","sourceRoot":"","sources":["../../src/javascript/style.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;
|
|
1
|
+
{"version":3,"file":"style.js","sourceRoot":"","sources":["../../src/javascript/style.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,16 +45,15 @@ export type AfterRecipeText = string | ((actual: string) => string | undefined)
|
|
|
45
45
|
*
|
|
46
46
|
* Behavior:
|
|
47
47
|
* - Removes ONE leading newline if present (for template string ergonomics)
|
|
48
|
-
* -
|
|
49
|
-
* - Preserves additional leading/trailing empty lines beyond the first
|
|
48
|
+
* - Preserves trailing newlines (important for testing formatters like Prettier)
|
|
50
49
|
* - For lines with content: removes common indentation
|
|
51
50
|
* - For lines with only whitespace: removes common indentation, preserving remaining spaces
|
|
52
51
|
*
|
|
53
52
|
* Examples:
|
|
54
53
|
* - `\n code` → `code` (single leading newline removed)
|
|
55
54
|
* - `\n\n code` → `\ncode` (first newline removed, second preserved)
|
|
56
|
-
* - ` code\n` → `code` (trailing newline
|
|
57
|
-
* - ` code\n\n` → `code\n` (
|
|
55
|
+
* - ` code\n` → `code\n` (trailing newline preserved)
|
|
56
|
+
* - ` code\n\n` → `code\n\n` (trailing newlines preserved)
|
|
58
57
|
*/
|
|
59
58
|
export declare function dedent(s: string): string;
|
|
60
59
|
export declare function dedentAfter(s?: AfterRecipeText): AfterRecipeText;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-test.d.ts","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAc,WAAW,EAAC,MAAM,YAAY,CAAC;AACpD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AASnC,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,UAAU;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC1C,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,GAAG,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,UAAU;IACnB,0BAA0B,EAAE,OAAO,CAAO;IAE1C,MAAM,EAAE,MAAM,CAAmB;IAEjC;;;OAGG;IACH,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D;;OAEG;IACH,sBAAsB,EAAE,gBAAgB,CAAyB;IAEjE,OAAO,CAAC,mBAAmB,CAA+C;IAE1E,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAIrD,UAAU,CAAC,GAAG,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDnJ,qBAAqB;YASrB,2BAA2B;YAO3B,yBAAyB;YA2BzB,oBAAoB;YAapB,WAAW;IAezB;;OAEG;YACW,KAAK;YA+BL,mDAAmD;CAMpE;AAoBD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAEnG
|
|
1
|
+
{"version":3,"file":"rewrite-test.d.ts","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAc,WAAW,EAAC,MAAM,YAAY,CAAC;AACpD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AASnC,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,UAAU;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC1C,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,GAAG,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,UAAU;IACnB,0BAA0B,EAAE,OAAO,CAAO;IAE1C,MAAM,EAAE,MAAM,CAAmB;IAEjC;;;OAGG;IACH,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D;;OAEG;IACH,sBAAsB,EAAE,gBAAgB,CAAyB;IAEjE,OAAO,CAAC,mBAAmB,CAA+C;IAE1E,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAIrD,UAAU,CAAC,GAAG,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDnJ,qBAAqB;YASrB,2BAA2B;YAO3B,yBAAyB;YA2BzB,oBAAoB;YAapB,WAAW;IAezB;;OAEG;YACW,KAAK;YA+BL,mDAAmD;CAMpE;AAoBD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAEnG;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAyCxC;AAED,wBAAgB,WAAW,CAAC,CAAC,CAAC,EAAE,eAAe,GAAG,eAAe,CAchE;AAGD,qBAAa,WAAY,SAAQ,MAAM;IAKvB,OAAO,CAAC,OAAO;IAJ3B,IAAI,SAA0B;IAC9B,WAAW,SAAW;IACtB,WAAW,SAAY;gBAEH,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC;IAI5C,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CAGjD;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAElE"}
|
|
@@ -290,36 +290,24 @@ class NoopRecipe extends recipe_1.Recipe {
|
|
|
290
290
|
*
|
|
291
291
|
* Behavior:
|
|
292
292
|
* - Removes ONE leading newline if present (for template string ergonomics)
|
|
293
|
-
* -
|
|
294
|
-
* - Preserves additional leading/trailing empty lines beyond the first
|
|
293
|
+
* - Preserves trailing newlines (important for testing formatters like Prettier)
|
|
295
294
|
* - For lines with content: removes common indentation
|
|
296
295
|
* - For lines with only whitespace: removes common indentation, preserving remaining spaces
|
|
297
296
|
*
|
|
298
297
|
* Examples:
|
|
299
298
|
* - `\n code` → `code` (single leading newline removed)
|
|
300
299
|
* - `\n\n code` → `\ncode` (first newline removed, second preserved)
|
|
301
|
-
* - ` code\n` → `code` (trailing newline
|
|
302
|
-
* - ` code\n\n` → `code\n` (
|
|
300
|
+
* - ` code\n` → `code\n` (trailing newline preserved)
|
|
301
|
+
* - ` code\n\n` → `code\n\n` (trailing newlines preserved)
|
|
303
302
|
*/
|
|
304
303
|
function dedent(s) {
|
|
305
304
|
if (!s)
|
|
306
305
|
return s;
|
|
307
306
|
// Remove single leading newline for ergonomics
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
let end = s.length;
|
|
311
|
-
for (let i = s.length - 1; i >= start; i--) {
|
|
312
|
-
const ch = s.charCodeAt(i);
|
|
313
|
-
if (ch === 10) { // '\n'
|
|
314
|
-
end = i;
|
|
315
|
-
break;
|
|
316
|
-
}
|
|
317
|
-
if (ch !== 32 && ch !== 9)
|
|
318
|
-
break; // not ' ' or '\t'
|
|
319
|
-
}
|
|
320
|
-
if (start >= end)
|
|
307
|
+
const start = s.charCodeAt(0) === 10 ? 1 : 0; // 10 = '\n'
|
|
308
|
+
if (start >= s.length)
|
|
321
309
|
return '';
|
|
322
|
-
const str = start > 0
|
|
310
|
+
const str = start > 0 ? s.slice(start) : s;
|
|
323
311
|
const lines = str.split('\n');
|
|
324
312
|
// Always consider all lines for minIndent calculation
|
|
325
313
|
// If first line has content at column 0, minIndent will be 0 and no dedenting happens
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.69.
|
|
1
|
+
8.69.1
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assertions.d.ts","sourceRoot":"","sources":["../../src/yaml/assertions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,eAAe,EAAe,UAAU,EAAC,MAAM,SAAS,CAAC;AAEjE,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAE5B,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAQ/F"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.yaml = yaml;
|
|
4
|
+
/*
|
|
5
|
+
* Copyright 2025 the original author or authors.
|
|
6
|
+
* <p>
|
|
7
|
+
* Licensed under the Moderne Source Available License (the "License");
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
10
|
+
* <p>
|
|
11
|
+
* https://docs.moderne.io/licensing/moderne-source-available-license
|
|
12
|
+
* <p>
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
const test_1 = require("../test");
|
|
20
|
+
const parser_1 = require("./parser");
|
|
21
|
+
const tree_1 = require("./tree");
|
|
22
|
+
function yaml(before, after) {
|
|
23
|
+
return {
|
|
24
|
+
kind: tree_1.Yaml.Kind.Documents,
|
|
25
|
+
before: before,
|
|
26
|
+
after: (0, test_1.dedentAfter)(after),
|
|
27
|
+
ext: 'yaml',
|
|
28
|
+
parser: () => new parser_1.YamlParser()
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=assertions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../src/yaml/assertions.ts"],"names":[],"mappings":";;AAmBA,oBAQC;AA3BD;;;;;;;;;;;;;;GAcG;AACH,kCAAiE;AACjE,qCAAoC;AACpC,iCAA4B;AAE5B,SAAgB,IAAI,CAAC,MAAqB,EAAE,KAAuB;IAC/D,OAAO;QACH,IAAI,EAAE,WAAI,CAAC,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,IAAA,kBAAW,EAAC,KAAK,CAAC;QACzB,GAAG,EAAE,MAAM;QACX,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,mBAAU,EAAE;KACjC,CAAC;AACN,CAAC"}
|
package/dist/yaml/index.d.ts
CHANGED
package/dist/yaml/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":"AAeA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":"AAeA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAE1B,OAAO,SAAS,CAAC;AACjB,OAAO,OAAO,CAAC"}
|
package/dist/yaml/index.js
CHANGED
|
@@ -29,9 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
* See the License for the specific language governing permissions and
|
|
30
30
|
* limitations under the License.
|
|
31
31
|
*/
|
|
32
|
+
__exportStar(require("./assertions"), exports);
|
|
33
|
+
__exportStar(require("./parser"), exports);
|
|
32
34
|
__exportStar(require("./tree"), exports);
|
|
33
35
|
__exportStar(require("./visitor"), exports);
|
|
34
|
-
__exportStar(require("./parser"), exports);
|
|
35
36
|
require("./print");
|
|
36
37
|
require("./rpc");
|
|
37
38
|
//# sourceMappingURL=index.js.map
|
package/dist/yaml/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yCAAuB;AACvB,4CAA0B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,+CAA6B;AAC7B,2CAAyB;AACzB,yCAAuB;AACvB,4CAA0B;AAE1B,mBAAiB;AACjB,iBAAe"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.69.
|
|
3
|
+
"version": "8.69.1",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"homepage": "https://github.com/openrewrite/rewrite",
|
|
@@ -47,11 +47,11 @@
|
|
|
47
47
|
"scripts": {
|
|
48
48
|
"build": "rm -rf ./dist tsconfig.build.tsbuildinfo && tsc --build tsconfig.build.json",
|
|
49
49
|
"postbuild": "chmod +x dist/rpc/server.js dist/cli/rewrite.js && npm link",
|
|
50
|
-
"typecheck": "tsc --noEmit",
|
|
50
|
+
"typecheck": "tsc --noEmit -p tsconfig.test.json",
|
|
51
51
|
"dev": "tsc --watch -p tsconfig.json",
|
|
52
|
-
"test": "npm run typecheck && npm run build && NODE_OPTIONS='--max-old-space-size=4096' jest",
|
|
52
|
+
"test": "npm run typecheck && npm run build && NODE_OPTIONS='--max-old-space-size=4096 --experimental-vm-modules' jest",
|
|
53
53
|
"build:fixtures": "tsc --build fixtures/tsconfig.json",
|
|
54
|
-
"ci:test": "NODE_OPTIONS='--max-old-space-size=4096' jest",
|
|
54
|
+
"ci:test": "NODE_OPTIONS='--max-old-space-size=4096 --experimental-vm-modules' jest",
|
|
55
55
|
"start": "npm run build && node ./dist/rpc/server.js"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
@@ -77,6 +77,7 @@
|
|
|
77
77
|
"benchmark": "^2.1.4",
|
|
78
78
|
"jest": "^29.7.0",
|
|
79
79
|
"jest-junit": "^16.0.0",
|
|
80
|
+
"prettier": "^3.7.4",
|
|
80
81
|
"ts-jest": "^29.2.5",
|
|
81
82
|
"ts-node": "^10.9.2"
|
|
82
83
|
},
|
package/src/java/type.ts
CHANGED
|
@@ -232,6 +232,18 @@ export namespace Type {
|
|
|
232
232
|
kind: Type.Kind.Unknown
|
|
233
233
|
});
|
|
234
234
|
|
|
235
|
+
/**
|
|
236
|
+
* Type guard that checks if an unknown value is a JavaType.
|
|
237
|
+
* All JavaType kinds start with 'org.openrewrite.java.tree.JavaType$'.
|
|
238
|
+
*/
|
|
239
|
+
export function isType(value: unknown): value is Type {
|
|
240
|
+
return value !== null &&
|
|
241
|
+
typeof value === 'object' &&
|
|
242
|
+
'kind' in value &&
|
|
243
|
+
typeof (value as { kind: unknown }).kind === 'string' &&
|
|
244
|
+
(value as { kind: string }).kind.startsWith('org.openrewrite.java.tree.JavaType$');
|
|
245
|
+
}
|
|
246
|
+
|
|
235
247
|
export function isPrimitive(type?: Type): type is Type.Primitive {
|
|
236
248
|
return type?.kind === Type.Kind.Primitive;
|
|
237
249
|
}
|
|
@@ -108,6 +108,15 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
|
|
|
108
108
|
parser: () => new JavaScriptParser({sourceFileCache, relativeTo})
|
|
109
109
|
}
|
|
110
110
|
} else {
|
|
111
|
+
// Write non-JS/TS files to disk so tools like Prettier can find config files
|
|
112
|
+
if (spec.before && spec.path) {
|
|
113
|
+
const filePath = path.join(relativeTo, spec.path);
|
|
114
|
+
const dir = path.dirname(filePath);
|
|
115
|
+
if (!fs.existsSync(dir)) {
|
|
116
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
117
|
+
}
|
|
118
|
+
fs.writeFileSync(filePath, spec.before);
|
|
119
|
+
}
|
|
111
120
|
yield spec;
|
|
112
121
|
}
|
|
113
122
|
}
|
|
@@ -249,12 +249,13 @@ export class JavaScriptComparatorVisitor extends JavaScriptVisitor<J> {
|
|
|
249
249
|
return j;
|
|
250
250
|
}
|
|
251
251
|
|
|
252
|
+
// Check if it's a Type node
|
|
253
|
+
if (Type.isType(j)) {
|
|
254
|
+
return await this.visitType(j, other);
|
|
255
|
+
}
|
|
256
|
+
|
|
252
257
|
// Check if it's a Tree node (has a kind property with a string value)
|
|
253
258
|
if (kind !== undefined && typeof kind === 'string') {
|
|
254
|
-
// Check if it's a Type node (starts with "org.openrewrite.java.tree.JavaType$")
|
|
255
|
-
if (kind.startsWith('org.openrewrite.java.tree.JavaType$')) {
|
|
256
|
-
return await this.visitType(j, other);
|
|
257
|
-
}
|
|
258
259
|
return await this.visit(j, other);
|
|
259
260
|
}
|
|
260
261
|
|
|
@@ -2244,13 +2245,7 @@ export class JavaScriptSemanticComparatorVisitor extends JavaScriptComparatorVis
|
|
|
2244
2245
|
if (this.lenientTypeMatching && (j == null || other == null)) {
|
|
2245
2246
|
if (j !== other) {
|
|
2246
2247
|
// Don't abort if one is null and the other is a Type
|
|
2247
|
-
|
|
2248
|
-
const otherKind = (other as any)?.kind;
|
|
2249
|
-
const isTypeComparison =
|
|
2250
|
-
(jKind && typeof jKind === 'string' && jKind.startsWith('org.openrewrite.java.tree.JavaType$')) ||
|
|
2251
|
-
(otherKind && typeof otherKind === 'string' && otherKind.startsWith('org.openrewrite.java.tree.JavaType$'));
|
|
2252
|
-
|
|
2253
|
-
if (!isTypeComparison) {
|
|
2248
|
+
if (!Type.isType(j) && !Type.isType(other)) {
|
|
2254
2249
|
this.structuralMismatch(propertyName!);
|
|
2255
2250
|
}
|
|
2256
2251
|
}
|