@openrewrite/rewrite 8.62.0 → 8.62.2
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/rpc.d.ts +3 -3
- package/dist/java/rpc.d.ts.map +1 -1
- package/dist/java/rpc.js +6 -6
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/tree.d.ts +31 -33
- package/dist/java/tree.d.ts.map +1 -1
- package/dist/java/tree.js +125 -7
- package/dist/java/tree.js.map +1 -1
- package/dist/java/type.d.ts +70 -57
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +454 -25
- package/dist/java/type.js.map +1 -1
- package/dist/java/visitor.d.ts +4 -4
- package/dist/java/visitor.d.ts.map +1 -1
- package/dist/java/visitor.js +34 -28
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/assertions.d.ts +3 -0
- package/dist/javascript/assertions.d.ts.map +1 -1
- package/dist/javascript/assertions.js +78 -1
- package/dist/javascript/assertions.js.map +1 -1
- package/dist/javascript/format.js +4 -4
- package/dist/javascript/format.js.map +1 -1
- package/dist/javascript/parser.d.ts +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +38 -11
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/rpc.js +1 -4
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/tree.d.ts +33 -35
- package/dist/javascript/tree.d.ts.map +1 -1
- package/dist/javascript/tree.js +70 -17
- package/dist/javascript/tree.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +44 -8
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +571 -101
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/javascript/visitor.d.ts +2 -2
- package/dist/javascript/visitor.d.ts.map +1 -1
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/tree.d.ts +0 -2
- package/dist/json/tree.d.ts.map +1 -1
- package/dist/json/tree.js +12 -2
- package/dist/json/tree.js.map +1 -1
- package/dist/reference.js +1 -1
- package/dist/reference.js.map +1 -1
- package/dist/rpc/chrome-profiler.d.ts +25 -0
- package/dist/rpc/chrome-profiler.d.ts.map +1 -0
- package/dist/rpc/chrome-profiler.js +405 -0
- package/dist/rpc/chrome-profiler.js.map +1 -0
- package/dist/rpc/queue.d.ts +0 -3
- package/dist/rpc/queue.d.ts.map +1 -1
- package/dist/rpc/queue.js +6 -6
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/request/parse.d.ts.map +1 -1
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/rewrite-rpc.d.ts +1 -0
- package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/rpc/rewrite-rpc.js +1 -1
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.d.ts.map +1 -1
- package/dist/rpc/server.js +26 -1
- package/dist/rpc/server.js.map +1 -1
- package/dist/test/rewrite-test.d.ts +1 -1
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +18 -2
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/text/tree.d.ts +0 -2
- package/dist/text/tree.d.ts.map +1 -1
- package/dist/text/tree.js +4 -17
- package/dist/text/tree.js.map +1 -1
- package/dist/tree.d.ts +1 -0
- package/dist/tree.d.ts.map +1 -1
- package/dist/tree.js +14 -0
- package/dist/tree.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +3 -3
- package/src/java/rpc.ts +18 -15
- package/src/java/tree.ts +68 -38
- package/src/java/type.ts +475 -74
- package/src/java/visitor.ts +45 -39
- package/src/javascript/assertions.ts +52 -1
- package/src/javascript/format.ts +4 -4
- package/src/javascript/parser.ts +51 -18
- package/src/javascript/rpc.ts +8 -10
- package/src/javascript/tree.ts +34 -35
- package/src/javascript/type-mapping.ts +582 -47
- package/src/javascript/visitor.ts +5 -5
- package/src/json/tree.ts +1 -2
- package/src/reference.ts +1 -1
- package/src/rpc/chrome-profiler.ts +373 -0
- package/src/rpc/queue.ts +8 -12
- package/src/rpc/request/parse.ts +1 -1
- package/src/rpc/rewrite-rpc.ts +3 -2
- package/src/rpc/server.ts +30 -1
- package/src/test/rewrite-test.ts +19 -3
- package/src/text/tree.ts +0 -1
- package/src/tree.ts +15 -0
package/dist/rpc/server.js
CHANGED
|
@@ -64,13 +64,14 @@ const rewrite_rpc_1 = require("./rewrite-rpc");
|
|
|
64
64
|
const fs = __importStar(require("fs"));
|
|
65
65
|
const commander_1 = require("commander");
|
|
66
66
|
const tmp_promise_1 = require("tmp-promise");
|
|
67
|
+
const chrome_profiler_1 = require("./chrome-profiler");
|
|
67
68
|
// Include all languages you want this server to support.
|
|
68
69
|
require("../text");
|
|
69
70
|
require("../json");
|
|
70
71
|
require("../java");
|
|
71
72
|
require("../javascript");
|
|
72
73
|
// Not possible to set the stack size when executing from npx for security reasons
|
|
73
|
-
require('v8').setFlagsFromString('--stack-size=
|
|
74
|
+
require('v8').setFlagsFromString('--stack-size=8000');
|
|
74
75
|
function main() {
|
|
75
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
77
|
const program = new commander_1.Command();
|
|
@@ -82,8 +83,15 @@ function main() {
|
|
|
82
83
|
.option('--trace-get-object-output', 'enable `GetObject` output tracing')
|
|
83
84
|
.option('--trace-get-object-input', 'enable `GetObject` input tracing')
|
|
84
85
|
.option('--recipe-install-dir <install_dir>', 'Recipe installation directory (default is a temporary directory)')
|
|
86
|
+
.option('--profile', 'enable profiling')
|
|
85
87
|
.parse();
|
|
86
88
|
const options = program.opts();
|
|
89
|
+
// Chrome profiling
|
|
90
|
+
let profiler;
|
|
91
|
+
if (options.profile) {
|
|
92
|
+
profiler = new chrome_profiler_1.ChromeProfiler();
|
|
93
|
+
profiler.start().catch(console.error);
|
|
94
|
+
}
|
|
87
95
|
let recipeInstallDir;
|
|
88
96
|
if (!options.recipeInstallDir) {
|
|
89
97
|
let recipeCleanup;
|
|
@@ -96,12 +104,18 @@ function main() {
|
|
|
96
104
|
}
|
|
97
105
|
// Register cleanup on exit
|
|
98
106
|
process.on('SIGINT', () => __awaiter(this, void 0, void 0, function* () {
|
|
107
|
+
if (profiler) {
|
|
108
|
+
yield profiler.stop();
|
|
109
|
+
}
|
|
99
110
|
if (recipeCleanup) {
|
|
100
111
|
yield recipeCleanup();
|
|
101
112
|
}
|
|
102
113
|
process.exit(0);
|
|
103
114
|
}));
|
|
104
115
|
process.on('SIGTERM', () => __awaiter(this, void 0, void 0, function* () {
|
|
116
|
+
if (profiler) {
|
|
117
|
+
yield profiler.stop();
|
|
118
|
+
}
|
|
105
119
|
if (recipeCleanup) {
|
|
106
120
|
yield recipeCleanup();
|
|
107
121
|
}
|
|
@@ -111,6 +125,17 @@ function main() {
|
|
|
111
125
|
}
|
|
112
126
|
else {
|
|
113
127
|
recipeInstallDir = options.recipeInstallDir;
|
|
128
|
+
// Register cleanup for profiler when no recipe cleanup is needed
|
|
129
|
+
if (profiler) {
|
|
130
|
+
process.on('SIGINT', () => __awaiter(this, void 0, void 0, function* () {
|
|
131
|
+
yield profiler.stop();
|
|
132
|
+
process.exit(0);
|
|
133
|
+
}));
|
|
134
|
+
process.on('SIGTERM', () => __awaiter(this, void 0, void 0, function* () {
|
|
135
|
+
yield profiler.stop();
|
|
136
|
+
process.exit(0);
|
|
137
|
+
}));
|
|
138
|
+
}
|
|
114
139
|
}
|
|
115
140
|
const log = options.logFile ? fs.createWriteStream(options.logFile, { flags: 'a' }) : undefined;
|
|
116
141
|
const logger = {
|
package/dist/rpc/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/rpc/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,8CAAkD;AAClD,+CAAyC;AACzC,uCAAyB;AACzB,yCAAkC;AAClC,6CAAgC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/rpc/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export declare class RecipeSpec {
|
|
|
27
27
|
recipeExecutionContext: ExecutionContext;
|
|
28
28
|
private dataTableAssertions;
|
|
29
29
|
dataTable<Row>(name: string, allRows: (rows: Row[]) => void): void;
|
|
30
|
-
rewriteRun(...sourceSpecs: SourceSpec<any>[]): Promise<void>;
|
|
30
|
+
rewriteRun(...sourceSpecs: (SourceSpec<any> | Generator<SourceSpec<any>, void, unknown>)[]): Promise<void>;
|
|
31
31
|
private expectNoParseFailures;
|
|
32
32
|
private expectParsePrintIdempotence;
|
|
33
33
|
private expectResultsToMatchAfter;
|
|
@@ -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;AAUnC,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,UAAU,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
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;AAUnC,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,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAwClG,qBAAqB;YASrB,2BAA2B;YAO3B,yBAAyB;YA2BzB,oBAAoB;YAapB,WAAW;IAYzB;;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,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"}
|
|
@@ -68,7 +68,19 @@ class RecipeSpec {
|
|
|
68
68
|
}
|
|
69
69
|
rewriteRun(...sourceSpecs) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
|
|
71
|
+
// Flatten generators into a list of sourceSpecs
|
|
72
|
+
const flattenedSpecs = [];
|
|
73
|
+
for (const specOrGenerator of sourceSpecs) {
|
|
74
|
+
if (specOrGenerator && typeof specOrGenerator.next === 'function') {
|
|
75
|
+
for (const spec of specOrGenerator) {
|
|
76
|
+
flattenedSpecs.push(spec);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
flattenedSpecs.push(specOrGenerator);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
const specsByKind = flattenedSpecs.reduce((groups, spec) => {
|
|
72
84
|
const kind = spec.kind;
|
|
73
85
|
if (!groups[kind]) {
|
|
74
86
|
groups[kind] = [];
|
|
@@ -202,7 +214,11 @@ class RecipeSpec {
|
|
|
202
214
|
const b = spec.beforeRecipe ? spec.beforeRecipe(sourceFile) : sourceFile;
|
|
203
215
|
if (b !== undefined) {
|
|
204
216
|
if (b instanceof Promise) {
|
|
205
|
-
|
|
217
|
+
const mapped = yield b;
|
|
218
|
+
if (mapped === undefined) {
|
|
219
|
+
throw new Error("Expected beforeRecipe to return a SourceFile, but got undefined. Did you forget a return statement?");
|
|
220
|
+
}
|
|
221
|
+
return [spec, mapped];
|
|
206
222
|
}
|
|
207
223
|
return [spec, b];
|
|
208
224
|
}
|
|
@@ -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/text/tree.d.ts
CHANGED
|
@@ -8,8 +8,6 @@ export declare namespace PlainText {
|
|
|
8
8
|
const Kind: {
|
|
9
9
|
readonly PlainText: "org.openrewrite.text.PlainText";
|
|
10
10
|
readonly Snippet: "org.openrewrite.text.PlainText$Snippet";
|
|
11
|
-
readonly Checksum: "org.openrewrite.Checksum";
|
|
12
|
-
readonly FileAttributes: "org.openrewrite.FileAttributes";
|
|
13
11
|
};
|
|
14
12
|
interface Snippet extends Tree {
|
|
15
13
|
readonly kind: typeof PlainText.Kind.Snippet;
|
package/dist/text/tree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/text/tree.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,UAAU,EAAE,IAAI,EAAW,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,SAAU,SAAQ,UAAU;IACzC,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAA;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,EAAE,CAAA;CACzC;AAED,yBAAiB,SAAS,CAAC;IAChB,MAAM,IAAI
|
|
1
|
+
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/text/tree.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,UAAU,EAAE,IAAI,EAAW,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,SAAU,SAAQ,UAAU;IACzC,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAA;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,EAAE,CAAA;CACzC;AAED,yBAAiB,SAAS,CAAC;IAChB,MAAM,IAAI;;;KAGP,CAAA;IAEV,UAAiB,OAAQ,SAAQ,IAAI;QACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAA;QAC5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KACxB;CACJ;AAID,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,SAAS,CAExD"}
|
package/dist/text/tree.js
CHANGED
|
@@ -2,25 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PlainText = void 0;
|
|
4
4
|
exports.isPlainText = isPlainText;
|
|
5
|
-
/*
|
|
6
|
-
* Copyright 2025 the original author or authors.
|
|
7
|
-
* <p>
|
|
8
|
-
* Licensed under the Moderne Source Available License (the "License");
|
|
9
|
-
* you may not use this file except in compliance with the License.
|
|
10
|
-
* You may obtain a copy of the License at
|
|
11
|
-
* <p>
|
|
12
|
-
* https://docs.moderne.io/licensing/moderne-source-available-license
|
|
13
|
-
* <p>
|
|
14
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
15
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
16
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
17
|
-
* See the License for the specific language governing permissions and
|
|
18
|
-
* limitations under the License.
|
|
19
|
-
*/
|
|
20
|
-
const tree_1 = require("../tree");
|
|
21
5
|
var PlainText;
|
|
22
6
|
(function (PlainText) {
|
|
23
|
-
PlainText.Kind =
|
|
7
|
+
PlainText.Kind = {
|
|
8
|
+
PlainText: "org.openrewrite.text.PlainText",
|
|
9
|
+
Snippet: "org.openrewrite.text.PlainText$Snippet"
|
|
10
|
+
};
|
|
24
11
|
})(PlainText || (exports.PlainText = PlainText = {}));
|
|
25
12
|
const textKindValues = new Set(Object.values(PlainText.Kind));
|
|
26
13
|
function isPlainText(tree) {
|
package/dist/text/tree.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/text/tree.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/text/tree.ts"],"names":[],"mappings":";;;AAqCA,kCAEC;AAhBD,IAAiB,SAAS,CAUzB;AAVD,WAAiB,SAAS;IACT,cAAI,GAAG;QAChB,SAAS,EAAE,gCAAgC;QAC3C,OAAO,EAAE,wCAAwC;KAC3C,CAAA;AAMd,CAAC,EAVgB,SAAS,yBAAT,SAAS,QAUzB;AAED,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAE9D,SAAgB,WAAW,CAAC,IAAS;IACjC,OAAO,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|
package/dist/tree.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare class Cursor {
|
|
|
25
25
|
get messages(): Map<string | symbol, any>;
|
|
26
26
|
getNearestMessage<T>(key: string): any;
|
|
27
27
|
asArray(): any[];
|
|
28
|
+
parentTree(level?: number): Cursor | undefined;
|
|
28
29
|
firstEnclosing<T>(match: (value: any) => value is T): T | undefined;
|
|
29
30
|
get root(): Cursor;
|
|
30
31
|
}
|
package/dist/tree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAI5B,eAAO,MAAM,QAAQ;;;CAGX,CAAA;AAEV,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC5B;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,IAAI,CAM9C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,OAAO,CAEjD;AAED,qBAAa,MAAM;aAGa,KAAK,EAAE,GAAG;aAAkB,MAAM,CAAC,EAAE,MAAM;IAFvE,OAAO,CAAC,SAAS,CAAC,CAA4B;gBAElB,KAAK,EAAE,GAAG,EAAkB,MAAM,CAAC,EAAE,MAAM,YAAA;IAGvE,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAKxC;IAED,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG;IAKtC,OAAO,IAAI,GAAG,EAAE;IAUhB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS;IAWnE,IAAI,IAAI,IAAI,MAAM,CAMjB;CACJ;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,OAAO,QAAQ,CAAC,QAAQ,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,OAAO,QAAQ,CAAC,cAAc,CAAA;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAA;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAA;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAA;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACxB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,UAAU,CAE1D;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,cAAc,CAAC,EAAE,cAAc,CAAA;CAClC"}
|
|
1
|
+
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAI5B,eAAO,MAAM,QAAQ;;;CAGX,CAAA;AAEV,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC5B;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,IAAI,CAM9C;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,OAAO,CAEjD;AAED,qBAAa,MAAM;aAGa,KAAK,EAAE,GAAG;aAAkB,MAAM,CAAC,EAAE,MAAM;IAFvE,OAAO,CAAC,SAAS,CAAC,CAA4B;gBAElB,KAAK,EAAE,GAAG,EAAkB,MAAM,CAAC,EAAE,MAAM,YAAA;IAGvE,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAKxC;IAED,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG;IAKtC,OAAO,IAAI,GAAG,EAAE;IAUhB,UAAU,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,GAAG,SAAS;IAejD,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS;IAWnE,IAAI,IAAI,IAAI,MAAM,CAMjB;CACJ;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,OAAO,QAAQ,CAAC,QAAQ,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,OAAO,QAAQ,CAAC,cAAc,CAAA;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAA;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAA;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAA;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACxB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,UAAU,CAE1D;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,cAAc,CAAC,EAAE,cAAc,CAAA;CAClC"}
|
package/dist/tree.js
CHANGED
|
@@ -41,6 +41,20 @@ class Cursor {
|
|
|
41
41
|
}
|
|
42
42
|
return path;
|
|
43
43
|
}
|
|
44
|
+
parentTree(level = 1) {
|
|
45
|
+
let c = this.parent;
|
|
46
|
+
let treeCount = 0;
|
|
47
|
+
while (c) {
|
|
48
|
+
if (isTree(c.value)) {
|
|
49
|
+
treeCount++;
|
|
50
|
+
if (treeCount === level) {
|
|
51
|
+
return c;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
c = c.parent;
|
|
55
|
+
}
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
44
58
|
firstEnclosing(match) {
|
|
45
59
|
let c = this;
|
|
46
60
|
while (c) {
|
package/dist/tree.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":";;;AAuCA,wBAMC;AAED,0BAEC;
|
|
1
|
+
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.62.
|
|
1
|
+
8.62.2
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.62.
|
|
3
|
+
"version": "8.62.2",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"homepage": "https://github.com/openrewrite/rewrite",
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"build": "rm -rf ./dist tsconfig.build.tsbuildinfo && tsc --build tsconfig.build.json",
|
|
24
24
|
"postbuild": "chmod +x dist/rpc/server.js && npm link",
|
|
25
25
|
"dev": "tsc --watch -p tsconfig.json",
|
|
26
|
-
"test": "npm run build && jest",
|
|
26
|
+
"test": "npm run build && NODE_OPTIONS='--max-old-space-size=4096' jest",
|
|
27
27
|
"build:fixtures": "tsc --build fixtures/tsconfig.json",
|
|
28
|
-
"ci:test": "jest",
|
|
28
|
+
"ci:test": "NODE_OPTIONS='--max-old-space-size=4096' jest",
|
|
29
29
|
"start": "npm run build && node ./dist/rpc/server.js"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
package/src/java/rpc.ts
CHANGED
|
@@ -19,7 +19,7 @@ import {Expression, isSpace, J, TextComment} from "./tree";
|
|
|
19
19
|
import {produceAsync} from "../visitor";
|
|
20
20
|
import {createDraft, Draft, finishDraft, WritableDraft} from "immer";
|
|
21
21
|
import {isTree} from "../tree";
|
|
22
|
-
import {
|
|
22
|
+
import {Type} from "./type";
|
|
23
23
|
|
|
24
24
|
export class JavaSender extends JavaVisitor<RpcSendQueue> {
|
|
25
25
|
|
|
@@ -514,8 +514,8 @@ export class JavaSender extends JavaVisitor<RpcSendQueue> {
|
|
|
514
514
|
protected async visitIdentifier(ident: J.Identifier, q: RpcSendQueue): Promise<J | undefined> {
|
|
515
515
|
await q.getAndSendList(ident, id => id.annotations, annot => annot.id, annot => this.visit(annot, q));
|
|
516
516
|
await q.getAndSend(ident, id => id.simpleName);
|
|
517
|
-
await q.getAndSend(ident, id => id.type, type => this.visitType(type, q));
|
|
518
|
-
await q.getAndSend(ident, id => id.fieldType, type => this.visitType(type, q));
|
|
517
|
+
await q.getAndSend(ident, id => asRef(id.type), type => this.visitType(type, q));
|
|
518
|
+
await q.getAndSend(ident, id => asRef(id.fieldType), type => this.visitType(type, q));
|
|
519
519
|
return ident;
|
|
520
520
|
}
|
|
521
521
|
|
|
@@ -573,7 +573,7 @@ export class JavaSender extends JavaVisitor<RpcSendQueue> {
|
|
|
573
573
|
return container;
|
|
574
574
|
}
|
|
575
575
|
|
|
576
|
-
public override async visitType(javaType:
|
|
576
|
+
public override async visitType(javaType: Type | undefined, q: RpcSendQueue): Promise<Type | undefined> {
|
|
577
577
|
const codec = RpcCodecs.forInstance(javaType);
|
|
578
578
|
await codec?.rpcSend(javaType, q);
|
|
579
579
|
return javaType;
|
|
@@ -900,7 +900,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
900
900
|
draft.value = await q.receive(literal.value);
|
|
901
901
|
draft.valueSource = await q.receive(literal.valueSource);
|
|
902
902
|
draft.unicodeEscapes = await q.receiveList(literal.unicodeEscapes);
|
|
903
|
-
draft.type = await q.receive(literal.type, type => this.visitType(type, q) as unknown as
|
|
903
|
+
draft.type = await q.receive(literal.type, type => this.visitType(type, q) as unknown as Type.Primitive);
|
|
904
904
|
|
|
905
905
|
return finishDraft(draft);
|
|
906
906
|
}
|
|
@@ -912,8 +912,8 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
912
912
|
draft.typeParameters = await q.receive(memberRef.typeParameters, typeParams => this.visitContainer(typeParams, q));
|
|
913
913
|
draft.reference = await q.receive(memberRef.reference, ref => this.visitLeftPadded(ref, q));
|
|
914
914
|
draft.type = await q.receive(memberRef.type, type => this.visitType(type, q));
|
|
915
|
-
draft.methodType = await q.receive(memberRef.methodType, type => this.visitType(type, q) as unknown as
|
|
916
|
-
draft.variableType = await q.receive(memberRef.variableType, type => this.visitType(type, q) as unknown as
|
|
915
|
+
draft.methodType = await q.receive(memberRef.methodType, type => this.visitType(type, q) as unknown as Type.Method);
|
|
916
|
+
draft.variableType = await q.receive(memberRef.variableType, type => this.visitType(type, q) as unknown as Type.Variable);
|
|
917
917
|
|
|
918
918
|
return finishDraft(draft);
|
|
919
919
|
}
|
|
@@ -925,7 +925,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
925
925
|
draft.typeParameters = await q.receive(methodInvoc.typeParameters, typeParams => this.visitContainer(typeParams, q));
|
|
926
926
|
draft.name = await q.receive(methodInvoc.name, name => this.visit(name, q));
|
|
927
927
|
draft.arguments = await q.receive(methodInvoc.arguments, args => this.visitContainer(args, q));
|
|
928
|
-
draft.methodType = await q.receive(methodInvoc.methodType, type => this.visitType(type, q) as unknown as
|
|
928
|
+
draft.methodType = await q.receive(methodInvoc.methodType, type => this.visitType(type, q) as unknown as Type.Method);
|
|
929
929
|
|
|
930
930
|
return finishDraft(draft);
|
|
931
931
|
}
|
|
@@ -967,7 +967,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
967
967
|
draft.class = await q.receive(newClass.class, clazz => this.visit(clazz, q));
|
|
968
968
|
draft.arguments = await q.receive(newClass.arguments, args => this.visitContainer(args, q));
|
|
969
969
|
draft.body = await q.receive(newClass.body, body => this.visit(body, q));
|
|
970
|
-
draft.constructorType = await q.receive(newClass.constructorType, type => this.visitType(type, q) as unknown as
|
|
970
|
+
draft.constructorType = await q.receive(newClass.constructorType, type => this.visitType(type, q) as unknown as Type.Method);
|
|
971
971
|
|
|
972
972
|
return finishDraft(draft);
|
|
973
973
|
}
|
|
@@ -1012,7 +1012,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
1012
1012
|
protected async visitPrimitive(primitive: J.Primitive, q: RpcReceiveQueue): Promise<J | undefined> {
|
|
1013
1013
|
const draft = createDraft(primitive);
|
|
1014
1014
|
|
|
1015
|
-
draft.type = await q.receive(primitive.type, type => this.visitType(type, q) as unknown as
|
|
1015
|
+
draft.type = await q.receive(primitive.type, type => this.visitType(type, q) as unknown as Type.Primitive);
|
|
1016
1016
|
|
|
1017
1017
|
return finishDraft(draft);
|
|
1018
1018
|
}
|
|
@@ -1116,7 +1116,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
1116
1116
|
draft.name = await q.receive(variable.name, name => this.visit(name, q));
|
|
1117
1117
|
draft.dimensionsAfterName = await q.receiveListDefined(variable.dimensionsAfterName, dim => this.visitLeftPadded(dim, q));
|
|
1118
1118
|
draft.initializer = await q.receive(variable.initializer, init => this.visitOptionalLeftPadded(init, q));
|
|
1119
|
-
draft.variableType = await q.receive(variable.variableType, type => this.visitType(type, q) as unknown as
|
|
1119
|
+
draft.variableType = await q.receive(variable.variableType, type => this.visitType(type, q) as unknown as Type.Variable);
|
|
1120
1120
|
|
|
1121
1121
|
return finishDraft(draft);
|
|
1122
1122
|
}
|
|
@@ -1268,7 +1268,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
1268
1268
|
draft.throws = await q.receive(method.throws, throws => this.visitContainer(throws, q));
|
|
1269
1269
|
draft.body = await q.receive(method.body, body => this.visit(body, q));
|
|
1270
1270
|
draft.defaultValue = await q.receive(method.defaultValue, def => this.visitLeftPadded(def, q));
|
|
1271
|
-
draft.methodType = await q.receive(method.methodType, type => this.visitType(type, q) as unknown as
|
|
1271
|
+
draft.methodType = await q.receive(method.methodType, type => this.visitType(type, q) as unknown as Type.Method);
|
|
1272
1272
|
|
|
1273
1273
|
return finishDraft(draft);
|
|
1274
1274
|
}
|
|
@@ -1291,7 +1291,7 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
1291
1291
|
draft.annotations = await q.receiveListDefined(ident.annotations, annot => this.visit(annot, q));
|
|
1292
1292
|
draft.simpleName = await q.receive(ident.simpleName);
|
|
1293
1293
|
draft.type = await q.receive(ident.type, type => this.visitType(type, q));
|
|
1294
|
-
draft.fieldType = await q.receive(ident.fieldType, type => this.visitType(type, q) as any as
|
|
1294
|
+
draft.fieldType = await q.receive(ident.fieldType, type => this.visitType(type, q) as any as Type.Variable);
|
|
1295
1295
|
|
|
1296
1296
|
return finishDraft(draft);
|
|
1297
1297
|
}
|
|
@@ -1371,11 +1371,14 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
|
|
|
1371
1371
|
return finishDraft(draft) as J.Container<T>;
|
|
1372
1372
|
}
|
|
1373
1373
|
|
|
1374
|
-
public override async visitType(javaType:
|
|
1374
|
+
public override async visitType(javaType: Type | undefined, q: RpcReceiveQueue): Promise<Type | undefined> {
|
|
1375
1375
|
const codec = RpcCodecs.forInstance(javaType);
|
|
1376
1376
|
if (codec) {
|
|
1377
1377
|
return await codec.rpcReceive(javaType, q);
|
|
1378
1378
|
}
|
|
1379
|
-
|
|
1379
|
+
if (javaType !== undefined) {
|
|
1380
|
+
throw new Error("Missing codec for Type " + javaType.kind);
|
|
1381
|
+
}
|
|
1382
|
+
return undefined;
|
|
1380
1383
|
}
|
|
1381
1384
|
}
|