@openrewrite/rewrite 8.92.17 → 8.92.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/java/formatting-utils.d.ts +2 -1
- package/dist/java/formatting-utils.d.ts.map +1 -1
- package/dist/java/formatting-utils.js +4 -3
- package/dist/java/formatting-utils.js.map +1 -1
- package/dist/java/rpc.d.ts.map +1 -1
- package/dist/java/rpc.js +2 -0
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/tree.d.ts +8 -0
- package/dist/java/tree.d.ts.map +1 -1
- package/dist/java/tree.js +11 -1
- package/dist/java/tree.js.map +1 -1
- package/dist/java/type.d.ts +7 -1
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +16 -1
- package/dist/java/type.js.map +1 -1
- package/dist/javascript/add-import.d.ts +27 -21
- package/dist/javascript/add-import.d.ts.map +1 -1
- package/dist/javascript/add-import.js +303 -143
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/amd.d.ts.map +1 -1
- package/dist/javascript/amd.js +25 -10
- package/dist/javascript/amd.js.map +1 -1
- package/dist/javascript/autodetect.js +36 -45
- package/dist/javascript/autodetect.js.map +1 -1
- package/dist/javascript/binding.d.ts +6 -4
- package/dist/javascript/binding.d.ts.map +1 -1
- package/dist/javascript/binding.js +54 -18
- package/dist/javascript/binding.js.map +1 -1
- package/dist/javascript/comparator.d.ts +22 -5
- package/dist/javascript/comparator.d.ts.map +1 -1
- package/dist/javascript/comparator.js +116 -38
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/format/format.d.ts +2 -0
- package/dist/javascript/format/format.d.ts.map +1 -1
- package/dist/javascript/format/format.js +11 -1
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/index.d.ts +4 -2
- package/dist/javascript/index.d.ts.map +1 -1
- package/dist/javascript/index.js +10 -1
- package/dist/javascript/index.js.map +1 -1
- package/dist/javascript/markers.d.ts.map +1 -1
- package/dist/javascript/markers.js +64 -0
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/method-matcher.d.ts +13 -2
- package/dist/javascript/method-matcher.d.ts.map +1 -1
- package/dist/javascript/method-matcher.js +32 -19
- package/dist/javascript/method-matcher.js.map +1 -1
- package/dist/javascript/package-name.d.ts +6 -0
- package/dist/javascript/package-name.d.ts.map +1 -0
- package/dist/javascript/package-name.js +47 -0
- package/dist/javascript/package-name.js.map +1 -0
- package/dist/javascript/preconditions.d.ts +4 -1
- package/dist/javascript/preconditions.d.ts.map +1 -1
- package/dist/javascript/preconditions.js +7 -4
- package/dist/javascript/preconditions.js.map +1 -1
- package/dist/javascript/recipes/change-method-target-to-import.d.ts +29 -0
- package/dist/javascript/recipes/change-method-target-to-import.d.ts.map +1 -0
- package/dist/javascript/recipes/change-method-target-to-import.js +164 -0
- package/dist/javascript/recipes/change-method-target-to-import.js.map +1 -0
- package/dist/javascript/recipes/index.d.ts +1 -0
- package/dist/javascript/recipes/index.d.ts.map +1 -1
- package/dist/javascript/recipes/index.js +1 -0
- package/dist/javascript/recipes/index.js.map +1 -1
- package/dist/javascript/scope.d.ts +60 -16
- package/dist/javascript/scope.d.ts.map +1 -1
- package/dist/javascript/scope.js +596 -131
- package/dist/javascript/scope.js.map +1 -1
- package/dist/javascript/search/uses-method.d.ts +1 -1
- package/dist/javascript/search/uses-method.d.ts.map +1 -1
- package/dist/javascript/search/uses-method.js +2 -2
- package/dist/javascript/search/uses-method.js.map +1 -1
- package/dist/javascript/search/uses-type.d.ts +14 -1
- package/dist/javascript/search/uses-type.d.ts.map +1 -1
- package/dist/javascript/search/uses-type.js +24 -9
- package/dist/javascript/search/uses-type.js.map +1 -1
- package/dist/javascript/templating/bindings.d.ts +1 -1
- package/dist/javascript/templating/bindings.d.ts.map +1 -1
- package/dist/javascript/templating/bindings.js +10 -50
- package/dist/javascript/templating/bindings.js.map +1 -1
- package/dist/javascript/templating/comparator.d.ts +8 -11
- package/dist/javascript/templating/comparator.d.ts.map +1 -1
- package/dist/javascript/templating/comparator.js +12 -110
- package/dist/javascript/templating/comparator.js.map +1 -1
- package/dist/javascript/templating/engine.d.ts +34 -24
- package/dist/javascript/templating/engine.d.ts.map +1 -1
- package/dist/javascript/templating/engine.js +200 -112
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/pattern.d.ts +11 -5
- package/dist/javascript/templating/pattern.d.ts.map +1 -1
- package/dist/javascript/templating/pattern.js +86 -20
- package/dist/javascript/templating/pattern.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.d.ts +34 -3
- package/dist/javascript/templating/placeholder-replacement.d.ts.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +126 -60
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/templating/precedence.d.ts +3 -1
- package/dist/javascript/templating/precedence.d.ts.map +1 -1
- package/dist/javascript/templating/precedence.js +28 -8
- package/dist/javascript/templating/precedence.js.map +1 -1
- package/dist/javascript/templating/template.d.ts +7 -6
- package/dist/javascript/templating/template.d.ts.map +1 -1
- package/dist/javascript/templating/template.js +31 -28
- package/dist/javascript/templating/template.js.map +1 -1
- package/dist/javascript/templating/types.d.ts +6 -3
- package/dist/javascript/templating/types.d.ts.map +1 -1
- package/dist/javascript/templating/utils.d.ts +10 -1
- package/dist/javascript/templating/utils.d.ts.map +1 -1
- package/dist/javascript/templating/utils.js +22 -3
- package/dist/javascript/templating/utils.js.map +1 -1
- package/dist/javascript/tree-debug.d.ts +2 -0
- package/dist/javascript/tree-debug.d.ts.map +1 -1
- package/dist/javascript/tree-debug.js +6 -0
- package/dist/javascript/tree-debug.js.map +1 -1
- package/dist/javascript/tsconfig.d.ts.map +1 -1
- package/dist/javascript/tsconfig.js +7 -17
- package/dist/javascript/tsconfig.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +34 -16
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +253 -249
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/javascript/type-report-cli.d.ts +7 -0
- package/dist/javascript/type-report-cli.d.ts.map +1 -0
- package/dist/javascript/type-report-cli.js +129 -0
- package/dist/javascript/type-report-cli.js.map +1 -0
- package/dist/javascript/type-report.d.ts +61 -0
- package/dist/javascript/type-report.d.ts.map +1 -0
- package/dist/javascript/type-report.js +488 -0
- package/dist/javascript/type-report.js.map +1 -0
- package/dist/markers.d.ts +4 -0
- package/dist/markers.d.ts.map +1 -1
- package/dist/markers.js +8 -0
- package/dist/markers.js.map +1 -1
- package/dist/recipe.d.ts +5 -0
- package/dist/recipe.d.ts.map +1 -1
- package/dist/recipe.js +5 -0
- package/dist/recipe.js.map +1 -1
- package/dist/rewrite-javascript-version.txt +1 -1
- package/dist/rpc/queue.d.ts +16 -0
- package/dist/rpc/queue.d.ts.map +1 -1
- package/dist/rpc/queue.js +27 -9
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.d.ts +3 -1
- package/dist/rpc/request/prepare-recipe.d.ts.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +13 -6
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/search/is-source-file.d.ts +1 -0
- package/dist/search/is-source-file.d.ts.map +1 -1
- package/dist/search/is-source-file.js +7 -2
- package/dist/search/is-source-file.js.map +1 -1
- package/dist/test/rewrite-test.d.ts +5 -0
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +14 -3
- package/dist/test/rewrite-test.js.map +1 -1
- package/package.json +4 -3
- package/src/index.ts +3 -1
- package/src/java/formatting-utils.ts +5 -4
- package/src/java/rpc.ts +2 -0
- package/src/java/tree.ts +15 -0
- package/src/java/type.ts +19 -2
- package/src/javascript/add-import.ts +338 -152
- package/src/javascript/amd.ts +28 -12
- package/src/javascript/autodetect.ts +32 -41
- package/src/javascript/binding.ts +64 -22
- package/src/javascript/comparator.ts +119 -43
- package/src/javascript/format/format.ts +9 -0
- package/src/javascript/index.ts +6 -3
- package/src/javascript/markers.ts +43 -1
- package/src/javascript/method-matcher.ts +34 -22
- package/src/javascript/package-name.ts +45 -0
- package/src/javascript/preconditions.ts +7 -4
- package/src/javascript/recipes/change-method-target-to-import.ts +178 -0
- package/src/javascript/recipes/index.ts +1 -0
- package/src/javascript/scope.ts +705 -169
- package/src/javascript/search/uses-method.ts +2 -2
- package/src/javascript/search/uses-type.ts +30 -9
- package/src/javascript/templating/bindings.ts +13 -38
- package/src/javascript/templating/comparator.ts +16 -127
- package/src/javascript/templating/engine.ts +229 -127
- package/src/javascript/templating/pattern.ts +107 -28
- package/src/javascript/templating/placeholder-replacement.ts +154 -62
- package/src/javascript/templating/precedence.ts +33 -11
- package/src/javascript/templating/template.ts +35 -30
- package/src/javascript/templating/types.ts +6 -3
- package/src/javascript/templating/utils.ts +24 -2
- package/src/javascript/tree-debug.ts +9 -0
- package/src/javascript/tsconfig.ts +7 -17
- package/src/javascript/type-mapping.ts +258 -252
- package/src/javascript/type-report-cli.ts +96 -0
- package/src/javascript/type-report.ts +575 -0
- package/src/markers.ts +8 -0
- package/src/recipe.ts +6 -0
- package/src/rpc/queue.ts +44 -5
- package/src/rpc/request/prepare-recipe.ts +16 -6
- package/src/search/is-source-file.ts +8 -3
- package/src/test/rewrite-test.ts +14 -3
package/dist/recipe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../src/recipe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../src/recipe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
8.92.
|
|
1
|
+
8.92.18
|
package/dist/rpc/queue.d.ts
CHANGED
|
@@ -29,11 +29,23 @@ export interface RpcCodec<T> {
|
|
|
29
29
|
*/
|
|
30
30
|
rpcReceive(before: T, q: RpcReceiveQueue): Promise<T>;
|
|
31
31
|
}
|
|
32
|
+
/**
|
|
33
|
+
* Converts a type that has no {@link RpcCodec} on either side, and so travels as one inline value,
|
|
34
|
+
* between its shape here and the one the peer's serializer gives it.
|
|
35
|
+
*/
|
|
36
|
+
export interface RpcValueCodec<T> {
|
|
37
|
+
/**
|
|
38
|
+
* @param value The value as the peer serialized it, with its `kind` and without its top-level serializer keys.
|
|
39
|
+
*/
|
|
40
|
+
fromValue(value: any): T;
|
|
41
|
+
toValue(after: T): any;
|
|
42
|
+
}
|
|
32
43
|
/**
|
|
33
44
|
* A registry for managing RPC codecs based on object types.
|
|
34
45
|
*/
|
|
35
46
|
export declare class RpcCodecs {
|
|
36
47
|
private static nonTreeCodecs;
|
|
48
|
+
private static valueCodecs;
|
|
37
49
|
/**
|
|
38
50
|
* The first key is on sourceFileType and the second on object type
|
|
39
51
|
*/
|
|
@@ -54,6 +66,8 @@ export declare class RpcCodecs {
|
|
|
54
66
|
* @returns The corresponding `RpcCodec`, or `undefined` if not found.
|
|
55
67
|
*/
|
|
56
68
|
static forType(type: string, sourceFileType?: string): RpcCodec<any> | undefined;
|
|
69
|
+
static registerValueCodec(type: string, codec: RpcValueCodec<any>): void;
|
|
70
|
+
static valueCodecForType(type: string): RpcValueCodec<any> | undefined;
|
|
57
71
|
/**
|
|
58
72
|
* Determines the appropriate codec for an instance based on its `kind` property.
|
|
59
73
|
*
|
|
@@ -94,6 +108,7 @@ export declare class RpcSendQueue {
|
|
|
94
108
|
*/
|
|
95
109
|
private putListPositions;
|
|
96
110
|
private add;
|
|
111
|
+
private valueMessage;
|
|
97
112
|
private doChange;
|
|
98
113
|
private typesAreDifferent;
|
|
99
114
|
private getValueType;
|
|
@@ -158,6 +173,7 @@ export declare class RpcReceiveQueue {
|
|
|
158
173
|
receiveListDefined<T>(before: T[] | undefined, onChange?: (before: T) => T | Promise<T | undefined> | undefined): Promise<T[]>;
|
|
159
174
|
receiveList<T>(before: T[] | undefined, onChange?: (before: T) => T | Promise<T | undefined> | undefined): Promise<T[] | undefined>;
|
|
160
175
|
private receiveListImpl;
|
|
176
|
+
private inlineValue;
|
|
161
177
|
private newObj;
|
|
162
178
|
}
|
|
163
179
|
/**
|
package/dist/rpc/queue.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/rpc/queue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/rpc/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc/queue.js
CHANGED
|
@@ -56,6 +56,12 @@ class RpcCodecs {
|
|
|
56
56
|
}
|
|
57
57
|
return this.nonTreeCodecs.get(type);
|
|
58
58
|
}
|
|
59
|
+
static registerValueCodec(type, codec) {
|
|
60
|
+
this.valueCodecs.set(type, codec);
|
|
61
|
+
}
|
|
62
|
+
static valueCodecForType(type) {
|
|
63
|
+
return this.valueCodecs.get(type);
|
|
64
|
+
}
|
|
59
65
|
/**
|
|
60
66
|
* Determines the appropriate codec for an instance based on its `kind` property.
|
|
61
67
|
*
|
|
@@ -71,6 +77,7 @@ class RpcCodecs {
|
|
|
71
77
|
}
|
|
72
78
|
exports.RpcCodecs = RpcCodecs;
|
|
73
79
|
RpcCodecs.nonTreeCodecs = new Map();
|
|
80
|
+
RpcCodecs.valueCodecs = new Map();
|
|
74
81
|
/**
|
|
75
82
|
* The first key is on sourceFileType and the second on object type
|
|
76
83
|
*/
|
|
@@ -153,7 +160,7 @@ class RpcSendQueue {
|
|
|
153
160
|
}
|
|
154
161
|
else {
|
|
155
162
|
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after, this.sourceFileType);
|
|
156
|
-
this.put(
|
|
163
|
+
this.put(this.valueMessage(RpcObjectState.CHANGE, after, !onChange && !afterCodec));
|
|
157
164
|
await this.doChange(after, before, onChange, afterCodec);
|
|
158
165
|
}
|
|
159
166
|
});
|
|
@@ -185,7 +192,7 @@ class RpcSendQueue {
|
|
|
185
192
|
const afterCodec = onChangeRun ? undefined : RpcCodecs.forInstance(anAfter, this.sourceFileType);
|
|
186
193
|
// Without an onChange callback or codec, no property messages follow, so the
|
|
187
194
|
// value must travel inline (as in send()) or the receiver keeps the stale element
|
|
188
|
-
this.put(
|
|
195
|
+
this.put(this.valueMessage(RpcObjectState.CHANGE, anAfter, !onChangeRun && !afterCodec));
|
|
189
196
|
await this.doChange(anAfter, aBefore, onChangeRun, afterCodec);
|
|
190
197
|
}
|
|
191
198
|
}
|
|
@@ -229,14 +236,18 @@ class RpcSendQueue {
|
|
|
229
236
|
ref = this.refs.create(after);
|
|
230
237
|
}
|
|
231
238
|
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after, this.sourceFileType);
|
|
232
|
-
this.put({
|
|
233
|
-
state: RpcObjectState.ADD,
|
|
234
|
-
valueType: this.getValueType(after),
|
|
235
|
-
value: onChange || afterCodec ? undefined : after,
|
|
236
|
-
ref: ref
|
|
237
|
-
});
|
|
239
|
+
this.put(Object.assign(Object.assign({}, this.valueMessage(RpcObjectState.ADD, after, !onChange && !afterCodec)), { valueType: this.getValueType(after), ref: ref }));
|
|
238
240
|
await this.doChange(after, undefined, onChange, afterCodec);
|
|
239
241
|
}
|
|
242
|
+
// An inline value carries its type even in a CHANGE, as the peer needs it to decode the value
|
|
243
|
+
valueMessage(state, after, inline) {
|
|
244
|
+
if (!inline) {
|
|
245
|
+
return { state };
|
|
246
|
+
}
|
|
247
|
+
const valueType = this.getValueType(after);
|
|
248
|
+
const valueCodec = valueType === undefined ? undefined : RpcCodecs.valueCodecForType(valueType);
|
|
249
|
+
return { state, valueType, value: valueCodec ? valueCodec.toValue(after) : after };
|
|
250
|
+
}
|
|
240
251
|
async doChange(after, before, onChange, afterCodec) {
|
|
241
252
|
const lastBefore = this.before;
|
|
242
253
|
this.before = before;
|
|
@@ -453,7 +464,8 @@ class RpcReceiveQueue {
|
|
|
453
464
|
after = await codec.rpcReceive(before, this);
|
|
454
465
|
}
|
|
455
466
|
else if (message.value !== undefined) {
|
|
456
|
-
after = message.valueType ?
|
|
467
|
+
after = message.valueType ?
|
|
468
|
+
this.inlineValue(message.valueType, message.value) :
|
|
457
469
|
typeof message.value === "string" ? this.internedStrings.internValue(message.value) : message.value;
|
|
458
470
|
}
|
|
459
471
|
else if (message.state === RpcObjectState.ADD && message.valueType) {
|
|
@@ -523,6 +535,12 @@ class RpcReceiveQueue {
|
|
|
523
535
|
throw new Error(`${message.state} is not supported for lists.`);
|
|
524
536
|
}
|
|
525
537
|
}
|
|
538
|
+
inlineValue(valueType, value) {
|
|
539
|
+
const kind = this.internedStrings.internType(valueType);
|
|
540
|
+
const valueCodec = RpcCodecs.valueCodecForType(kind);
|
|
541
|
+
const typed = Object.assign({ kind }, withoutSerializerKeys(value));
|
|
542
|
+
return valueCodec ? valueCodec.fromValue(typed) : typed;
|
|
543
|
+
}
|
|
526
544
|
newObj(type) {
|
|
527
545
|
const codec = RpcCodecs.forType(type, this.sourceFileType);
|
|
528
546
|
if (codec === null || codec === void 0 ? void 0 : codec.rpcNew) {
|
package/dist/rpc/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/rpc/queue.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/rpc/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ import { RecipeMarketplace } from "../../marketplace";
|
|
|
4
4
|
export declare class PrepareRecipe {
|
|
5
5
|
private readonly id;
|
|
6
6
|
private readonly options?;
|
|
7
|
-
|
|
7
|
+
private readonly acceptsCausesAnotherCycle?;
|
|
8
|
+
constructor(id: string, options?: any | undefined, acceptsCausesAnotherCycle?: boolean | undefined);
|
|
8
9
|
static handle(connection: MessageConnection, marketplace: RecipeMarketplace, preparedRecipes: Map<String, Recipe>, metricsCsv?: string): void;
|
|
9
10
|
/**
|
|
10
11
|
* Prepares a recipe and, recursively, its whole child tree, registering every node in
|
|
@@ -56,6 +57,7 @@ export interface PrepareRecipeResponse {
|
|
|
56
57
|
* locally from these instead of re-preparing each child by name (the whole-tree optimization).
|
|
57
58
|
*/
|
|
58
59
|
recipeList?: PrepareRecipeResponse[];
|
|
60
|
+
causesAnotherCycle?: boolean;
|
|
59
61
|
}
|
|
60
62
|
/**
|
|
61
63
|
* Either a leaf (a single visitor identified by {@code visitorName} +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-recipe.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAiB,MAAM,cAAc,CAAC;AAQtE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,aAAa;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"prepare-recipe.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAiB,MAAM,cAAc,CAAC;AAQtE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,aAAa;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAEzB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC;gBAH1B,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,GAAG,YAAA,EAEb,yBAAyB,CAAC,EAAE,OAAO,YAAA;IAGhE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,EAC7B,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,UAAU,CAAC,EAAE,MAAM;IA2BjC;;;;;;OAMG;mBACkB,eAAe;IAyEpC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAM1B;;;;OAIG;mBACkB,qBAAqB;IAwC1C;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBA0BZ,uBAAuB;CA+B/C;AAED,MAAM,WAAW,WAAW;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B;AAED,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,gBAAgB,CAAA;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,YAAY,EAAE,CAAA;IACjC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,YAAY,EAAE,CAAA;IACjC,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;;OAGG;IACH,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAA;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,YAAY;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,EAAE,CAAA;IACnB,EAAE,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAA;IACzB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAA;CAC5B"}
|
|
@@ -57,25 +57,29 @@ const recipe_2 = require("../recipe");
|
|
|
57
57
|
const java_recipe_1 = require("../java-recipe");
|
|
58
58
|
const metrics_1 = require("./metrics");
|
|
59
59
|
class PrepareRecipe {
|
|
60
|
-
constructor(id, options
|
|
60
|
+
constructor(id, options,
|
|
61
|
+
// Older Java hosts reject unknown response fields, so causesAnotherCycle is only sent when asked.
|
|
62
|
+
acceptsCausesAnotherCycle) {
|
|
61
63
|
this.id = id;
|
|
62
64
|
this.options = options;
|
|
65
|
+
this.acceptsCausesAnotherCycle = acceptsCausesAnotherCycle;
|
|
63
66
|
}
|
|
64
67
|
static handle(connection, marketplace, preparedRecipes, metricsCsv) {
|
|
65
68
|
const snowflake = (0, snowflake_id_1.SnowflakeId)();
|
|
66
69
|
connection.onRequest(new rpc.RequestType("PrepareRecipe"), (0, metrics_1.withMetrics)("PrepareRecipe", metricsCsv, (context) => async (request) => {
|
|
67
70
|
var _a;
|
|
68
71
|
context.target = request.id;
|
|
72
|
+
const accepts = request.acceptsCausesAnotherCycle === true;
|
|
69
73
|
const recipeCtor = marketplace.findRecipe(request.id);
|
|
70
74
|
if (!recipeCtor) {
|
|
71
75
|
// A miss means the host owns this recipe (e.g. a Java-delegate child a host
|
|
72
76
|
// re-prepares by name), so answer with a delegatesTo stand-in for it to resolve.
|
|
73
|
-
return await PrepareRecipe.prepareInstance(new java_recipe_1.DelegatingRecipe(request.id, (_a = request.options) !== null && _a !== void 0 ? _a : {}), snowflake, preparedRecipes, marketplace);
|
|
77
|
+
return await PrepareRecipe.prepareInstance(new java_recipe_1.DelegatingRecipe(request.id, (_a = request.options) !== null && _a !== void 0 ? _a : {}), snowflake, preparedRecipes, marketplace, accepts);
|
|
74
78
|
}
|
|
75
79
|
if (!recipeCtor[1]) {
|
|
76
80
|
throw new Error(`Recipe ${request.id} was installed without a constructor`);
|
|
77
81
|
}
|
|
78
|
-
return await PrepareRecipe.prepareInstance(new recipeCtor[1](request.options), snowflake, preparedRecipes, marketplace);
|
|
82
|
+
return await PrepareRecipe.prepareInstance(new recipeCtor[1](request.options), snowflake, preparedRecipes, marketplace, accepts);
|
|
79
83
|
}));
|
|
80
84
|
}
|
|
81
85
|
/**
|
|
@@ -85,7 +89,7 @@ class PrepareRecipe {
|
|
|
85
89
|
* Required options are validated per node. A stand-in for a host recipe (see {@link #delegatesTo})
|
|
86
90
|
* carries only {@code delegatesTo} and leaves validation to the host.
|
|
87
91
|
*/
|
|
88
|
-
static async prepareInstance(recipe, snowflake, preparedRecipes, marketplace) {
|
|
92
|
+
static async prepareInstance(recipe, snowflake, preparedRecipes, marketplace, acceptsCausesAnotherCycle) {
|
|
89
93
|
var _a;
|
|
90
94
|
const id = snowflake.generate();
|
|
91
95
|
const delegatesTo = PrepareRecipe.delegatesTo(recipe);
|
|
@@ -120,6 +124,9 @@ class PrepareRecipe {
|
|
|
120
124
|
scanVisitor: recipe instanceof recipe_1.ScanningRecipe ? `scan:${id}` : undefined,
|
|
121
125
|
scanPreconditions: scanPreconditions
|
|
122
126
|
};
|
|
127
|
+
if (acceptsCausesAnotherCycle && recipe.causesAnotherCycle === true) {
|
|
128
|
+
response.causesAnotherCycle = true;
|
|
129
|
+
}
|
|
123
130
|
const childResponses = [];
|
|
124
131
|
for (const child of await recipe.recipeList()) {
|
|
125
132
|
if (child instanceof recipe_2.RpcRecipe) {
|
|
@@ -130,7 +137,7 @@ class PrepareRecipe {
|
|
|
130
137
|
options[option.name] = option.value;
|
|
131
138
|
}
|
|
132
139
|
}
|
|
133
|
-
childResponses.push(await PrepareRecipe.prepareInstance(new java_recipe_1.DelegatingRecipe(child.name, options), snowflake, preparedRecipes, marketplace));
|
|
140
|
+
childResponses.push(await PrepareRecipe.prepareInstance(new java_recipe_1.DelegatingRecipe(child.name, options), snowflake, preparedRecipes, marketplace, acceptsCausesAnotherCycle));
|
|
134
141
|
continue;
|
|
135
142
|
}
|
|
136
143
|
// Register a child that was instantiated in recipeList() but never installed, so a peer
|
|
@@ -138,7 +145,7 @@ class PrepareRecipe {
|
|
|
138
145
|
if (!PrepareRecipe.delegatesTo(child) && !marketplace.findRecipe(child.name)) {
|
|
139
146
|
await marketplace.install(child.constructor, []);
|
|
140
147
|
}
|
|
141
|
-
childResponses.push(await PrepareRecipe.prepareInstance(child, snowflake, preparedRecipes, marketplace));
|
|
148
|
+
childResponses.push(await PrepareRecipe.prepareInstance(child, snowflake, preparedRecipes, marketplace, acceptsCausesAnotherCycle));
|
|
142
149
|
}
|
|
143
150
|
response.recipeList = childResponses;
|
|
144
151
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,yCAAsE;AACtE,gEAA0D;AAC1D,uDAAsF;AACtF,sCAAoC;AACpC,gDAAgD;AAGhD,uCAAsC;AAGtC,MAAa,aAAa;IACtB,YAA6B,EAAU,
|
|
1
|
+
{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { TreeVisitor } from "../visitor";
|
|
|
2
2
|
import { ExecutionContext } from "../execution";
|
|
3
3
|
export declare class IsSourceFile extends TreeVisitor<any, ExecutionContext> {
|
|
4
4
|
private readonly matcher;
|
|
5
|
+
/** Reads and matches `filePattern` the way Java's FindSourceFiles does, so the precondition agrees on both hosts. */
|
|
5
6
|
constructor(filePattern: string);
|
|
6
7
|
protected preVisit(tree: any, _: ExecutionContext): Promise<any>;
|
|
7
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-source-file.d.ts","sourceRoot":"","sources":["../../src/search/is-source-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAK9C,qBAAa,YAAa,SAAQ,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"is-source-file.d.ts","sourceRoot":"","sources":["../../src/search/is-source-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAK9C,qBAAa,YAAa,SAAQ,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,qHAAqH;gBACzG,WAAW,EAAE,MAAM;cAUf,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC;CAUzE"}
|
|
@@ -39,10 +39,15 @@ const tree_1 = require("../tree");
|
|
|
39
39
|
const markers_1 = require("../markers");
|
|
40
40
|
const picomatch = __importStar(require("picomatch"));
|
|
41
41
|
class IsSourceFile extends visitor_1.TreeVisitor {
|
|
42
|
+
/** Reads and matches `filePattern` the way Java's FindSourceFiles does, so the precondition agrees on both hosts. */
|
|
42
43
|
constructor(filePattern) {
|
|
43
44
|
super();
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
const patterns = filePattern.split(";")
|
|
46
|
+
.map(p => p.trim().replace(/^\.?[/\\]/, ""))
|
|
47
|
+
.filter(p => p.length > 0);
|
|
48
|
+
const options = { dot: true };
|
|
49
|
+
this.matcher = patterns.length === 0 ? () => true :
|
|
50
|
+
picomatch.default ? picomatch.default(patterns, options) : picomatch(patterns, options);
|
|
46
51
|
}
|
|
47
52
|
async preVisit(tree, _) {
|
|
48
53
|
this.stopAfterPreVisit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-source-file.js","sourceRoot":"","sources":["../../src/search/is-source-file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAuC;AAEvC,kCAAqC;AACrC,wCAA6C;AAC7C,qDAAuC;AAEvC,MAAa,YAAa,SAAQ,qBAAkC;IAGhE,YAAY,WAAmB;QAC3B,KAAK,EAAE,CAAC;QACR,
|
|
1
|
+
{"version":3,"file":"is-source-file.js","sourceRoot":"","sources":["../../src/search/is-source-file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAuC;AAEvC,kCAAqC;AACrC,wCAA6C;AAC7C,qDAAuC;AAEvC,MAAa,YAAa,SAAQ,qBAAkC;IAGhE,qHAAqH;IACrH,YAAY,WAAmB;QAC3B,KAAK,EAAE,CAAC;QACR,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;aAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAC/C,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAE,SAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzG,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,IAAS,EAAE,CAAmB;QACnD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,+BAA+B;YACjF,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,OAAO,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxBD,oCAwBC"}
|
|
@@ -40,6 +40,11 @@ export declare class RecipeSpec {
|
|
|
40
40
|
static restoreSuiteConfiguration(): void;
|
|
41
41
|
/** Bounds the registry to the suite that is running, which is all it has to span. */
|
|
42
42
|
static forgetSuiteSpecs(): void;
|
|
43
|
+
/**
|
|
44
|
+
* Setting `REWRITE_JAVASCRIPT_DUMP_TYPES` prints each parsed file's type attribution, and a
|
|
45
|
+
* recipe that produces no change names the nodes that carry none. See the README section
|
|
46
|
+
* "Inspecting type attribution".
|
|
47
|
+
*/
|
|
43
48
|
rewriteRun(...sourceSpecs: (SourceSpec<any> | Generator<SourceSpec<any>, void, unknown> | AsyncGenerator<SourceSpec<any>, void, unknown>)[]): Promise<void>;
|
|
44
49
|
private expectNoParseFailures;
|
|
45
50
|
private expectParsePrintIdempotence;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"rewrite-test.d.ts","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ const util_1 = require("../util");
|
|
|
35
35
|
const parse_error_1 = require("../parse-error");
|
|
36
36
|
const markers_1 = require("../markers");
|
|
37
37
|
const javascript_1 = require("../javascript");
|
|
38
|
+
const type_report_1 = require("../javascript/type-report");
|
|
38
39
|
class RecipeSpec {
|
|
39
40
|
constructor() {
|
|
40
41
|
var _a;
|
|
@@ -90,6 +91,11 @@ class RecipeSpec {
|
|
|
90
91
|
static forgetSuiteSpecs() {
|
|
91
92
|
RecipeSpec.live && (RecipeSpec.live = []);
|
|
92
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* Setting `REWRITE_JAVASCRIPT_DUMP_TYPES` prints each parsed file's type attribution, and a
|
|
96
|
+
* recipe that produces no change names the nodes that carry none. See the README section
|
|
97
|
+
* "Inspecting type attribution".
|
|
98
|
+
*/
|
|
93
99
|
async rewriteRun(...sourceSpecs) {
|
|
94
100
|
var _a, e_1, _b, _c;
|
|
95
101
|
// Flatten generators into a list of sourceSpecs
|
|
@@ -138,6 +144,9 @@ class RecipeSpec {
|
|
|
138
144
|
const specs = specsByKind[kind];
|
|
139
145
|
const parsed = await this.parse(specs);
|
|
140
146
|
await this.expectNoParseFailures(parsed);
|
|
147
|
+
for (const [_, sourceFile] of parsed) {
|
|
148
|
+
await (0, type_report_1.dumpTypesIfRequested)(sourceFile);
|
|
149
|
+
}
|
|
141
150
|
await this.expectWhitespaceNotToContainNonwhitespaceCharacters(parsed);
|
|
142
151
|
this.checkParsePrintIdempotence && await this.expectParsePrintIdempotence(parsed);
|
|
143
152
|
allParsed.push(...parsed);
|
|
@@ -219,7 +228,7 @@ class RecipeSpec {
|
|
|
219
228
|
}
|
|
220
229
|
}
|
|
221
230
|
else {
|
|
222
|
-
await this.expectAfter(spec, after);
|
|
231
|
+
await this.expectAfter(spec, after, matchingSpec === null || matchingSpec === void 0 ? void 0 : matchingSpec[1]);
|
|
223
232
|
}
|
|
224
233
|
}
|
|
225
234
|
}
|
|
@@ -235,7 +244,7 @@ class RecipeSpec {
|
|
|
235
244
|
await this.expectAfter(spec, after === null || after === void 0 ? void 0 : after.after);
|
|
236
245
|
}
|
|
237
246
|
}
|
|
238
|
-
async expectAfter(spec, after) {
|
|
247
|
+
async expectAfter(spec, after, before) {
|
|
239
248
|
if (!after) {
|
|
240
249
|
throw new Error('Expected for recipe to have produced a change for file:\n' + (0, util_1.trimIndent)(spec.before));
|
|
241
250
|
}
|
|
@@ -244,8 +253,10 @@ class RecipeSpec {
|
|
|
244
253
|
const afterSource = typeof spec.after === "function" ?
|
|
245
254
|
spec.after(actualAfter) : spec.after;
|
|
246
255
|
if (actualAfter !== afterSource) {
|
|
256
|
+
// A tree the recipe returned unchanged usually means it never fired.
|
|
257
|
+
const hint = after === before ? await (0, type_report_1.attributionHint)(after) : "";
|
|
247
258
|
throw new Error(`Recipe output does not match expected.\n` +
|
|
248
|
-
`Expected:\n${afterSource}\n\nActual:\n${actualAfter}`);
|
|
259
|
+
`Expected:\n${afterSource}\n\nActual:\n${actualAfter}${hint}`);
|
|
249
260
|
}
|
|
250
261
|
if (spec.afterRecipe) {
|
|
251
262
|
await spec.afterRecipe(after);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.92.
|
|
3
|
+
"version": "8.92.18",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"repository": {
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"scripts": {
|
|
61
61
|
"prebuild": "bun -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && bun -e \"require('fs').rmSync('tsconfig.build.tsbuildinfo',{force:true})\"",
|
|
62
62
|
"build": "tsc --build tsconfig.build.json",
|
|
63
|
-
"postbuild": "bun -e \"require('fs').chmodSync('dist/rpc/server.js', 0o755)\" && npm link",
|
|
63
|
+
"postbuild": "bun -e \"require('fs').chmodSync('dist/rpc/server.js', 0o755); require('fs').chmodSync('dist/javascript/type-report-cli.js', 0o755)\" && npm link",
|
|
64
64
|
"typecheck": "tsc --noEmit -p tsconfig.test.json",
|
|
65
65
|
"dev": "tsc --watch -p tsconfig.json",
|
|
66
66
|
"test": "npm run typecheck && npm run build && vitest run",
|
|
@@ -103,6 +103,7 @@
|
|
|
103
103
|
"lodash": "^4.18.1"
|
|
104
104
|
},
|
|
105
105
|
"bin": {
|
|
106
|
-
"rewrite-rpc": "./dist/rpc/server.js"
|
|
106
|
+
"rewrite-rpc": "./dist/rpc/server.js",
|
|
107
|
+
"rewrite-javascript-types": "./dist/javascript/type-report-cli.js"
|
|
107
108
|
}
|
|
108
109
|
}
|