@effect/language-service 0.6.2 → 0.7.1

package/index.js

@@ -982,20 +982,52 @@ var dedupeWith = /* @__PURE__ */ dual(2, (self, isEquivalent) => {
 });
 
 // src/utils/AST.ts
-function getNodesContainingRange(ts) {
+function collectSelfAndAncestorNodesInRange(node, textRange) {
+  let result = empty();
+  let parent = node;
+  while (parent) {
+    if (parent.end >= textRange.end) {
+      result = pipe(result, append(parent));
+    }
+    parent = parent.parent;
+  }
+  return result;
+}
+function getAncestorNodesInRange(ts) {
   return (sourceFile, textRange) => {
     const precedingToken = ts.findPrecedingToken(textRange.pos, sourceFile);
     if (!precedingToken) return empty();
-    let result = empty();
-    let parent = precedingToken;
-    while (parent) {
-      if (parent.end >= textRange.end) {
-        result = pipe(result, append(parent));
+    return collectSelfAndAncestorNodesInRange(precedingToken, textRange);
+  };
+}
+function findNodeAtPosition(ts, sourceFile, position) {
+  function find(node) {
+    if (position >= node.getStart() && position < node.getEnd()) {
+      return ts.forEachChild(node, find) || node;
+    }
+    return void 0;
+  }
+  return fromNullable(find(sourceFile));
+}
+function collectDescendantsAndAncestorsInRange(ts, sourceFile, textRange) {
+  const nodeAtPosition = findNodeAtPosition(ts, sourceFile, textRange.pos);
+  if (isNone2(nodeAtPosition)) return empty();
+  return collectSelfAndAncestorNodesInRange(nodeAtPosition.value, textRange);
+}
+function getSingleReturnEffectFromEffectGen(ts, typeChecker, node) {
+  const effectGenLike = effectGen(ts, typeChecker)(node);
+  if (isSome2(effectGenLike)) {
+    const body = effectGenLike.value.body;
+    if (body.statements.length === 1 && ts.isReturnStatement(body.statements[0]) && body.statements[0].expression && ts.isYieldExpression(body.statements[0].expression) && body.statements[0].expression.expression) {
+      const nodeToCheck = body.statements[0].expression.expression;
+      const type = typeChecker.getTypeAtLocation(nodeToCheck);
+      const maybeEffect = effectType(ts, typeChecker)(type, nodeToCheck);
+      if (isSome2(maybeEffect)) {
+        return some2(nodeToCheck);
       }
-      parent = parent.parent;
     }
-    return result;
-  };
+  }
+  return none2();
 }
 function toTextRange(positionOrRange) {
   return typeof positionOrRange === "number" ? { end: positionOrRange, pos: positionOrRange } : positionOrRange;
@@ -1492,17 +1524,8 @@ var unnecessaryEffectGen = createDiagnostic({
     const effectDiagnostics = [];
     const brokenGenerators = /* @__PURE__ */ new Set();
     const visit = (node) => {
-      const effectGenLike = effectGen(ts, typeChecker)(node);
-      if (isSome2(effectGenLike)) {
-        const body = effectGenLike.value.body;
-        if (body.statements.length === 1 && ts.isReturnStatement(body.statements[0]) && body.statements[0].expression && ts.isYieldExpression(body.statements[0].expression) && body.statements[0].expression.expression) {
-          const nodeToCheck = body.statements[0].expression.expression;
-          const type = typeChecker.getTypeAtLocation(nodeToCheck);
-          const maybeEffect = effectType(ts, typeChecker)(type, nodeToCheck);
-          if (isSome2(maybeEffect)) {
-            brokenGenerators.add(node);
-          }
-        }
+      if (isSome2(getSingleReturnEffectFromEffectGen(ts, typeChecker, node))) {
+        brokenGenerators.add(node);
       }
       ts.forEachChild(node, visit);
     };
@@ -1561,7 +1584,7 @@ function prependEffectTypeArguments(ts, program) {
     if (!hasTruncationHappened) return quickInfo;
     const typeChecker = program.getTypeChecker();
     const effectTypeArgsDocumentation = pipe(
-      getNodesContainingRange(ts)(sourceFile, toTextRange(position)),
+      getAncestorNodesInRange(ts)(sourceFile, toTextRange(position)),
       head,
       flatMap(
         (_) => effectType(ts, typeChecker)(typeChecker.getTypeAtLocation(_), _)
@@ -1590,7 +1613,7 @@ var asyncAwaitToGen = createRefactor({
   name: "effect/asyncAwaitToGen",
   description: "Convert to Effect.gen",
   apply: (ts, program) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     filter(
       (node) => ts.isFunctionDeclaration(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node)
     ),
@@ -1648,7 +1671,7 @@ var asyncAwaitToGenTryPromise = createRefactor({
   name: "effect/asyncAwaitToGenTryPromise",
   description: "Convert to Effect.gen with failures",
   apply: (ts, program) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     filter(
       (node) => ts.isFunctionDeclaration(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node)
     ),
@@ -1736,7 +1759,7 @@ var effectGenToFn = createRefactor({
   name: "effect/effectGenToFn",
   description: "Convert to Effect.fn",
   apply: (ts, program) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     findFirst2(
       (node) => gen(function* () {
         const effectGen2 = yield* effectGen(ts, program.getTypeChecker())(node);
@@ -1809,12 +1832,12 @@ var functionToArrow = createRefactor({
   description: "Convert to arrow",
   apply: (ts) => (sourceFile, textRange) => pipe(
     pipe(
-      getNodesContainingRange(ts)(sourceFile, textRange),
+      getAncestorNodesInRange(ts)(sourceFile, textRange),
       filter(ts.isFunctionDeclaration)
     ),
     appendAll(
       pipe(
-        getNodesContainingRange(ts)(sourceFile, textRange),
+        getAncestorNodesInRange(ts)(sourceFile, textRange),
         filter(ts.isMethodDeclaration)
       )
     ),
@@ -1886,7 +1909,7 @@ var pipeableToDatafirst = createRefactor({
   name: "effect/pipeableToDatafirst",
   description: "Rewrite to datafirst",
   apply: (ts, program) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     filter(isPipeCall(ts)),
     filter((node) => isNodeInRange(textRange)(node.expression)),
     filter(
@@ -1931,12 +1954,41 @@ var pipeableToDatafirst = createRefactor({
   )
 });
 
+// src/refactors/removeUnnecessaryEffectGen.ts
+var removeUnnecessaryEffectGen = createRefactor({
+  name: "effect/removeUnnecessaryEffectGen",
+  description: "Remove unnecessary Effect.gen",
+  apply: (ts, program) => (sourceFile, textRange) => {
+    const typeChecker = program.getTypeChecker();
+    return pipe(
+      collectDescendantsAndAncestorsInRange(ts, sourceFile, textRange),
+      findFirst2(
+        (node) => gen(function* () {
+          const returnedYieldedEffect = yield* getSingleReturnEffectFromEffectGen(
+            ts,
+            typeChecker,
+            node
+          );
+          return { nodeToReplace: node, returnedYieldedEffect };
+        })
+      ),
+      map((a) => ({
+        kind: "refactor.rewrite.effect.removeUnnecessaryEffectGen",
+        description: "Remove unnecessary Effect.gen",
+        apply: (changeTracker) => {
+          changeTracker.replaceNode(sourceFile, a.nodeToReplace, a.returnedYieldedEffect);
+        }
+      }))
+    );
+  }
+});
+
 // src/refactors/toggleLazyConst.ts
 var toggleLazyConst = createRefactor({
   name: "effect/toggleLazyConst",
   description: "Toggle type annotation",
   apply: (ts) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     filter(ts.isVariableDeclaration),
     filter((node) => isNodeInRange(textRange)(node.name)),
     filter(
@@ -1975,7 +2027,7 @@ var toggleReturnTypeAnnotation = createRefactor({
     return gen(function* () {
       const typeChecker = program.getTypeChecker();
       const node = yield* pipe(
-        getNodesContainingRange(ts)(sourceFile, textRange),
+        getAncestorNodesInRange(ts)(sourceFile, textRange),
         filter(
           (node2) => ts.isFunctionDeclaration(node2) || ts.isFunctionExpression(node2) || ts.isArrowFunction(node2) || ts.isMethodDeclaration(node2)
         ),
@@ -2012,7 +2064,7 @@ var toggleTypeAnnotation = createRefactor({
   name: "effect/toggleTypeAnnotation",
   description: "Toggle type annotation",
   apply: (ts, program) => (sourceFile, textRange) => pipe(
-    getNodesContainingRange(ts)(sourceFile, textRange),
+    getAncestorNodesInRange(ts)(sourceFile, textRange),
     filter(
       (node) => ts.isVariableDeclaration(node) || ts.isPropertyDeclaration(node)
     ),
@@ -2084,6 +2136,7 @@ var refactors = {
   asyncAwaitToGenTryPromise,
   functionToArrow,
   pipeableToDatafirst,
+  removeUnnecessaryEffectGen,
   toggleLazyConst,
   toggleReturnTypeAnnotation,
   toggleTypeAnnotation,