@openrewrite/rewrite 8.62.6 → 8.62.7
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/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +9 -1
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/preconditions.d.ts +4 -3
- package/dist/javascript/preconditions.d.ts.map +1 -1
- package/dist/javascript/preconditions.js +11 -29
- package/dist/javascript/preconditions.js.map +1 -1
- package/dist/javascript/remove-import.d.ts +1 -0
- package/dist/javascript/remove-import.d.ts.map +1 -1
- package/dist/javascript/remove-import.js +76 -7
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +4 -0
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +48 -33
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/rpc/request/generate.d.ts +1 -1
- package/dist/rpc/request/generate.d.ts.map +1 -1
- package/dist/rpc/request/generate.js +6 -3
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-languages.d.ts +1 -1
- package/dist/rpc/request/get-languages.d.ts.map +1 -1
- package/dist/rpc/request/get-languages.js +6 -5
- 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 -4
- package/dist/rpc/request/get-object.js.map +1 -1
- package/dist/rpc/request/get-recipes.d.ts +1 -1
- package/dist/rpc/request/get-recipes.d.ts.map +1 -1
- package/dist/rpc/request/get-recipes.js +5 -3
- package/dist/rpc/request/get-recipes.js.map +1 -1
- package/dist/rpc/request/install-recipes.d.ts +1 -1
- package/dist/rpc/request/install-recipes.d.ts.map +1 -1
- package/dist/rpc/request/install-recipes.js +6 -3
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/metrics.d.ts +42 -0
- package/dist/rpc/request/metrics.d.ts.map +1 -0
- package/dist/rpc/request/metrics.js +184 -0
- package/dist/rpc/request/metrics.js.map +1 -0
- package/dist/rpc/request/parse.d.ts +1 -1
- package/dist/rpc/request/parse.d.ts.map +1 -1
- package/dist/rpc/request/parse.js +7 -3
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.d.ts +1 -1
- package/dist/rpc/request/prepare-recipe.d.ts.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +6 -3
- 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 +6 -3
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/visit.d.ts +1 -1
- package/dist/rpc/request/visit.d.ts.map +1 -1
- package/dist/rpc/request/visit.js +8 -4
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.d.ts +1 -0
- package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/rpc/rewrite-rpc.js +12 -9
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.js +2 -0
- package/dist/rpc/server.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/javascript/parser.ts +13 -1
- package/src/javascript/preconditions.ts +10 -10
- package/src/javascript/remove-import.ts +75 -9
- package/src/javascript/type-mapping.ts +50 -30
- package/src/rpc/request/generate.ts +7 -3
- package/src/rpc/request/get-languages.ts +6 -5
- package/src/rpc/request/get-object.ts +10 -4
- package/src/rpc/request/get-recipes.ts +5 -3
- package/src/rpc/request/install-recipes.ts +6 -3
- package/src/rpc/request/metrics.ts +167 -0
- package/src/rpc/request/parse.ts +12 -6
- package/src/rpc/request/prepare-recipe.ts +7 -3
- package/src/rpc/request/print.ts +7 -3
- package/src/rpc/request/visit.ts +9 -4
- package/src/rpc/rewrite-rpc.ts +14 -9
- package/src/rpc/server.ts +3 -0
|
@@ -63,14 +63,17 @@ const recipe_1 = require("../../recipe");
|
|
|
63
63
|
const snowflake_id_1 = require("@akashrajpurohit/snowflake-id");
|
|
64
64
|
const preconditions_1 = require("../../preconditions");
|
|
65
65
|
const recipe_2 = require("../recipe");
|
|
66
|
+
const metrics_1 = require("./metrics");
|
|
66
67
|
class PrepareRecipe {
|
|
67
68
|
constructor(id, options) {
|
|
68
69
|
this.id = id;
|
|
69
70
|
this.options = options;
|
|
70
71
|
}
|
|
71
|
-
static handle(connection, registry, preparedRecipes) {
|
|
72
|
+
static handle(connection, registry, preparedRecipes, metricsCsv) {
|
|
72
73
|
const snowflake = (0, snowflake_id_1.SnowflakeId)();
|
|
73
|
-
|
|
74
|
+
const target = { target: '' };
|
|
75
|
+
connection.onRequest(new rpc.RequestType("PrepareRecipe"), (0, metrics_1.withMetrics)("PrepareRecipe", target, metricsCsv)((request) => __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
target.target = request.id;
|
|
74
77
|
const id = snowflake.generate();
|
|
75
78
|
const recipeCtor = registry.all.get(request.id);
|
|
76
79
|
if (!recipeCtor) {
|
|
@@ -90,7 +93,7 @@ class PrepareRecipe {
|
|
|
90
93
|
scanVisitor: recipe instanceof recipe_1.ScanningRecipe ? `scan:${id}` : undefined,
|
|
91
94
|
scanPreconditions: scanPreconditions
|
|
92
95
|
};
|
|
93
|
-
}));
|
|
96
|
+
})));
|
|
94
97
|
}
|
|
95
98
|
/**
|
|
96
99
|
* For preconditions that can be evaluated on the remote peer, let the remote peer
|
|
@@ -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;
|
|
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?: string) => any): void;
|
|
13
|
+
static handle(connection: rpc.MessageConnection, getObject: (id: string, sourceFileType?: string) => any, 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;
|
|
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;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,EACvD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAa3C"}
|
|
@@ -61,6 +61,7 @@ exports.Print = exports.MarkerPrinter = void 0;
|
|
|
61
61
|
const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
62
62
|
const tree_1 = require("../../tree");
|
|
63
63
|
const print_1 = require("../../print");
|
|
64
|
+
const metrics_1 = require("./metrics");
|
|
64
65
|
var MarkerPrinter;
|
|
65
66
|
(function (MarkerPrinter) {
|
|
66
67
|
MarkerPrinter["DEFAULT"] = "DEFAULT";
|
|
@@ -73,9 +74,11 @@ class Print {
|
|
|
73
74
|
this.sourceFileType = sourceFileType;
|
|
74
75
|
this.markerPrinter = markerPrinter;
|
|
75
76
|
}
|
|
76
|
-
static handle(connection, getObject) {
|
|
77
|
-
|
|
77
|
+
static handle(connection, getObject, metricsCsv) {
|
|
78
|
+
const target = { target: '' };
|
|
79
|
+
connection.onRequest(new rpc.RequestType("Print"), (0, metrics_1.withMetrics)("Print", target, metricsCsv)((request) => __awaiter(this, void 0, void 0, function* () {
|
|
78
80
|
const tree = yield getObject(request.treeId.toString(), request.sourceFileType);
|
|
81
|
+
target.target = (0, metrics_1.extractSourcePath)(tree);
|
|
79
82
|
const out = new print_1.PrintOutputCapture(print_1.MarkerPrinter[request.markerPrinter]);
|
|
80
83
|
if ((0, tree_1.isSourceFile)(tree)) {
|
|
81
84
|
return yield (0, print_1.printer)(tree).print(tree, out);
|
|
@@ -83,7 +86,7 @@ class Print {
|
|
|
83
86
|
else {
|
|
84
87
|
return yield (0, print_1.printer)(request.sourceFileType).print(tree, out);
|
|
85
88
|
}
|
|
86
|
-
}));
|
|
89
|
+
})));
|
|
87
90
|
}
|
|
88
91
|
}
|
|
89
92
|
exports.Print = Print;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,qCAA8C;AAC9C,uCAA6F;
|
|
1
|
+
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/rpc/request/print.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,qCAA8C;AAC9C,uCAA6F;AAE7F,uCAAyD;AAEzD,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,EACvD,UAAmB;QAC7B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC9B,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,WAAW,CAAuB,OAAO,CAAC,EAAE,IAAA,qBAAW,EAAgB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAM,OAAO,EAAC,EAAE;YAC7I,MAAM,IAAI,GAAS,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACtF,MAAM,CAAC,MAAM,GAAG,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;YACxC,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,CAAC;IACR,CAAC;CACJ;AAnBD,sBAmBC"}
|
|
@@ -12,7 +12,7 @@ export declare class Visit {
|
|
|
12
12
|
private readonly p;
|
|
13
13
|
private readonly cursor;
|
|
14
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
|
|
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>, metricsCsv?: string): void;
|
|
16
16
|
private static instantiateVisitor;
|
|
17
17
|
}
|
|
18
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;
|
|
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;AAKpD,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,EACxF,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;mBAqBnB,kBAAkB;CAsC1C"}
|
|
@@ -61,6 +61,7 @@ exports.Visit = void 0;
|
|
|
61
61
|
const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
62
62
|
const tree_1 = require("../../tree");
|
|
63
63
|
const visitor_1 = require("../../visitor");
|
|
64
|
+
const metrics_1 = require("./metrics");
|
|
64
65
|
class Visit {
|
|
65
66
|
constructor(visitor, sourceFileType, visitorOptions, treeId, p, cursor) {
|
|
66
67
|
this.visitor = visitor;
|
|
@@ -70,13 +71,16 @@ class Visit {
|
|
|
70
71
|
this.p = p;
|
|
71
72
|
this.cursor = cursor;
|
|
72
73
|
}
|
|
73
|
-
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor) {
|
|
74
|
-
|
|
74
|
+
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor, metricsCsv) {
|
|
75
|
+
const target = { target: '' };
|
|
76
|
+
connection.onRequest(new rpc.RequestType("Visit"), (0, metrics_1.withMetrics)("Visit", target, metricsCsv)((request) => __awaiter(this, void 0, void 0, function* () {
|
|
75
77
|
const p = yield getObject(request.p, undefined);
|
|
76
78
|
const before = yield getObject(request.treeId, request.sourceFileType);
|
|
79
|
+
const cursor = yield getCursor(request.cursor, request.sourceFileType);
|
|
80
|
+
target.target = (0, metrics_1.extractSourcePath)(before, cursor);
|
|
77
81
|
localObjects.set(before.id.toString(), before);
|
|
78
82
|
const visitor = yield Visit.instantiateVisitor(request, preparedRecipes, recipeCursors, p);
|
|
79
|
-
const after = yield visitor.visit(before, p,
|
|
83
|
+
const after = yield visitor.visit(before, p, cursor);
|
|
80
84
|
if (!after) {
|
|
81
85
|
localObjects.delete(before.id.toString());
|
|
82
86
|
}
|
|
@@ -84,7 +88,7 @@ class Visit {
|
|
|
84
88
|
localObjects.set(after.id.toString(), after);
|
|
85
89
|
}
|
|
86
90
|
return { modified: before !== after };
|
|
87
|
-
}));
|
|
91
|
+
})));
|
|
88
92
|
}
|
|
89
93
|
static instantiateVisitor(request, preparedRecipes, recipeCursors, p) {
|
|
90
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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
|
@@ -63,6 +63,7 @@ const tree_1 = require("../tree");
|
|
|
63
63
|
const recipe_1 = require("../recipe");
|
|
64
64
|
const snowflake_id_1 = require("@akashrajpurohit/snowflake-id");
|
|
65
65
|
const request_1 = require("./request");
|
|
66
|
+
const metrics_1 = require("./request/metrics");
|
|
66
67
|
const queue_1 = require("./queue");
|
|
67
68
|
const recipe_2 = require("./recipe");
|
|
68
69
|
const install_recipes_1 = require("./request/install-recipes");
|
|
@@ -80,21 +81,23 @@ class RewriteRpc {
|
|
|
80
81
|
this.remoteObjects = new Map();
|
|
81
82
|
this.remoteRefs = new Map();
|
|
82
83
|
this.localRefs = new reference_1.ReferenceMap();
|
|
84
|
+
// Initialize metrics CSV file if configured
|
|
85
|
+
(0, metrics_1.initializeMetricsCsv)(options.metricsCsv, options.logger);
|
|
83
86
|
const preparedRecipes = new Map();
|
|
84
87
|
const recipeCursors = new WeakMap();
|
|
85
88
|
// Need this indirection, otherwise `this` will be undefined when executed in the handlers.
|
|
86
89
|
const getObject = (id, sourceFileType) => this.getObject(id, sourceFileType);
|
|
87
90
|
const getCursor = (cursorIds, sourceFileType) => this.getCursor(cursorIds, sourceFileType);
|
|
88
91
|
const registry = options.registry || new recipe_1.RecipeRegistry();
|
|
89
|
-
request_1.Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor);
|
|
90
|
-
request_1.Generate.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject);
|
|
91
|
-
request_1.GetObject.handle(this.connection, this.remoteObjects, this.localObjects, this.localRefs, (options === null || options === void 0 ? void 0 : options.batchSize) || 200, !!(options === null || options === void 0 ? void 0 : options.traceGetObjectOutput));
|
|
92
|
-
request_1.GetRecipes.handle(this.connection, registry);
|
|
93
|
-
get_languages_1.GetLanguages.handle(this.connection);
|
|
94
|
-
request_1.PrepareRecipe.handle(this.connection, registry, preparedRecipes);
|
|
95
|
-
request_1.Parse.handle(this.connection, this.localObjects);
|
|
96
|
-
request_1.Print.handle(this.connection, getObject);
|
|
97
|
-
install_recipes_1.InstallRecipes.handle(this.connection, (_a = options.recipeInstallDir) !== null && _a !== void 0 ? _a : ".rewrite", registry, options.logger);
|
|
92
|
+
request_1.Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor, options.metricsCsv);
|
|
93
|
+
request_1.Generate.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, options.metricsCsv);
|
|
94
|
+
request_1.GetObject.handle(this.connection, this.remoteObjects, this.localObjects, this.localRefs, (options === null || options === void 0 ? void 0 : options.batchSize) || 200, !!(options === null || options === void 0 ? void 0 : options.traceGetObjectOutput), options.metricsCsv);
|
|
95
|
+
request_1.GetRecipes.handle(this.connection, registry, options.metricsCsv);
|
|
96
|
+
get_languages_1.GetLanguages.handle(this.connection, options.metricsCsv);
|
|
97
|
+
request_1.PrepareRecipe.handle(this.connection, registry, preparedRecipes, options.metricsCsv);
|
|
98
|
+
request_1.Parse.handle(this.connection, this.localObjects, options.metricsCsv);
|
|
99
|
+
request_1.Print.handle(this.connection, getObject, options.metricsCsv);
|
|
100
|
+
install_recipes_1.InstallRecipes.handle(this.connection, (_a = options.recipeInstallDir) !== null && _a !== void 0 ? _a : ".rewrite", registry, options.logger, options.metricsCsv);
|
|
98
101
|
this.connection.listen();
|
|
99
102
|
}
|
|
100
103
|
static set(value) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc/server.js
CHANGED
|
@@ -78,6 +78,7 @@ function main() {
|
|
|
78
78
|
program
|
|
79
79
|
.option('--port <number>', 'port number')
|
|
80
80
|
.option('--log-file <log_path>', 'log file path')
|
|
81
|
+
.option('--metrics-csv <metrics_csv_path>', 'metrics CSV output path')
|
|
81
82
|
.option('-v, --verbose', 'enable verbose output')
|
|
82
83
|
.option('--batch-size [size]', 'sets the batch size (default is 200)', s => parseInt(s, 10), 200)
|
|
83
84
|
.option('--trace-get-object-output', 'enable `GetObject` output tracing')
|
|
@@ -168,6 +169,7 @@ function main() {
|
|
|
168
169
|
rewrite_rpc_1.RewriteRpc.set(new rewrite_rpc_1.RewriteRpc(connection, {
|
|
169
170
|
batchSize: options.batchSize,
|
|
170
171
|
logger: logger,
|
|
172
|
+
metricsCsv: options.metricsCsv,
|
|
171
173
|
traceGetObjectInput: options.traceGetObjectInput ? log : undefined,
|
|
172
174
|
traceGetObjectOutput: options.traceGetObjectOutput,
|
|
173
175
|
recipeInstallDir: recipeInstallDir
|
package/dist/rpc/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/rpc/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,8CAAkD;AAClD,+CAAyC;AACzC,uCAAyB;AACzB,yCAAkC;AAClC,6CAAgC;AAChC,uDAAiD;AAEjD,yDAAyD;AACzD,mBAAiB;AACjB,mBAAiB;AACjB,mBAAiB;AACjB,yBAAuB;AAEvB,kFAAkF;AAClF,OAAO,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/rpc/server.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.62.
|
|
1
|
+
8.62.7
|
package/package.json
CHANGED
package/src/javascript/parser.ts
CHANGED
|
@@ -153,7 +153,19 @@ export class JavaScriptParser extends Parser {
|
|
|
153
153
|
if (sourceText !== undefined) {
|
|
154
154
|
// Determine script kind based on file extension
|
|
155
155
|
const scriptKind = getScriptKindFromFileName(fileName);
|
|
156
|
-
|
|
156
|
+
|
|
157
|
+
// Build CreateSourceFileOptions with jsDocParsingMode
|
|
158
|
+
const sourceFileOptions: ts.CreateSourceFileOptions = typeof languageVersion === 'number'
|
|
159
|
+
? {
|
|
160
|
+
languageVersion: languageVersion,
|
|
161
|
+
jsDocParsingMode: ts.JSDocParsingMode.ParseNone // We override this as otherwise invalid JSDoc causes parse errors
|
|
162
|
+
}
|
|
163
|
+
: {
|
|
164
|
+
...languageVersion,
|
|
165
|
+
jsDocParsingMode: ts.JSDocParsingMode.ParseNone // We override this as otherwise invalid JSDoc causes parse errors
|
|
166
|
+
};
|
|
167
|
+
|
|
168
|
+
sourceFile = ts.createSourceFile(fileName, sourceText, sourceFileOptions, true, scriptKind);
|
|
157
169
|
// Cache the SourceFile if it's a dependency
|
|
158
170
|
if (!input && this.sourceFileCache) {
|
|
159
171
|
this.sourceFileCache.set(fileName, sourceFile);
|
|
@@ -14,27 +14,27 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import {RewriteRpc} from "../rpc";
|
|
17
|
-
import {Recipe} from "../recipe";
|
|
18
17
|
import {UsesMethod, UsesType} from "./search";
|
|
19
18
|
import {ExecutionContext} from "../execution";
|
|
20
19
|
import {TreeVisitor} from "../visitor";
|
|
21
20
|
import {IsSourceFile} from "../search";
|
|
21
|
+
import {RpcRecipe} from "../rpc/recipe";
|
|
22
22
|
|
|
23
|
-
export
|
|
24
|
-
return
|
|
23
|
+
export function hasSourcePath(filePattern: string): Promise<RpcRecipe> | TreeVisitor<any, ExecutionContext> {
|
|
24
|
+
return RewriteRpc.get() ? RewriteRpc.get()!.prepareRecipe("org.openrewrite.FindSourceFiles", {
|
|
25
25
|
filePattern
|
|
26
|
-
})
|
|
26
|
+
}) : new IsSourceFile(filePattern);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export
|
|
30
|
-
return
|
|
29
|
+
export function usesMethod(methodMatcher: string, matchOverrides: boolean = false): Promise<RpcRecipe> | TreeVisitor<any, ExecutionContext> {
|
|
30
|
+
return RewriteRpc.get() ? RewriteRpc.get()!.prepareRecipe("org.openrewrite.java.search.UsesMethod", {
|
|
31
31
|
methodMatcher,
|
|
32
32
|
matchOverrides
|
|
33
|
-
})
|
|
33
|
+
}) : new UsesMethod(methodMatcher);
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
export
|
|
37
|
-
return
|
|
36
|
+
export function usesType(fullyQualifiedType: string): Promise<RpcRecipe> | TreeVisitor<any, ExecutionContext> {
|
|
37
|
+
return RewriteRpc.get() ? RewriteRpc.get()!.prepareRecipe("org.openrewrite.java.search.UsesType", {
|
|
38
38
|
fullyQualifiedType
|
|
39
|
-
})
|
|
39
|
+
}) : new UsesType(fullyQualifiedType);
|
|
40
40
|
}
|
|
@@ -220,7 +220,22 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
220
220
|
const identifier = namedBindings as J.Identifier;
|
|
221
221
|
const name = identifier.simpleName;
|
|
222
222
|
|
|
223
|
-
|
|
223
|
+
// When removing a specific member from a namespace import,
|
|
224
|
+
// we can only remove the entire namespace if it's not used
|
|
225
|
+
if (this.member !== undefined) {
|
|
226
|
+
// We're trying to remove a specific member from this namespace
|
|
227
|
+
// Check if the namespace itself is used
|
|
228
|
+
if (!usedIdentifiers.has(name) && !usedTypes.has(name)) {
|
|
229
|
+
// Namespace is not used, remove the entire import
|
|
230
|
+
if (!importClause.name) {
|
|
231
|
+
return undefined;
|
|
232
|
+
}
|
|
233
|
+
return this.updateImportClause(jsImport, importClause, draft => {
|
|
234
|
+
draft.namedBindings = undefined;
|
|
235
|
+
}, p);
|
|
236
|
+
}
|
|
237
|
+
// Namespace is used, we can't remove individual members from it
|
|
238
|
+
} else if (this.shouldRemoveImport(name, usedIdentifiers, usedTypes)) {
|
|
224
239
|
// If there's no default import, remove the entire import
|
|
225
240
|
if (!importClause.name) {
|
|
226
241
|
return undefined;
|
|
@@ -235,7 +250,22 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
235
250
|
const alias = namedBindings as JS.Alias;
|
|
236
251
|
const aliasName = (alias.alias as J.Identifier).simpleName;
|
|
237
252
|
|
|
238
|
-
|
|
253
|
+
// When removing a specific member from a namespace import,
|
|
254
|
+
// we can only remove the entire namespace if it's not used
|
|
255
|
+
if (this.member !== undefined) {
|
|
256
|
+
// We're trying to remove a specific member from this namespace
|
|
257
|
+
// Check if the namespace itself is used
|
|
258
|
+
if (!usedIdentifiers.has(aliasName) && !usedTypes.has(aliasName)) {
|
|
259
|
+
// Namespace is not used, remove the entire import
|
|
260
|
+
if (!importClause.name) {
|
|
261
|
+
return undefined;
|
|
262
|
+
}
|
|
263
|
+
return this.updateImportClause(jsImport, importClause, draft => {
|
|
264
|
+
draft.namedBindings = undefined;
|
|
265
|
+
}, p);
|
|
266
|
+
}
|
|
267
|
+
// Namespace is used, we can't remove individual members from it
|
|
268
|
+
} else if (this.shouldRemoveImport(aliasName, usedIdentifiers, usedTypes)) {
|
|
239
269
|
// If there's no default import, remove the entire import
|
|
240
270
|
if (!importClause.name) {
|
|
241
271
|
return undefined;
|
|
@@ -284,8 +314,26 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
284
314
|
namedImports.elements.elements,
|
|
285
315
|
(elem: J) => {
|
|
286
316
|
if (elem.kind === JS.Kind.ImportSpecifier) {
|
|
287
|
-
const
|
|
288
|
-
|
|
317
|
+
const specifier = elem as JS.ImportSpecifier;
|
|
318
|
+
const importName = this.getImportName(specifier);
|
|
319
|
+
const aliasName = this.getImportAlias(specifier);
|
|
320
|
+
|
|
321
|
+
// For aliased imports, check if the alias is used
|
|
322
|
+
// For non-aliased imports, check if the import name is used
|
|
323
|
+
const nameToCheck = aliasName || importName;
|
|
324
|
+
|
|
325
|
+
// Check if we should remove this import
|
|
326
|
+
if (this.member !== undefined) {
|
|
327
|
+
// We're removing a specific member - check if this matches
|
|
328
|
+
if (this.member === importName) {
|
|
329
|
+
// This is the member we want to remove - check if it's used
|
|
330
|
+
return usedIdentifiers.has(nameToCheck) || usedTypes.has(nameToCheck);
|
|
331
|
+
}
|
|
332
|
+
return true; // Keep imports that don't match the member
|
|
333
|
+
} else {
|
|
334
|
+
// We're removing based on the import name itself
|
|
335
|
+
return !this.shouldRemoveImport(importName, usedIdentifiers, usedTypes);
|
|
336
|
+
}
|
|
289
337
|
}
|
|
290
338
|
return true; // Keep non-ImportSpecifier elements
|
|
291
339
|
},
|
|
@@ -437,6 +485,7 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
437
485
|
const spec = specifier.specifier;
|
|
438
486
|
if (spec?.kind === JS.Kind.Alias) {
|
|
439
487
|
// Handle aliased import: import { foo as bar }
|
|
488
|
+
// Return the original name (foo)
|
|
440
489
|
const alias = spec as JS.Alias;
|
|
441
490
|
const propertyName = alias.propertyName.element;
|
|
442
491
|
if (propertyName?.kind === J.Kind.Identifier) {
|
|
@@ -449,6 +498,20 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
449
498
|
return '';
|
|
450
499
|
}
|
|
451
500
|
|
|
501
|
+
private getImportAlias(specifier: JS.ImportSpecifier): string | undefined {
|
|
502
|
+
const spec = specifier.specifier;
|
|
503
|
+
if (spec?.kind === JS.Kind.Alias) {
|
|
504
|
+
// Handle aliased import: import { foo as bar }
|
|
505
|
+
// Return the alias name (bar)
|
|
506
|
+
const alias = spec as JS.Alias;
|
|
507
|
+
if (alias.alias?.kind === J.Kind.Identifier) {
|
|
508
|
+
return (alias.alias as J.Identifier).simpleName;
|
|
509
|
+
}
|
|
510
|
+
}
|
|
511
|
+
// No alias for regular imports
|
|
512
|
+
return undefined;
|
|
513
|
+
}
|
|
514
|
+
|
|
452
515
|
private getBindingElementName(bindingElement: JS.BindingElement): string {
|
|
453
516
|
const name = bindingElement.name;
|
|
454
517
|
if (name?.kind === J.Kind.Identifier) {
|
|
@@ -582,12 +645,15 @@ export class RemoveImport<P> extends JavaScriptVisitor<P> {
|
|
|
582
645
|
} else if (methodInv.select?.element?.kind === J.Kind.Identifier) {
|
|
583
646
|
// Direct identifier like fs in fs.method() - though this is rare
|
|
584
647
|
usedIdentifiers.add((methodInv.select.element as J.Identifier).simpleName);
|
|
648
|
+
} else if (!methodInv.select) {
|
|
649
|
+
// No select means this is a direct function call like isArray()
|
|
650
|
+
// Only in this case should we add the method name as a used identifier
|
|
651
|
+
if (methodInv.name && methodInv.name.kind === J.Kind.Identifier) {
|
|
652
|
+
usedIdentifiers.add((methodInv.name as J.Identifier).simpleName);
|
|
653
|
+
}
|
|
585
654
|
}
|
|
586
|
-
|
|
587
|
-
//
|
|
588
|
-
if (methodInv.name && methodInv.name.kind === J.Kind.Identifier) {
|
|
589
|
-
usedIdentifiers.add((methodInv.name as J.Identifier).simpleName);
|
|
590
|
-
}
|
|
655
|
+
// Note: We don't add method names for calls like Array.isArray() or obj.method()
|
|
656
|
+
// because those are methods on objects, not standalone imported functions
|
|
591
657
|
// Recursively check arguments
|
|
592
658
|
if (methodInv.arguments) {
|
|
593
659
|
for (const arg of methodInv.arguments.elements) {
|