@effect/language-service 0.71.2 → 0.72.1

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Function.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Function.js
 var isFunction = (input) => typeof input === "function";
 var dual = function(arity, body) {
   if (typeof arity === "function") {
@@ -98,7 +98,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Equivalence.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Equivalence.js
 var make = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
 var array = (item) => make((self, that) => {
   if (self.length !== that.length) {
@@ -113,7 +113,7 @@ var array = (item) => make((self, that) => {
   return true;
 });
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/GlobalValue.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/GlobalValue.js
 var globalStoreId = `effect/GlobalValue`;
 var globalStore;
 var globalValue = (id, compute) => {
@@ -127,7 +127,7 @@ var globalValue = (id, compute) => {
   return globalStore.get(id);
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Predicate.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Predicate.js
 var isString = (input) => typeof input === "string";
 var isNumber = (input) => typeof input === "number";
 var isBoolean = (input) => typeof input === "boolean";
@@ -138,10 +138,10 @@ var hasProperty = /* @__PURE__ */ dual(2, (self, property) => isObject(self) &&
 var isTagged = /* @__PURE__ */ dual(2, (self, tag) => hasProperty(self, "_tag") && self["_tag"] === tag);
 var isRecord = (input) => isRecordOrArray(input) && !Array.isArray(input);
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/errors.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/errors.js
 var getBugErrorMessage = (message) => `BUG: ${message} - please report an issue at https://github.com/Effect-TS/effect/issues`;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Utils.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var GenKindImpl = class {
   value;
@@ -263,7 +263,7 @@ var internalCall = isNotOptimizedAway ? standard.effect_internal_function : forc
 var genConstructor = function* () {
 }.constructor;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Hash.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Hash.js
 var randomHashCache = /* @__PURE__ */ globalValue(/* @__PURE__ */ Symbol.for("effect/Hash/randomHashCache"), () => /* @__PURE__ */ new WeakMap());
 var symbol = /* @__PURE__ */ Symbol.for("effect/Hash");
 var hash = (self) => {
@@ -372,7 +372,7 @@ var cached = function() {
   return hash2;
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Equal.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Equal.js
 var symbol2 = /* @__PURE__ */ Symbol.for("effect/Equal");
 function equals() {
   if (arguments.length === 1) {
@@ -428,7 +428,7 @@ function compareBoth(self, that) {
 var isEqual = (u) => hasProperty(u, symbol2);
 var equivalence = () => equals;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Inspectable.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJSON = (x) => {
   try {
@@ -486,7 +486,7 @@ var redact = (u) => {
   return u;
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Pipeable.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Pipeable.js
 var pipeArguments = (self, args2) => {
   switch (args2.length) {
     case 0:
@@ -519,16 +519,16 @@ var pipeArguments = (self, args2) => {
   }
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/opCodes/effect.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/opCodes/effect.js
 var OP_COMMIT = "Commit";
 var OP_FAILURE = "Failure";
 var OP_WITH_RUNTIME = "WithRuntime";
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/version.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/version.js
 var moduleVersion = "3.19.14";
 var getCurrentVersion = () => moduleVersion;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/effectable.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/effectable.js
 var EffectTypeId = /* @__PURE__ */ Symbol.for("effect/Effect");
 var StreamTypeId = /* @__PURE__ */ Symbol.for("effect/Stream");
 var SinkTypeId = /* @__PURE__ */ Symbol.for("effect/Sink");
@@ -615,7 +615,7 @@ var StructuralCommitPrototype = {
   ...StructuralPrototype
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/option.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/option.js
 var TypeId = /* @__PURE__ */ Symbol.for("effect/Option");
 var CommonProto = {
   ...EffectPrototype,
@@ -673,7 +673,7 @@ var some = (value) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/either.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/either.js
 var TypeId2 = /* @__PURE__ */ Symbol.for("effect/Either");
 var CommonProto2 = {
   ...EffectPrototype,
@@ -735,7 +735,7 @@ var right = (right3) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Either.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Either.js
 var right2 = right;
 var left2 = left;
 var isLeft2 = isLeft;
@@ -743,10 +743,10 @@ var isRight2 = isRight;
 var map = /* @__PURE__ */ dual(2, (self, f) => isRight2(self) ? right2(f(self.right)) : left2(self.left));
 var getOrElse = /* @__PURE__ */ dual(2, (self, onLeft) => isLeft2(self) ? onLeft(self.left) : self.right);
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/array.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Order.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Order.js
 var make2 = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 var string2 = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
 var number2 = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
@@ -760,7 +760,7 @@ var combine2 = /* @__PURE__ */ dual(2, (self, that) => make2((a1, a2) => {
 }));
 var mapInput = /* @__PURE__ */ dual(2, (self, f) => make2((b1, b2) => self(f(b1), f(b2))));
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Option.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Option.js
 var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
@@ -771,7 +771,7 @@ var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nu
 var getOrUndefined = /* @__PURE__ */ getOrElse2(constUndefined);
 var map2 = /* @__PURE__ */ dual(2, (self, f) => isNone2(self) ? none2() : some2(f(self.value)));
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Record.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Record.js
 var map3 = /* @__PURE__ */ dual(2, (self, f) => {
   const out = {
     ...self
@@ -783,7 +783,7 @@ var map3 = /* @__PURE__ */ dual(2, (self, f) => {
 });
 var keys = (self) => Object.keys(self);
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Array.js
+// ../../node_modules/.pnpm/effect@3.19.14/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)));
@@ -887,7 +887,7 @@ var dedupeWith = /* @__PURE__ */ dual(2, (self, isEquivalent) => {
 var dedupe = (self) => dedupeWith(self, equivalence());
 var join = /* @__PURE__ */ dual(2, (self, sep) => fromIterable(self).join(sep));
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Chunk.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Chunk.js
 var TypeId3 = /* @__PURE__ */ Symbol.for("effect/Chunk");
 function copy(src, srcPos, dest, destPos, len) {
   for (let i = srcPos; i < Math.min(src.length, srcPos + len); i++) {
@@ -1183,14 +1183,14 @@ var isNonEmpty = (self) => self.length > 0;
 var unsafeHead = (self) => unsafeGet2(self, 0);
 var headNonEmpty2 = unsafeHead;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/config.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/config.js
 var SIZE = 5;
 var BUCKET_SIZE = /* @__PURE__ */ Math.pow(2, SIZE);
 var MASK = BUCKET_SIZE - 1;
 var MAX_INDEX_NODE = BUCKET_SIZE / 2;
 var MIN_ARRAY_NODE = BUCKET_SIZE / 4;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/bitwise.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/bitwise.js
 function popcount(x) {
   x -= x >> 1 & 1431655765;
   x = (x & 858993459) + (x >> 2 & 858993459);
@@ -1209,13 +1209,13 @@ function fromBitmap(bitmap, bit) {
   return popcount(bitmap & bit - 1);
 }
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/stack.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/stack.js
 var make4 = (value, previous) => ({
   value,
   previous
 });
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/array.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/array.js
 function arrayUpdate(mutate3, at, v, arr) {
   let out = arr;
   if (!mutate3) {
@@ -1260,7 +1260,7 @@ function arraySpliceIn(mutate3, at, v, arr) {
   return out;
 }
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/node.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap/node.js
 var EmptyNode = class _EmptyNode {
   _tag = "EmptyNode";
   modify(edit, _shift, f, hash2, key, size4) {
@@ -1495,7 +1495,7 @@ function mergeLeaves(edit, shift, h1, n1, h2, n2) {
   }
 }
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashMap.js
 var HashMapSymbolKey = "effect/HashMap";
 var HashMapTypeId = /* @__PURE__ */ Symbol.for(HashMapSymbolKey);
 var HashMapProto = {
@@ -1707,7 +1707,7 @@ var reduce2 = /* @__PURE__ */ dual(3, (self, zero2, f) => {
   return zero2;
 });
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashSet.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/hashSet.js
 var HashSetSymbolKey = "effect/HashSet";
 var HashSetTypeId = /* @__PURE__ */ Symbol.for(HashSetSymbolKey);
 var HashSetProto = {
@@ -1769,13 +1769,13 @@ var union2 = /* @__PURE__ */ dual(2, (self, that) => mutate(empty4(), (set2) =>
 }));
 var forEach2 = /* @__PURE__ */ dual(2, (self, f) => forEach(self._keyMap, (_, k) => f(k)));
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/HashSet.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/HashSet.js
 var empty5 = empty4;
 var size3 = size2;
 var add2 = add;
 var union3 = union2;
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/data.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/data.js
 var ArrayProto = /* @__PURE__ */ Object.assign(/* @__PURE__ */ Object.create(Array.prototype), {
   [symbol]() {
     return cached(this, array2(this));
@@ -1798,7 +1798,7 @@ var Structural = /* @__PURE__ */ (function() {
   return Structural2;
 })();
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/opCodes/cause.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/opCodes/cause.js
 var OP_DIE = "Die";
 var OP_EMPTY = "Empty";
 var OP_FAIL = "Fail";
@@ -1806,7 +1806,7 @@ var OP_INTERRUPT = "Interrupt";
 var OP_PARALLEL = "Parallel";
 var OP_SEQUENTIAL = "Sequential";
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/cause.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/cause.js
 var CauseSymbolKey = "effect/Cause";
 var CauseTypeId = /* @__PURE__ */ Symbol.for(CauseSymbolKey);
 var variance = {
@@ -2238,7 +2238,7 @@ var prettyErrors = (cause) => reduceWithContext(cause, void 0, {
   sequentialCase: (_, l, r) => [...l, ...r]
 });
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/singleShotGen.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/singleShotGen.js
 var SingleShotGen2 = class _SingleShotGen {
   self;
   called = false;
@@ -2268,7 +2268,7 @@ var SingleShotGen2 = class _SingleShotGen {
   }
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/core.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/core.js
 var EffectTypeId2 = /* @__PURE__ */ Symbol.for("effect/Effect");
 var EffectPrimitive = class {
   _op;
@@ -2552,7 +2552,7 @@ var currentSpanFromFiber = (fiber) => {
   return span !== void 0 && span._tag === "Span" ? some2(span) : none2();
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Data.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Data.js
 var Class2 = Structural;
 var Error2 = /* @__PURE__ */ (function() {
   const plainArgsSymbol = /* @__PURE__ */ Symbol.for("effect/Data/Error/plainArgs");
@@ -2590,10 +2590,10 @@ var TaggedError = (tag) => {
   return O.BaseEffectError;
 };
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/common.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/common.js
 var encoder = /* @__PURE__ */ new TextEncoder();
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/base64.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/base64.js
 var encode = (bytes) => {
   const length = bytes.length;
   let result = "";
@@ -2619,13 +2619,13 @@ var encode = (bytes) => {
 };
 var base64abc = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "+", "/"];
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/base64Url.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/internal/encoding/base64Url.js
 var encode2 = (data) => encode(data).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Encoding.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Encoding.js
 var encodeBase64Url = (input) => typeof input === "string" ? encode2(encoder.encode(input)) : encode2(input);
 
-// node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Graph.js
+// ../../node_modules/.pnpm/effect@3.19.14/node_modules/effect/dist/esm/Graph.js
 var TypeId4 = "~effect/Graph";
 var Edge = class extends Class2 {
 };
@@ -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,40 @@ 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);
+      for (const version of Object.keys(resolvedPackages["effect"])) {
+        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 +5200,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
@@ -5489,10 +5541,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 +5664,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 +5897,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 +5934,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 +5973,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 +5995,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 +6015,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 +6035,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 +6096,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 +6134,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 +6174,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 +6187,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 +6225,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 +6267,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 +6294,7 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
                       }
                     }
                     return {
-                      ...parsedContextTag.value,
+                      ...parsedContextTag,
                       className: atLocation.name,
                       selfTypeNode,
                       args: wholeCall.arguments,
@@ -6252,9 +6364,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 +6489,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 +6509,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 +6517,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 +6537,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 +6560,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 +6590,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 +6619,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 +6766,14 @@ function make7(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     extendsDataTaggedError,
     extendsDataTaggedClass,
     extendsSchemaTaggedRequest,
+    extendsSchemaRequestClass,
     extendsEffectSqlModelClass,
     lazyExpression,
     emptyFunction,
     pipingFlows,
-    reconstructPipingFlow
+    reconstructPipingFlow,
+    getEffectRelatedPackages,
+    supportedEffect
   };
 }
 
@@ -7969,6 +8083,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 +8098,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 +8111,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 +8128,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 +8139,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 +8174,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 +8239,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 +8405,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 +9240,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 +10071,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 +10169,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 +11356,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 +11565,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 +11601,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 +11623,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 +11644,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: []
+                    });
+                  }
                 }
               }
             }
@@ -13256,7 +13373,7 @@ function effectTypeArgs(sourceFile, position, quickInfo2) {
   );
 }
 
-// node_modules/.pnpm/pako@2.1.0/node_modules/pako/dist/pako.esm.mjs
+// ../../node_modules/.pnpm/pako@2.1.0/node_modules/pako/dist/pako.esm.mjs
 var Z_FIXED$1 = 4;
 var Z_BINARY = 0;
 var Z_TEXT = 1;
@@ -18500,6 +18617,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 +18673,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 +18721,7 @@ var effectGenToFn = createRefactor({
               void 0,
               nodeToReplace.typeParameters,
               nodeToReplace.parameters,
-              nodeToReplace.type,
+              returnType,
               generatorFunction.body
             )].concat(pipeArgs)
           );