@effect/language-service 0.18.0 → 0.19.0

package/transform.js

@@ -740,9 +740,17 @@ var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
 var isSome2 = isSome;
+var match = /* @__PURE__ */ dual(2, (self, {
+  onNone,
+  onSome
+}) => isNone2(self) ? onNone() : onSome(self.value));
+var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
+var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
 
 // node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Array.js
 var fromIterable = (collection) => Array.isArray(collection) ? collection : Array.from(collection);
+var append = /* @__PURE__ */ dual(2, (self, last) => [...self, last]);
+var appendAll = /* @__PURE__ */ dual(2, (self, that) => fromIterable(self).concat(fromIterable(that)));
 var isArray = Array.isArray;
 var isEmptyArray = (self) => self.length === 0;
 var isEmptyReadonlyArray = isEmptyArray;
@@ -751,6 +759,7 @@ var sort = /* @__PURE__ */ dual(2, (self, O) => {
   out.sort(O);
   return out;
 });
+var empty = () => [];
 var map2 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
 var flatMap = /* @__PURE__ */ dual(2, (self, f) => {
   if (isEmptyReadonlyArray(self)) {
@@ -858,7 +867,7 @@ var map3 = dual(2, (fa, f) => make2((ctx) => {
   if (result._tag !== "Right") return result;
   return makeInternalSuccess(f(result.value));
 }));
-var orElse = (f) => (fa) => make2((ctx) => {
+var orElse2 = (f) => (fa) => make2((ctx) => {
   const result = fa.run(ctx);
   if (result._tag === "Left") return f(result.value).run(ctx);
   return result;
@@ -1063,10 +1072,10 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
     const sectionOverrides = {};
     const skippedRules = [];
     const regex = /@effect-diagnostics(-next-line)?((?:\s[a-zA-Z0-9/]+:(?:off|warning|error|message|suggestion|skip-file))+)?/gm;
-    let match;
-    while ((match = regex.exec(sourceFile.text)) !== null) {
-      const nextLineCaptureGroup = match[1];
-      const rulesCaptureGroup = match[2];
+    let match2;
+    while ((match2 = regex.exec(sourceFile.text)) !== null) {
+      const nextLineCaptureGroup = match2[1];
+      const rulesCaptureGroup = match2[2];
       if (rulesCaptureGroup) {
         const trimmedRuleString = rulesCaptureGroup.trim();
         if (trimmedRuleString) {
@@ -1078,7 +1087,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
               if (ruleLevel === "skip-file") skippedRules.push(ruleName);
               const isOverrideNextLine = nextLineCaptureGroup && nextLineCaptureGroup.trim().toLowerCase() === "-next-line";
               if (isOverrideNextLine) {
-                const node = findNodeWithLeadingCommentAtPosition(match.index);
+                const node = findNodeWithLeadingCommentAtPosition(match2.index);
                 if (node) {
                   lineOverrides[ruleName] = lineOverrides[ruleName] || [];
                   lineOverrides[ruleName].unshift({
@@ -1090,7 +1099,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
               } else {
                 sectionOverrides[ruleName] = sectionOverrides[ruleName] || [];
                 sectionOverrides[ruleName].unshift({
-                  pos: match.index,
+                  pos: match2.index,
                   level: ruleLevel
                 });
               }
@@ -1376,6 +1385,51 @@ var expectedAndRealType = fn("TypeCheckerApi.expectedAndRealType")(function* (so
   cache.expectedAndRealType.set(sourceFile, result);
   return result;
 });
+var appendToUniqueTypesMap = fn(
+  "TypeCheckerApi.appendToUniqueTypesMap"
+)(
+  function* (memory, initialType, excludeNever) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const newIndexes = /* @__PURE__ */ new Set();
+    const knownIndexes = /* @__PURE__ */ new Set();
+    let toTest = [initialType];
+    while (toTest.length > 0) {
+      const type = toTest.pop();
+      if (!type) break;
+      if (excludeNever && type.flags & ts.TypeFlags.Never) {
+        continue;
+      }
+      if (type.isUnion()) {
+        toTest = toTest.concat(type.types);
+      } else {
+        const foundMatch = [];
+        for (const [typeId, knownType] of memory.entries()) {
+          const areSame = typeChecker.isTypeAssignableTo(knownType, type) && typeChecker.isTypeAssignableTo(type, knownType);
+          if (areSame) {
+            foundMatch.push(typeId);
+            break;
+          }
+        }
+        if (foundMatch.length === 0) {
+          const newId = "t" + (memory.size + 1);
+          memory.set(newId, type);
+          newIndexes.add(newId);
+        } else {
+          knownIndexes.add(foundMatch[0]);
+        }
+      }
+    }
+    return {
+      newIndexes,
+      knownIndexes,
+      allIndexes: pipe(
+        fromIterable(newIndexes),
+        appendAll(fromIterable(knownIndexes))
+      )
+    };
+  }
+);
 
 // src/diagnostics/duplicatePackage.ts
 var checkedPackagesCache = /* @__PURE__ */ new Map();
@@ -1447,6 +1501,348 @@ If this is intended set the LSP config "allowedDuplicatedPackages" to ${JSON.str
   })
 });
 
+// src/core/AST.ts
+function collectSelfAndAncestorNodesInRange(node, textRange) {
+  return sync(() => {
+    let result = empty();
+    let parent = node;
+    while (parent) {
+      if (parent.end >= textRange.end) {
+        result = pipe(result, append(parent));
+      }
+      parent = parent.parent;
+    }
+    return result;
+  });
+}
+var getAncestorNodesInRange = fn("AST.getAncestorNodesInRange")(function* (sourceFile, textRange) {
+  const nodeAtPosition = yield* option(findNodeAtPosition(sourceFile, textRange.pos));
+  if (isNone2(nodeAtPosition)) return empty();
+  return yield* collectSelfAndAncestorNodesInRange(nodeAtPosition.value, textRange);
+});
+var NodeNotFoundError = class {
+  _tag = "@effect/language-service/NodeNotFoundError";
+};
+var findNodeAtPosition = fn("AST.findNodeAtPosition")(function* (sourceFile, position) {
+  const ts = yield* service(TypeScriptApi);
+  function find(node) {
+    if (position >= node.getStart() && position < node.getEnd()) {
+      return ts.forEachChild(node, find) || node;
+    }
+    return void 0;
+  }
+  const result = find(sourceFile);
+  if (!result) return yield* fail(new NodeNotFoundError());
+  return result;
+});
+var getCommentAtPosition = fn("TypeScriptApi.getCommentAtPosition")(function* (sourceFile, pos) {
+  const ts = yield* service(TypeScriptApi);
+  const token = yield* findNodeAtPosition(sourceFile, pos);
+  if (token === void 0 || token.kind === ts.SyntaxKind.JsxText || pos >= token.end - (ts.tokenToString(token.kind) || "").length) {
+    return yield* fail(new NodeNotFoundError());
+  }
+  const startPos = token.pos === 0 ? (ts.getShebang(sourceFile.text) || "").length : token.pos;
+  if (startPos === 0) return yield* fail(new NodeNotFoundError());
+  const result = ts.forEachTrailingCommentRange(sourceFile.text, startPos, isCommentInRange, pos) || ts.forEachLeadingCommentRange(sourceFile.text, startPos, isCommentInRange, pos);
+  if (!result) return yield* fail(new NodeNotFoundError());
+  return result;
+});
+function isCommentInRange(pos, end, kind, _nl, at) {
+  return at >= pos && at < end ? { pos, end, kind } : void 0;
+}
+var transformAsyncAwaitToEffectGen = fn("AST.transformAsyncAwaitToEffectGen")(
+  function* (node, effectModuleName, onAwait) {
+    const ts = yield* service(TypeScriptApi);
+    function visitor(_) {
+      if (ts.isAwaitExpression(_)) {
+        const expression = ts.visitEachChild(_.expression, visitor, ts.nullTransformationContext);
+        return ts.factory.createYieldExpression(
+          ts.factory.createToken(ts.SyntaxKind.AsteriskToken),
+          onAwait(expression)
+        );
+      }
+      return ts.visitEachChild(_, visitor, ts.nullTransformationContext);
+    }
+    const generatorBody = visitor(node.body);
+    const effectGenCallExp = yield* createEffectGenCallExpression(effectModuleName, generatorBody);
+    let currentFlags = ts.getCombinedModifierFlags(node);
+    currentFlags &= ~ts.ModifierFlags.Async;
+    const newModifiers = ts.factory.createModifiersFromModifierFlags(currentFlags);
+    if (ts.isArrowFunction(node)) {
+      return ts.factory.createArrowFunction(
+        newModifiers,
+        node.typeParameters,
+        node.parameters,
+        void 0,
+        node.equalsGreaterThanToken,
+        effectGenCallExp
+      );
+    }
+    const newBody = ts.factory.createBlock([
+      ts.factory.createReturnStatement(effectGenCallExp)
+    ]);
+    if (ts.isFunctionDeclaration(node)) {
+      return ts.factory.createFunctionDeclaration(
+        newModifiers,
+        node.asteriskToken,
+        node.name,
+        node.typeParameters,
+        node.parameters,
+        void 0,
+        newBody
+      );
+    }
+    return ts.factory.createFunctionExpression(
+      newModifiers,
+      node.asteriskToken,
+      node.name,
+      node.typeParameters,
+      node.parameters,
+      void 0,
+      newBody
+    );
+  }
+);
+var addReturnTypeAnnotation = fn("AST.addReturnTypeAnnotation")(function* (sourceFile, declaration, typeNode) {
+  const ts = yield* service(TypeScriptApi);
+  const changes = yield* service(ChangeTracker);
+  const closeParen = ts.findChildOfKind(declaration, ts.SyntaxKind.CloseParenToken, sourceFile);
+  const needParens = ts.isArrowFunction(declaration) && closeParen === void 0;
+  const endNode = needParens ? declaration.parameters[0] : closeParen;
+  if (endNode) {
+    if (needParens) {
+      changes.insertNodeBefore(
+        sourceFile,
+        endNode,
+        ts.factory.createToken(ts.SyntaxKind.OpenParenToken)
+      );
+      changes.insertNodeAfter(
+        sourceFile,
+        endNode,
+        ts.factory.createToken(ts.SyntaxKind.CloseParenToken)
+      );
+    }
+    changes.insertNodeAt(sourceFile, endNode.end, typeNode, { prefix: ": " });
+  }
+});
+var removeReturnTypeAnnotation = fn("AST.removeReturnTypeAnnotation")(function* (sourceFile, declaration) {
+  const ts = yield* service(TypeScriptApi);
+  const changes = yield* service(ChangeTracker);
+  const closeParen = ts.findChildOfKind(declaration, ts.SyntaxKind.CloseParenToken, sourceFile);
+  const needParens = ts.isArrowFunction(declaration) && closeParen === void 0;
+  const endNode = needParens ? declaration.parameters[0] : closeParen;
+  if (endNode && declaration.type) {
+    changes.deleteRange(sourceFile, { pos: endNode.end, end: declaration.type.end });
+  }
+});
+var ImportModuleIdentifierNotFoundError = class {
+  _tag = "@effect/language-service/ImportModuleIdentifierNotFoundError";
+};
+var findImportedModuleIdentifier = fn("AST.findImportedModuleIdentifier")(
+  function* (sourceFile, test) {
+    const ts = yield* service(TypeScriptApi);
+    for (const statement of sourceFile.statements) {
+      if (!ts.isImportDeclaration(statement)) continue;
+      const importClause = statement.importClause;
+      if (!importClause) continue;
+      const namedBindings = importClause.namedBindings;
+      if (!namedBindings) continue;
+      if (ts.isNamespaceImport(namedBindings)) {
+        if (yield* test(namedBindings.name, statement.moduleSpecifier, none2())) {
+          return namedBindings.name;
+        }
+      } else if (ts.isNamedImports(namedBindings)) {
+        for (const importSpecifier of namedBindings.elements) {
+          const importProperty = fromNullable(importSpecifier.propertyName).pipe(
+            orElse(() => some2(importSpecifier.name))
+          );
+          if (yield* test(importSpecifier.name, statement.moduleSpecifier, importProperty)) {
+            return importSpecifier.name;
+          }
+        }
+      }
+    }
+    return yield* fail(new ImportModuleIdentifierNotFoundError());
+  }
+);
+function findImportedModuleIdentifierByPackageAndNameOrBarrel(sourceFile, packageName, moduleName) {
+  return findImportedModuleIdentifier(
+    sourceFile,
+    fn(
+      "AST.findImportedModuleIdentifierByPackageAndNameOrBarrel.findImportedModuleIdentifier"
+    )(function* (_, fromModule, importProperty) {
+      const ts = yield* service(TypeScriptApi);
+      if (isNone2(importProperty) && ts.isStringLiteral(fromModule) && fromModule.text === packageName + "/" + moduleName) {
+        return true;
+      }
+      if (isSome2(importProperty) && ts.isIdentifier(importProperty.value) && importProperty.value.text === moduleName && ts.isStringLiteral(fromModule) && fromModule.text === packageName) {
+        return true;
+      }
+      return false;
+    })
+  );
+}
+var simplifyTypeNode = fn("AST.simplifyTypeNode")(function* (typeNode) {
+  const ts = yield* service(TypeScriptApi);
+  function collectCallable(typeNode2) {
+    if (ts.isParenthesizedTypeNode(typeNode2)) return collectCallable(typeNode2.type);
+    if (ts.isFunctionTypeNode(typeNode2)) {
+      return some2([
+        ts.factory.createCallSignature(typeNode2.typeParameters, typeNode2.parameters, typeNode2.type)
+      ]);
+    }
+    if (ts.isTypeLiteralNode(typeNode2)) {
+      const allCallSignatures = typeNode2.members.every(ts.isCallSignatureDeclaration);
+      if (allCallSignatures) {
+        return some2(typeNode2.members);
+      }
+    }
+    if (ts.isIntersectionTypeNode(typeNode2)) {
+      const members = typeNode2.types.map((node) => collectCallable(node));
+      if (members.every(isSome2)) {
+        return some2(members.map((_) => isSome2(_) ? _.value : []).flat());
+      }
+    }
+    return none2();
+  }
+  const callSignatures = collectCallable(typeNode);
+  if (isSome2(callSignatures) && callSignatures.value.length > 1) {
+    return ts.factory.createTypeLiteralNode(callSignatures.value);
+  }
+  return typeNode;
+});
+var tryPreserveDeclarationSemantics = fn("AST.tryPreserveDeclarationSemantics")(
+  function* (nodeToReplace, node) {
+    const ts = yield* service(TypeScriptApi);
+    if (!ts.isExpression(node)) return node;
+    if (ts.isFunctionDeclaration(nodeToReplace)) {
+      if (!nodeToReplace.name) return node;
+      return ts.factory.createVariableStatement(
+        nodeToReplace.modifiers,
+        ts.factory.createVariableDeclarationList(
+          [ts.factory.createVariableDeclaration(
+            nodeToReplace.name,
+            void 0,
+            void 0,
+            node
+          )],
+          ts.NodeFlags.Const
+        )
+      );
+    } else if (ts.isMethodDeclaration(nodeToReplace)) {
+      return ts.factory.createPropertyDeclaration(
+        nodeToReplace.modifiers,
+        nodeToReplace.name,
+        void 0,
+        void 0,
+        node
+      );
+    }
+    return node;
+  }
+);
+var parseAccessedExpressionForCompletion = fn(
+  "AST.parseAccessedExpressionForCompletion"
+)(
+  function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const precedingToken = ts.findPrecedingToken(position, sourceFile, void 0, true);
+    if (!precedingToken) return yield* fail(new NodeNotFoundError());
+    let accessedObject = precedingToken;
+    let replacementSpan = ts.createTextSpan(position, 0);
+    let outerNode = precedingToken;
+    if (ts.isIdentifier(precedingToken) && precedingToken.parent && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.parent.getStart(sourceFile),
+        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+      );
+      accessedObject = precedingToken.parent.expression;
+      outerNode = precedingToken.parent;
+    } else if (ts.isToken(precedingToken) && precedingToken.kind === ts.SyntaxKind.DotToken && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.parent.getStart(sourceFile),
+        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+      );
+      accessedObject = precedingToken.parent.expression;
+      outerNode = precedingToken.parent;
+    } else if (ts.isIdentifier(precedingToken) && precedingToken.parent) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.getStart(sourceFile),
+        precedingToken.end - precedingToken.getStart(sourceFile)
+      );
+      accessedObject = precedingToken;
+      outerNode = precedingToken;
+    } else {
+      return yield* fail(new NodeNotFoundError());
+    }
+    return { accessedObject, outerNode, replacementSpan };
+  }
+);
+var parseDataForExtendsClassCompletion = fn(
+  "AST.parseDataForExtendsClassCompletion"
+)(function* (sourceFile, position) {
+  const ts = yield* service(TypeScriptApi);
+  const { accessedObject, outerNode, replacementSpan } = yield* parseAccessedExpressionForCompletion(
+    sourceFile,
+    position
+  );
+  if (!ts.isIdentifier(accessedObject)) return yield* fail(new NodeNotFoundError());
+  let classDeclaration = outerNode.parent;
+  while (ts.isExpressionWithTypeArguments(classDeclaration) || ts.isHeritageClause(classDeclaration)) {
+    if (!classDeclaration.parent) break;
+    classDeclaration = classDeclaration.parent;
+  }
+  if (!ts.isClassDeclaration(classDeclaration)) return yield* fail(new NodeNotFoundError());
+  if (!classDeclaration.name) return yield* fail(new NodeNotFoundError());
+  return {
+    accessedObject,
+    classDeclaration,
+    className: classDeclaration.name,
+    replacementSpan
+  };
+});
+var createEffectGenCallExpression = fn("AST.createEffectGenCallExpression")(function* (effectModuleIdentifierName, node) {
+  const ts = yield* service(TypeScriptApi);
+  const generator = ts.factory.createFunctionExpression(
+    void 0,
+    ts.factory.createToken(ts.SyntaxKind.AsteriskToken),
+    void 0,
+    [],
+    [],
+    void 0,
+    node
+    // NOTE(mattia): intended, to use same routine for both ConciseBody and Body
+  );
+  return ts.factory.createCallExpression(
+    ts.factory.createPropertyAccessExpression(
+      ts.factory.createIdentifier(effectModuleIdentifierName),
+      "gen"
+    ),
+    void 0,
+    [generator]
+  );
+});
+var createEffectGenCallExpressionWithBlock = fn(
+  "AST.createEffectGenCallExpressionWithBlock"
+)(function* (effectModuleIdentifierName, statement) {
+  const ts = yield* service(TypeScriptApi);
+  return yield* createEffectGenCallExpression(
+    effectModuleIdentifierName,
+    ts.factory.createBlock(Array.isArray(statement) ? statement : [statement], false)
+  );
+});
+var createReturnYieldStarStatement = fn("AST.createReturnYieldStarStatement")(
+  function* (expr) {
+    const ts = yield* service(TypeScriptApi);
+    return ts.factory.createReturnStatement(
+      ts.factory.createYieldExpression(
+        ts.factory.createToken(ts.SyntaxKind.AsteriskToken),
+        expr
+      )
+    );
+  }
+);
+
 // src/utils/TypeParser.ts
 var TypeParserIssue = class {
   constructor(type, node, message) {
@@ -1466,6 +1862,13 @@ function covariantTypeArgument(type) {
   }
   return succeed(signatures[0].getReturnType());
 }
+function contravariantTypeArgument(type) {
+  const signatures = type.getCallSignatures();
+  if (signatures.length !== 1) {
+    return typeParserIssue("Contravariant type has no call signature", type);
+  }
+  return succeed(signatures[0].getTypeParameterAtPosition(0));
+}
 function invariantTypeArgument(type) {
   const signatures = type.getCallSignatures();
   if (signatures.length !== 1) {
@@ -1497,6 +1900,19 @@ var varianceStructCovariantType = fn("TypeParser.varianceStructCovariantType")(
     return yield* covariantTypeArgument(propertyType);
   }
 );
+var varianceStructContravariantType = fn(
+  "TypeParser.varianceStructContravariantType"
+)(
+  function* (type, atLocation, propertyName) {
+    const typeChecker = yield* service(TypeCheckerApi);
+    const propertySymbol = typeChecker.getPropertyOfType(type, propertyName);
+    if (!propertySymbol) {
+      return yield* typeParserIssue(`Type has no '${propertyName}' property`, type, atLocation);
+    }
+    const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
+    return yield* contravariantTypeArgument(propertyType);
+  }
+);
 var varianceStructInvariantType = fn("TypeParser.varianceStructInvariantType")(
   function* (type, atLocation, propertyName) {
     const typeChecker = yield* service(TypeCheckerApi);
@@ -1515,6 +1931,13 @@ var effectVarianceStruct = fn("TypeParser.effectVarianceStruct")(function* (type
     R: yield* varianceStructCovariantType(type, atLocation, "_R")
   };
 });
+var layerVarianceStruct = fn("TypeParser.layerVarianceStruct")(function* (type, atLocation) {
+  return {
+    ROut: yield* varianceStructContravariantType(type, atLocation, "_ROut"),
+    E: yield* varianceStructCovariantType(type, atLocation, "_E"),
+    RIn: yield* varianceStructCovariantType(type, atLocation, "_RIn")
+  };
+});
 var effectType = fn("TypeParser.effectType")(function* (type, atLocation) {
   const ts = yield* service(TypeScriptApi);
   const typeChecker = yield* service(TypeCheckerApi);
@@ -1535,6 +1958,26 @@ var effectType = fn("TypeParser.effectType")(function* (type, atLocation) {
   }
   return yield* typeParserIssue("Type has no effect variance struct", type, atLocation);
 });
+var layerType = fn("TypeParser.layerType")(function* (type, atLocation) {
+  const ts = yield* service(TypeScriptApi);
+  const typeChecker = yield* service(TypeCheckerApi);
+  yield* pipeableType(type, atLocation);
+  const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
+    (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional)
+  );
+  propertiesSymbols.sort((a, b) => b.name.indexOf("LayerTypeId") - a.name.indexOf("LayerTypeId"));
+  for (const propertySymbol of propertiesSymbols) {
+    const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
+    const varianceArgs = yield* option(layerVarianceStruct(
+      propertyType,
+      atLocation
+    ));
+    if (isSome2(varianceArgs)) {
+      return varianceArgs.value;
+    }
+  }
+  return yield* typeParserIssue("Type has no layer variance struct", type, atLocation);
+});
 var fiberType = fn("TypeParser.fiberType")(function* (type, atLocation) {
   const typeChecker = yield* service(TypeCheckerApi);
   const awaitSymbol = typeChecker.getPropertyOfType(type, "await");
@@ -1700,19 +2143,68 @@ var effectFnGen = fn("TypeParser.effectFnGen")(function* (node) {
     functionStar: generatorFunction.getFirstToken()
   };
 });
-var returnYieldEffectBlock = fn("TypeParser.returnYieldEffectBlock")(function* (body) {
+var unnecessaryEffectGen = fn("TypeParser.unnecessaryEffectGen")(function* (node) {
   const ts = yield* service(TypeScriptApi);
   const typeChecker = yield* service(TypeCheckerApi);
-  if (ts.isBlock(body) && 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);
-    yield* effectType(type, nodeToCheck);
-    return nodeToCheck;
+  const { body } = yield* effectGen(node);
+  if (body.statements.length !== 1) {
+    return yield* typeParserIssue(
+      "Generator body should have a single statement",
+      void 0,
+      node
+    );
+  }
+  let explicitReturn = false;
+  let nodeToCheck = body.statements[0];
+  while (nodeToCheck) {
+    if (ts.isReturnStatement(nodeToCheck) && nodeToCheck.expression) {
+      nodeToCheck = nodeToCheck.expression;
+      explicitReturn = true;
+      continue;
+    }
+    if (ts.isExpressionStatement(nodeToCheck)) {
+      nodeToCheck = nodeToCheck.expression;
+      continue;
+    }
+    if (ts.isYieldExpression(nodeToCheck) && nodeToCheck.asteriskToken && nodeToCheck.expression) {
+      const yieldedExpression = nodeToCheck.expression;
+      const type = typeChecker.getTypeAtLocation(yieldedExpression);
+      const { A: successType } = yield* effectType(type, yieldedExpression);
+      let replacementNode = succeed(yieldedExpression);
+      if (!explicitReturn && !(successType.flags & ts.TypeFlags.VoidLike)) {
+        replacementNode = pipe(
+          gen(function* () {
+            const effectIdentifier = pipe(
+              yield* option(
+                findImportedModuleIdentifierByPackageAndNameOrBarrel(node.getSourceFile(), "effect", "Effect")
+              ),
+              match({
+                onNone: () => "Effect",
+                onSome: (_) => _.text
+              })
+            );
+            return ts.factory.createCallExpression(
+              ts.factory.createPropertyAccessExpression(
+                ts.factory.createIdentifier(effectIdentifier),
+                "asVoid"
+              ),
+              void 0,
+              [
+                yieldedExpression
+              ]
+            );
+          }),
+          provideService(TypeScriptApi, ts)
+        );
+      }
+      return { node, body, yieldedExpression, replacementNode };
+    }
+    break;
   }
   return yield* typeParserIssue(
-    "Node is not a return statement with a yield expression",
+    "Not an handled node",
     void 0,
-    body
+    node
   );
 });
 var effectSchemaVarianceStruct = fn("TypeParser.effectSchemaVarianceStruct")(
@@ -1777,7 +2269,7 @@ var floatingEffect = createDiagnostic({
       if (isSome2(effect)) {
         const allowedFloatingEffects = yield* pipe(
           fiberType(type, node.expression),
-          orElse(() => effectSubtype(type, node.expression)),
+          orElse2(() => effectSubtype(type, node.expression)),
           option
         );
         if (isNone2(allowedFloatingEffects)) {
@@ -1829,7 +2321,7 @@ var missingEffectContext = createDiagnostic({
           valueNode,
           realType
         ),
-        orElse(() => succeed([]))
+        orElse2(() => succeed([]))
       );
       if (missingContext.length > 0) {
         effectDiagnostics.push(
@@ -1881,7 +2373,7 @@ var missingEffectError = createDiagnostic({
           valueNode,
           realType
         ),
-        orElse(() => succeed([]))
+        orElse2(() => succeed([]))
       );
       if (missingContext.length > 0) {
         effectDiagnostics.push(
@@ -1925,8 +2417,8 @@ var missingStarInYieldEffectGen = createDiagnostic({
           const effectGenNode = functionStarNode.parent;
           const effectGenLike = yield* pipe(
             effectGen(effectGenNode),
-            orElse(() => effectFnUntracedGen(effectGenNode)),
-            orElse(() => effectFnGen(effectGenNode)),
+            orElse2(() => effectFnUntracedGen(effectGenNode)),
+            orElse2(() => effectFnGen(effectGenNode)),
             option
           );
           if (isSome2(effectGenLike)) {
@@ -1974,7 +2466,7 @@ var missingStarInYieldEffectGen = createDiagnostic({
 });
 
 // src/diagnostics/unnecessaryEffectGen.ts
-var unnecessaryEffectGen = createDiagnostic({
+var unnecessaryEffectGen2 = createDiagnostic({
   name: "unnecessaryEffectGen",
   code: 5,
   apply: fn("unnecessaryEffectGen.apply")(function* (sourceFile) {
@@ -1990,13 +2482,9 @@ var unnecessaryEffectGen = createDiagnostic({
     while (nodeToVisit.length > 0) {
       const node = nodeToVisit.shift();
       ts.forEachChild(node, appendNodeToVisit);
-      const maybeNode = yield* pipe(
-        effectGen(node),
-        flatMap2(({ body }) => returnYieldEffectBlock(body)),
-        option
-      );
+      const maybeNode = yield* option(unnecessaryEffectGen(node));
       if (isSome2(maybeNode)) {
-        unnecessaryGenerators.set(node, maybeNode.value);
+        unnecessaryGenerators.set(node, maybeNode.value.replacementNode);
       }
     }
     unnecessaryGenerators.forEach(
@@ -2011,7 +2499,7 @@ var unnecessaryEffectGen = createDiagnostic({
             const textChanges = yield* service(
               ChangeTracker
             );
-            textChanges.replaceNode(sourceFile, effectGenCall, yieldedResult);
+            textChanges.replaceNode(sourceFile, effectGenCall, yield* yieldedResult);
           })
         }]
       })
@@ -2027,7 +2515,7 @@ var diagnostics = [
   missingEffectError,
   floatingEffect,
   missingStarInYieldEffectGen,
-  unnecessaryEffectGen
+  unnecessaryEffectGen2
 ];
 
 // src/transform.ts