@openrewrite/rewrite 8.72.2 → 8.72.3

package/dist/rpc/request/prepare-recipe.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrepareRecipe = void 0;
 /*
@@ -71,7 +62,7 @@ class PrepareRecipe {
     }
     static handle(connection, marketplace, preparedRecipes, metricsCsv) {
         const snowflake = (0, snowflake_id_1.SnowflakeId)();
-        connection.onRequest(new rpc.RequestType("PrepareRecipe"), (0, metrics_1.withMetrics)("PrepareRecipe", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
+        connection.onRequest(new rpc.RequestType("PrepareRecipe"), (0, metrics_1.withMetrics)("PrepareRecipe", metricsCsv, (context) => async (request) => {
             context.target = request.id;
             const id = snowflake.generate();
             const recipeCtor = marketplace.findRecipe(request.id);
@@ -83,67 +74,61 @@ class PrepareRecipe {
             }
             let recipe = new recipeCtor[1](request.options);
             const editPreconditions = [];
-            recipe = yield this.optimizePreconditions(recipe, "edit", editPreconditions);
+            recipe = await this.optimizePreconditions(recipe, "edit", editPreconditions);
             const scanPreconditions = [];
-            recipe = yield this.optimizePreconditions(recipe, "scan", scanPreconditions);
+            recipe = await this.optimizePreconditions(recipe, "scan", scanPreconditions);
             preparedRecipes.set(id, recipe);
             const result = {
                 id: id,
-                descriptor: yield recipe.descriptor(),
+                descriptor: await recipe.descriptor(),
                 editVisitor: `edit:${id}`,
                 editPreconditions: editPreconditions,
                 scanVisitor: recipe instanceof recipe_1.ScanningRecipe ? `scan:${id}` : undefined,
                 scanPreconditions: scanPreconditions
             };
             return result;
-        })));
+        }));
     }
     /**
      * For preconditions that can be evaluated on the remote peer, let the remote peer
      * evaluate them and know that we will only have to do the visit work if the
      * precondition passes.
      */
-    static optimizePreconditions(recipe, phase, preconditions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let visitor;
-            if (phase === "edit") {
-                visitor = yield recipe.editor();
-            }
-            else if (phase === "scan") {
-                if (recipe instanceof recipe_1.ScanningRecipe) {
-                    visitor = yield recipe.scanner(undefined);
-                }
-                else {
-                    return recipe;
-                }
-            }
-            if (visitor instanceof preconditions_1.Check) {
-                if (visitor.check instanceof recipe_2.RpcRecipe) {
-                    preconditions.push({ visitorName: phase === "edit" ? visitor.check.editVisitor : visitor.check.scanVisitor });
-                    recipe = Object.assign(Object.create(Object.getPrototypeOf(recipe)), recipe, phase === "edit" ?
-                        {
-                            editor() {
-                                return __awaiter(this, void 0, void 0, function* () {
-                                    return visitor.v;
-                                });
-                            }
-                        } :
-                        {
-                            scanner(acc) {
-                                return __awaiter(this, void 0, void 0, function* () {
-                                    const checkVisitor = yield recipe.scanner(acc);
-                                    return checkVisitor.v;
-                                });
-                            }
-                        });
-                }
-                this.visitorTypePrecondition(preconditions, visitor.v);
+    static async optimizePreconditions(recipe, phase, preconditions) {
+        let visitor;
+        if (phase === "edit") {
+            visitor = await recipe.editor();
+        }
+        else if (phase === "scan") {
+            if (recipe instanceof recipe_1.ScanningRecipe) {
+                visitor = await recipe.scanner(undefined);
             }
             else {
-                this.visitorTypePrecondition(preconditions, visitor);
+                return recipe;
             }
-            return recipe;
-        });
+        }
+        if (visitor instanceof preconditions_1.Check) {
+            if (visitor.check instanceof recipe_2.RpcRecipe) {
+                preconditions.push({ visitorName: phase === "edit" ? visitor.check.editVisitor : visitor.check.scanVisitor });
+                recipe = Object.assign(Object.create(Object.getPrototypeOf(recipe)), recipe, phase === "edit" ?
+                    {
+                        async editor() {
+                            return visitor.v;
+                        }
+                    } :
+                    {
+                        async scanner(acc) {
+                            const checkVisitor = await recipe.scanner(acc);
+                            return checkVisitor.v;
+                        }
+                    });
+            }
+            this.visitorTypePrecondition(preconditions, visitor.v);
+        }
+        else {
+            this.visitorTypePrecondition(preconditions, visitor);
+        }
+        return recipe;
     }
     static visitorTypePrecondition(preconditions, v) {
         let treeType;

package/dist/rpc/request/prepare-recipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-recipe.js","sourceRoot":"","sources":["../../../src/rpc/request/prepare-recipe.ts"],"names":[],"mappings":"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"}

package/dist/rpc/request/print.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Print = exports.MarkerPrinter = void 0;
 /*
@@ -75,8 +66,8 @@ class Print {
         this.markerPrinter = markerPrinter;
     }
     static handle(connection, getObject, logger, metricsCsv) {
-        connection.onRequest(new rpc.RequestType("Print"), (0, metrics_1.withMetrics)("Print", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
-            const tree = yield getObject(request.treeId.toString(), request.sourceFileType);
+        connection.onRequest(new rpc.RequestType("Print"), (0, metrics_1.withMetrics)("Print", metricsCsv, (context) => async (request) => {
+            const tree = await getObject(request.treeId.toString(), request.sourceFileType);
             context.target = (0, metrics_1.extractSourcePath)(tree);
             if (logger) {
                 logger.log("Printing " + ((0, tree_1.isSourceFile)(tree) ? tree.sourcePath : `tree of type ${tree.kind} in ${context.target}`));
@@ -84,13 +75,13 @@ class Print {
             const out = new print_1.PrintOutputCapture(print_1.MarkerPrinter[request.markerPrinter]);
             let result;
             if ((0, tree_1.isSourceFile)(tree)) {
-                result = yield (0, print_1.printer)(tree).print(tree, out);
+                result = await (0, print_1.printer)(tree).print(tree, out);
             }
             else {
-                result = yield (0, print_1.printer)(request.sourceFileType).print(tree, out);
+                result = await (0, print_1.printer)(request.sourceFileType).print(tree, out);
             }
             return result;
-        })));
+        }));
     }
 }
 exports.Print = Print;

package/dist/rpc/request/print.js.map

@@ -1 +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,EACZ,cAAsB,EAC9B,gBAA+B,aAAa,CAAC,OAAO;QAF5C,WAAM,GAAN,MAAM,CAAM;QACZ,mBAAc,GAAd,cAAc,CAAQ;QAC9B,kBAAa,GAAb,aAAa,CAAuC;IACzE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,SAAsD,EACtD,MAAmB,EACnB,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,CAAM,OAAO,EAAC,EAAE;YACzB,MAAM,IAAI,GAAS,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACtF,OAAO,CAAC,MAAM,GAAG,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,IAAI,CAAC,IAAI,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxH,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,0BAAkB,CAAC,qBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC9E,IAAI,MAAc,CAAC;YACnB,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,MAAM,GAAG,MAAM,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,MAAM,IAAA,eAAO,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAjCD,sBAiCC"}
+{"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,EACZ,cAAsB,EAC9B,gBAA+B,aAAa,CAAC,OAAO;QAF5C,WAAM,GAAN,MAAM,CAAM;QACZ,mBAAc,GAAd,cAAc,CAAQ;QAC9B,kBAAa,GAAb,aAAa,CAAuC;IACzE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,SAAsD,EACtD,MAAmB,EACnB,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,KAAK,EAAC,OAAO,EAAC,EAAE;YACzB,MAAM,IAAI,GAAS,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACtF,OAAO,CAAC,MAAM,GAAG,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,IAAA,mBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,IAAI,CAAC,IAAI,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxH,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,0BAAkB,CAAC,qBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC9E,IAAI,MAAc,CAAC;YACnB,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,MAAM,GAAG,MAAM,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,MAAM,IAAA,eAAO,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAjCD,sBAiCC"}

package/dist/rpc/request/visit.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Visit = void 0;
 /*
@@ -74,14 +65,14 @@ class Visit {
         this.cursor = cursor;
     }
     static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor, metricsCsv) {
-        connection.onRequest(new rpc.RequestType("Visit"), (0, metrics_1.withMetrics)("Visit", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
-            const p = yield getObject(request.p, undefined);
-            const before = yield getObject(request.treeId, request.sourceFileType);
-            const cursor = yield getCursor(request.cursor, request.sourceFileType);
+        connection.onRequest(new rpc.RequestType("Visit"), (0, metrics_1.withMetrics)("Visit", metricsCsv, (context) => async (request) => {
+            const p = await getObject(request.p, undefined);
+            const before = await getObject(request.treeId, request.sourceFileType);
+            const cursor = await getCursor(request.cursor, request.sourceFileType);
             context.target = (0, metrics_1.extractSourcePath)(before, cursor);
             localObjects.set(before.id.toString(), before);
-            const visitor = yield Visit.instantiateVisitor(request, preparedRecipes, recipeCursors, p);
-            const after = yield visitor.visit(before, p, cursor);
+            const visitor = await Visit.instantiateVisitor(request, preparedRecipes, recipeCursors, p);
+            const after = await visitor.visit(before, p, cursor);
             if (!after) {
                 localObjects.delete(before.id.toString());
             }
@@ -89,72 +80,66 @@ class Visit {
                 localObjects.set(after.id.toString(), after);
             }
             return { modified: before !== after };
-        })));
+        }));
     }
-    static instantiateVisitor(request, preparedRecipes, recipeCursors, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const visitorName = request.visitor;
-            if (visitorName.startsWith("scan:")) {
-                const recipeKey = visitorName.substring("scan:".length);
-                const recipe = preparedRecipes.get(recipeKey);
-                if (!recipe) {
-                    throw new Error(`No scanning recipe found for key: ${recipeKey}`);
+    static async instantiateVisitor(request, preparedRecipes, recipeCursors, p) {
+        const visitorName = request.visitor;
+        if (visitorName.startsWith("scan:")) {
+            const recipeKey = visitorName.substring("scan:".length);
+            const recipe = preparedRecipes.get(recipeKey);
+            if (!recipe) {
+                throw new Error(`No scanning recipe found for key: ${recipeKey}`);
+            }
+            // If we're transitioning from edit back to scan, this is a new cycle.
+            // Clear the cursor so a fresh accumulator is created.
+            if (recipePhases.get(recipe) === 'edit') {
+                recipeCursors.delete(recipe);
+            }
+            recipePhases.set(recipe, 'scan');
+            let cursor = recipeCursors.get(recipe);
+            if (!cursor) {
+                cursor = (0, tree_1.rootCursor)();
+                recipeCursors.set(recipe, cursor);
+            }
+            const acc = recipe.accumulator(cursor, p);
+            return new class extends visitor_1.TreeVisitor {
+                // Delegate isAcceptable to the scanner visitor
+                // This ensures we only process source files the scanner can handle
+                async isAcceptable(sourceFile, ctx) {
+                    return (await recipe.scanner(acc)).isAcceptable(sourceFile, ctx);
                 }
-                // If we're transitioning from edit back to scan, this is a new cycle.
-                // Clear the cursor so a fresh accumulator is created.
-                if (recipePhases.get(recipe) === 'edit') {
-                    recipeCursors.delete(recipe);
+                async preVisit(tree, ctx) {
+                    await (await recipe.scanner(acc)).visit(tree, ctx);
+                    this.stopAfterPreVisit();
+                    return tree;
                 }
-                recipePhases.set(recipe, 'scan');
+            };
+        }
+        else if (visitorName.startsWith("edit:")) {
+            const recipeKey = visitorName.substring("edit:".length);
+            const recipe = preparedRecipes.get(recipeKey);
+            if (!recipe) {
+                throw new Error(`No editing recipe found for key: ${recipeKey}`);
+            }
+            recipePhases.set(recipe, 'edit');
+            // For ScanningRecipe, we need to use the same cursor that was used during scanning
+            // to retrieve the accumulator that was stored there
+            if (recipe instanceof recipe_1.ScanningRecipe) {
                 let cursor = recipeCursors.get(recipe);
                 if (!cursor) {
                     cursor = (0, tree_1.rootCursor)();
                     recipeCursors.set(recipe, cursor);
                 }
                 const acc = recipe.accumulator(cursor, p);
-                return new class extends visitor_1.TreeVisitor {
-                    // Delegate isAcceptable to the scanner visitor
-                    // This ensures we only process source files the scanner can handle
-                    isAcceptable(sourceFile, ctx) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            return (yield recipe.scanner(acc)).isAcceptable(sourceFile, ctx);
-                        });
-                    }
-                    preVisit(tree, ctx) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            yield (yield recipe.scanner(acc)).visit(tree, ctx);
-                            this.stopAfterPreVisit();
-                            return tree;
-                        });
-                    }
-                };
-            }
-            else if (visitorName.startsWith("edit:")) {
-                const recipeKey = visitorName.substring("edit:".length);
-                const recipe = preparedRecipes.get(recipeKey);
-                if (!recipe) {
-                    throw new Error(`No editing recipe found for key: ${recipeKey}`);
-                }
-                recipePhases.set(recipe, 'edit');
-                // For ScanningRecipe, we need to use the same cursor that was used during scanning
-                // to retrieve the accumulator that was stored there
-                if (recipe instanceof recipe_1.ScanningRecipe) {
-                    let cursor = recipeCursors.get(recipe);
-                    if (!cursor) {
-                        cursor = (0, tree_1.rootCursor)();
-                        recipeCursors.set(recipe, cursor);
-                    }
-                    const acc = recipe.accumulator(cursor, p);
-                    return recipe.editorWithData(acc);
-                }
-                return yield recipe.editor();
-            }
-            else {
-                return Reflect.construct(
-                // "as any" bypasses strict type checking
-                globalThis[visitorName], request.visitorOptions ? Array.from(request.visitorOptions.values()) : []);
+                return recipe.editorWithData(acc);
             }
-        });
+            return await recipe.editor();
+        }
+        else {
+            return Reflect.construct(
+            // "as any" bypasses strict type checking
+            globalThis[visitorName], request.visitorOptions ? Array.from(request.visitorOptions.values()) : []);
+        }
     }
 }
 exports.Visit = Visit;

package/dist/rpc/request/visit.js.map

@@ -1 +1 @@
-{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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"}

package/dist/rpc/rewrite-rpc.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RewriteRpc = void 0;
 /*
@@ -101,10 +92,10 @@ class RewriteRpc {
         request_1.ParseProject.handle(this.connection, this.localObjects, options.metricsCsv);
         request_1.Print.handle(this.connection, getObject, options.logger, options.metricsCsv);
         install_recipes_1.InstallRecipes.handle(this.connection, (_a = options.recipeInstallDir) !== null && _a !== void 0 ? _a : ".rewrite", marketplace, options.logger, options.metricsCsv);
-        this.connection.onRequest(new rpc.RequestType("TraceGetObject"), (request) => __awaiter(this, void 0, void 0, function* () {
+        this.connection.onRequest(new rpc.RequestType("TraceGetObject"), async (request) => {
             this.traceGetObject = request;
             return true;
-        }));
+        });
         RewriteRpc.set(this);
         this.connection.listen();
     }
@@ -118,96 +109,78 @@ class RewriteRpc {
         this.connection.end();
         return this;
     }
-    getObject(id, sourceFileType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const localObject = this.localObjects.get(id);
-            const q = new queue_1.RpcReceiveQueue(this.remoteRefs, sourceFileType, () => {
-                return this.connection.sendRequest(new rpc.RequestType("GetObject"), new request_1.GetObject(id, sourceFileType));
-            }, this.logger, this.traceGetObject.receive);
-            const remoteObject = yield q.receive(localObject);
-            const eof = (yield q.take());
-            if (eof.state !== queue_1.RpcObjectState.END_OF_OBJECT) {
-                queue_1.RpcObjectData.logTrace(eof, this.traceGetObject.receive, this.logger);
-                throw new Error(`Expected END_OF_OBJECT but got: ${eof.state}`);
-            }
-            this.remoteObjects.set(id, remoteObject);
-            this.localObjects.set(id, remoteObject);
-            return remoteObject;
-        });
-    }
-    getCursor(cursorIds, sourceFileType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let cursor = (0, tree_1.rootCursor)();
-            if (cursorIds) {
-                for (let i = cursorIds.length - 1; i >= 0; i--) {
-                    const cursorObject = yield this.getObject(cursorIds[i], sourceFileType);
-                    this.remoteObjects.set(cursorIds[i], cursorObject);
-                    cursor = new tree_1.Cursor(cursorObject, cursor);
-                }
-            }
-            return cursor;
-        });
-    }
-    parse(inputs, sourceFileType, relativeTo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const parsed = [];
-            for (const g of yield this.connection.sendRequest(new rpc.RequestType("Parse"), new request_1.Parse(inputs, relativeTo))) {
-                parsed.push(yield this.getObject(g, sourceFileType));
-            }
-            return parsed;
-        });
-    }
-    print(tree, cursor) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!cursor && !(0, tree_1.isSourceFile)(tree)) {
-                throw new Error("Cursor is required for non-SourceFile trees");
-            }
-            this.localObjects.set(tree.id.toString(), tree);
-            const sourceFile = (0, tree_1.isSourceFile)(tree) ? tree : cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t));
-            return yield this.connection.sendRequest(new rpc.RequestType("Print"), new request_1.Print(tree.id, sourceFile.kind));
-        });
-    }
-    languages() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.remoteLanguages) {
-                this.remoteLanguages = yield this.connection.sendRequest(new rpc.RequestType0("GetLanguages"));
+    async getObject(id, sourceFileType) {
+        const localObject = this.localObjects.get(id);
+        const q = new queue_1.RpcReceiveQueue(this.remoteRefs, sourceFileType, () => {
+            return this.connection.sendRequest(new rpc.RequestType("GetObject"), new request_1.GetObject(id, sourceFileType));
+        }, this.logger, this.traceGetObject.receive);
+        const remoteObject = await q.receive(localObject);
+        const eof = (await q.take());
+        if (eof.state !== queue_1.RpcObjectState.END_OF_OBJECT) {
+            queue_1.RpcObjectData.logTrace(eof, this.traceGetObject.receive, this.logger);
+            throw new Error(`Expected END_OF_OBJECT but got: ${eof.state}`);
+        }
+        this.remoteObjects.set(id, remoteObject);
+        this.localObjects.set(id, remoteObject);
+        return remoteObject;
+    }
+    async getCursor(cursorIds, sourceFileType) {
+        let cursor = (0, tree_1.rootCursor)();
+        if (cursorIds) {
+            for (let i = cursorIds.length - 1; i >= 0; i--) {
+                const cursorObject = await this.getObject(cursorIds[i], sourceFileType);
+                this.remoteObjects.set(cursorIds[i], cursorObject);
+                cursor = new tree_1.Cursor(cursorObject, cursor);
             }
-            return this.remoteLanguages;
-        });
-    }
-    marketplace() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const rows = yield this.connection.sendRequest(new rpc.RequestType0("GetMarketplace"));
-            return yield (0, request_1.toMarketplace)(rows);
-        });
+        }
+        return cursor;
     }
-    prepareRecipe(id, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.connection.sendRequest(new rpc.RequestType("PrepareRecipe"), new request_1.PrepareRecipe(id, options));
-            return new recipe_1.RpcRecipe(this, response.id, response.descriptor, response.editVisitor, response.scanVisitor);
-        });
+    async parse(inputs, sourceFileType, relativeTo) {
+        const parsed = [];
+        for (const g of await this.connection.sendRequest(new rpc.RequestType("Parse"), new request_1.Parse(inputs, relativeTo))) {
+            parsed.push(await this.getObject(g, sourceFileType));
+        }
+        return parsed;
     }
-    visit(tree, visitorName, p, cursor) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.localObjects.set(tree.id.toString(), tree);
-            const pId = this.localObject(p);
-            const cursorIds = this.getCursorIds(cursor);
-            const sourceFileType = (0, tree_1.isSourceFile)(tree) ? tree.kind :
-                cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t)).kind;
-            const response = yield this.connection.sendRequest(new rpc.RequestType("Visit"), new request_1.Visit(visitorName, sourceFileType, undefined, tree.id.toString(), pId, cursorIds));
-            return response.modified ? this.getObject(tree.id.toString(), sourceFileType) : tree;
-        });
+    async print(tree, cursor) {
+        if (!cursor && !(0, tree_1.isSourceFile)(tree)) {
+            throw new Error("Cursor is required for non-SourceFile trees");
+        }
+        this.localObjects.set(tree.id.toString(), tree);
+        const sourceFile = (0, tree_1.isSourceFile)(tree) ? tree : cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t));
+        return await this.connection.sendRequest(new rpc.RequestType("Print"), new request_1.Print(tree.id, sourceFile.kind));
     }
-    generate(remoteRecipeId, ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ctxId = this.localObject(ctx);
-            const generated = [];
-            const response = yield this.connection.sendRequest(new rpc.RequestType("Generate"), new request_1.Generate(remoteRecipeId, ctxId));
-            for (let i = 0; i < response.ids.length; i++) {
-                generated.push(yield this.getObject(response.ids[i], response.sourceFileTypes[i]));
-            }
-            return generated;
-        });
+    async languages() {
+        if (!this.remoteLanguages) {
+            this.remoteLanguages = await this.connection.sendRequest(new rpc.RequestType0("GetLanguages"));
+        }
+        return this.remoteLanguages;
+    }
+    async marketplace() {
+        const rows = await this.connection.sendRequest(new rpc.RequestType0("GetMarketplace"));
+        return await (0, request_1.toMarketplace)(rows);
+    }
+    async prepareRecipe(id, options) {
+        const response = await this.connection.sendRequest(new rpc.RequestType("PrepareRecipe"), new request_1.PrepareRecipe(id, options));
+        return new recipe_1.RpcRecipe(this, response.id, response.descriptor, response.editVisitor, response.scanVisitor);
+    }
+    async visit(tree, visitorName, p, cursor) {
+        this.localObjects.set(tree.id.toString(), tree);
+        const pId = this.localObject(p);
+        const cursorIds = this.getCursorIds(cursor);
+        const sourceFileType = (0, tree_1.isSourceFile)(tree) ? tree.kind :
+            cursor.firstEnclosing(t => (0, tree_1.isSourceFile)(t)).kind;
+        const response = await this.connection.sendRequest(new rpc.RequestType("Visit"), new request_1.Visit(visitorName, sourceFileType, undefined, tree.id.toString(), pId, cursorIds));
+        return response.modified ? this.getObject(tree.id.toString(), sourceFileType) : tree;
+    }
+    async generate(remoteRecipeId, ctx) {
+        const ctxId = this.localObject(ctx);
+        const generated = [];
+        const response = await this.connection.sendRequest(new rpc.RequestType("Generate"), new request_1.Generate(remoteRecipeId, ctxId));
+        for (let i = 0; i < response.ids.length; i++) {
+            generated.push(await this.getObject(response.ids[i], response.sourceFileTypes[i]));
+        }
+        return generated;
     }
     installRecipes(recipes) {
         return this.connection.sendRequest(new rpc.RequestType("InstallRecipes"), new install_recipes_1.InstallRecipes(recipes));