@openrewrite/rewrite 8.62.2 → 8.62.4
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/execution.d.ts.map +1 -1
- package/dist/execution.js.map +1 -1
- package/dist/java/rpc.d.ts +1 -0
- package/dist/java/rpc.d.ts.map +1 -1
- package/dist/java/rpc.js +81 -0
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/tree.d.ts.map +1 -1
- package/dist/java/tree.js +0 -87
- package/dist/java/tree.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.map +1 -1
- package/dist/javascript/format.d.ts +2 -2
- package/dist/javascript/format.d.ts.map +1 -1
- 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 +26 -4
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/print.d.ts +2 -2
- package/dist/javascript/print.d.ts.map +1 -1
- package/dist/javascript/print.js.map +1 -1
- package/dist/javascript/rpc.js +1 -16
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +4 -19
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +228 -163
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/javascript/visitor.d.ts +1 -1
- package/dist/javascript/visitor.d.ts.map +1 -1
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/print.js.map +1 -1
- package/dist/json/rpc.js +46 -17
- package/dist/json/rpc.js.map +1 -1
- package/dist/json/visitor.d.ts +2 -2
- package/dist/json/visitor.d.ts.map +1 -1
- package/dist/json/visitor.js.map +1 -1
- package/dist/print.d.ts +2 -2
- package/dist/print.d.ts.map +1 -1
- package/dist/print.js +4 -2
- package/dist/print.js.map +1 -1
- package/dist/rpc/queue.d.ts +15 -6
- package/dist/rpc/queue.d.ts.map +1 -1
- package/dist/rpc/queue.js +37 -13
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/request/generate.d.ts +4 -0
- package/dist/rpc/request/generate.d.ts.map +1 -1
- package/dist/rpc/request/generate.js +9 -4
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-object.d.ts +2 -2
- package/dist/rpc/request/get-object.d.ts.map +1 -1
- package/dist/rpc/request/get-object.js +4 -12
- package/dist/rpc/request/get-object.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/request/print.d.ts +3 -4
- package/dist/rpc/request/print.d.ts.map +1 -1
- package/dist/rpc/request/print.js +5 -6
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/visit.d.ts +3 -2
- package/dist/rpc/request/visit.d.ts.map +1 -1
- package/dist/rpc/request/visit.js +5 -4
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.d.ts +3 -3
- package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/rpc/rewrite-rpc.js +19 -16
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/text/rpc.js +37 -40
- package/dist/text/rpc.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/execution.ts +0 -2
- package/src/java/rpc.ts +68 -0
- package/src/java/tree.ts +1 -65
- package/src/java/visitor.ts +4 -4
- package/src/javascript/format.ts +2 -2
- package/src/javascript/parser.ts +19 -5
- package/src/javascript/print.ts +3 -3
- package/src/javascript/rpc.ts +4 -17
- package/src/javascript/type-mapping.ts +235 -170
- package/src/javascript/visitor.ts +1 -1
- package/src/json/print.ts +1 -1
- package/src/json/rpc.ts +40 -19
- package/src/json/visitor.ts +2 -2
- package/src/print.ts +6 -4
- package/src/rpc/queue.ts +36 -12
- package/src/rpc/request/generate.ts +18 -6
- package/src/rpc/request/get-object.ts +6 -13
- package/src/rpc/request/parse.ts +1 -1
- package/src/rpc/request/print.ts +5 -7
- package/src/rpc/request/visit.ts +6 -5
- package/src/rpc/rewrite-rpc.ts +24 -19
- package/src/test/rewrite-test.ts +1 -1
- package/src/text/rpc.ts +33 -37
package/dist/rpc/queue.js
CHANGED
|
@@ -38,36 +38,59 @@ class RpcCodecs {
|
|
|
38
38
|
*
|
|
39
39
|
* @param type - The string identifier of the object type.
|
|
40
40
|
* @param codec - The codec implementation to be registered.
|
|
41
|
+
* @param sourceFileType The source file type of the source file containing (or will contain) this element.
|
|
41
42
|
*/
|
|
42
|
-
static registerCodec(type, codec) {
|
|
43
|
-
|
|
43
|
+
static registerCodec(type, codec, sourceFileType) {
|
|
44
|
+
if (sourceFileType) {
|
|
45
|
+
let codecsForSourceFile = this.treeCodecs.get(sourceFileType);
|
|
46
|
+
if (!codecsForSourceFile) {
|
|
47
|
+
codecsForSourceFile = new Map();
|
|
48
|
+
this.treeCodecs.set(sourceFileType, codecsForSourceFile);
|
|
49
|
+
}
|
|
50
|
+
codecsForSourceFile.set(type, codec);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
this.nonTreeCodecs.set(type, codec);
|
|
54
|
+
}
|
|
44
55
|
}
|
|
45
56
|
/**
|
|
46
57
|
* Retrieves the registered codec for a given type.
|
|
47
58
|
*
|
|
48
59
|
* @param type - The string identifier of the object type.
|
|
60
|
+
* @param sourceFileType The source file type of the source file containing (or will contain) this element.
|
|
49
61
|
* @returns The corresponding `RpcCodec`, or `undefined` if not found.
|
|
50
62
|
*/
|
|
51
|
-
static forType(type) {
|
|
52
|
-
|
|
63
|
+
static forType(type, sourceFileType) {
|
|
64
|
+
var _a;
|
|
65
|
+
if (sourceFileType) {
|
|
66
|
+
const treeCodec = (_a = this.treeCodecs.get(sourceFileType)) === null || _a === void 0 ? void 0 : _a.get(type);
|
|
67
|
+
return treeCodec || this.nonTreeCodecs.get(type);
|
|
68
|
+
}
|
|
69
|
+
return this.nonTreeCodecs.get(type);
|
|
53
70
|
}
|
|
54
71
|
/**
|
|
55
72
|
* Determines the appropriate codec for an instance based on its `kind` property.
|
|
56
73
|
*
|
|
57
74
|
* @param before - The object instance to find a codec for.
|
|
75
|
+
* @param sourceFileType The source file type of the source file containing (or will contain) this element.
|
|
58
76
|
* @returns The corresponding `RpcCodec`, or `undefined` if no matching codec is found.
|
|
59
77
|
*/
|
|
60
|
-
static forInstance(before) {
|
|
78
|
+
static forInstance(before, sourceFileType) {
|
|
61
79
|
if (before !== undefined && before !== null && typeof before === "object" && "kind" in before) {
|
|
62
|
-
return RpcCodecs.forType(before["kind"]);
|
|
80
|
+
return RpcCodecs.forType(before["kind"], sourceFileType);
|
|
63
81
|
}
|
|
64
82
|
}
|
|
65
83
|
}
|
|
66
84
|
exports.RpcCodecs = RpcCodecs;
|
|
67
|
-
RpcCodecs.
|
|
85
|
+
RpcCodecs.nonTreeCodecs = new Map();
|
|
86
|
+
/**
|
|
87
|
+
* The first key is on sourceFileType and the second on object type
|
|
88
|
+
*/
|
|
89
|
+
RpcCodecs.treeCodecs = new Map();
|
|
68
90
|
class RpcSendQueue {
|
|
69
|
-
constructor(refs, trace) {
|
|
91
|
+
constructor(refs, sourceFileType, trace) {
|
|
70
92
|
this.refs = refs;
|
|
93
|
+
this.sourceFileType = sourceFileType;
|
|
71
94
|
this.trace = trace;
|
|
72
95
|
this.q = [];
|
|
73
96
|
}
|
|
@@ -108,7 +131,7 @@ class RpcSendQueue {
|
|
|
108
131
|
this.put({ state: RpcObjectState.DELETE });
|
|
109
132
|
}
|
|
110
133
|
else {
|
|
111
|
-
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after);
|
|
134
|
+
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after, this.sourceFileType);
|
|
112
135
|
this.put({ state: RpcObjectState.CHANGE, value: onChange || afterCodec ? undefined : after });
|
|
113
136
|
yield this.doChange(after, before, onChange, afterCodec);
|
|
114
137
|
}
|
|
@@ -133,7 +156,7 @@ class RpcSendQueue {
|
|
|
133
156
|
}
|
|
134
157
|
else {
|
|
135
158
|
this.put({ state: RpcObjectState.CHANGE });
|
|
136
|
-
yield this.doChange(anAfter, aBefore, onChangeRun, RpcCodecs.forInstance(anAfter));
|
|
159
|
+
yield this.doChange(anAfter, aBefore, onChangeRun, RpcCodecs.forInstance(anAfter, this.sourceFileType));
|
|
137
160
|
}
|
|
138
161
|
}
|
|
139
162
|
}
|
|
@@ -168,7 +191,7 @@ class RpcSendQueue {
|
|
|
168
191
|
}
|
|
169
192
|
ref = this.refs.create(after);
|
|
170
193
|
}
|
|
171
|
-
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after);
|
|
194
|
+
let afterCodec = onChange ? undefined : RpcCodecs.forInstance(after, this.sourceFileType);
|
|
172
195
|
this.put({
|
|
173
196
|
state: RpcObjectState.ADD,
|
|
174
197
|
valueType: this.getValueType(after),
|
|
@@ -205,8 +228,9 @@ class RpcSendQueue {
|
|
|
205
228
|
}
|
|
206
229
|
exports.RpcSendQueue = RpcSendQueue;
|
|
207
230
|
class RpcReceiveQueue {
|
|
208
|
-
constructor(refs, pull, logFile) {
|
|
231
|
+
constructor(refs, sourceFileType, pull, logFile) {
|
|
209
232
|
this.refs = refs;
|
|
233
|
+
this.sourceFileType = sourceFileType;
|
|
210
234
|
this.pull = pull;
|
|
211
235
|
this.logFile = logFile;
|
|
212
236
|
this.batch = [];
|
|
@@ -272,7 +296,7 @@ class RpcReceiveQueue {
|
|
|
272
296
|
if (onChange) {
|
|
273
297
|
after = yield onChange(before);
|
|
274
298
|
}
|
|
275
|
-
else if ((codec = RpcCodecs.forInstance(before))) {
|
|
299
|
+
else if ((codec = RpcCodecs.forInstance(before, this.sourceFileType))) {
|
|
276
300
|
after = yield codec.rpcReceive(before, this);
|
|
277
301
|
}
|
|
278
302
|
else if (message.value !== undefined) {
|
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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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import * as rpc from "vscode-jsonrpc/node";
|
|
2
2
|
import { Recipe } from "../../recipe";
|
|
3
3
|
import { Cursor } from "../../tree";
|
|
4
|
+
export interface GenerateResponse {
|
|
5
|
+
ids: string[];
|
|
6
|
+
sourceFileTypes: string[];
|
|
7
|
+
}
|
|
4
8
|
export declare class Generate {
|
|
5
9
|
private readonly id;
|
|
6
10
|
private readonly p;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/generate.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAAa,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/generate.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAAa,MAAM,YAAY,CAAC;AAG9C,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,eAAe,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,qBAAa,QAAQ;IACL,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAU,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAA9B,EAAE,EAAE,MAAM,EAAmB,CAAC,EAAE,MAAM;IAGnE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI;CA4BtD"}
|
|
@@ -69,6 +69,10 @@ class Generate {
|
|
|
69
69
|
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject) {
|
|
70
70
|
connection.onRequest(new rpc.RequestType("Generate"), (request) => __awaiter(this, void 0, void 0, function* () {
|
|
71
71
|
const recipe = preparedRecipes.get(request.id);
|
|
72
|
+
const response = {
|
|
73
|
+
ids: [],
|
|
74
|
+
sourceFileTypes: []
|
|
75
|
+
};
|
|
72
76
|
if (recipe && recipe instanceof recipe_1.ScanningRecipe) {
|
|
73
77
|
let cursor = recipeCursors.get(recipe);
|
|
74
78
|
if (!cursor) {
|
|
@@ -78,12 +82,13 @@ class Generate {
|
|
|
78
82
|
const ctx = getObject(request.p);
|
|
79
83
|
const acc = recipe.accumulator(cursor, ctx);
|
|
80
84
|
const generated = yield recipe.generate(acc, ctx);
|
|
81
|
-
|
|
85
|
+
for (const g of generated) {
|
|
82
86
|
localObjects.set(g.id.toString(), g);
|
|
83
|
-
|
|
84
|
-
|
|
87
|
+
response.ids.push(g.id.toString());
|
|
88
|
+
response.sourceFileTypes.push(g.kind);
|
|
89
|
+
}
|
|
85
90
|
}
|
|
86
|
-
return
|
|
91
|
+
return response;
|
|
87
92
|
}));
|
|
88
93
|
}
|
|
89
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/rpc/request/generate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,yCAAoD;AACpD,qCAA8C;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/rpc/request/generate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,yCAAoD;AACpD,qCAA8C;AAQ9C,MAAa,QAAQ;IACjB,YAA6B,EAAU,EAAmB,CAAS;QAAtC,OAAE,GAAF,EAAE,CAAQ;QAAmB,MAAC,GAAD,CAAC,CAAQ;IACnE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,YAA8B,EAC9B,eAAoC,EACpC,aAAsC,EACtC,SAA8B;QACxC,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,WAAW,CAAoC,UAAU,CAAC,EAAE,CAAO,OAAO,EAAE,EAAE;YACvG,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG;gBACb,GAAG,EAAE,EAAE;gBACP,eAAe,EAAE,EAAE;aACF,CAAC;YAEtB,IAAI,MAAM,IAAI,MAAM,YAAY,uBAAc,EAAE,CAAC;gBAC7C,IAAI,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;oBACtB,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACtC,CAAC;gBACD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAqB,CAAC;gBACrD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAC5C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBAEjD,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;oBACxB,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;oBACrC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACnC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC;YAEL,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAA,CAAC,CAAC;IACP,CAAC;CACJ;AApCD,4BAoCC"}
|
|
@@ -2,8 +2,8 @@ import * as rpc from "vscode-jsonrpc/node";
|
|
|
2
2
|
import { ReferenceMap } from "../../reference";
|
|
3
3
|
export declare class GetObject {
|
|
4
4
|
private readonly id;
|
|
5
|
-
private readonly
|
|
6
|
-
constructor(id: string,
|
|
5
|
+
private readonly sourceFileType?;
|
|
6
|
+
constructor(id: string, sourceFileType?: string | undefined);
|
|
7
7
|
static handle(connection: rpc.MessageConnection, remoteObjects: Map<string, any>, localObjects: Map<string, any | ((input: string) => any)>, localRefs: ReferenceMap, batchSize: number, trace: boolean): void;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=get-object.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-object.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,qBAAa,SAAS;IACN,OAAO,CAAC,QAAQ,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"get-object.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,qBAAa,SAAS;IACN,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;gBADf,EAAE,EAAE,MAAM,EACV,cAAc,CAAC,EAAE,MAAM,YAAA;IAGpD,MAAM,CAAC,MAAM,CACT,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC,EACzD,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,GACf,IAAI;CAuCV"}
|
|
@@ -61,9 +61,9 @@ exports.GetObject = void 0;
|
|
|
61
61
|
const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
62
62
|
const queue_1 = require("../queue");
|
|
63
63
|
class GetObject {
|
|
64
|
-
constructor(id,
|
|
64
|
+
constructor(id, sourceFileType) {
|
|
65
65
|
this.id = id;
|
|
66
|
-
this.
|
|
66
|
+
this.sourceFileType = sourceFileType;
|
|
67
67
|
}
|
|
68
68
|
static handle(connection, remoteObjects, localObjects, localRefs, batchSize, trace) {
|
|
69
69
|
const pendingData = new Map();
|
|
@@ -83,16 +83,8 @@ class GetObject {
|
|
|
83
83
|
let allData = pendingData.get(objId);
|
|
84
84
|
if (!allData) {
|
|
85
85
|
const after = localObjects.get(objId);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
if (request.lastKnownId) {
|
|
89
|
-
before = remoteObjects.get(request.lastKnownId);
|
|
90
|
-
if (before === undefined) {
|
|
91
|
-
// Remote had something cached, but we've evicted it - must send full object
|
|
92
|
-
remoteObjects.delete(request.lastKnownId);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
allData = yield new queue_1.RpcSendQueue(localRefs, trace).generate(after, before);
|
|
86
|
+
const before = remoteObjects.get(objId);
|
|
87
|
+
allData = yield new queue_1.RpcSendQueue(localRefs, request.sourceFileType, trace).generate(after, before);
|
|
96
88
|
pendingData.set(objId, allData);
|
|
97
89
|
remoteObjects.set(objId, after);
|
|
98
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-object.js","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,oCAAqE;AAGrE,MAAa,SAAS;IAClB,YAA6B,EAAU,
|
|
1
|
+
{"version":3,"file":"get-object.js","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,oCAAqE;AAGrE,MAAa,SAAS;IAClB,YAA6B,EAAU,EACV,cAAuB;QADvB,OAAE,GAAF,EAAE,CAAQ;QACV,mBAAc,GAAd,cAAc,CAAS;IACpD,CAAC;IAED,MAAM,CAAC,MAAM,CACT,UAAiC,EACjC,aAA+B,EAC/B,YAAyD,EACzD,SAAuB,EACvB,SAAiB,EACjB,KAAc;QAEd,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;QAEvD,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,WAAW,CAAwB,WAAW,CAAC,EAAE,CAAM,OAAO,EAAC,EAAE;YAC1F,IAAI,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO;oBACH,EAAC,KAAK,EAAE,sBAAc,CAAC,MAAM,EAAC;oBAC9B,EAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,EAAC;iBACxC,CAAC;YACN,CAAC;YAED,IAAI,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;YACjD,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAC1C,IAAI,GAAG,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACtC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAExC,OAAO,GAAG,MAAM,IAAI,oBAAY,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACnG,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAEhC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAE3C,8CAA8C;YAC9C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA,CAAC,CAAC;IACP,CAAC;CACJ;AAnDD,8BAmDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAU,MAAM,cAAc,CAAC;AAKlD,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBADX,MAAM,EAAE,WAAW,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,YAAA;IAGhD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI;CAyBjF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,+CAAiD;AAEjD,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,+CAAiD;AAEjD,yCAAkD;AAClD,qCAAoC;AACpC,iCAA8B;AAG9B,MAAa,KAAK;IACd,YAA6B,MAAqB,EACrB,UAAmB;QADnB,WAAM,GAAN,MAAM,CAAe;QACrB,eAAU,GAAV,UAAU,CAAS;IAChD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,YAAyD;QACnE,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,WAAW,CAAuB,OAAO,CAAC,EAAE,CAAO,OAAO,EAAE,EAAE;YACvF,IAAI,MAAM,GAAG,gBAAO,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC5C,GAAG,EAAE,IAAI,4BAAgB,EAAE;gBAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;aACjC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACd,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,MAAM,GAAa,EAAE,CAAC;YAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7C,MAAM,EAAE,GAAG,IAAA,eAAQ,GAAE,CAAC;gBACtB,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,CAAO,EAAU,EAAE,EAAE;oBACtC,IAAI,UAAU,GAAe,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;oBAC5D,OAAO,IAAA,eAAO,EAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,GAAE,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;gBAC5D,CAAC,CAAA,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA,CAAC,CAAC;IACP,CAAC;CACJ;AA/BD,sBA+BC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import * as rpc from "vscode-jsonrpc/node";
|
|
2
|
-
import { Cursor } from "../../tree";
|
|
3
2
|
import { UUID } from "../../uuid";
|
|
4
3
|
export declare const enum MarkerPrinter {
|
|
5
4
|
DEFAULT = "DEFAULT",
|
|
@@ -8,9 +7,9 @@ export declare const enum MarkerPrinter {
|
|
|
8
7
|
}
|
|
9
8
|
export declare class Print {
|
|
10
9
|
private readonly treeId;
|
|
11
|
-
private readonly
|
|
10
|
+
private readonly sourceFileType;
|
|
12
11
|
readonly markerPrinter: MarkerPrinter;
|
|
13
|
-
constructor(treeId: UUID,
|
|
14
|
-
static handle(connection: rpc.MessageConnection, getObject: (id: string
|
|
12
|
+
constructor(treeId: UUID, sourceFileType: string, markerPrinter?: MarkerPrinter);
|
|
13
|
+
static handle(connection: rpc.MessageConnection, getObject: (id: string, sourceFileType?: string) => any): void;
|
|
15
14
|
}
|
|
16
15
|
//# sourceMappingURL=print.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAEhC,0BAAkB,aAAa;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,SAAS,cAAc;CAC1B;AAED,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAQ,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAU,QAAQ,CAAC,aAAa,EAAE,aAAa;gBAA5F,MAAM,EAAE,IAAI,EAAmB,cAAc,EAAE,MAAM,EAAW,aAAa,GAAE,aAAqC;IAGjJ,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI;CAW/E"}
|
|
@@ -68,21 +68,20 @@ var MarkerPrinter;
|
|
|
68
68
|
MarkerPrinter["SANITIZED"] = "SANITIZED";
|
|
69
69
|
})(MarkerPrinter || (exports.MarkerPrinter = MarkerPrinter = {}));
|
|
70
70
|
class Print {
|
|
71
|
-
constructor(treeId,
|
|
71
|
+
constructor(treeId, sourceFileType, markerPrinter = MarkerPrinter.DEFAULT) {
|
|
72
72
|
this.treeId = treeId;
|
|
73
|
-
this.
|
|
73
|
+
this.sourceFileType = sourceFileType;
|
|
74
74
|
this.markerPrinter = markerPrinter;
|
|
75
75
|
}
|
|
76
|
-
static handle(connection, getObject
|
|
76
|
+
static handle(connection, getObject) {
|
|
77
77
|
connection.onRequest(new rpc.RequestType("Print"), (request) => __awaiter(this, void 0, void 0, function* () {
|
|
78
|
-
const tree = yield getObject(request.treeId.toString());
|
|
78
|
+
const tree = yield getObject(request.treeId.toString(), request.sourceFileType);
|
|
79
79
|
const out = new print_1.PrintOutputCapture(print_1.MarkerPrinter[request.markerPrinter]);
|
|
80
80
|
if ((0, tree_1.isSourceFile)(tree)) {
|
|
81
81
|
return yield (0, print_1.printer)(tree).print(tree, out);
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
|
-
|
|
85
|
-
return yield (0, print_1.printer)(cursor).print(tree, out);
|
|
84
|
+
return yield (0, print_1.printer)(request.sourceFileType).print(tree, out);
|
|
86
85
|
}
|
|
87
86
|
}));
|
|
88
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,qCAA8C;AAC9C,uCAA6F;AAG7F,IAAkB,aAIjB;AAJD,WAAkB,aAAa;IAC3B,oCAAmB,CAAA;IACnB,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;AAC3B,CAAC,EAJiB,aAAa,6BAAb,aAAa,QAI9B;AAED,MAAa,KAAK;IACd,YAA6B,MAAY,EAAmB,cAAsB,EAAW,gBAA+B,aAAa,CAAC,OAAO;QAApH,WAAM,GAAN,MAAM,CAAM;QAAmB,mBAAc,GAAd,cAAc,CAAQ;QAAW,kBAAa,GAAb,aAAa,CAAuC;IACjJ,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,SAAuD;QACjE,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,WAAW,CAAuB,OAAO,CAAC,EAAE,CAAM,OAAO,EAAC,EAAE;YACrF,MAAM,IAAI,GAAS,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACtF,MAAM,GAAG,GAAG,IAAI,0BAAkB,CAAC,qBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC9E,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,OAAO,MAAM,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,OAAO,MAAM,IAAA,eAAO,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClE,CAAC;QACL,CAAC,CAAA,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,sBAgBC"}
|
|
@@ -6,12 +6,13 @@ export interface VisitResponse {
|
|
|
6
6
|
}
|
|
7
7
|
export declare class Visit {
|
|
8
8
|
private readonly visitor;
|
|
9
|
+
private readonly sourceFileType;
|
|
9
10
|
private readonly visitorOptions;
|
|
10
11
|
private readonly treeId;
|
|
11
12
|
private readonly p;
|
|
12
13
|
private readonly cursor;
|
|
13
|
-
constructor(visitor: string, visitorOptions: Map<string, any> | undefined, treeId: string, p: string, cursor: string[] | undefined);
|
|
14
|
-
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string) => any, getCursor: (cursorIds: string[] | undefined) => Promise<Cursor>): void;
|
|
14
|
+
constructor(visitor: string, sourceFileType: string, visitorOptions: Map<string, any> | undefined, treeId: string, p: string, cursor: string[] | undefined);
|
|
15
|
+
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string, sourceFileType?: string) => any, getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>): void;
|
|
15
16
|
private static instantiateVisitor;
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=visit.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAAmB,MAAM,YAAY,CAAC;AAIpD,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,CAAA;CACpB;AAED,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAAmB,MAAM,YAAY,CAAC;AAIpD,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,CAAA;CACpB;AAED,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBALN,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAC5C,MAAM,EAAE,MAAM,EACd,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;IAGzD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,EACvD,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI;mBAkBxF,kBAAkB;CAsC1C"}
|
|
@@ -62,8 +62,9 @@ const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
|
62
62
|
const tree_1 = require("../../tree");
|
|
63
63
|
const visitor_1 = require("../../visitor");
|
|
64
64
|
class Visit {
|
|
65
|
-
constructor(visitor, visitorOptions, treeId, p, cursor) {
|
|
65
|
+
constructor(visitor, sourceFileType, visitorOptions, treeId, p, cursor) {
|
|
66
66
|
this.visitor = visitor;
|
|
67
|
+
this.sourceFileType = sourceFileType;
|
|
67
68
|
this.visitorOptions = visitorOptions;
|
|
68
69
|
this.treeId = treeId;
|
|
69
70
|
this.p = p;
|
|
@@ -71,11 +72,11 @@ class Visit {
|
|
|
71
72
|
}
|
|
72
73
|
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor) {
|
|
73
74
|
connection.onRequest(new rpc.RequestType("Visit"), (request) => __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
const p = yield getObject(request.p);
|
|
75
|
-
const before = yield getObject(request.treeId);
|
|
75
|
+
const p = yield getObject(request.p, undefined);
|
|
76
|
+
const before = yield getObject(request.treeId, request.sourceFileType);
|
|
76
77
|
localObjects.set(before.id.toString(), before);
|
|
77
78
|
const visitor = yield Visit.instantiateVisitor(request, preparedRecipes, recipeCursors, p);
|
|
78
|
-
const after = yield visitor.visit(before, p, yield getCursor(request.cursor));
|
|
79
|
+
const after = yield visitor.visit(before, p, yield getCursor(request.cursor, request.sourceFileType));
|
|
79
80
|
if (!after) {
|
|
80
81
|
localObjects.delete(before.id.toString());
|
|
81
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,qCAAoD;AACpD,2CAA0C;AAO1C,MAAa,KAAK;IACd,YAA6B,OAAe,EACf,cAA4C,EAC5C,MAAc,EACd,CAAS,EACT,MAA4B;
|
|
1
|
+
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,9 @@ export declare class RewriteRpc {
|
|
|
30
30
|
static set(value: RewriteRpc): void;
|
|
31
31
|
static get(): RewriteRpc;
|
|
32
32
|
end(): RewriteRpc;
|
|
33
|
-
getObject<P>(id: string): Promise<P>;
|
|
34
|
-
getCursor(cursorIds: string[] | undefined): Promise<Cursor>;
|
|
35
|
-
parse(inputs: ParserInput[], relativeTo?: string): Promise<SourceFile[]>;
|
|
33
|
+
getObject<P>(id: string, sourceFileType?: string): Promise<P>;
|
|
34
|
+
getCursor(cursorIds: string[] | undefined, sourceFileType?: string): Promise<Cursor>;
|
|
35
|
+
parse(inputs: ParserInput[], sourceFileType: string, relativeTo?: string): Promise<SourceFile[]>;
|
|
36
36
|
print(tree: SourceFile): Promise<string>;
|
|
37
37
|
print(tree: Tree, cursor: Cursor): Promise<string>;
|
|
38
38
|
languages(): Promise<string[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAoC,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AACnF,OAAO,EAAS,gBAAgB,EAAE,cAAc,EAAC,MAAM,WAAW,CAAC;AAcnE,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAiB,sBAAsB,EAAC,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AACtC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAGrC,qBAAa,UAAU;IAeP,QAAQ,CAAC,UAAU,EAAE,iBAAiB;IAItC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAlBpC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAa;IAEpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAE3C,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,CAAa;IAE/E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IAEpD,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAa;IACrD,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAa;IAClD,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAsB;IAEtD,OAAO,CAAC,eAAe,CAAC,CAAW;gBAEd,UAAU,EAAE,iBAAiB,YAGrC,EACgB,OAAO,EAAE;QACtB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,cAAc,CAAC;QAC1B,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,mBAAmB,CAAC,EAAE,QAAQ,CAAC;QAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B;IAwBb,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU;IAI5B,MAAM,CAAC,GAAG,IAAI,UAAU;IAOxB,GAAG,IAAI,UAAU;IAKX,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc/rewrite-rpc.js
CHANGED
|
@@ -83,8 +83,8 @@ class RewriteRpc {
|
|
|
83
83
|
const preparedRecipes = new Map();
|
|
84
84
|
const recipeCursors = new WeakMap();
|
|
85
85
|
// Need this indirection, otherwise `this` will be undefined when executed in the handlers.
|
|
86
|
-
const getObject = (id) => this.getObject(id);
|
|
87
|
-
const getCursor = (cursorIds) => this.getCursor(cursorIds);
|
|
86
|
+
const getObject = (id, sourceFileType) => this.getObject(id, sourceFileType);
|
|
87
|
+
const getCursor = (cursorIds, sourceFileType) => this.getCursor(cursorIds, sourceFileType);
|
|
88
88
|
const registry = options.registry || new recipe_1.RecipeRegistry();
|
|
89
89
|
request_1.Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor);
|
|
90
90
|
request_1.Generate.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject);
|
|
@@ -93,7 +93,7 @@ class RewriteRpc {
|
|
|
93
93
|
get_languages_1.GetLanguages.handle(this.connection);
|
|
94
94
|
request_1.PrepareRecipe.handle(this.connection, registry, preparedRecipes);
|
|
95
95
|
request_1.Parse.handle(this.connection, this.localObjects);
|
|
96
|
-
request_1.Print.handle(this.connection, getObject
|
|
96
|
+
request_1.Print.handle(this.connection, getObject);
|
|
97
97
|
install_recipes_1.InstallRecipes.handle(this.connection, (_a = options.recipeInstallDir) !== null && _a !== void 0 ? _a : ".rewrite", registry, options.logger);
|
|
98
98
|
this.connection.listen();
|
|
99
99
|
}
|
|
@@ -110,12 +110,11 @@ class RewriteRpc {
|
|
|
110
110
|
this.connection.end();
|
|
111
111
|
return this;
|
|
112
112
|
}
|
|
113
|
-
getObject(id) {
|
|
113
|
+
getObject(id, sourceFileType) {
|
|
114
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
115
|
const localObject = this.localObjects.get(id);
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
return this.connection.sendRequest(new rpc.RequestType("GetObject"), new request_1.GetObject(id, lastKnownId));
|
|
116
|
+
const q = new queue_1.RpcReceiveQueue(this.remoteRefs, sourceFileType, () => {
|
|
117
|
+
return this.connection.sendRequest(new rpc.RequestType("GetObject"), new request_1.GetObject(id, sourceFileType));
|
|
119
118
|
}, this.options.traceGetObjectInput);
|
|
120
119
|
const remoteObject = yield q.receive(localObject);
|
|
121
120
|
const eof = (yield q.take());
|
|
@@ -127,12 +126,12 @@ class RewriteRpc {
|
|
|
127
126
|
return remoteObject;
|
|
128
127
|
});
|
|
129
128
|
}
|
|
130
|
-
getCursor(cursorIds) {
|
|
129
|
+
getCursor(cursorIds, sourceFileType) {
|
|
131
130
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
131
|
let cursor = (0, tree_1.rootCursor)();
|
|
133
132
|
if (cursorIds) {
|
|
134
133
|
for (let i = cursorIds.length - 1; i >= 0; i--) {
|
|
135
|
-
const cursorObject = yield this.getObject(cursorIds[i]);
|
|
134
|
+
const cursorObject = yield this.getObject(cursorIds[i], sourceFileType);
|
|
136
135
|
this.remoteObjects.set(cursorIds[i], cursorObject);
|
|
137
136
|
cursor = new tree_1.Cursor(cursorObject, cursor);
|
|
138
137
|
}
|
|
@@ -140,11 +139,11 @@ class RewriteRpc {
|
|
|
140
139
|
return cursor;
|
|
141
140
|
});
|
|
142
141
|
}
|
|
143
|
-
parse(inputs, relativeTo) {
|
|
142
|
+
parse(inputs, sourceFileType, relativeTo) {
|
|
144
143
|
return __awaiter(this, void 0, void 0, function* () {
|
|
145
144
|
const parsed = [];
|
|
146
145
|
for (const g of yield this.connection.sendRequest(new rpc.RequestType("Parse"), new request_1.Parse(inputs, relativeTo))) {
|
|
147
|
-
parsed.push(yield this.getObject(g));
|
|
146
|
+
parsed.push(yield this.getObject(g, sourceFileType));
|
|
148
147
|
}
|
|
149
148
|
return parsed;
|
|
150
149
|
});
|
|
@@ -155,7 +154,8 @@ class RewriteRpc {
|
|
|
155
154
|
throw new Error("Cursor is required for non-SourceFile trees");
|
|
156
155
|
}
|
|
157
156
|
this.localObjects.set(tree.id.toString(), tree);
|
|
158
|
-
return yield this.connection.sendRequest(new rpc.RequestType("Print"), new request_1.Print(tree.id,
|
|
157
|
+
return yield this.connection.sendRequest(new rpc.RequestType("Print"), new request_1.Print(tree.id, (0, tree_1.isSourceFile)(tree) ? tree.kind :
|
|
158
|
+
cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t)).kind));
|
|
159
159
|
});
|
|
160
160
|
}
|
|
161
161
|
languages() {
|
|
@@ -182,16 +182,19 @@ class RewriteRpc {
|
|
|
182
182
|
this.localObjects.set(tree.id.toString(), tree);
|
|
183
183
|
const pId = this.localObject(p);
|
|
184
184
|
const cursorIds = this.getCursorIds(cursor);
|
|
185
|
-
const
|
|
186
|
-
|
|
185
|
+
const sourceFileType = (0, tree_1.isSourceFile)(tree) ? tree.kind :
|
|
186
|
+
cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t)).kind;
|
|
187
|
+
const response = yield this.connection.sendRequest(new rpc.RequestType("Visit"), new request_1.Visit(visitorName, sourceFileType, undefined, tree.id.toString(), pId, cursorIds));
|
|
188
|
+
return response.modified ? this.getObject(tree.id.toString(), sourceFileType) : tree;
|
|
187
189
|
});
|
|
188
190
|
}
|
|
189
191
|
generate(remoteRecipeId, ctx) {
|
|
190
192
|
return __awaiter(this, void 0, void 0, function* () {
|
|
191
193
|
const ctxId = this.localObject(ctx);
|
|
192
194
|
const generated = [];
|
|
193
|
-
|
|
194
|
-
|
|
195
|
+
const response = yield this.connection.sendRequest(new rpc.RequestType("Generate"), new request_1.Generate(remoteRecipeId, ctxId));
|
|
196
|
+
for (let i = 0; i < response.ids.length; i++) {
|
|
197
|
+
generated.push(yield this.getObject(response.ids[i], response.sourceFileTypes[i]));
|
|
195
198
|
}
|
|
196
199
|
return generated;
|
|
197
200
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,kCAAmF;AACnF,sCAAmE;AACnE,gEAA0D;AAC1D,uCAUmB;AACnB,mCAAuE;AACvE,qCAAmC;AAEnC,+DAAiF;AAEjF,4CAA0C;AAE1C,2DAAqD;AAErD,MAAa,UAAU;IAenB,YAAqB,aAAgC,GAAG,CAAC,uBAAuB,CAChE,IAAI,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,EAC1C,IAAI,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAC9C,EACgB,OAOhB;;QAXQ,eAAU,GAAV,UAAU,CAGlB;QACgB,YAAO,GAAP,OAAO,CAOvB;QAvBI,cAAS,GAAG,IAAA,0BAAW,GAAE,CAAC;QAElC,iBAAY,GAAgD,IAAI,GAAG,EAAE,CAAC;QAC/E,oDAAoD;QACnC,mBAAc,GAAG,IAAI,WAAW,EAAE,CAAC;QAE3C,kBAAa,GAAqB,IAAI,GAAG,EAAE,CAAC;QAC5C,eAAU,GAAqB,IAAI,GAAG,EAAE,CAAC;QACzC,cAAS,GAAiB,IAAI,wBAAY,EAAE,CAAC;QAgBlD,MAAM,eAAe,GAAwB,IAAI,GAAG,EAAE,CAAC;QACvD,MAAM,aAAa,GAA4B,IAAI,OAAO,EAAE,CAAA;QAE5D,2FAA2F;QAC3F,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|