@openrewrite/rewrite 8.63.0 → 8.63.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/index.d.ts +1 -0
- package/dist/java/index.d.ts.map +1 -1
- package/dist/java/index.js +1 -0
- package/dist/java/index.js.map +1 -1
- package/dist/java/rpc.d.ts +2 -0
- package/dist/java/rpc.d.ts.map +1 -1
- package/dist/java/rpc.js +749 -410
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/tree.d.ts +1 -1
- package/dist/java/tree.d.ts.map +1 -1
- package/dist/java/type-visitor.d.ts +48 -0
- package/dist/java/type-visitor.d.ts.map +1 -0
- package/dist/java/type-visitor.js +260 -0
- package/dist/java/type-visitor.js.map +1 -0
- package/dist/java/type.d.ts +2 -0
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +0 -317
- package/dist/java/type.js.map +1 -1
- package/dist/java/visitor.d.ts.map +1 -1
- package/dist/java/visitor.js +579 -363
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/preconditions.d.ts +1 -1
- package/dist/javascript/preconditions.d.ts.map +1 -1
- package/dist/javascript/preconditions.js +7 -6
- package/dist/javascript/preconditions.js.map +1 -1
- package/dist/javascript/rpc.js +430 -350
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/tree.d.ts +1 -1
- package/dist/javascript/tree.d.ts.map +1 -1
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +7 -0
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/javascript/visitor.d.ts.map +1 -1
- package/dist/javascript/visitor.js +504 -309
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/visitor.d.ts.map +1 -1
- package/dist/json/visitor.js +46 -21
- package/dist/json/visitor.js.map +1 -1
- package/dist/rpc/queue.d.ts +7 -4
- package/dist/rpc/queue.d.ts.map +1 -1
- package/dist/rpc/queue.js +22 -32
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/request/generate.d.ts.map +1 -1
- package/dist/rpc/request/generate.js +2 -3
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-languages.d.ts.map +1 -1
- package/dist/rpc/request/get-languages.js +4 -3
- package/dist/rpc/request/get-languages.js.map +1 -1
- package/dist/rpc/request/get-object.d.ts +1 -1
- package/dist/rpc/request/get-object.d.ts.map +1 -1
- package/dist/rpc/request/get-object.js +8 -7
- package/dist/rpc/request/get-object.js.map +1 -1
- package/dist/rpc/request/get-recipes.d.ts.map +1 -1
- package/dist/rpc/request/get-recipes.js +2 -2
- package/dist/rpc/request/get-recipes.js.map +1 -1
- package/dist/rpc/request/index.d.ts +1 -0
- package/dist/rpc/request/index.d.ts.map +1 -1
- package/dist/rpc/request/index.js +1 -0
- package/dist/rpc/request/index.js.map +1 -1
- package/dist/rpc/request/install-recipes.d.ts.map +1 -1
- package/dist/rpc/request/install-recipes.js +30 -21
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/metrics.d.ts +10 -10
- package/dist/rpc/request/metrics.d.ts.map +1 -1
- package/dist/rpc/request/metrics.js +38 -31
- package/dist/rpc/request/metrics.js.map +1 -1
- package/dist/rpc/request/parse.d.ts.map +1 -1
- package/dist/rpc/request/parse.js +10 -12
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.d.ts.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +4 -4
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/rpc/request/print.d.ts +1 -1
- package/dist/rpc/request/print.d.ts.map +1 -1
- package/dist/rpc/request/print.js +10 -6
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/trace-get-object.d.ts +5 -0
- package/dist/rpc/request/trace-get-object.d.ts.map +1 -0
- package/dist/rpc/request/trace-get-object.js +3 -0
- package/dist/rpc/request/trace-get-object.js.map +1 -0
- package/dist/rpc/request/visit.d.ts.map +1 -1
- package/dist/rpc/request/visit.js +2 -3
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.d.ts +2 -3
- package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/rpc/rewrite-rpc.js +14 -5
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.d.ts.map +1 -1
- package/dist/rpc/server.js +15 -44
- package/dist/rpc/server.js.map +1 -1
- package/dist/rpc/trace.d.ts +1 -1
- package/dist/rpc/trace.d.ts.map +1 -1
- package/dist/rpc/trace.js +3 -3
- package/dist/rpc/trace.js.map +1 -1
- package/dist/util.d.ts +6 -0
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +14 -0
- package/dist/util.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/java/index.ts +1 -0
- package/src/java/rpc.ts +726 -537
- package/src/java/tree.ts +1 -1
- package/src/java/type-visitor.ts +241 -0
- package/src/java/type.ts +13 -277
- package/src/java/visitor.ts +581 -378
- package/src/javascript/preconditions.ts +7 -6
- package/src/javascript/rpc.ts +431 -360
- package/src/javascript/tree.ts +1 -1
- package/src/javascript/type-mapping.ts +7 -0
- package/src/javascript/visitor.ts +505 -310
- package/src/json/visitor.ts +47 -22
- package/src/rpc/queue.ts +20 -17
- package/src/rpc/request/generate.ts +31 -25
- package/src/rpc/request/get-languages.ts +18 -10
- package/src/rpc/request/get-object.ts +42 -34
- package/src/rpc/request/get-recipes.ts +15 -8
- package/src/rpc/request/index.ts +1 -0
- package/src/rpc/request/install-recipes.ts +96 -79
- package/src/rpc/request/metrics.ts +54 -48
- package/src/rpc/request/parse.ts +31 -25
- package/src/rpc/request/prepare-recipe.ts +31 -23
- package/src/rpc/request/print.ts +28 -14
- package/src/rpc/request/trace-get-object.ts +4 -0
- package/src/rpc/request/visit.ts +22 -16
- package/src/rpc/rewrite-rpc.ts +23 -10
- package/src/rpc/server.ts +17 -52
- package/src/rpc/trace.ts +3 -3
- package/src/util.ts +14 -0
- package/dist/rpc/chrome-profiler.d.ts +0 -25
- package/dist/rpc/chrome-profiler.d.ts.map +0 -1
- package/dist/rpc/chrome-profiler.js +0 -405
- package/dist/rpc/chrome-profiler.js.map +0 -1
- package/src/rpc/chrome-profiler.ts +0 -373
|
@@ -68,9 +68,8 @@ class Generate {
|
|
|
68
68
|
this.p = p;
|
|
69
69
|
}
|
|
70
70
|
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, metricsCsv) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
target.target = request.id;
|
|
71
|
+
connection.onRequest(new rpc.RequestType("Generate"), (0, metrics_1.withMetrics)("Generate", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
context.target = request.id;
|
|
74
73
|
const recipe = preparedRecipes.get(request.id);
|
|
75
74
|
const response = {
|
|
76
75
|
ids: [],
|
|
@@ -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;AAE9C,uCAAsC;AAOtC,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,EAC9B,UAAmB;QAC7B,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/rpc/request/generate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,yCAAoD;AACpD,qCAA8C;AAE9C,uCAAsC;AAOtC,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,EAC9B,UAAmB;QAC7B,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,WAAW,CAAoC,UAAU,CAAC,EAClE,IAAA,qBAAW,EACP,UAAU,EACV,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,CAAO,OAAO,EAAE,EAAE;YAC3B,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;YAC5B,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,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AA7CD,4BA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-languages.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-languages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,qBAAa,YAAY;IACrB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"get-languages.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-languages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,qBAAa,YAAY;IACrB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAoB9E"}
|
|
@@ -47,15 +47,16 @@ const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
|
47
47
|
const metrics_1 = require("./metrics");
|
|
48
48
|
class GetLanguages {
|
|
49
49
|
static handle(connection, metricsCsv) {
|
|
50
|
-
|
|
51
|
-
connection.onRequest(new rpc.RequestType0("GetLanguages"), (0, metrics_1.withMetrics0)("GetLanguages", target, metricsCsv)(() => __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
connection.onRequest(new rpc.RequestType0("GetLanguages"), (0, metrics_1.withMetrics0)("GetLanguages", metricsCsv, (context) => () => __awaiter(this, void 0, void 0, function* () {
|
|
52
51
|
// Include all languages you want this server to support receiving from a remote peer
|
|
53
|
-
|
|
52
|
+
const languages = [
|
|
54
53
|
"org.openrewrite.text.PlainText",
|
|
55
54
|
"org.openrewrite.json.tree.Json$Document",
|
|
56
55
|
"org.openrewrite.java.tree.J$CompilationUnit",
|
|
57
56
|
"org.openrewrite.javascript.tree.JS$CompilationUnit",
|
|
58
57
|
];
|
|
58
|
+
context.target = '';
|
|
59
|
+
return languages;
|
|
59
60
|
})));
|
|
60
61
|
}
|
|
61
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-languages.js","sourceRoot":"","sources":["../../../src/rpc/request/get-languages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2C;AAC3C,uCAAuC;AAEvC,MAAa,YAAY;IACrB,MAAM,CAAC,MAAM,CAAC,UAAiC,EAAE,UAAmB;QAChE,
|
|
1
|
+
{"version":3,"file":"get-languages.js","sourceRoot":"","sources":["../../../src/rpc/request/get-languages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2C;AAC3C,uCAAuC;AAEvC,MAAa,YAAY;IACrB,MAAM,CAAC,MAAM,CAAC,UAAiC,EAAE,UAAmB;QAChE,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,YAAY,CAAkB,cAAc,CAAC,EACrD,IAAA,sBAAY,EACR,cAAc,EACd,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,GAAS,EAAE;YACpB,qFAAqF;YACrF,MAAM,SAAS,GAAG;gBACd,gCAAgC;gBAChC,yCAAyC;gBACzC,6CAA6C;gBAC7C,oDAAoD;aACvD,CAAC;YACF,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACrB,CAAC,CAAA,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AArBD,oCAqBC"}
|
|
@@ -4,6 +4,6 @@ export declare class GetObject {
|
|
|
4
4
|
private readonly id;
|
|
5
5
|
private readonly sourceFileType?;
|
|
6
6
|
constructor(id: string, sourceFileType?: string | undefined);
|
|
7
|
-
static handle(connection: rpc.MessageConnection, remoteObjects: Map<string, any>, localObjects: Map<string, any | ((input: string) => any)>, localRefs: ReferenceMap, batchSize: number, trace: boolean, metricsCsv?: string): void;
|
|
7
|
+
static handle(connection: rpc.MessageConnection, remoteObjects: Map<string, any>, localObjects: Map<string, any | ((input: string) => any)>, localRefs: ReferenceMap, batchSize: number, trace: () => boolean, metricsCsv?: string): 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;AAG7C,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,
|
|
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;AAG7C,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,MAAM,OAAO,EACpB,UAAU,CAAC,EAAE,MAAM,GACpB,IAAI;CAmDV"}
|
|
@@ -68,27 +68,28 @@ class GetObject {
|
|
|
68
68
|
}
|
|
69
69
|
static handle(connection, remoteObjects, localObjects, localRefs, batchSize, trace, metricsCsv) {
|
|
70
70
|
const pendingData = new Map();
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
let objId = request.id;
|
|
71
|
+
connection.onRequest(new rpc.RequestType("GetObject"), (0, metrics_1.withMetrics)("GetObject", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
const objId = request.id;
|
|
74
73
|
if (!localObjects.has(objId)) {
|
|
74
|
+
context.target = '';
|
|
75
75
|
return [
|
|
76
76
|
{ state: queue_1.RpcObjectState.DELETE },
|
|
77
77
|
{ state: queue_1.RpcObjectState.END_OF_OBJECT }
|
|
78
78
|
];
|
|
79
79
|
}
|
|
80
|
-
|
|
80
|
+
const objectOrGenerator = localObjects.get(objId);
|
|
81
81
|
if (typeof objectOrGenerator === 'function') {
|
|
82
|
-
|
|
82
|
+
const obj = yield objectOrGenerator(objId);
|
|
83
83
|
localObjects.set(objId, obj);
|
|
84
84
|
}
|
|
85
85
|
const obj = localObjects.get(objId);
|
|
86
|
-
|
|
86
|
+
context.target = (0, metrics_1.extractSourcePath)(obj);
|
|
87
87
|
let allData = pendingData.get(objId);
|
|
88
88
|
if (!allData) {
|
|
89
89
|
const after = obj;
|
|
90
90
|
const before = remoteObjects.get(objId);
|
|
91
|
-
allData = yield new queue_1.RpcSendQueue(localRefs, request.sourceFileType, trace
|
|
91
|
+
allData = yield new queue_1.RpcSendQueue(localRefs, request.sourceFileType, trace())
|
|
92
|
+
.generate(after, before);
|
|
92
93
|
pendingData.set(objId, allData);
|
|
93
94
|
remoteObjects.set(objId, after);
|
|
94
95
|
}
|
|
@@ -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;AAErE,uCAAyD;AAEzD,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,
|
|
1
|
+
{"version":3,"file":"get-object.js","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,oCAAqE;AAErE,uCAAyD;AAEzD,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,KAAoB,EACpB,UAAmB;QAEnB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;QAEvD,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,WAAW,CAAwB,WAAW,CAAC,EACvD,IAAA,qBAAW,EACP,WAAW,EACX,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,CAAM,OAAO,EAAC,EAAE;YACzB,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;gBACpB,OAAO;oBACH,EAAC,KAAK,EAAE,sBAAc,CAAC,MAAM,EAAC;oBAC9B,EAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,EAAC;iBACxC,CAAC;YACN,CAAC;YAED,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;YACnD,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC3C,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjC,CAAC;YAED,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;YAExC,IAAI,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,GAAG,CAAC;gBAClB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAExC,OAAO,GAAG,MAAM,IAAI,oBAAY,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC;qBACvE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC7B,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,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAhED,8BAgEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAmB,cAAc,EAAC,MAAM,cAAc,CAAC;AAG9D,qBAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"get-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/get-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAmB,cAAc,EAAC,MAAM,cAAc,CAAC;AAG9D,qBAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAiBxG"}
|
|
@@ -62,12 +62,12 @@ const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
|
62
62
|
const metrics_1 = require("./metrics");
|
|
63
63
|
class GetRecipes {
|
|
64
64
|
static handle(connection, registry, metricsCsv) {
|
|
65
|
-
|
|
66
|
-
connection.onRequest(new rpc.RequestType0("GetRecipes"), (0, metrics_1.withMetrics0)("GetRecipes", target, metricsCsv)(() => __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
connection.onRequest(new rpc.RequestType0("GetRecipes"), (0, metrics_1.withMetrics0)("GetRecipes", metricsCsv, (context) => () => __awaiter(this, void 0, void 0, function* () {
|
|
67
66
|
const recipes = [];
|
|
68
67
|
for (const [_name, recipe] of registry.all.entries()) {
|
|
69
68
|
recipes.push(yield new recipe().descriptor());
|
|
70
69
|
}
|
|
70
|
+
context.target = '';
|
|
71
71
|
return recipes;
|
|
72
72
|
})));
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/get-recipes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,uCAAuC;AAEvC,MAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAiC,EAAE,QAAwB,EAAE,UAAmB;QAC1F,
|
|
1
|
+
{"version":3,"file":"get-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/get-recipes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,uCAAuC;AAEvC,MAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAiC,EAAE,QAAwB,EAAE,UAAmB;QAC1F,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,YAAY,CAAiD,YAAY,CAAC,EAClF,IAAA,sBAAY,EACR,YAAY,EACZ,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,GAAS,EAAE;YACpB,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;YAClD,CAAC;YACD,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAlBD,gCAkBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/index.ts"],"names":[],"mappings":"AAeA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/index.ts"],"names":[],"mappings":"AAeA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC"}
|
|
@@ -36,4 +36,5 @@ __exportStar(require("./parse"), exports);
|
|
|
36
36
|
__exportStar(require("./prepare-recipe"), exports);
|
|
37
37
|
__exportStar(require("./print"), exports);
|
|
38
38
|
__exportStar(require("./visit"), exports);
|
|
39
|
+
__exportStar(require("./trace-get-object"), exports);
|
|
39
40
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/request/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,6CAA2B;AAC3B,+CAA6B;AAC7B,gDAA8B;AAC9B,0CAAwB;AACxB,mDAAiC;AACjC,0CAAwB;AACxB,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/request/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,6CAA2B;AAC3B,+CAA6B;AAC7B,gDAA8B;AAC9B,0CAAwB;AACxB,mDAAiC;AACjC,0CAAwB;AACxB,0CAAwB;AACxB,qDAAmC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAM5C,MAAM,WAAW,sBAAsB;IACnC,gBAAgB,EAAE,MAAM,CAAA;CAC3B;AAqCD,qBAAa,cAAc;IAMX,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC;;;;OAIG;gBAC0B,OAAO,EAAE,MAAM,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAGxF,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAC/E,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAM5C,MAAM,WAAW,sBAAsB;IACnC,gBAAgB,EAAE,MAAM,CAAA;CAC3B;AAqCD,qBAAa,cAAc;IAMX,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC;;;;OAIG;gBAC0B,OAAO,EAAE,MAAM,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAGxF,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAC/E,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAuEhE"}
|
|
@@ -102,9 +102,8 @@ class InstallRecipes {
|
|
|
102
102
|
this.recipes = recipes;
|
|
103
103
|
}
|
|
104
104
|
static handle(connection, installDir, registry, logger, metricsCsv) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
target.target = typeof request.recipes === "object" ? request.recipes.packageName : request.recipes;
|
|
105
|
+
connection.onRequest(new rpc.RequestType("InstallRecipes"), (0, metrics_1.withMetrics)("InstallRecipes", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
|
|
106
|
+
context.target = typeof request.recipes === "object" ? request.recipes.packageName : request.recipes;
|
|
108
107
|
const beforeInstall = registry.all.size;
|
|
109
108
|
let resolvedPath;
|
|
110
109
|
let recipesName = request.recipes;
|
|
@@ -164,26 +163,36 @@ class InstallRecipes {
|
|
|
164
163
|
}
|
|
165
164
|
}
|
|
166
165
|
exports.InstallRecipes = InstallRecipes;
|
|
166
|
+
/**
|
|
167
|
+
* Ensures dynamically loaded modules share the same class instances as the host
|
|
168
|
+
* by mapping require.cache entries. This prevents instanceof failures when the
|
|
169
|
+
* same package is installed in multiple node_modules directories.
|
|
170
|
+
*/
|
|
167
171
|
function setupSharedDependencies(targetModulePath) {
|
|
168
|
-
const sharedDeps = [
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
172
|
+
const sharedDeps = ['@openrewrite/rewrite', 'vscode-jsonrpc'];
|
|
173
|
+
const targetDir = path.dirname(targetModulePath);
|
|
174
|
+
sharedDeps.forEach(depName => {
|
|
175
|
+
const depPattern = path.sep + 'node_modules' + path.sep + depName.replace('/', path.sep);
|
|
176
|
+
for (const cachedPath of Object.keys(require.cache)) {
|
|
177
|
+
if (!cachedPath.includes(depPattern))
|
|
178
|
+
continue;
|
|
179
|
+
try {
|
|
180
|
+
// Extract subpath: /path/node_modules/@pkg/dist/tree.js -> dist/tree.js
|
|
181
|
+
const pkgIndex = cachedPath.indexOf(depPattern);
|
|
182
|
+
let subpath = cachedPath.substring(pkgIndex + depPattern.length)
|
|
183
|
+
.replace(/^[/\\]/, '') // Remove leading slash
|
|
184
|
+
.replace(/\.(js|ts)$/, '') // Remove extension
|
|
185
|
+
.replace(/^dist[/\\]/, '') // Remove dist/ prefix if present
|
|
186
|
+
.replace(/[/\\]index$/, ''); // Remove /index suffix
|
|
187
|
+
// Build require path: @pkg or @pkg/subpath
|
|
188
|
+
const requirePath = subpath ? `${depName}/${subpath}` : depName;
|
|
189
|
+
// Resolve from target's perspective and map cache
|
|
190
|
+
const targetDepPath = require.resolve(requirePath, { paths: [targetDir] });
|
|
191
|
+
require.cache[targetDepPath] = require.cache[cachedPath];
|
|
192
|
+
}
|
|
193
|
+
catch (e) {
|
|
194
|
+
// Target can't resolve this path, skip
|
|
183
195
|
}
|
|
184
|
-
}
|
|
185
|
-
catch (e) {
|
|
186
|
-
// Module not found or not resolvable, skip
|
|
187
196
|
}
|
|
188
197
|
});
|
|
189
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,2CAA6B;AAC7B,uCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,23 +20,23 @@ export declare function initializeMetricsCsv(metricsCsv?: string, logger?: rpc.L
|
|
|
20
20
|
/**
|
|
21
21
|
* Wraps an RPC request handler to record performance metrics to a CSV file.
|
|
22
22
|
*
|
|
23
|
-
* @param
|
|
24
|
-
* @param target A mutable object containing the target identifier for metrics
|
|
23
|
+
* @param requestType The request type name (e.g., "Visit", "GetObject")
|
|
25
24
|
* @param metricsCsv Optional path to the CSV file for recording metrics
|
|
26
|
-
* @
|
|
25
|
+
* @param handlerFactory A function that creates the handler with a mutable context for setting the target
|
|
26
|
+
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
27
27
|
*/
|
|
28
|
-
export declare function withMetrics<P, R>(
|
|
28
|
+
export declare function withMetrics<P, R>(requestType: string, metricsCsv: string | undefined, handlerFactory: (context: {
|
|
29
29
|
target: string;
|
|
30
|
-
}
|
|
30
|
+
}) => (request: P) => Promise<R>): (request: P) => Promise<R>;
|
|
31
31
|
/**
|
|
32
32
|
* Wraps an RPC request handler without parameters (RequestType0) to record performance metrics.
|
|
33
33
|
*
|
|
34
|
-
* @param
|
|
35
|
-
* @param target A mutable object containing the target identifier for metrics
|
|
34
|
+
* @param requestType The request type name (e.g., "GetLanguages", "GetRecipes")
|
|
36
35
|
* @param metricsCsv Optional path to the CSV file for recording metrics
|
|
37
|
-
* @
|
|
36
|
+
* @param handlerFactory A function that creates the handler with a mutable context for setting the target
|
|
37
|
+
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
38
38
|
*/
|
|
39
|
-
export declare function withMetrics0<R>(
|
|
39
|
+
export declare function withMetrics0<R>(requestType: string, metricsCsv: string | undefined, handlerFactory: (context: {
|
|
40
40
|
target: string;
|
|
41
|
-
}
|
|
41
|
+
}) => () => Promise<R>): (token: any) => Promise<R>;
|
|
42
42
|
//# sourceMappingURL=metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAA2B,MAAM,YAAY,CAAC;AAI5D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAapE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CA2BnF;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAA2B,MAAM,YAAY,CAAC;AAI5D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAapE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CA2BnF;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAC5B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,cAAc,EAAE,CAAC,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC1E,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAsB5B;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAC1B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,cAAc,EAAE,CAAC,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,KAAK,MAAM,OAAO,CAAC,CAAC,CAAC,GAChE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAsB5B"}
|
|
@@ -117,55 +117,62 @@ function initializeMetricsCsv(metricsCsv, logger) {
|
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
/**
|
|
120
|
-
*
|
|
120
|
+
* Wraps an RPC request handler to record performance metrics to a CSV file.
|
|
121
|
+
*
|
|
122
|
+
* @param requestType The request type name (e.g., "Visit", "GetObject")
|
|
123
|
+
* @param metricsCsv Optional path to the CSV file for recording metrics
|
|
124
|
+
* @param handlerFactory A function that creates the handler with a mutable context for setting the target
|
|
125
|
+
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
121
126
|
*/
|
|
122
|
-
function
|
|
123
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
127
|
+
function withMetrics(requestType, metricsCsv, handlerFactory) {
|
|
128
|
+
return (request) => __awaiter(this, void 0, void 0, function* () {
|
|
129
|
+
const context = { target: '' };
|
|
130
|
+
const handler = handlerFactory(context);
|
|
124
131
|
if (!metricsCsv) {
|
|
125
132
|
// No metrics recording requested, just execute the handler
|
|
126
|
-
return handler();
|
|
133
|
+
return yield handler(request);
|
|
127
134
|
}
|
|
128
135
|
const startTime = Date.now();
|
|
129
136
|
try {
|
|
130
|
-
const result = yield handler();
|
|
131
|
-
recordMetrics(metricsCsv,
|
|
137
|
+
const result = yield handler(request);
|
|
138
|
+
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
132
139
|
return result;
|
|
133
140
|
}
|
|
134
141
|
catch (error) {
|
|
135
|
-
|
|
142
|
+
// On error, still try to record metrics with the target (maybe empty)
|
|
143
|
+
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
136
144
|
throw error;
|
|
137
145
|
}
|
|
138
146
|
});
|
|
139
147
|
}
|
|
140
|
-
/**
|
|
141
|
-
* Wraps an RPC request handler to record performance metrics to a CSV file.
|
|
142
|
-
*
|
|
143
|
-
* @param request The request type name (e.g., "Visit", "GetObject")
|
|
144
|
-
* @param target A mutable object containing the target identifier for metrics
|
|
145
|
-
* @param metricsCsv Optional path to the CSV file for recording metrics
|
|
146
|
-
* @returns A function that wraps a request handler with metrics recording
|
|
147
|
-
*/
|
|
148
|
-
function withMetrics(request, target, metricsCsv) {
|
|
149
|
-
return (handler) => {
|
|
150
|
-
return (requestParam) => __awaiter(this, void 0, void 0, function* () {
|
|
151
|
-
return wrapWithMetrics(() => handler(requestParam), target, request, metricsCsv);
|
|
152
|
-
});
|
|
153
|
-
};
|
|
154
|
-
}
|
|
155
148
|
/**
|
|
156
149
|
* Wraps an RPC request handler without parameters (RequestType0) to record performance metrics.
|
|
157
150
|
*
|
|
158
|
-
* @param
|
|
159
|
-
* @param target A mutable object containing the target identifier for metrics
|
|
151
|
+
* @param requestType The request type name (e.g., "GetLanguages", "GetRecipes")
|
|
160
152
|
* @param metricsCsv Optional path to the CSV file for recording metrics
|
|
161
|
-
* @
|
|
153
|
+
* @param handlerFactory A function that creates the handler with a mutable context for setting the target
|
|
154
|
+
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
162
155
|
*/
|
|
163
|
-
function withMetrics0(
|
|
164
|
-
return (
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
156
|
+
function withMetrics0(requestType, metricsCsv, handlerFactory) {
|
|
157
|
+
return (_) => __awaiter(this, void 0, void 0, function* () {
|
|
158
|
+
const context = { target: '' };
|
|
159
|
+
const handler = handlerFactory(context);
|
|
160
|
+
if (!metricsCsv) {
|
|
161
|
+
// No metrics recording requested, just execute the handler
|
|
162
|
+
return yield handler();
|
|
163
|
+
}
|
|
164
|
+
const startTime = Date.now();
|
|
165
|
+
try {
|
|
166
|
+
const result = yield handler();
|
|
167
|
+
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
168
|
+
return result;
|
|
169
|
+
}
|
|
170
|
+
catch (error) {
|
|
171
|
+
// On error, still try to record metrics with the target (may be empty)
|
|
172
|
+
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
173
|
+
throw error;
|
|
174
|
+
}
|
|
175
|
+
});
|
|
169
176
|
}
|
|
170
177
|
function recordMetrics(metricsCsv, target, request, startTime) {
|
|
171
178
|
const endTime = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,8CAaC;AASD,oDA2BC;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAE3C,OAAO,EAAC,WAAW,EAAU,MAAM,cAAc,CAAC;AAMlD,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,EACzD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAU,MAAM,cAAc,CAAC;AAMlD,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,EACzD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAoC3C"}
|
|
@@ -70,28 +70,26 @@ class Parse {
|
|
|
70
70
|
this.relativeTo = relativeTo;
|
|
71
71
|
}
|
|
72
72
|
static handle(connection, localObjects, metricsCsv) {
|
|
73
|
-
|
|
74
|
-
connection.onRequest(new rpc.RequestType("Parse"), (0, metrics_1.withMetrics)("Parse", target, metricsCsv)((request) => __awaiter(this, void 0, void 0, function* () {
|
|
73
|
+
connection.onRequest(new rpc.RequestType("Parse"), (0, metrics_1.withMetrics)("Parse", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
|
|
75
74
|
// Set target to comma-separated list of file paths
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
context.target = request.inputs.map(input => typeof input === 'string' ? input : input.sourcePath).join(',');
|
|
76
|
+
const parser = parser_1.Parsers.createParser("javascript", {
|
|
78
77
|
ctx: new execution_1.ExecutionContext(),
|
|
79
78
|
relativeTo: request.relativeTo
|
|
80
79
|
});
|
|
81
|
-
if (!parser) {
|
|
82
|
-
return [];
|
|
83
|
-
}
|
|
84
80
|
const generator = parser.parse(...request.inputs);
|
|
85
|
-
const
|
|
81
|
+
const resultIds = [];
|
|
86
82
|
for (let i = 0; i < request.inputs.length; i++) {
|
|
87
83
|
const id = (0, uuid_1.randomId)();
|
|
88
84
|
localObjects.set(id, (id) => __awaiter(this, void 0, void 0, function* () {
|
|
89
|
-
|
|
90
|
-
return (0, immer_1.produce)(sourceFile, (draft) => {
|
|
85
|
+
const sourceFile = (yield generator.next()).value;
|
|
86
|
+
return (0, immer_1.produce)(sourceFile, (draft) => {
|
|
87
|
+
draft.id = id;
|
|
88
|
+
});
|
|
91
89
|
}));
|
|
92
|
-
|
|
90
|
+
resultIds.push(id);
|
|
93
91
|
}
|
|
94
|
-
return
|
|
92
|
+
return resultIds;
|
|
95
93
|
})));
|
|
96
94
|
}
|
|
97
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,+CAAiD;AACjD,yCAAkD;AAClD,qCAA0C;AAC1C,iCAA8B;AAE9B,uCAAsC;AAEtC,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,EACzD,UAAmB;QAC7B,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,+CAAiD;AACjD,yCAAkD;AAClD,qCAA0C;AAC1C,iCAA8B;AAE9B,uCAAsC;AAEtC,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,EACzD,UAAmB;QAC7B,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,WAAW,CAAuB,OAAO,CAAC,EAClD,IAAA,qBAAW,EACP,OAAO,EACP,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,CAAO,OAAO,EAAE,EAAE;YAC3B,mDAAmD;YACnD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACxC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CACvD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEZ,MAAM,MAAM,GAAG,gBAAO,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC9C,GAAG,EAAE,IAAI,4BAAgB,EAAE;gBAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;aACjC,CAAE,CAAC;YAEJ,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,SAAS,GAAW,EAAE,CAAC;YAE7B,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,MAAM,UAAU,GAAe,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;oBAC9D,OAAO,IAAA,eAAO,EAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;wBACjC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;oBAClB,CAAC,CAAC,CAAC;gBACP,CAAC,CAAA,CAAC,CAAC;gBACH,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,SAAS,CAAC;QACrB,CAAC,CAAA,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AA3CD,sBA2CC"}
|
|
@@ -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,EAAE,cAAc,EAAiB,MAAM,cAAc,CAAC;AAQtF,qBAAa,aAAa;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAArC,EAAE,EAAE,MAAM,EAAmB,OAAO,CAAC,EAAE,GAAG,YAAA;IAGvE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,UAAU,CAAC,EAAE,MAAM;
|
|
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,EAAE,cAAc,EAAiB,MAAM,cAAc,CAAC;AAQtF,qBAAa,aAAa;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAArC,EAAE,EAAE,MAAM,EAAmB,OAAO,CAAC,EAAE,GAAG,YAAA;IAGvE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,UAAU,CAAC,EAAE,MAAM;IAuCjC;;;;OAIG;mBACkB,qBAAqB;IAuC1C,OAAO,CAAC,MAAM,CAAC,uBAAuB;CAyBzC;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;CACpC;AAED,MAAM,WAAW,YAAY;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,EAAE,CAAA;CACtB"}
|
|
@@ -71,9 +71,8 @@ class PrepareRecipe {
|
|
|
71
71
|
}
|
|
72
72
|
static handle(connection, registry, preparedRecipes, metricsCsv) {
|
|
73
73
|
const snowflake = (0, snowflake_id_1.SnowflakeId)();
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
target.target = request.id;
|
|
74
|
+
connection.onRequest(new rpc.RequestType("PrepareRecipe"), (0, metrics_1.withMetrics)("PrepareRecipe", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
context.target = request.id;
|
|
77
76
|
const id = snowflake.generate();
|
|
78
77
|
const recipeCtor = registry.all.get(request.id);
|
|
79
78
|
if (!recipeCtor) {
|
|
@@ -85,7 +84,7 @@ class PrepareRecipe {
|
|
|
85
84
|
const scanPreconditions = [];
|
|
86
85
|
recipe = yield this.optimizePreconditions(recipe, "scan", scanPreconditions);
|
|
87
86
|
preparedRecipes.set(id, recipe);
|
|
88
|
-
|
|
87
|
+
const result = {
|
|
89
88
|
id: id,
|
|
90
89
|
descriptor: yield recipe.descriptor(),
|
|
91
90
|
editVisitor: `edit:${id}`,
|
|
@@ -93,6 +92,7 @@ class PrepareRecipe {
|
|
|
93
92
|
scanVisitor: recipe instanceof recipe_1.ScanningRecipe ? `scan:${id}` : undefined,
|
|
94
93
|
scanPreconditions: scanPreconditions
|
|
95
94
|
};
|
|
95
|
+
return result;
|
|
96
96
|
})));
|
|
97
97
|
}
|
|
98
98
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAE3C,yCAAsF;AACtF,gEAA0D;AAC1D,uDAA0C;AAC1C,sCAAoC;AAGpC,uCAAsC;AAEtC,MAAa,aAAa;IACtB,YAA6B,EAAU,EAAmB,OAAa;QAA1C,OAAE,GAAF,EAAE,CAAQ;QAAmB,YAAO,GAAP,OAAO,CAAM;IACvE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAA6B,EAC7B,QAAwB,EACxB,eAAoC,EACpC,UAAmB;QAC7B,MAAM,SAAS,GAAG,IAAA,0BAAW,GAAE,CAAC;QAChC,
|
|
1
|
+
{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ export declare class Print {
|
|
|
10
10
|
private readonly sourceFileType;
|
|
11
11
|
readonly markerPrinter: MarkerPrinter;
|
|
12
12
|
constructor(treeId: UUID, sourceFileType: string, markerPrinter?: MarkerPrinter);
|
|
13
|
-
static handle(connection: rpc.MessageConnection, getObject: (id: string, sourceFileType
|
|
13
|
+
static handle(connection: rpc.MessageConnection, getObject: (id: string, sourceFileType: string) => any, logger?: rpc.Logger, metricsCsv?: string): void;
|
|
14
14
|
}
|
|
15
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;AAG3C,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAGhC,0BAAkB,aAAa;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,SAAS,cAAc;CAC1B;AAED,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,MAAM;
|
|
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;AAGhC,0BAAkB,aAAa;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,SAAS,cAAc;CAC1B;AAED,qBAAa,KAAK;IACF,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,QAAQ,CAAC,aAAa,EAAE,aAAa;gBAFpB,MAAM,EAAE,IAAI,EACZ,cAAc,EAAE,MAAM,EAC9B,aAAa,GAAE,aAAqC;IAGzE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,GAAG,EACtD,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAwB3C"}
|