@effect/language-service 0.0.11 → 0.0.13

package/refactors/addPipe.js

@@ -4,30 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var _utils = /*#__PURE__*/require("@effect/language-service/utils");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/addPipe",
   description: "Rewrite using pipe",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
-    return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.reverse, Ch.fromIterable, Ch.filter(AST.isNodeInRange(textRange)), Ch.filter((0, _utils.isPipeableCallExpression)(ts)), Ch.head, O.map(node => ({
-      description: `Rewrite ${AST.getHumanReadableName(sourceFile, node.expression)} to pipe`,
-      apply: T.gen(function* ($) {
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
-        const args = (0, _utils.asPipeArguments)(ts)(node);
-        const newNode = ts.factory.createCallExpression(ts.factory.createIdentifier("pipe"), undefined, Array.from(args));
-        changeTracker.replaceNode(sourceFile, node, newNode);
-      })
-    })));
-  })
+  apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.reverse, Ch.fromIterable, Ch.filter(AST.isNodeInRange(textRange)), Ch.filter(AST.isPipeableCallExpression(ts)), Ch.head, O.map(node => ({
+    description: `Rewrite ${AST.getHumanReadableName(sourceFile, node.expression)} to pipe`,
+    apply: changeTracker => {
+      const args = AST.asPipeArguments(ts)(node);
+      const newNode = ts.factory.createCallExpression(ts.factory.createIdentifier("pipe"), undefined, Array.from(args));
+      changeTracker.replaceNode(sourceFile, node, newNode);
+    }
+  })))
 });
 exports.default = _default;
 //# sourceMappingURL=addPipe.js.map

package/refactors/addPipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"addPipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAuC;AAAA;AAAA,4BAExB,8BAAc,EAAC;EAC5BA,IAAI,EAAE,gBAAgB;EACtBC,WAAW,EAAE,oBAAoB;EACjCC,KAAK,EAAE,CAACC,UAAU,EAAEC,SAAS,KAC3BC,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;IACf,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACC,aAAa,CAAC,CAAC;IAEjD,OAAO,kBAAI,EACTD,GAAG,CAACE,uBAAuB,CAACJ,EAAE,CAAC,CAACL,UAAU,EAAEC,SAAS,CAAC,EACtDS,EAAE,CAACC,OAAO,EACVD,EAAE,CAACE,YAAY,EACfF,EAAE,CAACG,MAAM,CAACN,GAAG,CAACO,aAAa,CAACb,SAAS,CAAC,CAAC,EACvCS,EAAE,CAACG,MAAM,CAAC,mCAAwB,EAACR,EAAE,CAAC,CAAC,EACvCK,EAAE,CAACK,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEC,IAAI,KAAM;MACfpB,WAAW,EAAE,WAAWS,GAAG,CAACY,oBAAoB,CAACnB,UAAU,EAAEkB,IAAI,CAACE,UAAU,CAAC,UAAU;MACvFrB,KAAK,EAAEG,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;QACtB,MAAMiB,aAAa,GAAG,OAAOjB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACe,gBAAgB,CAAC,CAAC;QAC/D,MAAMC,IAAI,GAAG,0BAAe,EAAClB,EAAE,CAAC,CAACa,IAAI,CAAC;QAEtC,MAAMM,OAAO,GAAGnB,EAAE,CAACoB,OAAO,CAACC,oBAAoB,CAC7CrB,EAAE,CAACoB,OAAO,CAACE,gBAAgB,CAAC,MAAM,CAAC,EACnCC,SAAS,EACTC,KAAK,CAACC,IAAI,CAACP,IAAI,CAAC,CACjB;QAEDF,aAAa,CAACU,WAAW,CAAC/B,UAAU,EAAEkB,IAAI,EAAEM,OAAO,CAAC;MACtD,CAAC;KACF,CAAC,CAAC,CACJ;EACH,CAAC;CACJ,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","getNodesContainingRange","Ch","reverse","fromIterable","filter","isNodeInRange","head","O","map","node","getHumanReadableName","expression","changeTracker","ChangeTrackerApi","args","newNode","factory","createCallExpression","createIdentifier","undefined","Array","from","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/addPipe.ts"],"sourcesContent":[null]}
+{"version":3,"file":"addPipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,gBAAgB;EACtBC,WAAW,EAAE,oBAAoB;EACjCC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,OAAO,EACVD,EAAE,CAACE,YAAY,EACfF,EAAE,CAACG,MAAM,CAACL,GAAG,CAACM,aAAa,CAACP,SAAS,CAAC,CAAC,EACvCG,EAAE,CAACG,MAAM,CAACL,GAAG,CAACO,wBAAwB,CAACV,EAAE,CAAC,CAAC,EAC3CK,EAAE,CAACM,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEC,IAAI,KAAM;IACfhB,WAAW,EAAE,WAAWK,GAAG,CAACY,oBAAoB,CAACd,UAAU,EAAEa,IAAI,CAACE,UAAU,CAAC,UAAU;IACvFjB,KAAK,EAAGkB,aAA2C,IAAI;MACrD,MAAMC,IAAI,GAAGf,GAAG,CAACgB,eAAe,CAACnB,EAAE,CAAC,CAACc,IAAI,CAAC;MAE1C,MAAMM,OAAO,GAAGpB,EAAE,CAACqB,OAAO,CAACC,oBAAoB,CAC7CtB,EAAE,CAACqB,OAAO,CAACE,gBAAgB,CAAC,MAAM,CAAC,EACnCC,SAAS,EACTC,KAAK,CAACC,IAAI,CAACR,IAAI,CAAC,CACjB;MAEDD,aAAa,CAACU,WAAW,CAAC1B,UAAU,EAAEa,IAAI,EAAEM,OAAO,CAAC;IACtD;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","reverse","fromIterable","filter","isNodeInRange","isPipeableCallExpression","head","O","map","node","getHumanReadableName","expression","changeTracker","args","asPipeArguments","newNode","factory","createCallExpression","createIdentifier","undefined","Array","from","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/addPipe.ts"],"sourcesContent":[null]}

package/refactors/asyncAwaitToGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asyncAwaitToGen.d.ts","sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGen.ts"],"names":[],"mappings":";AAQA,wBAkCE"}
+{"version":3,"file":"asyncAwaitToGen.d.ts","sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGen.ts"],"names":[],"mappings":";AAMA,wBA8BE"}

package/refactors/asyncAwaitToGen.js

@@ -4,30 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var _utils = /*#__PURE__*/require("@effect/language-service/utils");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/asyncAwaitToGen",
   description: "Convert to Effect.gen",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
-    return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration), Ch.filter(node => !!node.body), Ch.filter(node => !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Async)), Ch.head, O.map(node => ({
-      description: "Rewrite to Effect.gen",
-      apply: T.gen(function* ($) {
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
-        const effectName = (0, _utils.getEffectModuleIdentifier)(ts)(sourceFile);
-        const newDeclaration = (0, _utils.transformAsyncAwaitToEffectGen)(ts)(node, effectName, expression => ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(effectName), "promise"), undefined, [expression]));
-        changeTracker.replaceNode(sourceFile, node, newDeclaration);
-      })
-    })));
-  })
+  apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration), Ch.filter(node => !!node.body), Ch.filter(node => !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Async)), Ch.head, O.map(node => ({
+    description: "Rewrite to Effect.gen",
+    apply: changeTracker => {
+      const effectName = AST.getEffectModuleIdentifier(ts)(sourceFile);
+      const newDeclaration = AST.transformAsyncAwaitToEffectGen(ts)(node, effectName, expression => ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(effectName), "promise"), undefined, [expression]));
+      changeTracker.replaceNode(sourceFile, node, newDeclaration);
+    }
+  })))
 });
 exports.default = _default;
 //# sourceMappingURL=asyncAwaitToGen.js.map

package/refactors/asyncAwaitToGen.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncAwaitToGen.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAuC;AAAA;AAAA,4BAExB,8BAAc,EAAC;EAC5BA,IAAI,EAAE,wBAAwB;EAC9BC,WAAW,EAAE,uBAAuB;EACpCC,KAAK,EAAE,CAACC,UAAU,EAAEC,SAAS,KAC3BC,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;IACf,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACC,aAAa,CAAC,CAAC;IAEjD,OAAO,kBAAI,EACTD,GAAG,CAACE,uBAAuB,CAACJ,EAAE,CAAC,CAACL,UAAU,EAAEC,SAAS,CAAC,EACtDS,EAAE,CAACC,MAAM,CAACN,EAAE,CAACO,qBAAqB,CAAC,EACnCF,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACC,IAAI,CAAC,EAChCJ,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,EAAER,EAAE,CAACU,wBAAwB,CAACF,IAAI,CAAC,GAAGR,EAAE,CAACW,aAAa,CAACC,KAAK,CAAC,CAAC,EACnFP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;MACff,WAAW,EAAE,uBAAuB;MACpCC,KAAK,EAAEG,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;QACtB,MAAMiB,aAAa,GAAG,OAAOjB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACe,gBAAgB,CAAC,CAAC;QAC/D,MAAMC,UAAU,GAAG,oCAAyB,EAAClB,EAAE,CAAC,CAACL,UAAU,CAAC;QAE5D,MAAMwB,cAAc,GAAG,yCAA8B,EAACnB,EAAE,CAAC,CAACQ,IAAI,EAAEU,UAAU,EAAGE,UAAU,IACrFpB,EAAE,CAACqB,OAAO,CAACC,oBAAoB,CAC7BtB,EAAE,CAACqB,OAAO,CAACE,8BAA8B,CACvCvB,EAAE,CAACqB,OAAO,CAACG,gBAAgB,CAACN,UAAU,CAAC,EACvC,SAAS,CACV,EACDO,SAAS,EACT,CAACL,UAAU,CAAC,CACb,CAAC;QAEJJ,aAAa,CAACU,WAAW,CAAC/B,UAAU,EAAEa,IAAI,EAAEW,cAAc,CAAC;MAC7D,CAAC;KACF,CAAC,CAAC,CACJ;EACH,CAAC;CACJ,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","getNodesContainingRange","Ch","filter","isFunctionDeclaration","node","body","getCombinedModifierFlags","ModifierFlags","Async","head","O","map","changeTracker","ChangeTrackerApi","effectName","newDeclaration","expression","factory","createCallExpression","createPropertyAccessExpression","createIdentifier","undefined","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGen.ts"],"sourcesContent":[null]}
+{"version":3,"file":"asyncAwaitToGen.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,wBAAwB;EAC9BC,WAAW,EAAE,uBAAuB;EACpCC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACN,EAAE,CAACO,qBAAqB,CAAC,EACnCF,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACC,IAAI,CAAC,EAChCJ,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,EAAER,EAAE,CAACU,wBAAwB,CAACF,IAAI,CAAC,GAAGR,EAAE,CAACW,aAAa,CAACC,KAAK,CAAC,CAAC,EACnFP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;IACfV,WAAW,EAAE,uBAAuB;IACpCC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,UAAU,GAAGd,GAAG,CAACe,yBAAyB,CAAClB,EAAE,CAAC,CAACC,UAAU,CAAC;MAEhE,MAAMkB,cAAc,GAAGhB,GAAG,CAACiB,8BAA8B,CAACpB,EAAE,CAAC,CAACQ,IAAI,EAAES,UAAU,EAAGI,UAAU,IACzFrB,EAAE,CAACsB,OAAO,CAACC,oBAAoB,CAC7BvB,EAAE,CAACsB,OAAO,CAACE,8BAA8B,CACvCxB,EAAE,CAACsB,OAAO,CAACG,gBAAgB,CAACR,UAAU,CAAC,EACvC,SAAS,CACV,EACDS,SAAS,EACT,CAACL,UAAU,CAAC,CACb,CAAC;MAEJL,aAAa,CAACW,WAAW,CAAC1B,UAAU,EAAEO,IAAI,EAAEW,cAAc,CAAC;IAC7D;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isFunctionDeclaration","node","body","getCombinedModifierFlags","ModifierFlags","Async","head","O","map","changeTracker","effectName","getEffectModuleIdentifier","newDeclaration","transformAsyncAwaitToEffectGen","expression","factory","createCallExpression","createPropertyAccessExpression","createIdentifier","undefined","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGen.ts"],"sourcesContent":[null]}

package/refactors/asyncAwaitToGenTryPromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asyncAwaitToGenTryPromise.d.ts","sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGenTryPromise.ts"],"names":[],"mappings":";AAQA,wBA4DE"}
+{"version":3,"file":"asyncAwaitToGenTryPromise.d.ts","sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGenTryPromise.ts"],"names":[],"mappings":";AAMA,wBAwDE"}

package/refactors/asyncAwaitToGenTryPromise.js

@@ -4,35 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var _utils = /*#__PURE__*/require("@effect/language-service/utils");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/asyncAwaitToGenTryPromise",
   description: "Convert to Effect.gen with failures",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
-    return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration), Ch.filter(node => !!node.body), Ch.filter(node => !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Async)), Ch.head, O.map(node => ({
-      description: "Rewrite to Effect.gen with failures",
-      apply: T.gen(function* ($) {
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
-        const effectName = (0, _utils.getEffectModuleIdentifier)(ts)(sourceFile);
-        let errorCount = 0;
-        function createErrorADT() {
-          errorCount++;
-          return ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment("_tag", ts.factory.createAsExpression(ts.factory.createStringLiteral("Error" + errorCount), ts.factory.createTypeReferenceNode("const"))), ts.factory.createShorthandPropertyAssignment("error")]);
-        }
-        const newDeclaration = (0, _utils.transformAsyncAwaitToEffectGen)(ts)(node, effectName, expression => ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(effectName), "tryCatchPromise"), undefined, [ts.factory.createArrowFunction(undefined, undefined, [], undefined, undefined, expression), ts.factory.createArrowFunction(undefined, undefined, [ts.factory.createParameterDeclaration(undefined, undefined, "error")], undefined, undefined, createErrorADT())]));
-        changeTracker.replaceNode(sourceFile, node, newDeclaration);
-      })
-    })));
-  })
+  apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration), Ch.filter(node => !!node.body), Ch.filter(node => !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Async)), Ch.head, O.map(node => ({
+    description: "Rewrite to Effect.gen with failures",
+    apply: changeTracker => {
+      const effectName = AST.getEffectModuleIdentifier(ts)(sourceFile);
+      let errorCount = 0;
+      function createErrorADT() {
+        errorCount++;
+        return ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment("_tag", ts.factory.createAsExpression(ts.factory.createStringLiteral("Error" + errorCount), ts.factory.createTypeReferenceNode("const"))), ts.factory.createShorthandPropertyAssignment("error")]);
+      }
+      const newDeclaration = AST.transformAsyncAwaitToEffectGen(ts)(node, effectName, expression => ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(effectName), "tryCatchPromise"), undefined, [ts.factory.createArrowFunction(undefined, undefined, [], undefined, undefined, expression), ts.factory.createArrowFunction(undefined, undefined, [ts.factory.createParameterDeclaration(undefined, undefined, "error")], undefined, undefined, createErrorADT())]));
+      changeTracker.replaceNode(sourceFile, node, newDeclaration);
+    }
+  })))
 });
 exports.default = _default;
 //# sourceMappingURL=asyncAwaitToGenTryPromise.js.map

package/refactors/asyncAwaitToGenTryPromise.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncAwaitToGenTryPromise.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAuC;AAAA;AAAA,4BAExB,8BAAc,EAAC;EAC5BA,IAAI,EAAE,kCAAkC;EACxCC,WAAW,EAAE,qCAAqC;EAClDC,KAAK,EAAE,CAACC,UAAU,EAAEC,SAAS,KAC3BC,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;IACf,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACC,aAAa,CAAC,CAAC;IAEjD,OAAO,kBAAI,EACTD,GAAG,CAACE,uBAAuB,CAACJ,EAAE,CAAC,CAACL,UAAU,EAAEC,SAAS,CAAC,EACtDS,EAAE,CAACC,MAAM,CAACN,EAAE,CAACO,qBAAqB,CAAC,EACnCF,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACC,IAAI,CAAC,EAChCJ,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,EAAER,EAAE,CAACU,wBAAwB,CAACF,IAAI,CAAC,GAAGR,EAAE,CAACW,aAAa,CAACC,KAAK,CAAC,CAAC,EACnFP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;MACff,WAAW,EAAE,qCAAqC;MAClDC,KAAK,EAAEG,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;QACtB,MAAMiB,aAAa,GAAG,OAAOjB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACe,gBAAgB,CAAC,CAAC;QAC/D,MAAMC,UAAU,GAAG,oCAAyB,EAAClB,EAAE,CAAC,CAACL,UAAU,CAAC;QAE5D,IAAIwB,UAAU,GAAG,CAAC;QAElB,SAASC,cAAc;UACrBD,UAAU,EAAE;UACZ,OAAOnB,EAAE,CAACqB,OAAO,CAACC,6BAA6B,CAAC,CAC9CtB,EAAE,CAACqB,OAAO,CAACE,wBAAwB,CACjC,MAAM,EACNvB,EAAE,CAACqB,OAAO,CAACG,kBAAkB,CAC3BxB,EAAE,CAACqB,OAAO,CAACI,mBAAmB,CAAC,OAAO,GAAGN,UAAU,CAAC,EACpDnB,EAAE,CAACqB,OAAO,CAACK,uBAAuB,CAAC,OAAO,CAAC,CAC5C,CACF,EACD1B,EAAE,CAACqB,OAAO,CAACM,iCAAiC,CAAC,OAAO,CAAC,CACtD,CAAC;QACJ;QAEA,MAAMC,cAAc,GAAI,yCAA8B,EAAC5B,EAAE,CAAC,CAACQ,IAAI,EAAEU,UAAU,EAAGW,UAAU,IACtF7B,EAAE,CAACqB,OAAO,CAACS,oBAAoB,CAC7B9B,EAAE,CAACqB,OAAO,CAACU,8BAA8B,CACvC/B,EAAE,CAACqB,OAAO,CAACW,gBAAgB,CAACd,UAAU,CAAC,EACvC,iBAAiB,CAClB,EACDe,SAAS,EACT,CACEjC,EAAE,CAACqB,OAAO,CAACa,mBAAmB,CAACD,SAAS,EAAEA,SAAS,EAAE,EAAE,EAAEA,SAAS,EAAEA,SAAS,EAAEJ,UAAU,CAAC,EAC1F7B,EAAE,CAACqB,OAAO,CAACa,mBAAmB,CAC5BD,SAAS,EACTA,SAAS,EACT,CAACjC,EAAE,CAACqB,OAAO,CAACc,0BAA0B,CAACF,SAAS,EAAEA,SAAS,EAAE,OAAO,CAAC,CAAC,EACtEA,SAAS,EACTA,SAAS,EACTb,cAAc,EAAE,CACjB,CACF,CACF,CAAE;QAELJ,aAAa,CAACoB,WAAW,CAACzC,UAAU,EAAEa,IAAI,EAAEoB,cAAc,CAAC;MAC7D,CAAC;KACF,CAAC,CAAC,CACJ;EACH,CAAC;CACJ,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","getNodesContainingRange","Ch","filter","isFunctionDeclaration","node","body","getCombinedModifierFlags","ModifierFlags","Async","head","O","map","changeTracker","ChangeTrackerApi","effectName","errorCount","createErrorADT","factory","createObjectLiteralExpression","createPropertyAssignment","createAsExpression","createStringLiteral","createTypeReferenceNode","createShorthandPropertyAssignment","newDeclaration","expression","createCallExpression","createPropertyAccessExpression","createIdentifier","undefined","createArrowFunction","createParameterDeclaration","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGenTryPromise.ts"],"sourcesContent":[null]}
+{"version":3,"file":"asyncAwaitToGenTryPromise.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,kCAAkC;EACxCC,WAAW,EAAE,qCAAqC;EAClDC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACN,EAAE,CAACO,qBAAqB,CAAC,EACnCF,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACC,IAAI,CAAC,EAChCJ,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,EAAER,EAAE,CAACU,wBAAwB,CAACF,IAAI,CAAC,GAAGR,EAAE,CAACW,aAAa,CAACC,KAAK,CAAC,CAAC,EACnFP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;IACfV,WAAW,EAAE,qCAAqC;IAClDC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,UAAU,GAAGd,GAAG,CAACe,yBAAyB,CAAClB,EAAE,CAAC,CAACC,UAAU,CAAC;MAEhE,IAAIkB,UAAU,GAAG,CAAC;MAElB,SAASC,cAAc;QACrBD,UAAU,EAAE;QACZ,OAAOnB,EAAE,CAACqB,OAAO,CAACC,6BAA6B,CAAC,CAC9CtB,EAAE,CAACqB,OAAO,CAACE,wBAAwB,CACjC,MAAM,EACNvB,EAAE,CAACqB,OAAO,CAACG,kBAAkB,CAC3BxB,EAAE,CAACqB,OAAO,CAACI,mBAAmB,CAAC,OAAO,GAAGN,UAAU,CAAC,EACpDnB,EAAE,CAACqB,OAAO,CAACK,uBAAuB,CAAC,OAAO,CAAC,CAC5C,CACF,EACD1B,EAAE,CAACqB,OAAO,CAACM,iCAAiC,CAAC,OAAO,CAAC,CACtD,CAAC;MACJ;MAEA,MAAMC,cAAc,GAAIzB,GAAG,CAAC0B,8BAA8B,CAAC7B,EAAE,CAAC,CAACQ,IAAI,EAAES,UAAU,EAAGa,UAAU,IAC1F9B,EAAE,CAACqB,OAAO,CAACU,oBAAoB,CAC7B/B,EAAE,CAACqB,OAAO,CAACW,8BAA8B,CACvChC,EAAE,CAACqB,OAAO,CAACY,gBAAgB,CAAChB,UAAU,CAAC,EACvC,iBAAiB,CAClB,EACDiB,SAAS,EACT,CACElC,EAAE,CAACqB,OAAO,CAACc,mBAAmB,CAACD,SAAS,EAAEA,SAAS,EAAE,EAAE,EAAEA,SAAS,EAAEA,SAAS,EAAEJ,UAAU,CAAC,EAC1F9B,EAAE,CAACqB,OAAO,CAACc,mBAAmB,CAC5BD,SAAS,EACTA,SAAS,EACT,CAAClC,EAAE,CAACqB,OAAO,CAACe,0BAA0B,CAACF,SAAS,EAAEA,SAAS,EAAE,OAAO,CAAC,CAAC,EACtEA,SAAS,EACTA,SAAS,EACTd,cAAc,EAAE,CACjB,CACF,CACF,CAAE;MAELJ,aAAa,CAACqB,WAAW,CAACpC,UAAU,EAAEO,IAAI,EAAEoB,cAAc,CAAC;IAC7D;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isFunctionDeclaration","node","body","getCombinedModifierFlags","ModifierFlags","Async","head","O","map","changeTracker","effectName","getEffectModuleIdentifier","errorCount","createErrorADT","factory","createObjectLiteralExpression","createPropertyAssignment","createAsExpression","createStringLiteral","createTypeReferenceNode","createShorthandPropertyAssignment","newDeclaration","transformAsyncAwaitToEffectGen","expression","createCallExpression","createPropertyAccessExpression","createIdentifier","undefined","createArrowFunction","createParameterDeclaration","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/asyncAwaitToGenTryPromise.ts"],"sourcesContent":[null]}

package/refactors/definition.d.ts

@@ -1,13 +1,14 @@
-import type * as T from "@effect/io/Effect";
-import type * as O from "@fp-ts/data/Option";
+import type * as AST from "@effect/language-service/utils/AST";
+import type * as O from "@effect/language-service/utils/Option";
 import type ts from "typescript/lib/tsserverlibrary";
 export interface RefactorDefinition {
     name: string;
     description: string;
-    apply: <E>(sourceFile: ts.SourceFile, textRange: ts.TextRange) => T.Effect<typeof ts | ts.Program, E, O.Option<{
-        description: string;
-        apply: T.Effect<typeof ts | ts.Program | ts.textChanges.ChangeTracker, E, void>;
-    }>>;
+    apply: (ts: AST.TypeScriptApi, program: ts.Program) => (sourceFile: ts.SourceFile, textRange: ts.TextRange) => O.Option<ApplicableRefactorDefinition>;
+}
+export interface ApplicableRefactorDefinition {
+    description: string;
+    apply: (changeTracker: ts.textChanges.ChangeTracker) => void;
 }
 export declare function createRefactor(definition: RefactorDefinition): RefactorDefinition;
 //# sourceMappingURL=definition.d.ts.map

package/refactors/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEpD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,CAAC,CAAC,EACP,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,SAAS,EAAE,EAAE,CAAC,SAAS,KACpB,CAAC,CAAC,MAAM,CACX,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EACtB,CAAC,EACD,CAAC,CAAC,MAAM,CAAC;QACP,WAAW,EAAE,MAAM,CAAA;QACnB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;KAChF,CAAC,CACH,CAAA;CACF;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,kBAAkB,sBAE5D"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oCAAoC,CAAA;AAC9D,OAAO,KAAK,KAAK,CAAC,MAAM,uCAAuC,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEpD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,CACrD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,SAAS,EAAE,EAAE,CAAC,SAAS,KACpB,CAAC,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAA;CAC5C;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,WAAW,CAAC,aAAa,KAAK,IAAI,CAAA;CAC7D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,kBAAkB,sBAE5D"}

package/refactors/definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"definition.js","mappings":";;;;;;AAoBM,SAAUA,cAAc,CAACC,UAA8B;EAC3D,OAAOA,UAAU;AACnB","names":["createRefactor","definition"],"sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"sourcesContent":[null]}
+{"version":3,"file":"definition.js","mappings":";;;;;;AAkBM,SAAUA,cAAc,CAACC,UAA8B;EAC3D,OAAOA,UAAU;AACnB","names":["createRefactor","definition"],"sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"sourcesContent":[null]}

package/refactors/functionToArrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionToArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"names":[],"mappings":";AAOA,wBAwEE"}
+{"version":3,"file":"functionToArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"names":[],"mappings":";AAMA,wBAmEE"}

package/refactors/functionToArrow.js

@@ -4,49 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/functionToArrow",
   description: "Convert to arrow",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
-    return (0, _Function.pipe)((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration)), Ch.concat((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isMethodDeclaration))), Ch.filter(node => !!node.body), Ch.filter(node => !!node.name && AST.isNodeInRange(textRange)(node.name)), Ch.head, O.map(node => ({
-      description: "Convert to arrow",
-      apply: T.gen(function* ($) {
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
-        const body = node.body;
-        let newBody = ts.factory.createBlock(body.statements);
-        if (body.statements.length === 1) {
-          const statement = body.statements[0];
-          if (statement && ts.isReturnStatement(statement) && statement.expression) {
-            newBody = statement.expression;
-          }
+  apply: ts => (sourceFile, textRange) => (0, _Function.pipe)((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration)), Ch.concat((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isMethodDeclaration))), Ch.filter(node => !!node.body), Ch.filter(node => !!node.name && AST.isNodeInRange(textRange)(node.name)), Ch.head, O.map(node => ({
+    description: "Convert to arrow",
+    apply: changeTracker => {
+      const body = node.body;
+      let newBody = ts.factory.createBlock(body.statements);
+      if (body.statements.length === 1) {
+        const statement = body.statements[0];
+        if (statement && ts.isReturnStatement(statement) && statement.expression) {
+          newBody = statement.expression;
         }
-        let arrowFlags = ts.getCombinedModifierFlags(node);
-        arrowFlags &= ~ts.ModifierFlags.Export;
-        arrowFlags &= ~ts.ModifierFlags.Default;
-        const arrowModifiers = ts.factory.createModifiersFromModifierFlags(arrowFlags);
-        const arrowFunction = ts.factory.createArrowFunction(arrowModifiers, node.typeParameters, node.parameters, undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), newBody);
-        let constFlags = ts.getCombinedModifierFlags(node);
-        constFlags &= ~arrowFlags;
-        const constModifiers = ts.factory.createModifiersFromModifierFlags(constFlags);
-        let newDeclaration = node;
-        if (ts.isMethodDeclaration(node)) {
-          newDeclaration = ts.factory.createPropertyDeclaration(constModifiers, node.name, undefined, undefined, arrowFunction);
-        } else if (ts.isFunctionDeclaration(node)) {
-          newDeclaration = ts.factory.createVariableStatement(constModifiers, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(node.name, undefined, undefined, arrowFunction)], ts.NodeFlags.Const));
-        }
-        changeTracker.replaceNode(sourceFile, node, newDeclaration);
-      })
-    })));
-  })
+      }
+      let arrowFlags = ts.getCombinedModifierFlags(node);
+      arrowFlags &= ~ts.ModifierFlags.Export;
+      arrowFlags &= ~ts.ModifierFlags.Default;
+      const arrowModifiers = ts.factory.createModifiersFromModifierFlags(arrowFlags);
+      const arrowFunction = ts.factory.createArrowFunction(arrowModifiers, node.typeParameters, node.parameters, undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), newBody);
+      let constFlags = ts.getCombinedModifierFlags(node);
+      constFlags &= ~arrowFlags;
+      const constModifiers = ts.factory.createModifiersFromModifierFlags(constFlags);
+      let newDeclaration = node;
+      if (ts.isMethodDeclaration(node)) {
+        newDeclaration = ts.factory.createPropertyDeclaration(constModifiers, node.name, undefined, undefined, arrowFunction);
+      } else if (ts.isFunctionDeclaration(node)) {
+        newDeclaration = ts.factory.createVariableStatement(constModifiers, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(node.name, undefined, undefined, arrowFunction)], ts.NodeFlags.Const));
+      }
+      changeTracker.replaceNode(sourceFile, node, newDeclaration);
+    }
+  })))
 });
 exports.default = _default;
 //# sourceMappingURL=functionToArrow.js.map

package/refactors/functionToArrow.js.map

@@ -1 +1 @@
-{"version":3,"file":"functionToArrow.js","mappings":"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","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","getNodesContainingRange","Ch","filter","isFunctionDeclaration","concat","isMethodDeclaration","node","body","isNodeInRange","head","O","map","changeTracker","ChangeTrackerApi","newBody","factory","createBlock","statements","length","statement","isReturnStatement","expression","arrowFlags","getCombinedModifierFlags","ModifierFlags","Export","Default","arrowModifiers","createModifiersFromModifierFlags","arrowFunction","createArrowFunction","typeParameters","parameters","undefined","createToken","SyntaxKind","EqualsGreaterThanToken","constFlags","constModifiers","newDeclaration","createPropertyDeclaration","createVariableStatement","createVariableDeclarationList","createVariableDeclaration","NodeFlags","Const","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"sourcesContent":[null]}
+{"version":3,"file":"functionToArrow.js","mappings":"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","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isFunctionDeclaration","concat","isMethodDeclaration","node","body","isNodeInRange","head","O","map","changeTracker","newBody","factory","createBlock","statements","length","statement","isReturnStatement","expression","arrowFlags","getCombinedModifierFlags","ModifierFlags","Export","Default","arrowModifiers","createModifiersFromModifierFlags","arrowFunction","createArrowFunction","typeParameters","parameters","undefined","createToken","SyntaxKind","EqualsGreaterThanToken","constFlags","constModifiers","newDeclaration","createPropertyDeclaration","createVariableStatement","createVariableDeclarationList","createVariableDeclaration","NodeFlags","Const","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"sourcesContent":[null]}

package/refactors/index.d.ts

@@ -3,12 +3,10 @@ declare const _default: {
     asyncAwaitToGenTryPromise: import("./definition").RefactorDefinition;
     removePipe: import("./definition").RefactorDefinition;
     addPipe: import("./definition").RefactorDefinition;
-    removeCurryArrow: import("./definition").RefactorDefinition;
     functionToArrow: import("./definition").RefactorDefinition;
     toggleTypeAnnotation: import("./definition").RefactorDefinition;
     toggleReturnTypeAnnotation: import("./definition").RefactorDefinition;
     wrapWithPipe: import("./definition").RefactorDefinition;
-    noSyncWithConstant: import("./definition").RefactorDefinition;
 };
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/refactors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/refactors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAWA,wBAWC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/refactors/index.ts"],"names":[],"mappings":";;;;;;;;;;AASA,wBASC"}

package/refactors/index.js

@@ -8,8 +8,6 @@ var _addPipe = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effec
 var _asyncAwaitToGen = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/asyncAwaitToGen"));
 var _asyncAwaitToGenTryPromise = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/asyncAwaitToGenTryPromise"));
 var _functionToArrow = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/functionToArrow"));
-var _noSyncWithConstant = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/noSyncWithConstant"));
-var _removeCurryArrow = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/removeCurryArrow"));
 var _removePipe = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/removePipe"));
 var _toggleReturnTypeAnnotation = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/toggleReturnTypeAnnotation"));
 var _toggleTypeAnnotation = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("@effect/language-service/refactors/toggleTypeAnnotation"));
@@ -20,12 +18,10 @@ var _default = {
   asyncAwaitToGenTryPromise: _asyncAwaitToGenTryPromise.default,
   removePipe: _removePipe.default,
   addPipe: _addPipe.default,
-  removeCurryArrow: _removeCurryArrow.default,
   functionToArrow: _functionToArrow.default,
   toggleTypeAnnotation: _toggleTypeAnnotation.default,
   toggleReturnTypeAnnotation: _toggleReturnTypeAnnotation.default,
-  wrapWithPipe: _wrapWithPipe.default,
-  noSyncWithConstant: _noSyncWithConstant.default
+  wrapWithPipe: _wrapWithPipe.default
 };
 exports.default = _default;
 //# sourceMappingURL=index.js.map

package/refactors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAA0E;AAAA,eAE3D;EACbA,eAAe,EAAfA,wBAAe;EACfC,yBAAyB,EAAzBA,kCAAyB;EACzBC,UAAU,EAAVA,mBAAU;EACVC,OAAO,EAAPA,gBAAO;EACPC,gBAAgB,EAAhBA,yBAAgB;EAChBC,eAAe,EAAfA,wBAAe;EACfC,oBAAoB,EAApBA,6BAAoB;EACpBC,0BAA0B,EAA1BA,mCAA0B;EAC1BC,YAAY,EAAZA,qBAAY;EACZC,kBAAkB,EAAlBA;CACD;AAAA","names":["asyncAwaitToGen","asyncAwaitToGenTryPromise","removePipe","addPipe","removeCurryArrow","functionToArrow","toggleTypeAnnotation","toggleReturnTypeAnnotation","wrapWithPipe","noSyncWithConstant"],"sourceRoot":"","sources":["../../../src/refactors/index.ts"],"sourcesContent":[null]}
+{"version":3,"file":"index.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAA0E;AAAA,eAE3D;EACbA,eAAe,EAAfA,wBAAe;EACfC,yBAAyB,EAAzBA,kCAAyB;EACzBC,UAAU,EAAVA,mBAAU;EACVC,OAAO,EAAPA,gBAAO;EACPC,eAAe,EAAfA,wBAAe;EACfC,oBAAoB,EAApBA,6BAAoB;EACpBC,0BAA0B,EAA1BA,mCAA0B;EAC1BC,YAAY,EAAZA;CACD;AAAA","names":["asyncAwaitToGen","asyncAwaitToGenTryPromise","removePipe","addPipe","functionToArrow","toggleTypeAnnotation","toggleReturnTypeAnnotation","wrapWithPipe"],"sourceRoot":"","sources":["../../../src/refactors/index.ts"],"sourcesContent":[null]}

package/refactors/removePipe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removePipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"names":[],"mappings":";AAQA,wBA8BE"}
+{"version":3,"file":"removePipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"names":[],"mappings":";AAMA,wBAyBE"}

package/refactors/removePipe.js

@@ -4,29 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var _utils = /*#__PURE__*/require("@effect/language-service/utils");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/removePipe",
   description: "Remove pipe call",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
-    return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter((0, _utils.isPipeCall)(ts)), Ch.filter(node => AST.isNodeInRange(textRange)(node.expression)), Ch.filter(node => node.arguments.length > 1), Ch.head, O.map(node => ({
-      description: "Remove pipe call",
-      apply: T.gen(function* ($) {
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
-        const newNode = node.arguments.slice(1).reduce((inner, exp) => ts.factory.createCallExpression(exp, undefined, [inner]), node.arguments[0]);
-        changeTracker.replaceNode(sourceFile, node, newNode);
-      })
-    })));
-  })
+  apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(AST.isPipeCall(ts)), Ch.filter(node => AST.isNodeInRange(textRange)(node.expression)), Ch.filter(node => node.arguments.length > 1), Ch.head, O.map(node => ({
+    description: "Remove pipe call",
+    apply: changeTracker => {
+      const newNode = node.arguments.slice(1).reduce((inner, exp) => ts.factory.createCallExpression(exp, undefined, [inner]), node.arguments[0]);
+      changeTracker.replaceNode(sourceFile, node, newNode);
+    }
+  })))
 });
 exports.default = _default;
 //# sourceMappingURL=removePipe.js.map

package/refactors/removePipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"removePipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAuC;AAAA;AAAA,4BAExB,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mBAAmB;EACzBC,WAAW,EAAE,kBAAkB;EAC/BC,KAAK,EAAE,CAACC,UAAU,EAAEC,SAAS,KAC3BC,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;IACf,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACC,aAAa,CAAC,CAAC;IAEjD,OAAO,kBAAI,EACTD,GAAG,CAACE,uBAAuB,CAACJ,EAAE,CAAC,CAACL,UAAU,EAAEC,SAAS,CAAC,EACtDS,EAAE,CAACC,MAAM,CAAC,qBAAU,EAACN,EAAE,CAAC,CAAC,EACzBK,EAAE,CAACC,MAAM,CAAEC,IAAI,IAAKL,GAAG,CAACM,aAAa,CAACZ,SAAS,CAAC,CAACW,IAAI,CAACE,UAAU,CAAC,CAAC,EAClEJ,EAAE,CAACC,MAAM,CACNC,IAAI,IAAKA,IAAI,CAACG,SAAS,CAACC,MAAM,GAAG,CAAC,CACpC,EACDN,EAAE,CAACO,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;MACfd,WAAW,EAAE,kBAAkB;MAC/BC,KAAK,EAAEG,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;QACtB,MAAMgB,aAAa,GAAG,OAAOhB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACc,gBAAgB,CAAC,CAAC;QAE/D,MAAMC,OAAO,GAAGV,IAAI,CAACG,SAAS,CAACQ,KAAK,CAAC,CAAC,CAAC,CAACC,MAAM,CAC5C,CAACC,KAAK,EAAEC,GAAG,KAAKrB,EAAE,CAACsB,OAAO,CAACC,oBAAoB,CAACF,GAAG,EAAEG,SAAS,EAAE,CAACJ,KAAK,CAAC,CAAC,EACxEb,IAAI,CAACG,SAAS,CAAC,CAAC,CAAE,CACnB;QAEDK,aAAa,CAACU,WAAW,CAAC9B,UAAU,EAAEY,IAAI,EAAEU,OAAO,CAAC;MACtD,CAAC;KACF,CAAC,CAAC,CACJ;EACH,CAAC;CACJ,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","getNodesContainingRange","Ch","filter","node","isNodeInRange","expression","arguments","length","head","O","map","changeTracker","ChangeTrackerApi","newNode","slice","reduce","inner","exp","factory","createCallExpression","undefined","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"sourcesContent":[null]}
+{"version":3,"file":"removePipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mBAAmB;EACzBC,WAAW,EAAE,kBAAkB;EAC/BC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACH,GAAG,CAACI,UAAU,CAACP,EAAE,CAAC,CAAC,EAC7BK,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAKL,GAAG,CAACM,aAAa,CAACP,SAAS,CAAC,CAACM,IAAI,CAACE,UAAU,CAAC,CAAC,EAClEL,EAAE,CAACC,MAAM,CACNE,IAAI,IAAKA,IAAI,CAACG,SAAS,CAACC,MAAM,GAAG,CAAC,CACpC,EACDP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;IACfV,WAAW,EAAE,kBAAkB;IAC/BC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,OAAO,GAAGT,IAAI,CAACG,SAAS,CAACO,KAAK,CAAC,CAAC,CAAC,CAACC,MAAM,CAC5C,CAACC,KAAK,EAAEC,GAAG,KAAKrB,EAAE,CAACsB,OAAO,CAACC,oBAAoB,CAACF,GAAG,EAAEG,SAAS,EAAE,CAACJ,KAAK,CAAC,CAAC,EACxEZ,IAAI,CAACG,SAAS,CAAC,CAAC,CAAE,CACnB;MAEDK,aAAa,CAACS,WAAW,CAACxB,UAAU,EAAEO,IAAI,EAAES,OAAO,CAAC;IACtD;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isPipeCall","node","isNodeInRange","expression","arguments","length","head","O","map","changeTracker","newNode","slice","reduce","inner","exp","factory","createCallExpression","undefined","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"sourcesContent":[null]}

package/refactors/toggleReturnTypeAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toggleReturnTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"names":[],"mappings":";AAeA,wBAoDE"}
+{"version":3,"file":"toggleReturnTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"names":[],"mappings":";AAaA,wBAgDE"}

package/refactors/toggleReturnTypeAnnotation.js

@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
 var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
-var _utils = /*#__PURE__*/require("@effect/language-service/utils");
-var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Chunk"));
-var _Function = /*#__PURE__*/require("@fp-ts/data/Function");
-var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fp-ts/data/Option"));
+var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
+var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
+var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
+var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/(0, _definition.createRefactor)({
   name: "effect/toggleReturnTypeAnnotation",
   description: "Toggle return type annotation",
-  apply: (sourceFile, textRange) => T.gen(function* ($) {
-    const ts = yield* $(T.service(AST.TypeScriptApi));
+  apply: (ts, program) => (sourceFile, textRange) => {
     function isConvertibleDeclaration(node) {
       switch (node.kind) {
         case ts.SyntaxKind.FunctionDeclaration:
@@ -31,12 +28,10 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
     }
     return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(isConvertibleDeclaration), Ch.head, O.map(node => ({
       description: "Toggle return type annotation",
-      apply: T.gen(function* ($) {
-        const program = yield* $(T.service(AST.TypeScriptProgram));
+      apply: changeTracker => {
         const typeChecker = program.getTypeChecker();
-        const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
         if (node.type) {
-          (0, _utils.removeReturnTypeAnnotation)(ts, changeTracker)(sourceFile, node);
+          AST.removeReturnTypeAnnotation(ts, changeTracker)(sourceFile, node);
           return;
         }
         const callableType = typeChecker.getTypeAtLocation(node);
@@ -44,10 +39,10 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
         const returnTypeNodes = returnTypes.map(type => typeChecker.typeToTypeNode(type, node, ts.NodeBuilderFlags.NoTruncation)).filter(node => !!node);
         if (returnTypeNodes.length === 0) return;
         const returnTypeNode = returnTypeNodes.length === 1 ? returnTypeNodes[0] : ts.factory.createUnionTypeNode(returnTypeNodes);
-        (0, _utils.addReturnTypeAnnotation)(ts, changeTracker)(sourceFile, node, returnTypeNode);
-      })
+        AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, returnTypeNode);
+      }
     })));
-  })
+  }
 });
 exports.default = _default;
 //# sourceMappingURL=toggleReturnTypeAnnotation.js.map

package/refactors/toggleReturnTypeAnnotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"toggleReturnTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AAAuC;AAAA;AAAA,4BASxB,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mCAAmC;EACzCC,WAAW,EAAE,+BAA+B;EAC5CC,KAAK,EAAE,CAACC,UAAU,EAAEC,SAAS,KAC3BC,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;IACf,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACC,aAAa,CAAC,CAAC;IAEjD,SAASC,wBAAwB,CAACC,IAAa;MAC7C,QAAQA,IAAI,CAACC,IAAI;QACf,KAAKN,EAAE,CAACO,UAAU,CAACC,mBAAmB;QACtC,KAAKR,EAAE,CAACO,UAAU,CAACE,kBAAkB;QACrC,KAAKT,EAAE,CAACO,UAAU,CAACG,aAAa;QAChC,KAAKV,EAAE,CAACO,UAAU,CAACI,iBAAiB;UAClC,OAAO,IAAI;QACb;UACE,OAAO,KAAK;MAAA;IAElB;IAEA,OAAO,kBAAI,EACTT,GAAG,CAACU,uBAAuB,CAACZ,EAAE,CAAC,CAACL,UAAU,EAAEC,SAAS,CAAC,EACtDiB,EAAE,CAACC,MAAM,CAACV,wBAAwB,CAAC,EACnCS,EAAE,CAACE,IAAI,EACPC,CAAC,CAACC,GAAG,CACFZ,IAAI,KAAM;MACTZ,WAAW,EAAE,+BAA+B;MAC5CC,KAAK,EAAEG,CAAC,CAACC,GAAG,CAAC,WAAUC,CAAC;QACtB,MAAMmB,OAAO,GAAG,OAAOnB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACiB,iBAAiB,CAAC,CAAC;QAC1D,MAAMC,WAAW,GAAGF,OAAO,CAACG,cAAc,EAAE;QAC5C,MAAMC,aAAa,GAAG,OAAOvB,CAAC,CAACF,CAAC,CAACI,OAAO,CAACC,GAAG,CAACqB,gBAAgB,CAAC,CAAC;QAE/D,IAAIlB,IAAI,CAACmB,IAAI,EAAE;UACb,qCAA0B,EAACxB,EAAE,EAAEsB,aAAa,CAAC,CAAC3B,UAAU,EAAEU,IAAI,CAAC;UAC/D;;QAGF,MAAMoB,YAAY,GAAGL,WAAW,CAACM,iBAAiB,CAACrB,IAAI,CAAC;QACxD,MAAMsB,WAAW,GAAGF,YAAY,CAACG,iBAAiB,EAAE,CAACX,GAAG,CAAEY,CAAC,IAAKA,CAAC,CAACC,aAAa,EAAE,CAAC;QAClF,MAAMC,eAAe,GAAGJ,WAAW,CAACV,GAAG,CAAEO,IAAI,IAC3CJ,WAAW,CAACY,cAAc,CAACR,IAAI,EAAEnB,IAAI,EAAEL,EAAE,CAACiC,gBAAgB,CAACC,YAAY,CAAC,CACzE,CAACpB,MAAM,CAAET,IAAI,IAA0B,CAAC,CAACA,IAAI,CAAC;QAC/C,IAAI0B,eAAe,CAACI,MAAM,KAAK,CAAC,EAAE;QAClC,MAAMC,cAAc,GAAGL,eAAe,CAACI,MAAM,KAAK,CAAC,GACjDJ,eAAe,CAAC,CAAC,CAAE,GACnB/B,EAAE,CAACqC,OAAO,CAACC,mBAAmB,CAACP,eAAe,CAAC;QAEjD,kCAAuB,EAAC/B,EAAE,EAAEsB,aAAa,CAAC,CAAC3B,UAAU,EAAEU,IAAI,EAAE+B,cAAc,CAAC;MAC9E,CAAC;KACF,CAAC,CACH,CACF;EACH,CAAC;CACJ,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","T","gen","$","ts","service","AST","TypeScriptApi","isConvertibleDeclaration","node","kind","SyntaxKind","FunctionDeclaration","FunctionExpression","ArrowFunction","MethodDeclaration","getNodesContainingRange","Ch","filter","head","O","map","program","TypeScriptProgram","typeChecker","getTypeChecker","changeTracker","ChangeTrackerApi","type","callableType","getTypeAtLocation","returnTypes","getCallSignatures","s","getReturnType","returnTypeNodes","typeToTypeNode","NodeBuilderFlags","NoTruncation","length","returnTypeNode","factory","createUnionTypeNode"],"sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"sourcesContent":[null]}
+{"version":3,"file":"toggleReturnTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BASnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mCAAmC;EACzCC,WAAW,EAAE,+BAA+B;EAC5CC,KAAK,EAAE,CAACC,EAAE,EAAEC,OAAO,KACjB,CAACC,UAAU,EAAEC,SAAS,KAAI;IACxB,SAASC,wBAAwB,CAACC,IAAa;MAC7C,QAAQA,IAAI,CAACC,IAAI;QACf,KAAKN,EAAE,CAACO,UAAU,CAACC,mBAAmB;QACtC,KAAKR,EAAE,CAACO,UAAU,CAACE,kBAAkB;QACrC,KAAKT,EAAE,CAACO,UAAU,CAACG,aAAa;QAChC,KAAKV,EAAE,CAACO,UAAU,CAACI,iBAAiB;UAClC,OAAO,IAAI;QACb;UACE,OAAO,KAAK;MAAA;IAElB;IAEA,OAAO,kBAAI,EACTC,GAAG,CAACC,uBAAuB,CAACb,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDW,EAAE,CAACC,MAAM,CAACX,wBAAwB,CAAC,EACnCU,EAAE,CAACE,IAAI,EACPC,CAAC,CAACC,GAAG,CACFb,IAAI,KAAM;MACTP,WAAW,EAAE,+BAA+B;MAC5CC,KAAK,EAAGoB,aAAa,IAAI;QACvB,MAAMC,WAAW,GAAGnB,OAAO,CAACoB,cAAc,EAAE;QAE5C,IAAIhB,IAAI,CAACiB,IAAI,EAAE;UACbV,GAAG,CAACW,0BAA0B,CAACvB,EAAE,EAAEmB,aAAa,CAAC,CAACjB,UAAU,EAAEG,IAAI,CAAC;UACnE;;QAGF,MAAMmB,YAAY,GAAGJ,WAAW,CAACK,iBAAiB,CAACpB,IAAI,CAAC;QACxD,MAAMqB,WAAW,GAAGF,YAAY,CAACG,iBAAiB,EAAE,CAACT,GAAG,CAAEU,CAAC,IAAKA,CAAC,CAACC,aAAa,EAAE,CAAC;QAClF,MAAMC,eAAe,GAAGJ,WAAW,CAACR,GAAG,CAAEI,IAAI,IAC3CF,WAAW,CAACW,cAAc,CAACT,IAAI,EAAEjB,IAAI,EAAEL,EAAE,CAACgC,gBAAgB,CAACC,YAAY,CAAC,CACzE,CAAClB,MAAM,CAAEV,IAAI,IAA0B,CAAC,CAACA,IAAI,CAAC;QAC/C,IAAIyB,eAAe,CAACI,MAAM,KAAK,CAAC,EAAE;QAClC,MAAMC,cAAc,GAAGL,eAAe,CAACI,MAAM,KAAK,CAAC,GACjDJ,eAAe,CAAC,CAAC,CAAE,GACnB9B,EAAE,CAACoC,OAAO,CAACC,mBAAmB,CAACP,eAAe,CAAC;QAEjDlB,GAAG,CAAC0B,uBAAuB,CAACtC,EAAE,EAAEmB,aAAa,CAAC,CAACjB,UAAU,EAAEG,IAAI,EAAE8B,cAAc,CAAC;MAClF;KACD,CAAC,CACH,CACF;EACH;CACH,CAAC;AAAA","names":["name","description","apply","ts","program","sourceFile","textRange","isConvertibleDeclaration","node","kind","SyntaxKind","FunctionDeclaration","FunctionExpression","ArrowFunction","MethodDeclaration","AST","getNodesContainingRange","Ch","filter","head","O","map","changeTracker","typeChecker","getTypeChecker","type","removeReturnTypeAnnotation","callableType","getTypeAtLocation","returnTypes","getCallSignatures","s","getReturnType","returnTypeNodes","typeToTypeNode","NodeBuilderFlags","NoTruncation","length","returnTypeNode","factory","createUnionTypeNode","addReturnTypeAnnotation"],"sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"sourcesContent":[null]}

package/refactors/toggleTypeAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";AAOA,wBAyCE"}
+{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";AAMA,wBAoCE"}