@effect/language-service 0.72.0 → 0.73.0

package/index.js

@@ -3414,6 +3414,13 @@ var option = (fa) => {
   nano[contE] = (_) => _ instanceof NanoDefectException ? fail3(_) : succeed(none2());
   return nano;
 };
+var orUndefined = (fa) => {
+  const nano = Object.create(MatchProto);
+  nano[args] = fa;
+  nano[contA] = (_) => succeed(_);
+  nano[contE] = (_) => _ instanceof NanoDefectException ? fail3(_) : succeed(void 0);
+  return nano;
+};
 var ignore = (fa) => {
   const nano = Object.create(MatchProto);
   nano[args] = fa;
@@ -3617,7 +3624,7 @@ function makeTypeScriptUtils(ts) {
     if (!hasProperty(packageJsonScope, "packageDirectory")) return;
     if (!isString(packageJsonScope.packageDirectory)) return;
     const { name } = packageJsonContent;
-    const version = hasProperty(packageJsonScope, "version") ? packageJsonScope.version : "";
+    const version = hasProperty(packageJsonContent, "version") ? packageJsonContent.version : "unknown";
     if (!isString(name)) return;
     if (!isString(version)) return;
     const hasEffectInPeerDependencies = hasProperty(packageJsonContent, "peerDependencies") && isObject(packageJsonContent.peerDependencies) && hasProperty(packageJsonContent.peerDependencies, "effect");
@@ -4909,6 +4916,8 @@ function makeTypeCheckerUtils(ts, typeChecker, tsUtils) {
 }
 
 // src/core/TypeParser.ts
+var checkedPackagesCache = /* @__PURE__ */ new Map();
+var programResolvedCacheSize = /* @__PURE__ */ new Map();
 var TypeParser = Tag("@effect/language-service/TypeParser");
 var nanoLayer3 = (fa) => gen(function* () {
   const ts = yield* service(TypeScriptApi);
@@ -4929,6 +4938,42 @@ function typeParserIssue(_message, _type, _node) {
   return TypeParserIssue.issue;
 }
 function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
+  function supportedEffect() {
+    for (const fileName of program.getRootFileNames()) {
+      const sourceFile = program.getSourceFile(fileName);
+      if (!sourceFile) continue;
+      const resolvedPackages = getEffectRelatedPackages(sourceFile);
+      const effectPkgs = resolvedPackages["effect"];
+      if (!effectPkgs) continue;
+      for (const version of Object.keys(effectPkgs)) {
+        if (String(version).startsWith("4")) return "v4";
+        if (String(version).startsWith("3")) return "v3";
+      }
+    }
+    return "v3";
+  }
+  function getEffectRelatedPackages(sourceFile) {
+    let resolvedPackages = checkedPackagesCache.get(sourceFile.fileName) || {};
+    const newResolvedModuleSize = hasProperty(program, "resolvedModules") && hasProperty(program.resolvedModules, "size") && isNumber(program.resolvedModules.size) ? program.resolvedModules.size : 0;
+    const oldResolvedSize = programResolvedCacheSize.get(sourceFile.fileName) || -1;
+    if (newResolvedModuleSize !== oldResolvedSize) {
+      const seenPackages = /* @__PURE__ */ new Set();
+      resolvedPackages = {};
+      program.getSourceFiles().map((_) => {
+        const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(_);
+        if (!packageInfo) return;
+        const packageNameAndVersion = packageInfo.name + "@" + packageInfo.version;
+        if (seenPackages.has(packageNameAndVersion)) return;
+        seenPackages.add(packageNameAndVersion);
+        if (!(packageInfo.name === "effect" || packageInfo.hasEffectInPeerDependencies)) return;
+        resolvedPackages[packageInfo.name] = resolvedPackages[packageInfo.name] || {};
+        resolvedPackages[packageInfo.name][packageInfo.version] = packageInfo.packageDirectory;
+      });
+      checkedPackagesCache.set(sourceFile.fileName, resolvedPackages);
+      programResolvedCacheSize.set(sourceFile.fileName, newResolvedModuleSize);
+    }
+    return resolvedPackages;
+  }
   const getSourceFilePackageInfo = cachedBy(
     fn("TypeParser.getSourceFilePackageInfo")(function* (sourceFile) {
       return tsUtils.resolveModuleWithPackageInfoFromSourceFile(program, sourceFile);
@@ -5157,19 +5202,28 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
   );
   const effectType = cachedBy(
     fn("TypeParser.effectType")(function* (type, atLocation) {
-      const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
-      );
-      if (propertiesSymbols.length === 0) {
-        return yield* typeParserIssue("Type has no effect variance struct", type, atLocation);
+      if (supportedEffect() === "v4") {
+        const typeIdSymbol = typeChecker.getPropertyOfType(type, "~effect/Effect");
+        if (typeIdSymbol) {
+          const typeIdType = typeChecker.getTypeOfSymbolAtLocation(typeIdSymbol, atLocation);
+          return yield* effectVarianceStruct(typeIdType, atLocation);
+        }
+        return yield* typeParserIssue("Type is not an effect", type, atLocation);
+      } else {
+        const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
+          (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
+        );
+        if (propertiesSymbols.length === 0) {
+          return yield* typeParserIssue("Type has no effect variance struct", type, atLocation);
+        }
+        propertiesSymbols.sort(
+          (a, b) => ts.symbolName(b).indexOf("EffectTypeId") - ts.symbolName(a).indexOf("EffectTypeId")
+        );
+        return yield* firstSuccessOf(propertiesSymbols.map((propertySymbol) => {
+          const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
+          return effectVarianceStruct(propertyType, atLocation);
+        }));
       }
-      propertiesSymbols.sort(
-        (a, b) => ts.symbolName(b).indexOf("EffectTypeId") - ts.symbolName(a).indexOf("EffectTypeId")
-      );
-      return yield* firstSuccessOf(propertiesSymbols.map((propertySymbol) => {
-        const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
-        return effectVarianceStruct(propertyType, atLocation);
-      }));
     }),
     "TypeParser.effectType",
     (type) => type
@@ -5298,7 +5352,7 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     fn("TypeParser.isEffectDataSourceFile")(function* (sourceFile) {
       const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
       if (!moduleSymbol) return yield* typeParserIssue("Node has no symbol", void 0, sourceFile);
-      const taggedEnumSymbol = typeChecker.tryGetMemberInModuleExports("TaggedEnum", moduleSymbol);
+      const taggedEnumSymbol = typeChecker.tryGetMemberInModuleExports("TaggedEnum", moduleSymbol) || typeChecker.tryGetMemberInModuleExports("taggedEnum", moduleSymbol);
       if (!taggedEnumSymbol) return yield* typeParserIssue("TaggedEnum not found", void 0, sourceFile);
       const taggedErrorSymbol = typeChecker.tryGetMemberInModuleExports("TaggedError", moduleSymbol);
       if (!taggedErrorSymbol) return yield* typeParserIssue("TaggedError not found", void 0, sourceFile);
@@ -5489,10 +5543,10 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
               }))
             )
           ),
-          option
+          orUndefined
         );
-        if (isSome2(isEffectGen)) {
-          effectGenResult = isEffectGen.value;
+        if (isEffectGen) {
+          effectGenResult = isEffectGen;
         }
       }
       if (scopeNode && effectGenResult) {
@@ -5612,6 +5666,21 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
   const effectSchemaType = cachedBy(
     fn("TypeParser.effectSchemaType")(function* (type, atLocation) {
       yield* pipeableType(type, atLocation);
+      const typeId = typeChecker.getPropertyOfType(type, "~effect/Schema/Schema");
+      if (typeId) {
+        const typeKey = typeChecker.getPropertyOfType(type, "Type");
+        const encodedKey = typeChecker.getPropertyOfType(type, "Encoded");
+        if (typeKey && encodedKey) {
+          const typeType = typeChecker.getTypeOfSymbolAtLocation(typeKey, atLocation);
+          const encodedType = typeChecker.getTypeOfSymbolAtLocation(encodedKey, atLocation);
+          return {
+            A: typeType,
+            I: encodedType,
+            R: typeChecker.getNeverType()
+          };
+        }
+        return yield* typeParserIssue("missing Type and Encoded");
+      }
       const ast = typeChecker.getPropertyOfType(type, "ast");
       if (!ast) return yield* typeParserIssue("Has no 'ast' property", type, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
@@ -5830,9 +5899,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
               if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
                 const isEffectSchemaModuleApi = yield* pipe(
                   isNodeReferenceToEffectSchemaModuleApi("Class")(schemaCall.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectSchemaModuleApi)) {
+                if (isEffectSchemaModuleApi) {
                   return {
                     className: atLocation.name,
                     selfTypeNode: schemaCall.typeArguments[0]
@@ -5867,9 +5936,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 const selfTypeNode = schemaTaggedClassTCall.typeArguments[0];
                 const isEffectSchemaModuleApi = yield* pipe(
                   isNodeReferenceToEffectSchemaModuleApi("TaggedClass")(schemaTaggedClassTCall.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectSchemaModuleApi)) {
+                if (isEffectSchemaModuleApi) {
                   return {
                     className: atLocation.name,
                     selfTypeNode,
@@ -5906,9 +5975,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 const selfTypeNode = schemaTaggedErrorTCall.typeArguments[0];
                 const isEffectSchemaModuleApi = yield* pipe(
                   isNodeReferenceToEffectSchemaModuleApi("TaggedError")(schemaTaggedErrorTCall.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectSchemaModuleApi)) {
+                if (isEffectSchemaModuleApi) {
                   return {
                     className: atLocation.name,
                     selfTypeNode,
@@ -5928,6 +5997,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
   );
   const extendsSchemaTaggedRequest = cachedBy(
     fn("TypeParser.extendsSchemaTaggedRequest")(function* (atLocation) {
+      if (supportedEffect() === "v4") {
+        return yield* typeParserIssue("Schema.TaggedClass is not supported in Effect v4", void 0, atLocation);
+      }
       if (!atLocation.name) {
         return yield* typeParserIssue("Class has no name", void 0, atLocation);
       }
@@ -5945,9 +6017,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 const selfTypeNode = schemaTaggedRequestTCall.typeArguments[0];
                 const isEffectSchemaModuleApi = yield* pipe(
                   isNodeReferenceToEffectSchemaModuleApi("TaggedRequest")(schemaTaggedRequestTCall.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectSchemaModuleApi)) {
+                if (isEffectSchemaModuleApi) {
                   return {
                     className: atLocation.name,
                     selfTypeNode,
@@ -5965,6 +6037,48 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     "TypeParser.extendsSchemaTaggedRequest",
     (atLocation) => atLocation
   );
+  const extendsSchemaRequestClass = cachedBy(
+    fn("TypeParser.extendsSchemaRequestClass")(function* (atLocation) {
+      if (supportedEffect() === "v3") {
+        return yield* typeParserIssue("Schema.RequestClass is not supported in Effect v3", void 0, atLocation);
+      }
+      if (!atLocation.name) {
+        return yield* typeParserIssue("Class has no name", void 0, atLocation);
+      }
+      const heritageClauses = atLocation.heritageClauses;
+      if (!heritageClauses) {
+        return yield* typeParserIssue("Class has no heritage clauses", void 0, atLocation);
+      }
+      for (const heritageClause of heritageClauses) {
+        for (const typeX of heritageClause.types) {
+          if (ts.isExpressionWithTypeArguments(typeX)) {
+            const expression = typeX.expression;
+            if (ts.isCallExpression(expression)) {
+              const schemaTaggedRequestTCall = expression.expression;
+              if (ts.isCallExpression(schemaTaggedRequestTCall) && schemaTaggedRequestTCall.typeArguments && schemaTaggedRequestTCall.typeArguments.length > 0) {
+                const selfTypeNode = schemaTaggedRequestTCall.typeArguments[0];
+                const isEffectSchemaModuleApi = yield* pipe(
+                  isNodeReferenceToEffectSchemaModuleApi("RequestClass")(schemaTaggedRequestTCall.expression),
+                  orUndefined
+                );
+                if (isEffectSchemaModuleApi) {
+                  return {
+                    className: atLocation.name,
+                    selfTypeNode,
+                    tagStringLiteral: void 0,
+                    keyStringLiteral: schemaTaggedRequestTCall.arguments.length > 0 && ts.isStringLiteral(schemaTaggedRequestTCall.arguments[0]) ? schemaTaggedRequestTCall.arguments[0] : void 0
+                  };
+                }
+              }
+            }
+          }
+        }
+      }
+      return yield* typeParserIssue("Class does not extend Schema.RequestClass", void 0, atLocation);
+    }),
+    "TypeParser.extendsSchemaRequestClass",
+    (atLocation) => atLocation
+  );
   const extendsDataTaggedError = cachedBy(
     fn("TypeParser.extendsDataTaggedError")(function* (atLocation) {
       if (!atLocation.name) {
@@ -5984,13 +6098,13 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
               if (ts.isPropertyAccessExpression(dataIdentifier) && ts.isIdentifier(dataIdentifier.name) && ts.idText(dataIdentifier.name) === "TaggedError") {
                 const parsedDataModule = yield* pipe(
                   importedDataModule(dataIdentifier.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(parsedDataModule)) {
+                if (parsedDataModule) {
                   return {
                     className: atLocation.name,
                     keyStringLiteral: dataTaggedErrorCall.arguments.length > 0 && ts.isStringLiteral(dataTaggedErrorCall.arguments[0]) ? dataTaggedErrorCall.arguments[0] : void 0,
-                    Data: parsedDataModule.value
+                    Data: parsedDataModule
                   };
                 }
               }
@@ -6022,13 +6136,13 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
               if (ts.isPropertyAccessExpression(dataIdentifier) && ts.isIdentifier(dataIdentifier.name) && ts.idText(dataIdentifier.name) === "TaggedClass") {
                 const parsedDataModule = yield* pipe(
                   importedDataModule(dataIdentifier.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(parsedDataModule)) {
+                if (parsedDataModule) {
                   return {
                     className: atLocation.name,
                     keyStringLiteral: dataTaggedClassCall.arguments.length > 0 && ts.isStringLiteral(dataTaggedClassCall.arguments[0]) ? dataTaggedClassCall.arguments[0] : void 0,
-                    Data: parsedDataModule.value
+                    Data: parsedDataModule
                   };
                 }
               }
@@ -6062,9 +6176,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 if (ts.isPropertyAccessExpression(contextTagIdentifier) && ts.isIdentifier(contextTagIdentifier.name) && ts.idText(contextTagIdentifier.name) === "Tag") {
                   const parsedContextModule = yield* pipe(
                     importedContextModule(contextTagIdentifier.expression),
-                    option
+                    orUndefined
                   );
-                  if (isSome2(parsedContextModule)) {
+                  if (parsedContextModule) {
                     const classSym = typeChecker.getSymbolAtLocation(atLocation.name);
                     if (!classSym) return yield* typeParserIssue("Class has no symbol", void 0, atLocation);
                     const type = typeChecker.getTypeOfSymbol(classSym);
@@ -6075,7 +6189,7 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                       keyStringLiteral: ts.isStringLiteral(contextTagCall.arguments[0]) ? contextTagCall.arguments[0] : void 0,
                       args: contextTagCall.arguments,
                       Identifier: tagType.Identifier,
-                      Tag: parsedContextModule.value
+                      Tag: parsedContextModule
                     };
                   }
                 }
@@ -6113,9 +6227,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 const selfTypeNode = wholeCall.typeArguments[0];
                 const isEffectTag = yield* pipe(
                   isNodeReferenceToEffectModuleApi("Tag")(effectTagIdentifier),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectTag)) {
+                if (isEffectTag) {
                   return {
                     className: atLocation.name,
                     selfTypeNode,
@@ -6155,17 +6269,17 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 const selfTypeNode = effectServiceCall.typeArguments[0];
                 const isEffectService = yield* pipe(
                   isNodeReferenceToEffectModuleApi("Service")(effectServiceIdentifier),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectService)) {
+                if (isEffectService) {
                   const classSym = typeChecker.getSymbolAtLocation(atLocation.name);
                   if (!classSym) return yield* typeParserIssue("Class has no symbol", void 0, atLocation);
                   const type = typeChecker.getTypeOfSymbol(classSym);
                   const parsedContextTag = yield* pipe(
                     contextTag(type, atLocation),
-                    option
+                    orUndefined
                   );
-                  if (isSome2(parsedContextTag)) {
+                  if (parsedContextTag) {
                     let accessors2 = void 0;
                     let dependencies = void 0;
                     if (wholeCall.arguments.length >= 2) {
@@ -6182,7 +6296,7 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                       }
                     }
                     return {
-                      ...parsedContextTag.value,
+                      ...parsedContextTag,
                       className: atLocation.name,
                       selfTypeNode,
                       args: wholeCall.arguments,
@@ -6252,9 +6366,9 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
               if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
                 const isEffectSchemaModuleApi = yield* pipe(
                   isNodeReferenceToEffectSqlModelModuleApi("Class")(schemaCall.expression),
-                  option
+                  orUndefined
                 );
-                if (isSome2(isEffectSchemaModuleApi)) {
+                if (isEffectSchemaModuleApi) {
                   return {
                     className: atLocation.name,
                     selfTypeNode: schemaCall.typeArguments[0]
@@ -6377,19 +6491,18 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 map8((s) => ({ _tag: "call", ...s }))
               )
             ),
-            option
+            orUndefined
           );
-          if (isSome2(parsed)) {
-            const result2 = parsed.value;
+          if (parsed) {
             let transformations;
             let flowNode;
             let childrenToTraverse = [];
-            if (result2._tag === "pipe") {
-              const signature = typeChecker.getResolvedSignature(result2.node);
+            if (parsed._tag === "pipe") {
+              const signature = typeChecker.getResolvedSignature(parsed.node);
               const typeArguments = signature ? typeChecker.getTypeArgumentsForResolvedSignature(signature) : void 0;
               transformations = [];
-              for (let i = 0; i < result2.args.length; i++) {
-                const arg = result2.args[i];
+              for (let i = 0; i < parsed.args.length; i++) {
+                const arg = parsed.args[i];
                 const outType = typeArguments?.[i + 1];
                 if (ts.isCallExpression(arg)) {
                   transformations.push({
@@ -6398,7 +6511,7 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                     args: Array.from(arg.arguments),
                     // e.g., [(x) => x + 1]
                     outType,
-                    kind: result2.kind
+                    kind: parsed.kind
                   });
                 } else {
                   transformations.push({
@@ -6406,17 +6519,17 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                     // e.g., Effect.asVoid
                     args: void 0,
                     outType,
-                    kind: result2.kind
+                    kind: parsed.kind
                   });
                 }
               }
-              flowNode = result2.node;
-              childrenToTraverse = result2.args;
+              flowNode = parsed.node;
+              childrenToTraverse = parsed.args;
             } else {
               const callSignature = typeChecker.getResolvedSignature(node);
               const outType = callSignature ? typeChecker.getReturnTypeOfSignature(callSignature) : void 0;
               transformations = [{
-                callee: result2.callee,
+                callee: parsed.callee,
                 args: void 0,
                 outType,
                 kind: "call"
@@ -6426,20 +6539,20 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
             if (parentFlow) {
               parentFlow.transformations.unshift(...transformations);
               parentFlow.subject = {
-                node: result2.subject,
-                outType: typeCheckerUtils.getTypeAtLocation(result2.subject)
+                node: parsed.subject,
+                outType: typeCheckerUtils.getTypeAtLocation(parsed.subject)
               };
-              workQueue.push([result2.subject, parentFlow]);
+              workQueue.push([parsed.subject, parentFlow]);
             } else {
               const newFlow = {
                 node: flowNode,
                 subject: {
-                  node: result2.subject,
-                  outType: typeCheckerUtils.getTypeAtLocation(result2.subject)
+                  node: parsed.subject,
+                  outType: typeCheckerUtils.getTypeAtLocation(parsed.subject)
                 },
                 transformations
               };
-              workQueue.push([result2.subject, newFlow]);
+              workQueue.push([parsed.subject, newFlow]);
             }
             for (const child of childrenToTraverse) {
               ts.forEachChild(child, (c) => {
@@ -6449,17 +6562,17 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
             continue;
           }
           if (includeEffectFn) {
-            const effectFnGenParsed = yield* pipe(effectFnGen(node), option);
-            const effectFnUntracedGenParsed = isNone2(effectFnGenParsed) ? yield* pipe(effectFnUntracedGen(node), option) : none2();
-            const effectFnNonGenParsed = isNone2(effectFnGenParsed) && isNone2(effectFnUntracedGenParsed) ? yield* pipe(effectFn(node), option) : none2();
-            const isEffectFnGen = isSome2(effectFnGenParsed);
-            const isEffectFnUntracedGen = isSome2(effectFnUntracedGenParsed);
-            const isEffectFnNonGen = isSome2(effectFnNonGenParsed);
-            const transformationKind = isEffectFnUntracedGen ? "effectFnUntraced" : "effectFn";
-            if (isEffectFnGen || isEffectFnUntracedGen) {
-              const effectFnParsed = isEffectFnGen ? effectFnGenParsed : effectFnUntracedGenParsed;
-              if (isSome2(effectFnParsed) && effectFnParsed.value.pipeArguments.length > 0) {
-                const fnResult = effectFnParsed.value;
+            const effectFnKind = yield* pipe(
+              map8(effectFnGen(node), (_) => ({ kind: "effectFnGen", ..._ })),
+              orElse2(
+                () => map8(effectFnUntracedGen(node), (_) => ({ kind: "effectFnUntracedGen", ..._ }))
+              ),
+              orElse2(() => map8(effectFn(node), (_) => ({ kind: "effectFn", ..._ }))),
+              orUndefined
+            );
+            if (effectFnKind && (effectFnKind.kind === "effectFnGen" || effectFnKind.kind === "effectFnUntracedGen")) {
+              if (effectFnKind.pipeArguments.length > 0) {
+                const fnResult = effectFnKind;
                 const pipeArgs = fnResult.pipeArguments;
                 const transformations = [];
                 let subjectType;
@@ -6479,14 +6592,14 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                       callee: arg.expression,
                       args: Array.from(arg.arguments),
                       outType,
-                      kind: transformationKind
+                      kind: effectFnKind.kind === "effectFnUntracedGen" ? "effectFnUntraced" : "effectFn"
                     });
                   } else {
                     transformations.push({
                       callee: arg,
                       args: void 0,
                       outType,
-                      kind: transformationKind
+                      kind: effectFnKind.kind === "effectFnUntracedGen" ? "effectFnUntraced" : "effectFn"
                     });
                   }
                 }
@@ -6508,8 +6621,8 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                 continue;
               }
             }
-            if (isEffectFnNonGen && isSome2(effectFnNonGenParsed) && effectFnNonGenParsed.value.pipeArguments.length > 0) {
-              const fnResult = effectFnNonGenParsed.value;
+            if (effectFnKind && effectFnKind.kind === "effectFn" && effectFnKind.pipeArguments.length > 0) {
+              const fnResult = effectFnKind;
               const pipeArgs = fnResult.pipeArguments;
               const transformations = [];
               let subjectType;
@@ -6655,11 +6768,14 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     extendsDataTaggedError,
     extendsDataTaggedClass,
     extendsSchemaTaggedRequest,
+    extendsSchemaRequestClass,
     extendsEffectSqlModelClass,
     lazyExpression,
     emptyFunction,
     pipingFlows,
-    reconstructPipingFlow
+    reconstructPipingFlow,
+    getEffectRelatedPackages,
+    supportedEffect
   };
 }
 
@@ -6670,6 +6786,7 @@ var contextSelfInClasses = createCompletion({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -7969,6 +8086,7 @@ var catchAllToMapError = createDiagnostic({
   apply: fn("catchAllToMapError.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
+    const catchAllName = typeParser.supportedEffect() === "v3" ? "catchAll" : "catch";
     const getFunctionBody = (node) => {
       if (ts.isArrowFunction(node)) {
         return node.body;
@@ -7983,10 +8101,10 @@ var catchAllToMapError = createDiagnostic({
         if (ts.isCallExpression(body)) {
           const isFailCall = yield* pipe(
             typeParser.isNodeReferenceToEffectModuleApi("fail")(body.expression),
-            option
+            orUndefined
           );
-          if (isSome2(isFailCall) && body.arguments.length >= 1) {
-            return some2({ failCall: body, failArg: body.arguments[0] });
+          if (isFailCall && body.arguments.length >= 1) {
+            return { failCall: body, failArg: body.arguments[0] };
           }
         }
         if (ts.isBlock(body)) {
@@ -7996,15 +8114,14 @@ var catchAllToMapError = createDiagnostic({
             if (ts.isReturnStatement(stmt) && stmt.expression && ts.isCallExpression(stmt.expression)) {
               const isFailCall = yield* pipe(
                 typeParser.isNodeReferenceToEffectModuleApi("fail")(stmt.expression.expression),
-                option
+                orUndefined
               );
-              if (isSome2(isFailCall) && stmt.expression.arguments.length >= 1) {
-                return some2({ failCall: stmt.expression, failArg: stmt.expression.arguments[0] });
+              if (isFailCall && stmt.expression.arguments.length >= 1) {
+                return { failCall: stmt.expression, failArg: stmt.expression.arguments[0] };
               }
             }
           }
         }
-        return none2();
       });
     };
     const flows = yield* typeParser.pipingFlows(true)(sourceFile);
@@ -8014,10 +8131,10 @@ var catchAllToMapError = createDiagnostic({
           continue;
         }
         const isCatchAllCall = yield* pipe(
-          typeParser.isNodeReferenceToEffectModuleApi("catchAll")(transformation.callee),
-          option
+          typeParser.isNodeReferenceToEffectModuleApi(catchAllName)(transformation.callee),
+          orUndefined
         );
-        if (isNone2(isCatchAllCall)) {
+        if (!isCatchAllCall) {
           continue;
         }
         const callback = transformation.args[0];
@@ -8025,11 +8142,11 @@ var catchAllToMapError = createDiagnostic({
         const functionBody = getFunctionBody(callback);
         if (!functionBody) continue;
         const failCallInfo = yield* getEffectFailCallInfo(functionBody);
-        if (isNone2(failCallInfo)) continue;
-        const { failArg, failCall } = failCallInfo.value;
+        if (!failCallInfo) continue;
+        const { failArg, failCall } = failCallInfo;
         report({
           location: transformation.callee,
-          messageText: `You can use Effect.mapError instead of Effect.catchAll + Effect.fail to transform the error type.`,
+          messageText: `You can use Effect.mapError instead of Effect.${catchAllName} + Effect.fail to transform the error type.`,
           fixes: [{
             fixName: "catchAllToMapError_fix",
             description: "Replace with Effect.mapError",
@@ -8060,7 +8177,7 @@ var catchUnfailableEffect = createDiagnostic({
   apply: fn("catchUnfailableEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
-    const catchFunctions = ["catchAll", "catch", "catchIf", "catchSome", "catchTag", "catchTags"];
+    const catchFunctions = typeParser.supportedEffect() === "v3" ? ["catchAll", "catch", "catchIf", "catchSome", "catchTag", "catchTags"] : ["catch", "catchIf", "catchTag", "catchTags"];
     const flows = yield* typeParser.pipingFlows(true)(sourceFile);
     for (const flow2 of flows) {
       for (let i = 0; i < flow2.transformations.length; i++) {
@@ -8125,7 +8242,12 @@ var classSelfMismatch = createDiagnostic({
           orElse2(() => typeParser.extendsSchemaClass(node)),
           orElse2(() => typeParser.extendsSchemaTaggedClass(node)),
           orElse2(() => typeParser.extendsSchemaTaggedError(node)),
-          orElse2(() => typeParser.extendsSchemaTaggedRequest(node)),
+          orElse2(
+            () => pipe(
+              typeParser.extendsSchemaTaggedRequest(node),
+              orElse2(() => typeParser.extendsSchemaRequestClass(node))
+            )
+          ),
           orElse2(() => typeParser.extendsEffectSqlModelClass(node)),
           orElse2(() => void_)
         );
@@ -8286,39 +8408,18 @@ var deterministicKeys = createDiagnostic({
 });
 
 // src/diagnostics/duplicatePackage.ts
-var checkedPackagesCache = /* @__PURE__ */ new Map();
-var programResolvedCacheSize = /* @__PURE__ */ new Map();
 var duplicatePackage = createDiagnostic({
   name: "duplicatePackage",
   code: 6,
   description: "Detects when multiple versions of the same Effect package are loaded",
   severity: "warning",
   apply: fn("duplicatePackage.apply")(function* (sourceFile, report) {
-    const program = yield* service(TypeScriptProgram);
-    const tsUtils = yield* service(TypeScriptUtils);
+    const typeParser = yield* service(TypeParser);
     const options = yield* service(LanguageServicePluginOptions);
     if (sourceFile.statements.length < 1) return;
-    let resolvedPackages = checkedPackagesCache.get(sourceFile.fileName) || {};
-    const newResolvedModuleSize = hasProperty(program, "resolvedModules") && hasProperty(program.resolvedModules, "size") && isNumber(program.resolvedModules.size) ? program.resolvedModules.size : 0;
-    const oldResolvedSize = programResolvedCacheSize.get(sourceFile.fileName) || -1;
-    if (newResolvedModuleSize !== oldResolvedSize) {
-      const seenPackages = /* @__PURE__ */ new Set();
-      resolvedPackages = {};
-      program.getSourceFiles().map((_) => {
-        const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(_);
-        if (!packageInfo) return;
-        const packageNameAndVersion = packageInfo.name + "@" + packageInfo.version;
-        if (seenPackages.has(packageNameAndVersion)) return;
-        seenPackages.add(packageNameAndVersion);
-        if (!(packageInfo.name === "effect" || packageInfo.hasEffectInPeerDependencies)) return;
-        if (options.allowedDuplicatedPackages.indexOf(packageInfo.name) > -1) return;
-        resolvedPackages[packageInfo.name] = resolvedPackages[packageInfo.name] || {};
-        resolvedPackages[packageInfo.name][packageInfo.version] = packageInfo.packageDirectory;
-      });
-      checkedPackagesCache.set(sourceFile.fileName, resolvedPackages);
-      programResolvedCacheSize.set(sourceFile.fileName, newResolvedModuleSize);
-    }
+    const resolvedPackages = typeParser.getEffectRelatedPackages(sourceFile);
     for (const packageName of Object.keys(resolvedPackages)) {
+      if (options.allowedDuplicatedPackages.indexOf(packageName) > -1) return;
       if (Object.keys(resolvedPackages[packageName]).length > 1) {
         const versions = Object.keys(resolvedPackages[packageName]);
         report({
@@ -9142,23 +9243,25 @@ var globalErrorInEffectCatch = createDiagnostic({
         if (isEffectWithCatch) {
           const signature = typeChecker.getResolvedSignature(node);
           if (signature) {
-            const objectType = typeChecker.getParameterType(signature, 0);
-            const catchFunctionSymbol = typeChecker.getPropertyOfType(objectType, "catch");
-            if (catchFunctionSymbol) {
-              const catchFunctionType = typeChecker.getTypeOfSymbolAtLocation(catchFunctionSymbol, node);
-              const signatures = typeChecker.getSignaturesOfType(catchFunctionType, ts.SignatureKind.Call);
-              if (signatures.length > 0) {
-                const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
-                if (returnType && typeCheckerUtils.isGlobalErrorType(returnType)) {
-                  const nodeText = sourceFile.text.substring(
-                    ts.getTokenPosOfNode(node.expression, sourceFile),
-                    node.expression.end
-                  );
-                  report({
-                    location: node.expression,
-                    messageText: `The 'catch' callback in ${nodeText} returns global 'Error', which loses type safety as untagged errors merge together. Consider using a tagged error and optionally wrapping the original in a 'cause' property.`,
-                    fixes: []
-                  });
+            const firstParameterType = typeChecker.getParameterType(signature, 0);
+            for (const objectType of typeCheckerUtils.unrollUnionMembers(firstParameterType)) {
+              const catchFunctionSymbol = typeChecker.getPropertyOfType(objectType, "catch");
+              if (catchFunctionSymbol) {
+                const catchFunctionType = typeChecker.getTypeOfSymbolAtLocation(catchFunctionSymbol, node);
+                const signatures = typeChecker.getSignaturesOfType(catchFunctionType, ts.SignatureKind.Call);
+                if (signatures.length > 0) {
+                  const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
+                  if (returnType && typeCheckerUtils.isGlobalErrorType(returnType)) {
+                    const nodeText = sourceFile.text.substring(
+                      ts.getTokenPosOfNode(node.expression, sourceFile),
+                      node.expression.end
+                    );
+                    report({
+                      location: node.expression,
+                      messageText: `The 'catch' callback in ${nodeText} returns global 'Error', which loses type safety as untagged errors merge together. Consider using a tagged error and optionally wrapping the original in a 'cause' property.`,
+                      fixes: []
+                    });
+                  }
                 }
               }
             }
@@ -9971,22 +10074,23 @@ var missingEffectError = createDiagnostic({
           map8((result) => {
             if (result.missingErrorTypes.length === 0) return;
             const fixes = [];
-            if (ts.isExpression(valueNode) && result.expectedErrorType.flags & ts.TypeFlags.Never) {
+            const catchAllErrorsName = typeParser.supportedEffect() === "v3" ? "catchAll" : "catch";
+            if (ts.isExpression(valueNode) && result.expectedErrorType.flags & ts.TypeFlags.Never && catchAllErrorsName) {
               fixes.push({
-                fixName: "missingEffectError_catchAll",
-                description: "Catch all errors with Effect.catchAll",
+                fixName: `missingEffectError_${catchAllErrorsName}`,
+                description: `Catch all errors with Effect.${catchAllErrorsName}`,
                 apply: gen(function* () {
                   const changeTracker = yield* service(ChangeTracker);
                   changeTracker.insertText(
                     sourceFile,
                     ts.getTokenPosOfNode(valueNode, sourceFile),
-                    effectModuleIdentifier + ".catchAll("
+                    effectModuleIdentifier + `.${catchAllErrorsName}(`
                   );
                   changeTracker.insertText(sourceFile, valueNode.end, ", () => ");
                   changeTracker.insertNodeAt(
                     sourceFile,
                     valueNode.end,
-                    createDieMessage("TODO: catchAll not implemented")
+                    createDieMessage(`TODO: ${catchAllErrorsName} not implemented`)
                   );
                   changeTracker.insertText(sourceFile, valueNode.end, ")");
                 })
@@ -10068,6 +10172,7 @@ var missingEffectServiceDependency = createDiagnostic({
     const typeChecker = yield* service(TypeCheckerApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() !== "v3") return;
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
       nodeToVisit.push(node);
@@ -11254,6 +11359,7 @@ var scopeInLayerEffect = createDiagnostic({
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
+    if (typeParser.supportedEffect() !== "v3") return;
     const layerModuleIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
       sourceFile,
       "effect",
@@ -11462,6 +11568,17 @@ var tryCatchInEffectGen = createDiagnostic({
   apply: fn("tryCatchInEffectGen.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
+    const alternatives = typeParser.supportedEffect() === "v4" ? [
+      "Effect.try",
+      "Effect.tryPromise",
+      "Effect.catch",
+      "Effect.catchTag"
+    ] : [
+      "Effect.try",
+      "Effect.tryPromise",
+      "Effect.catchAll",
+      "Effect.catchTag"
+    ];
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
       nodeToVisit.push(node);
@@ -11487,7 +11604,7 @@ var tryCatchInEffectGen = createDiagnostic({
             map8(() => {
               report({
                 location: node,
-                messageText: "Avoid using try/catch inside Effect generators. Use Effect's error handling mechanisms instead (e.g., Effect.try, Effect.tryPromise, Effect.catchAll, Effect.catchTag).",
+                messageText: `Avoid using try/catch inside Effect generators. Use Effect's error handling mechanisms instead (e.g. ${alternatives.join(", ")}).`,
                 fixes: []
               });
             }),
@@ -11509,6 +11626,7 @@ var unknownInEffectCatch = createDiagnostic({
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
       nodeToVisit.push(node);
@@ -11529,24 +11647,26 @@ var unknownInEffectCatch = createDiagnostic({
         if (isEffectWithCatch) {
           const signature = typeChecker.getResolvedSignature(node);
           if (signature) {
-            const objectType = typeChecker.getParameterType(signature, 0);
-            const catchFunctionSymbol = typeChecker.getPropertyOfType(objectType, "catch");
-            if (catchFunctionSymbol) {
-              const catchFunctionType = typeChecker.getTypeOfSymbolAtLocation(catchFunctionSymbol, node);
-              const signatures = typeChecker.getSignaturesOfType(catchFunctionType, ts.SignatureKind.Call);
-              if (signatures.length > 0) {
-                const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
-                if (returnType && (returnType.flags & ts.TypeFlags.Unknown || returnType.flags & ts.TypeFlags.Any)) {
-                  const nodeText = sourceFile.text.substring(
-                    ts.getTokenPosOfNode(node.expression, sourceFile),
-                    node.expression.end
-                  );
-                  report({
-                    location: node.expression,
-                    messageText: `The 'catch' callback in ${nodeText} returns 'unknown'. The catch callback should be used to provide typed errors.
+            const parameterType = typeChecker.getParameterType(signature, 0);
+            for (const objectType of typeCheckerUtils.unrollUnionMembers(parameterType)) {
+              const catchFunctionSymbol = typeChecker.getPropertyOfType(objectType, "catch");
+              if (catchFunctionSymbol) {
+                const catchFunctionType = typeChecker.getTypeOfSymbolAtLocation(catchFunctionSymbol, node);
+                const signatures = typeChecker.getSignaturesOfType(catchFunctionType, ts.SignatureKind.Call);
+                if (signatures.length > 0) {
+                  const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
+                  if (returnType && (returnType.flags & ts.TypeFlags.Unknown || returnType.flags & ts.TypeFlags.Any)) {
+                    const nodeText = sourceFile.text.substring(
+                      ts.getTokenPosOfNode(node.expression, sourceFile),
+                      node.expression.end
+                    );
+                    report({
+                      location: node.expression,
+                      messageText: `The 'catch' callback in ${nodeText} returns 'unknown'. The catch callback should be used to provide typed errors.
 Consider wrapping unknown errors into Effect's Data.TaggedError for example, or narrow down the type to the specific error raised.`,
-                    fixes: []
-                  });
+                      fixes: []
+                    });
+                  }
                 }
               }
             }
@@ -11982,50 +12102,90 @@ var effectSchemaSelfInClasses = createCompletion({
         isSnippet: true
       });
     }
-    const hasTaggedErrorCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedError")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedErrorCompletion) {
-      completions2.push({
-        name: `TaggedError<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}` : `TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedErrorCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedError")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedErrorCompletion) {
+        completions2.push({
+          name: `TaggedError<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}` : `TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTaggedClassCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedClass")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedClassCompletion) {
-      completions2.push({
-        name: `TaggedClass<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedClass<${name}>()("${name}", {${"${0}"}}){}` : `TaggedClass<${name}>()("${name}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedClass")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedClassCompletion) {
+        completions2.push({
+          name: `TaggedClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedClass<${name}>()("${name}", {${"${0}"}}){}` : `TaggedClass<${name}>()("${name}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTaggedRequestCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedRequest")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedRequestCompletion) {
-      completions2.push({
-        name: `TaggedRequest<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedRequest<${name}>()("${name}", {${"${0}"}}){}` : `TaggedRequest<${name}>()("${name}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedRequestCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedRequest")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedRequestCompletion) {
+        completions2.push({
+          name: `TaggedRequest<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedRequest<${name}>()("${name}", {${"${0}"}}){}` : `TaggedRequest<${name}>()("${name}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
+    }
+    if (typeParser.supportedEffect() === "v4") {
+      const hasErrorClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("ErrorClass")(accessedObject),
+          option
+        )
+      );
+      if (hasErrorClassCompletion) {
+        completions2.push({
+          name: `ErrorClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.ErrorClass<${name}>()({${"${0}"}}){}` : `ErrorClass<${name}>()({${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
+    }
+    if (typeParser.supportedEffect() === "v4") {
+      const hasRequestClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("RequestClass")(accessedObject),
+          option
+        )
+      );
+      if (hasRequestClassCompletion) {
+        completions2.push({
+          name: `RequestClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.RequestClass<${name}>("${name}")({${"${0}"}}){}` : `RequestClass<${name}>("${name}")({${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
     return completions2;
   })
@@ -12050,35 +12210,39 @@ var effectSelfInClasses = createCompletion({
     const name = ts.idText(className);
     const tagKey = (yield* createString(sourceFile, name, "service")) || name;
     const completions2 = [];
-    const hasServiceCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectModuleApi("Service")(accessedObject),
-        option
-      )
-    );
-    if (hasServiceCompletion) {
-      completions2.push({
-        name: `Service<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${effectIdentifier}.Service<${name}>()("${tagKey}", {${"${0}"}}){}` : `Service<${name}>()("${tagKey}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasServiceCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("Service")(accessedObject),
+          option
+        )
+      );
+      if (hasServiceCompletion) {
+        completions2.push({
+          name: `Service<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${effectIdentifier}.Service<${name}>()("${tagKey}", {${"${0}"}}){}` : `Service<${name}>()("${tagKey}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTagCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectModuleApi("Tag")(accessedObject),
-        option
-      )
-    );
-    if (hasTagCompletion) {
-      completions2.push({
-        name: `Tag("${name}")`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${effectIdentifier}.Tag("${tagKey}")<${name}, {${"${0}"}}>(){}` : `Tag("${tagKey}")<${name}, {${"${0}"}}>(){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTagCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("Tag")(accessedObject),
+          option
+        )
+      );
+      if (hasTagCompletion) {
+        completions2.push({
+          name: `Tag("${name}")`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${effectIdentifier}.Tag("${tagKey}")<${name}, {${"${0}"}}>(){}` : `Tag("${tagKey}")<${name}, {${"${0}"}}>(){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
     return completions2;
   })
@@ -12091,6 +12255,7 @@ var effectSqlModelSelfInClasses = createCompletion({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -12207,6 +12372,8 @@ var rpcMakeClasses = createCompletion({
   apply: fn("rpcMakeClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
+    const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -12233,6 +12400,8 @@ var schemaBrand = createCompletion({
   apply: fn("schemaBrand")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
+    const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseAccessedExpressionForCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject } = maybeInfos;
@@ -18500,6 +18669,12 @@ var effectGenToFn = createRefactor({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeParser = yield* service(TypeParser);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
+    const effectIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
+      sourceFile,
+      "effect",
+      "Effect"
+    ) || "Effect";
     const skipReturnBlock = (node) => ts.isBlock(node) && node.statements.length === 1 && ts.isReturnStatement(node.statements[0]) && node.statements[0].expression ? node.statements[0].expression : node;
     const parseFunctionLikeReturnEffectGen = fn("parseFunctionLikeReturnEffect.apply")(function* (node) {
       if ((ts.isArrowFunction(node) || ts.isMethodDeclaration(node) || ts.isFunctionDeclaration(node)) && node.body) {
@@ -18550,6 +18725,45 @@ var effectGenToFn = createRefactor({
             effectModule,
             "fn"
           );
+          let returnType = void 0;
+          if (nodeToReplace.type) {
+            const actualType = typeCheckerUtils.getTypeAtLocation(nodeToReplace.type);
+            if (actualType) {
+              const maybeType = yield* pipe(
+                typeParser.strictEffectType(actualType, nodeToReplace.type),
+                orUndefined
+              );
+              if (maybeType) {
+                const aType = typeCheckerUtils.typeToSimplifiedTypeNode(
+                  maybeType.A,
+                  nodeToReplace,
+                  ts.NodeBuilderFlags.NoTruncation
+                );
+                const eType = typeCheckerUtils.typeToSimplifiedTypeNode(
+                  maybeType.E,
+                  nodeToReplace,
+                  ts.NodeBuilderFlags.NoTruncation
+                );
+                const rType = typeCheckerUtils.typeToSimplifiedTypeNode(
+                  maybeType.R,
+                  nodeToReplace,
+                  ts.NodeBuilderFlags.NoTruncation
+                );
+                if (aType && eType && rType) {
+                  returnType = ts.factory.createTypeReferenceNode(
+                    ts.factory.createQualifiedName(
+                      ts.factory.createQualifiedName(
+                        ts.factory.createIdentifier(effectIdentifier),
+                        ts.factory.createIdentifier("fn")
+                      ),
+                      ts.factory.createIdentifier("Return")
+                    ),
+                    [aType, eType, rType]
+                  );
+                }
+              }
+            }
+          }
           const effectFnCallWithGenerator = ts.factory.createCallExpression(
             effectFn,
             void 0,
@@ -18559,7 +18773,7 @@ var effectGenToFn = createRefactor({
               void 0,
               nodeToReplace.typeParameters,
               nodeToReplace.parameters,
-              nodeToReplace.type,
+              returnType,
               generatorFunction.body
             )].concat(pipeArgs)
           );