@effect/language-service 0.35.2 → 0.37.0

package/transform.js

@@ -24,7 +24,7 @@ __export(transform_exports, {
 });
 module.exports = __toCommonJS(transform_exports);
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Function.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Function.js
 var isFunction = (input) => typeof input === "function";
 var dual = function(arity, body) {
   if (typeof arity === "function") {
@@ -118,7 +118,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/GlobalValue.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/GlobalValue.js
 var globalStoreId = `effect/GlobalValue`;
 var globalStore;
 var globalValue = (id, compute) => {
@@ -132,7 +132,7 @@ var globalValue = (id, compute) => {
   return globalStore.get(id);
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Predicate.js
+// node_modules/.pnpm/effect@3.17.8/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";
@@ -142,7 +142,7 @@ var isObject = (input) => isRecordOrArray(input) || isFunction2(input);
 var hasProperty = /* @__PURE__ */ dual(2, (self, property) => isObject(self) && property in self);
 var isRecord = (input) => isRecordOrArray(input) && !Array.isArray(input);
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Utils.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var GenKindImpl = class {
   value;
@@ -264,7 +264,7 @@ var internalCall = isNotOptimizedAway ? standard.effect_internal_function : forc
 var genConstructor = function* () {
 }.constructor;
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Hash.js
+// node_modules/.pnpm/effect@3.17.8/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) => {
@@ -331,10 +331,10 @@ var string = (str) => {
   }
   return optimize(h);
 };
-var structureKeys = (o, keys) => {
+var structureKeys = (o, keys2) => {
   let h = 12289;
-  for (let i = 0; i < keys.length; i++) {
-    h ^= pipe(string(keys[i]), combine(hash(o[keys[i]])));
+  for (let i = 0; i < keys2.length; i++) {
+    h ^= pipe(string(keys2[i]), combine(hash(o[keys2[i]])));
   }
   return optimize(h);
 };
@@ -363,7 +363,7 @@ var cached = function() {
   return hash2;
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Equal.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Equal.js
 var symbol2 = /* @__PURE__ */ Symbol.for("effect/Equal");
 function equals() {
   if (arguments.length === 1) {
@@ -417,7 +417,7 @@ function compareBoth(self, that) {
 var isEqual = (u) => hasProperty(u, symbol2);
 var equivalence = () => equals;
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Inspectable.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJSON = (x) => {
   try {
@@ -469,7 +469,7 @@ var redact = (u) => {
   return u;
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Pipeable.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Pipeable.js
 var pipeArguments = (self, args2) => {
   switch (args2.length) {
     case 0:
@@ -502,14 +502,14 @@ var pipeArguments = (self, args2) => {
   }
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/opCodes/effect.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/opCodes/effect.js
 var OP_COMMIT = "Commit";
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/version.js
-var moduleVersion = "3.17.1";
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/version.js
+var moduleVersion = "3.17.8";
 var getCurrentVersion = () => moduleVersion;
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/effectable.js
+// node_modules/.pnpm/effect@3.17.8/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");
@@ -596,7 +596,7 @@ var StructuralCommitPrototype = {
   ...StructuralPrototype
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/option.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/option.js
 var TypeId = /* @__PURE__ */ Symbol.for("effect/Option");
 var CommonProto = {
   ...EffectPrototype,
@@ -654,7 +654,7 @@ var some = (value) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/either.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/either.js
 var TypeId2 = /* @__PURE__ */ Symbol.for("effect/Either");
 var CommonProto2 = {
   ...EffectPrototype,
@@ -716,7 +716,7 @@ var right = (right3) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Either.js
 var right2 = right;
 var left2 = left;
 var isLeft2 = isLeft;
@@ -724,14 +724,14 @@ 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.17.1/node_modules/effect/dist/esm/internal/array.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Order.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Order.js
 var make = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 var string2 = /* @__PURE__ */ make((self, that) => self < that ? -1 : 1);
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Option.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Option.js
 var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
@@ -739,7 +739,19 @@ var isSome2 = isSome;
 var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Array.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Record.js
+var map2 = /* @__PURE__ */ dual(2, (self, f) => {
+  const out = {
+    ...self
+  };
+  for (const key of keys(self)) {
+    out[key] = f(self[key], key);
+  }
+  return out;
+});
+var keys = (self) => Object.keys(self);
+
+// node_modules/.pnpm/effect@3.17.8/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)));
@@ -777,7 +789,7 @@ var intersectionWith = (isEquivalent) => {
 };
 var intersection = /* @__PURE__ */ intersectionWith(_equivalence);
 var empty = () => [];
-var map2 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
+var map3 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
 var flatMap = /* @__PURE__ */ dual(2, (self, f) => {
   if (isEmptyReadonlyArray(self)) {
     return [];
@@ -915,6 +927,7 @@ var NanoFiber = class {
   _yielded = void 0;
   _services = {};
   _cache = {};
+  _perf = false;
   runLoop(nano) {
     let current = nano;
     while (true) {
@@ -938,6 +951,34 @@ var NanoFiber = class {
     return NanoYield;
   }
 };
+var timings = {};
+var timingsCount = {};
+var WithSpanProto = {
+  ...PrimitiveProto,
+  [evaluate](fiber) {
+    const [fa, name] = this[args];
+    if (!fiber._perf) return fa;
+    const start = performance.now();
+    timingsCount[name] = (timingsCount[name] || 0) + 1;
+    return match(fa, {
+      onSuccess: (_) => {
+        const end = performance.now();
+        timings[name] = (timings[name] || 0) + (end - start);
+        return succeed(_);
+      },
+      onFailure: (_) => {
+        const end = performance.now();
+        timings[name] = (timings[name] || 0) + (end - start);
+        return fail(_);
+      }
+    });
+  }
+};
+var withSpan = (name) => (fa) => {
+  const nano = Object.create(WithSpanProto);
+  nano[args] = [fa, name];
+  return nano;
+};
 var unsafeRun = (nano) => {
   const fiber = new NanoFiber();
   const result = fiber.runLoop(nano);
@@ -966,7 +1007,7 @@ var flatMap2 = dual(2, (fa, f) => {
   nano[contA] = f;
   return nano;
 });
-var map3 = dual(2, (fa, f) => flatMap2(fa, (_) => succeed(f(_))));
+var map4 = dual(2, (fa, f) => flatMap2(fa, (_) => succeed(f(_))));
 var SyncProto = {
   ...PrimitiveProto,
   [evaluate](fiber) {
@@ -999,7 +1040,7 @@ var unsafeFromIterator = (iterator, initial) => {
   return nano;
 };
 var gen = (...args2) => suspend(() => unsafeFromIterator(args2[0]()));
-var fn = (_) => (body) => (...args2) => suspend(() => unsafeFromIterator(body(...args2)));
+var fn = (_) => (body) => (...args2) => withSpan(_)(suspend(() => unsafeFromIterator(body(...args2))));
 var MatchProto = {
   ...PrimitiveProto,
   [evaluate](fiber) {
@@ -1125,7 +1166,7 @@ function parseDiagnosticSeverity(config) {
     pipe(
       Object.entries(config),
       filter(([key, value]) => isString(key) && isString(value)),
-      map2(([key, value]) => [String(key).toLowerCase(), String(value).toLowerCase()]),
+      map3(([key, value]) => [String(key).toLowerCase(), String(value).toLowerCase()]),
       filter(
         ([_, value]) => value === "off" || value === "error" || value === "warning" || value === "message" || value === "suggestion"
       )
@@ -1143,8 +1184,10 @@ var defaults = {
   inlays: true,
   allowedDuplicatedPackages: [],
   namespaceImportPackages: [],
+  topLevelNamedReexports: "ignore",
   barrelImportPackages: [],
-  topLevelNamedReexports: "ignore"
+  importAliases: {},
+  renames: true
 };
 function parse(config) {
   return {
@@ -1159,7 +1202,9 @@ function parse(config) {
     allowedDuplicatedPackages: isObject(config) && hasProperty(config, "allowedDuplicatedPackages") && isArray(config.allowedDuplicatedPackages) && config.allowedDuplicatedPackages.every(isString) ? config.allowedDuplicatedPackages.map((_) => _.toLowerCase()) : defaults.allowedDuplicatedPackages,
     namespaceImportPackages: isObject(config) && hasProperty(config, "namespaceImportPackages") && isArray(config.namespaceImportPackages) && config.namespaceImportPackages.every(isString) ? config.namespaceImportPackages.map((_) => _.toLowerCase()) : defaults.namespaceImportPackages,
     barrelImportPackages: isObject(config) && hasProperty(config, "barrelImportPackages") && isArray(config.barrelImportPackages) && config.barrelImportPackages.every(isString) ? config.barrelImportPackages.map((_) => _.toLowerCase()) : defaults.barrelImportPackages,
-    topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && ["ignore", "follow"].includes(config.topLevelNamedReexports.toLowerCase()) ? config.topLevelNamedReexports.toLowerCase() : defaults.topLevelNamedReexports
+    importAliases: isObject(config) && hasProperty(config, "importAliases") && isRecord(config.importAliases) ? map2(config.importAliases, (value) => String(value)) : defaults.importAliases,
+    topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && ["ignore", "follow"].includes(config.topLevelNamedReexports.toLowerCase()) ? config.topLevelNamedReexports.toLowerCase() : defaults.topLevelNamedReexports,
+    renames: isObject(config) && hasProperty(config, "renames") && isBoolean(config.renames) ? config.renames : defaults.renames
   };
 }
 
@@ -1223,7 +1268,7 @@ function makeTypeScriptUtils(ts) {
     return pipe(
       referencedPackages.concat(packageJsonScope?.referencedPackages || []),
       dedupe,
-      map2((packageName) => packageName.toLowerCase()),
+      map3((packageName) => packageName.toLowerCase()),
       filter(
         (packageName) => pattern.endsWith("*") && packageName.startsWith(pattern.toLowerCase().substring(0, pattern.length - 1))
       )
@@ -1247,7 +1292,7 @@ function makeTypeScriptUtils(ts) {
     const sourceText = sourceFile.text;
     let result;
     function find(node) {
-      const leading = ts.getLeadingCommentRanges(sourceText, node.getFullStart());
+      const leading = ts.getLeadingCommentRanges(sourceText, node.pos);
       if (leading) {
         for (const commentRange of leading) {
           if (commentRange.pos <= position && position < commentRange.end) {
@@ -1256,8 +1301,8 @@ function makeTypeScriptUtils(ts) {
           }
         }
       }
-      if (node.getFullStart() <= position && position < node.getEnd()) {
-        node.forEachChild(find);
+      if (node.pos <= position && position < node.end) {
+        ts.forEachChild(node, find);
       }
     }
     find(sourceFile);
@@ -1276,7 +1321,7 @@ function makeTypeScriptUtils(ts) {
   }
   function findNodeAtPosition(sourceFile, position) {
     function find(node) {
-      if (position >= node.getStart() && position < node.getEnd()) {
+      if (position >= ts.getTokenPosOfNode(node, sourceFile) && position < node.end) {
         return ts.forEachChild(node, find) || node;
       }
       return void 0;
@@ -1303,7 +1348,6 @@ function makeTypeScriptUtils(ts) {
       return;
     }
     const startPos = token.pos === 0 ? (ts.getShebang(sourceFile.text) || "").length : token.pos;
-    if (startPos === 0) return;
     const result = ts.forEachTrailingCommentRange(sourceFile.text, startPos, isCommentInRange, pos) || ts.forEachLeadingCommentRange(sourceFile.text, startPos, isCommentInRange, pos);
     return result;
   }
@@ -1340,7 +1384,7 @@ function makeTypeScriptUtils(ts) {
       fnCall = ts.factory.createCallExpression(
         fnCall,
         void 0,
-        [ts.factory.createStringLiteral(fnName.text)]
+        [ts.factory.createStringLiteral(ts.idText(fnName))]
       );
     }
     return tryPreserveDeclarationSemantics(
@@ -1412,7 +1456,7 @@ function makeTypeScriptUtils(ts) {
       if (!namedBindings) continue;
       if (ts.isNamespaceImport(namedBindings)) {
         if (test(namedBindings.name, statement.moduleSpecifier, none2())) {
-          return namedBindings.name.text;
+          return ts.idText(namedBindings.name);
         }
       } else if (ts.isNamedImports(namedBindings)) {
         for (const importSpecifier of namedBindings.elements) {
@@ -1420,7 +1464,7 @@ function makeTypeScriptUtils(ts) {
             orElse(() => some2(importSpecifier.name))
           );
           if (test(importSpecifier.name, statement.moduleSpecifier, importProperty)) {
-            return importSpecifier.name.text;
+            return ts.idText(importSpecifier.name);
           }
         }
       }
@@ -1433,7 +1477,7 @@ function makeTypeScriptUtils(ts) {
         if (isNone2(importProperty) && ts.isStringLiteral(fromModule) && fromModule.text === packageName + "/" + moduleName) {
           return true;
         }
-        if (isSome2(importProperty) && ts.isIdentifier(importProperty.value) && importProperty.value.text === moduleName && ts.isStringLiteral(fromModule) && fromModule.text === packageName) {
+        if (isSome2(importProperty) && ts.isIdentifier(importProperty.value) && ts.idText(importProperty.value) === moduleName && ts.isStringLiteral(fromModule) && fromModule.text === packageName) {
           return true;
         }
         return false;
@@ -1508,23 +1552,26 @@ function makeTypeScriptUtils(ts) {
     let replacementSpan = ts.createTextSpan(position, 0);
     let outerNode = precedingToken;
     if (ts.isIdentifier(precedingToken) && precedingToken.parent && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      const spanStart = ts.getTokenPosOfNode(precedingToken.parent, sourceFile);
       replacementSpan = ts.createTextSpan(
-        precedingToken.parent.getStart(sourceFile),
-        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+        spanStart,
+        precedingToken.end - spanStart
       );
       accessedObject = precedingToken.parent.expression;
       outerNode = precedingToken.parent;
     } else if (ts.isToken(precedingToken) && precedingToken.kind === ts.SyntaxKind.DotToken && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      const precedingTokenSpanStart = ts.getTokenPosOfNode(precedingToken.parent, sourceFile);
       replacementSpan = ts.createTextSpan(
-        precedingToken.parent.getStart(sourceFile),
-        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+        precedingTokenSpanStart,
+        precedingToken.end - precedingTokenSpanStart
       );
       accessedObject = precedingToken.parent.expression;
       outerNode = precedingToken.parent;
     } else if (ts.isIdentifier(precedingToken) && precedingToken.parent) {
+      const precedingTokenSpanStart = ts.getTokenPosOfNode(precedingToken, sourceFile);
       replacementSpan = ts.createTextSpan(
-        precedingToken.getStart(sourceFile),
-        precedingToken.end - precedingToken.getStart(sourceFile)
+        precedingTokenSpanStart,
+        precedingToken.end - precedingTokenSpanStart
       );
       accessedObject = precedingToken;
       outerNode = precedingToken;
@@ -1618,6 +1665,13 @@ function makeTypeScriptUtils(ts) {
       []
     );
   }
+  function getSourceFileOfNode(current) {
+    let node = current;
+    while (node && node.kind !== ts.SyntaxKind.SourceFile) {
+      node = node.parent;
+    }
+    return node;
+  }
   return {
     findNodeAtPositionIncludingTrivia,
     parsePackageContentNameAndVersionFromScope,
@@ -1637,7 +1691,8 @@ function makeTypeScriptUtils(ts) {
     createEffectGenCallExpressionWithBlock,
     createReturnYieldStarStatement,
     makeGetModuleSpecifier,
-    parseAccessedExpressionForCompletion
+    parseAccessedExpressionForCompletion,
+    getSourceFileOfNode
   };
 }
 
@@ -1748,7 +1803,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
                 if (foundNode) {
                   lineOverrides[ruleName] = lineOverrides[ruleName] || [];
                   lineOverrides[ruleName].unshift({
-                    pos: foundNode.node.getFullStart(),
+                    pos: foundNode.node.pos,
                     end: foundNode.node.end,
                     level: ruleLevel
                   });
@@ -1787,11 +1842,12 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
           service(ChangeTracker),
           (changeTracker) => gen(function* () {
             const disableAtNode = findParentStatementForDisableNextLine(node);
-            const { line } = ts.getLineAndCharacterOfPosition(sourceFile, disableAtNode.getStart());
+            const start = ts.getTokenPosOfNode(disableAtNode, sourceFile);
+            const { line } = ts.getLineAndCharacterOfPosition(sourceFile, start);
             changeTracker.insertCommentBeforeLine(
               sourceFile,
               line,
-              disableAtNode.getStart(),
+              start,
               ` @effect-diagnostics-next-line ${rule.name}:off`
             );
           })
@@ -1814,8 +1870,8 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       };
       const applicableDiagnostics = [];
       yield* rule.apply(sourceFile, (entry) => {
-        const range = "getEnd" in entry.location ? { pos: entry.location.getStart(sourceFile), end: entry.location.getEnd() } : entry.location;
-        const node = "getEnd" in entry.location ? entry.location : tsUtils.findNodeAtPositionIncludingTrivia(sourceFile, entry.location.pos);
+        const range = "kind" in entry.location ? { pos: ts.getTokenPosOfNode(entry.location, sourceFile), end: entry.location.end } : entry.location;
+        const node = "kind" in entry.location ? entry.location : tsUtils.findNodeAtPositionIncludingTrivia(sourceFile, entry.location.pos);
         applicableDiagnostics.push({
           range,
           messageText: entry.messageText,
@@ -1919,7 +1975,7 @@ var getEditsForCodegen = fn("LSP.getEditsForCodegen")(function* (codegens2, sour
   const edit = yield* codegen.apply(sourceFile, range);
   const updateHashComment = pipe(
     service(ChangeTracker),
-    map3((changeTracker) => {
+    map4((changeTracker) => {
       changeTracker.deleteRange(sourceFile, range);
       changeTracker.insertText(sourceFile, range.pos, `${codegen.name}:${edit.hash}`);
     })
@@ -1933,31 +1989,71 @@ var getEditsForCodegen = fn("LSP.getEditsForCodegen")(function* (codegens2, sour
     ignore: updateHashComment
   };
 });
+var getEffectLspPatchSourceFileMetadata = (sourceFile) => {
+  return sourceFile["@effect-lsp-patch/metadata"];
+};
 
 // src/core/TypeCheckerApi.ts
 var TypeCheckerApi = Tag("TypeChecker");
-var deterministicTypeOrder = gen(function* () {
-  const typeChecker = yield* service(TypeCheckerApi);
-  return make((a, b) => {
-    const aName = typeChecker.typeToString(a);
-    const bName = typeChecker.typeToString(b);
-    if (aName < bName) return -1;
-    if (aName > bName) return 1;
-    return 0;
-  });
-});
-var getMissingTypeEntriesInTargetType = fn(
-  "TypeCheckerApi.getMissingTypeEntriesInTargetType"
-)(
-  function* (realType, expectedType) {
+function makeResolveExternalModuleName(typeChecker) {
+  if (!(hasProperty(typeChecker, "resolveExternalModuleName") && isFunction(typeChecker.resolveExternalModuleName))) {
+    return;
+  }
+  const _internal = typeChecker.resolveExternalModuleName;
+  return (moduleSpecifier) => {
+    return _internal(moduleSpecifier);
+  };
+}
+
+// src/core/TypeCheckerUtils.ts
+var TypeCheckerUtils = Tag("TypeCheckerUtils");
+var nanoLayer2 = (fa) => pipe(
+  service(TypeScriptApi),
+  flatMap2(
+    (ts) => flatMap2(service(TypeCheckerApi), (typeChecker) => pipe(fa, provideService(TypeCheckerUtils, makeTypeCheckerUtils(ts, typeChecker))))
+  )
+);
+function makeTypeCheckerUtils(ts, typeChecker) {
+  function isUnion(type) {
+    return !!(type.flags & ts.TypeFlags.Union);
+  }
+  function isIndexType(type) {
+    return !!(type.flags & ts.TypeFlags.Index);
+  }
+  function isThisTypeParameter(type) {
+    return !!(type.flags & ts.TypeFlags.TypeParameter && type.isThisType);
+  }
+  function getTypeParameterAtPosition(signature, pos) {
+    const type = typeChecker.getParameterType(signature, pos);
+    if (isIndexType(type) && isThisTypeParameter(type.type)) {
+      const constraint = typeChecker.getBaseConstraintOfType(type.type);
+      if (constraint) {
+        return typeChecker.getIndexType(constraint);
+      }
+    }
+    return type;
+  }
+  const unrollUnionMembers = (type) => {
+    const result = [];
+    let toTest = [type];
+    while (toTest.length > 0) {
+      const type2 = toTest.pop();
+      if (isUnion(type2)) {
+        toTest = toTest.concat(type2.types);
+      } else {
+        result.push(type2);
+      }
+    }
+    return result;
+  };
+  const getMissingTypeEntriesInTargetType = function(realType, expectedType) {
     if (realType === expectedType) return [];
-    const typeChecker = yield* service(TypeCheckerApi);
     const result = [];
     let toTest = [realType];
     while (toTest.length > 0) {
       const type = toTest.pop();
       if (!type) return result;
-      if (type.isUnion()) {
+      if (isUnion(type)) {
         toTest = toTest.concat(type.types);
       } else {
         const assignable = typeChecker.isTypeAssignableTo(type, expectedType);
@@ -1967,77 +2063,99 @@ var getMissingTypeEntriesInTargetType = fn(
       }
     }
     return result;
-  }
-);
-var CannotFindAncestorConvertibleDeclarationError = class {
-  constructor(node) {
-    this.node = node;
-  }
-  _tag = "@effect/language-service/CannotFindAncestorConvertibleDeclarationError";
-};
-var getAncestorConvertibleDeclaration = fn(
-  "TypeCheckerApi.getAncestorConvertibleDeclaration"
-)(function* (node) {
-  const ts = yield* service(TypeScriptApi);
-  let current = node;
-  while (current) {
-    if (ts.isFunctionDeclaration(current) || ts.isFunctionExpression(current) || ts.isArrowFunction(current) || ts.isMethodDeclaration(current)) {
-      return current;
+  };
+  const appendToUniqueTypesMap = fn(
+    "TypeCheckerUtils.appendToUniqueTypesMap"
+  )(
+    function* (memory, initialType, shouldExclude) {
+      const newIndexes = /* @__PURE__ */ new Set();
+      const knownIndexes = /* @__PURE__ */ new Set();
+      let toTest = [initialType];
+      while (toTest.length > 0) {
+        const type = toTest.pop();
+        if (!type) break;
+        if (yield* shouldExclude(type)) {
+          continue;
+        }
+        if (isUnion(type)) {
+          toTest = toTest.concat(type.types);
+        } else {
+          const foundMatch = [];
+          for (const [typeId, knownType] of memory.entries()) {
+            const areSame = typeChecker.isTypeAssignableTo(knownType, type) && typeChecker.isTypeAssignableTo(type, knownType);
+            if (areSame) {
+              foundMatch.push(typeId);
+              break;
+            }
+          }
+          if (foundMatch.length === 0) {
+            const newId = "t" + (memory.size + 1);
+            memory.set(newId, type);
+            newIndexes.add(newId);
+          } else {
+            knownIndexes.add(foundMatch[0]);
+          }
+        }
+      }
+      return {
+        newIndexes,
+        knownIndexes,
+        allIndexes: pipe(
+          fromIterable(newIndexes),
+          appendAll(fromIterable(knownIndexes))
+        )
+      };
     }
-    current = current.parent;
-  }
-  return yield* fail(new CannotFindAncestorConvertibleDeclarationError(node));
-});
-var CannotInferReturnTypeFromEmptyBody = class {
-  constructor(declaration) {
-    this.declaration = declaration;
-  }
-  _tag = "@effect/language-service/CannotInferReturnTypeFromEmptyBody";
-};
-var CannotInferReturnType = class {
-  constructor(declaration) {
-    this.declaration = declaration;
-  }
-  _tag = "@effect/language-service/CannotInferReturnType";
-};
-var getInferredReturnType = fn("TypeCheckerApi.getInferredReturnType")(function* (declaration) {
-  const typeChecker = yield* service(TypeCheckerApi);
-  if (!declaration.body) {
-    return yield* fail(
-      new CannotInferReturnTypeFromEmptyBody(declaration)
-    );
-  }
-  let returnType;
-  if (typeChecker.isImplementationOfOverload(declaration)) {
-    const signatures = typeChecker.getTypeAtLocation(declaration).getCallSignatures();
-    if (signatures.length > 1) {
-      returnType = typeChecker.getUnionType(
-        signatures.map((s) => s.getReturnType()).filter((_) => !!_)
+  );
+  const deterministicTypeOrder = make((a, b) => {
+    const aName = typeChecker.typeToString(a);
+    const bName = typeChecker.typeToString(b);
+    if (aName < bName) return -1;
+    if (aName > bName) return 1;
+    return 0;
+  });
+  const getAncestorConvertibleDeclaration = (node) => {
+    let current = node;
+    while (current) {
+      if (ts.isFunctionDeclaration(current) || ts.isFunctionExpression(current) || ts.isArrowFunction(current) || ts.isMethodDeclaration(current)) {
+        return current;
+      }
+      current = current.parent;
+    }
+  };
+  const getInferredReturnType = (declaration) => {
+    if (!declaration.body) {
+      return;
+    }
+    let returnType;
+    if (typeChecker.isImplementationOfOverload(declaration)) {
+      const signatures = typeChecker.getSignaturesOfType(
+        typeChecker.getTypeAtLocation(declaration),
+        ts.SignatureKind.Call
       );
+      if (signatures.length > 1) {
+        returnType = typeChecker.getUnionType(
+          signatures.map((s) => typeChecker.getReturnTypeOfSignature(s)).filter((_) => !!_)
+        );
+      }
     }
-  }
-  if (!returnType) {
-    const signature = typeChecker.getSignatureFromDeclaration(declaration);
-    if (signature) {
-      const typePredicate = typeChecker.getTypePredicateOfSignature(signature);
-      if (typePredicate && typePredicate.type) {
-        return typePredicate.type;
-      } else {
-        returnType = typeChecker.getReturnTypeOfSignature(signature);
+    if (!returnType) {
+      const signature = typeChecker.getSignatureFromDeclaration(declaration);
+      if (signature) {
+        const typePredicate = typeChecker.getTypePredicateOfSignature(signature);
+        if (typePredicate && typePredicate.type) {
+          return typePredicate.type;
+        } else {
+          returnType = typeChecker.getReturnTypeOfSignature(signature);
+        }
       }
     }
-  }
-  if (!returnType) {
-    return yield* fail(
-      new CannotInferReturnType(declaration)
-    );
-  }
-  return returnType;
-});
-var expectedAndRealType = cachedBy(
-  fn("TypeCheckerApi.expectedAndRealType")(function* (sourceFile) {
-    const typeChecker = yield* service(TypeCheckerApi);
-    const ts = yield* service(TypeScriptApi);
+    return returnType;
+  };
+  const expectedAndRealTypeCache = /* @__PURE__ */ new WeakMap();
+  const expectedAndRealType = (sourceFile) => {
+    const cached2 = expectedAndRealTypeCache.get(sourceFile);
+    if (cached2) return cached2;
     const result = [];
     const nodeToVisit = [sourceFile];
     const appendNodeToVisit = (node) => {
@@ -2055,7 +2173,7 @@ var expectedAndRealType = cachedBy(
       } else if (ts.isCallExpression(node)) {
         const resolvedSignature = typeChecker.getResolvedSignature(node);
         if (resolvedSignature) {
-          resolvedSignature.getParameters().map((parameter, index) => {
+          resolvedSignature.parameters.map((parameter, index) => {
             const expectedType = typeChecker.getTypeOfSymbolAtLocation(parameter, node);
             const realType = typeChecker.getTypeAtLocation(node.arguments[index]);
             result.push([
@@ -2074,11 +2192,14 @@ var expectedAndRealType = cachedBy(
           if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
             const type = typeChecker.getContextualType(parent.parent);
             if (type) {
-              const symbol3 = typeChecker.getPropertyOfType(type, node.text);
-              if (symbol3) {
-                const expectedType = typeChecker.getTypeOfSymbolAtLocation(symbol3, node);
-                const realType = typeChecker.getTypeAtLocation(node);
-                result.push([node, expectedType, node, realType]);
+              const name = ts.isIdentifier(node) ? ts.idText(node) : ts.isStringLiteral(node) ? node.text : void 0;
+              if (name) {
+                const symbol3 = typeChecker.getPropertyOfType(type, name);
+                if (symbol3) {
+                  const expectedType = typeChecker.getTypeOfSymbolAtLocation(symbol3, node);
+                  const realType = typeChecker.getTypeAtLocation(node);
+                  result.push([node, expectedType, node, realType]);
+                }
               }
             }
           }
@@ -2092,12 +2213,12 @@ var expectedAndRealType = cachedBy(
         appendNodeToVisit(node.right);
         continue;
       } else if (ts.isReturnStatement(node) && node.expression) {
-        const parentDeclaration = yield* option(getAncestorConvertibleDeclaration(node));
-        if (isSome2(parentDeclaration)) {
-          const expectedType = yield* option(getInferredReturnType(parentDeclaration.value));
+        const parentDeclaration = getAncestorConvertibleDeclaration(node);
+        if (parentDeclaration) {
+          const expectedType = getInferredReturnType(parentDeclaration);
           const realType = typeChecker.getTypeAtLocation(node.expression);
-          if (isSome2(expectedType)) {
-            result.push([node, expectedType.value, node, realType]);
+          if (expectedType) {
+            result.push([node, expectedType, node, realType]);
           }
         }
         ts.forEachChild(node, appendNodeToVisit);
@@ -2113,10 +2234,10 @@ var expectedAndRealType = cachedBy(
         continue;
       } else if (ts.isArrowFunction(node) && (node.typeParameters || []).length > 0 && ts.isExpression(node.body)) {
         const body = node.body;
-        const expectedType = yield* option(getInferredReturnType(node));
+        const expectedType = getInferredReturnType(node);
         const realType = typeChecker.getTypeAtLocation(body);
-        if (isSome2(expectedType)) {
-          result.push([body, expectedType.value, body, realType]);
+        if (expectedType) {
+          result.push([body, expectedType, body, realType]);
         }
         ts.forEachChild(body, appendNodeToVisit);
         continue;
@@ -2129,87 +2250,31 @@ var expectedAndRealType = cachedBy(
       }
       ts.forEachChild(node, appendNodeToVisit);
     }
+    expectedAndRealTypeCache.set(sourceFile, result);
     return result;
-  }),
-  "TypeCheckerApi.expectedAndRealType",
-  (sourceFile) => sourceFile
-);
-var unrollUnionMembers = (type) => {
-  const result = [];
-  let toTest = [type];
-  while (toTest.length > 0) {
-    const type2 = toTest.pop();
-    if (type2.isUnion()) {
-      toTest = toTest.concat(type2.types);
-    } else {
-      result.push(type2);
-    }
-  }
-  return result;
-};
-var appendToUniqueTypesMap = fn(
-  "TypeCheckerApi.appendToUniqueTypesMap"
-)(
-  function* (memory, initialType, shouldExclude) {
-    const typeChecker = yield* service(TypeCheckerApi);
-    const newIndexes = /* @__PURE__ */ new Set();
-    const knownIndexes = /* @__PURE__ */ new Set();
-    let toTest = [initialType];
-    while (toTest.length > 0) {
-      const type = toTest.pop();
-      if (!type) break;
-      if (yield* shouldExclude(type)) {
-        continue;
-      }
-      if (type.isUnion()) {
-        toTest = toTest.concat(type.types);
-      } else {
-        const foundMatch = [];
-        for (const [typeId, knownType] of memory.entries()) {
-          const areSame = typeChecker.isTypeAssignableTo(knownType, type) && typeChecker.isTypeAssignableTo(type, knownType);
-          if (areSame) {
-            foundMatch.push(typeId);
-            break;
-          }
-        }
-        if (foundMatch.length === 0) {
-          const newId = "t" + (memory.size + 1);
-          memory.set(newId, type);
-          newIndexes.add(newId);
-        } else {
-          knownIndexes.add(foundMatch[0]);
-        }
-      }
-    }
-    return {
-      newIndexes,
-      knownIndexes,
-      allIndexes: pipe(
-        fromIterable(newIndexes),
-        appendAll(fromIterable(knownIndexes))
-      )
-    };
-  }
-);
-function makeResolveExternalModuleName(typeChecker) {
-  if (!(hasProperty(typeChecker, "resolveExternalModuleName") && isFunction(typeChecker.resolveExternalModuleName))) {
-    return;
-  }
-  const _internal = typeChecker.resolveExternalModuleName;
-  return (moduleSpecifier) => {
-    return _internal(moduleSpecifier);
+  };
+  return {
+    isUnion,
+    getTypeParameterAtPosition,
+    getMissingTypeEntriesInTargetType,
+    unrollUnionMembers,
+    appendToUniqueTypesMap,
+    deterministicTypeOrder,
+    getInferredReturnType,
+    expectedAndRealType
   };
 }
 
 // src/core/TypeParser.ts
 var TypeParser = Tag("@effect/language-service/TypeParser");
-var nanoLayer2 = (fa) => gen(function* () {
+var nanoLayer3 = (fa) => gen(function* () {
   const ts = yield* service(TypeScriptApi);
   const tsUtils = yield* service(TypeScriptUtils);
   const typeChecker = yield* service(TypeCheckerApi);
+  const typeCheckerUtils = yield* service(TypeCheckerUtils);
   return yield* pipe(
     fa,
-    provideService(TypeParser, make2(ts, tsUtils, typeChecker))
+    provideService(TypeParser, make2(ts, tsUtils, typeChecker, typeCheckerUtils))
   );
 });
 var TypeParserIssue = class _TypeParserIssue {
@@ -2219,27 +2284,27 @@ var TypeParserIssue = class _TypeParserIssue {
 function typeParserIssue(_message, _type, _node) {
   return TypeParserIssue.issue;
 }
-function make2(ts, tsUtils, typeChecker) {
+function make2(ts, tsUtils, typeChecker, typeCheckerUtils) {
   function covariantTypeArgument(type) {
-    const signatures = type.getCallSignatures();
+    const signatures = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
     if (signatures.length !== 1) {
       return typeParserIssue("Covariant type has no call signature", type);
     }
-    return succeed(signatures[0].getReturnType());
+    return succeed(typeChecker.getReturnTypeOfSignature(signatures[0]));
   }
   function contravariantTypeArgument(type) {
-    const signatures = type.getCallSignatures();
+    const signatures = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
     if (signatures.length !== 1) {
       return typeParserIssue("Contravariant type has no call signature", type);
     }
-    return succeed(signatures[0].getTypeParameterAtPosition(0));
+    return succeed(typeCheckerUtils.getTypeParameterAtPosition(signatures[0], 0));
   }
   function invariantTypeArgument(type) {
-    const signatures = type.getCallSignatures();
+    const signatures = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
     if (signatures.length !== 1) {
       return typeParserIssue("Invariant type has no call signature", type);
     }
-    return succeed(signatures[0].getReturnType());
+    return succeed(typeChecker.getReturnTypeOfSignature(signatures[0]));
   }
   const pipeableType = cachedBy(
     function(type, atLocation) {
@@ -2248,7 +2313,7 @@ function make2(ts, tsUtils, typeChecker) {
         return typeParserIssue("Type has no 'pipe' property", type, atLocation);
       }
       const pipeType = typeChecker.getTypeOfSymbolAtLocation(pipeSymbol, atLocation);
-      const signatures = pipeType.getCallSignatures();
+      const signatures = typeChecker.getSignaturesOfType(pipeType, ts.SignatureKind.Call);
       if (signatures.length === 0) {
         return typeParserIssue("'pipe' property is not callable", type, atLocation);
       }
@@ -2281,7 +2346,7 @@ function make2(ts, tsUtils, typeChecker) {
     const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
     return invariantTypeArgument(propertyType);
   };
-  const effectVarianceStruct = (type, atLocation) => map3(
+  const effectVarianceStruct = (type, atLocation) => map4(
     all(
       varianceStructCovariantType(type, atLocation, "_A"),
       varianceStructCovariantType(type, atLocation, "_E"),
@@ -2289,7 +2354,7 @@ function make2(ts, tsUtils, typeChecker) {
     ),
     ([A, E, R]) => ({ A, E, R })
   );
-  const layerVarianceStruct = (type, atLocation) => map3(
+  const layerVarianceStruct = (type, atLocation) => map4(
     all(
       varianceStructContravariantType(type, atLocation, "_ROut"),
       varianceStructCovariantType(type, atLocation, "_E"),
@@ -2303,7 +2368,9 @@ function make2(ts, tsUtils, typeChecker) {
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
         (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
       );
-      propertiesSymbols.sort((a, b) => b.name.indexOf("EffectTypeId") - a.name.indexOf("EffectTypeId"));
+      propertiesSymbols.sort(
+        (a, b) => ts.symbolName(b).indexOf("EffectTypeId") - ts.symbolName(a).indexOf("EffectTypeId")
+      );
       for (const propertySymbol of propertiesSymbols) {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
         result = pipe(result, orElse2(() => effectVarianceStruct(propertyType, atLocation)));
@@ -2315,7 +2382,7 @@ function make2(ts, tsUtils, typeChecker) {
   );
   const strictEffectType = cachedBy(
     fn("TypeParser.strictEffectType")(function* (type, atLocation) {
-      if (!(type.symbol && type.symbol.name === "Effect" && !type.aliasSymbol)) {
+      if (!(type.symbol && ts.symbolName(type.symbol) === "Effect" && !type.aliasSymbol)) {
         return yield* typeParserIssue("Type name should be Effect with no alias symbol", type, atLocation);
       }
       return yield* effectType(type, atLocation);
@@ -2329,7 +2396,9 @@ function make2(ts, tsUtils, typeChecker) {
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
         (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
       );
-      propertiesSymbols.sort((a, b) => b.name.indexOf("LayerTypeId") - a.name.indexOf("LayerTypeId"));
+      propertiesSymbols.sort(
+        (a, b) => ts.symbolName(b).indexOf("LayerTypeId") - ts.symbolName(a).indexOf("LayerTypeId")
+      );
       for (const propertySymbol of propertiesSymbols) {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
         const varianceArgs = yield* option(layerVarianceStruct(
@@ -2424,6 +2493,21 @@ function make2(ts, tsUtils, typeChecker) {
     "TypeParser.importedEffectModule",
     (node) => node
   );
+  const importedDataModule = cachedBy(
+    fn("TypeParser.importedDataModule")(function* (node) {
+      const type = typeChecker.getTypeAtLocation(node);
+      const propertySymbol = typeChecker.getPropertyOfType(type, "TaggedError");
+      if (!propertySymbol) {
+        return yield* typeParserIssue("Type has no 'TaggedError' property", type, node);
+      }
+      if (!ts.isExpression(node)) {
+        return yield* typeParserIssue("Node is not an expression", type, node);
+      }
+      return node;
+    }),
+    "TypeParser.importedDataModule",
+    (node) => node
+  );
   const effectGen = cachedBy(
     function(node) {
       if (!ts.isCallExpression(node)) {
@@ -2443,12 +2527,12 @@ function make2(ts, tsUtils, typeChecker) {
         return typeParserIssue("Node is not a property access expression", void 0, node);
       }
       const propertyAccess = node.expression;
-      if (propertyAccess.name.text !== "gen") {
+      if (!(ts.isIdentifier(propertyAccess.name) && ts.idText(propertyAccess.name) === "gen")) {
         return typeParserIssue("Call expression name is not 'gen'", void 0, node);
       }
       return pipe(
         importedEffectModule(propertyAccess.expression),
-        map3((effectModule) => ({
+        map4((effectModule) => ({
           node,
           effectModule,
           generatorFunction,
@@ -2487,7 +2571,7 @@ function make2(ts, tsUtils, typeChecker) {
         );
       }
       const propertyAccess = node.expression;
-      if (propertyAccess.name.text !== "fnUntraced") {
+      if (!(ts.isIdentifier(propertyAccess.name) && ts.idText(propertyAccess.name) === "fnUntraced")) {
         return typeParserIssue(
           "Call expression name is not 'fnUntraced'",
           void 0,
@@ -2496,7 +2580,7 @@ function make2(ts, tsUtils, typeChecker) {
       }
       return pipe(
         importedEffectModule(propertyAccess.expression),
-        map3((effectModule) => ({
+        map4((effectModule) => ({
           node,
           effectModule,
           generatorFunction,
@@ -2540,7 +2624,7 @@ function make2(ts, tsUtils, typeChecker) {
         );
       }
       const propertyAccess = expressionToTest;
-      if (propertyAccess.name.text !== "fn") {
+      if (!(ts.isIdentifier(propertyAccess.name) && ts.idText(propertyAccess.name) === "fn")) {
         return typeParserIssue(
           "Call expression name is not 'fn'",
           void 0,
@@ -2549,7 +2633,7 @@ function make2(ts, tsUtils, typeChecker) {
       }
       return pipe(
         importedEffectModule(propertyAccess.expression),
-        map3((effectModule) => ({
+        map4((effectModule) => ({
           node,
           generatorFunction,
           effectModule,
@@ -2623,7 +2707,7 @@ function make2(ts, tsUtils, typeChecker) {
     "TypeParser.unnecessaryEffectGen",
     (node) => node
   );
-  const effectSchemaVarianceStruct = (type, atLocation) => map3(
+  const effectSchemaVarianceStruct = (type, atLocation) => map4(
     all(
       varianceStructInvariantType(type, atLocation, "_A"),
       varianceStructInvariantType(type, atLocation, "_I"),
@@ -2639,7 +2723,7 @@ function make2(ts, tsUtils, typeChecker) {
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
         (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
       );
-      propertiesSymbols.sort((a, b) => b.name.indexOf("TypeId") - a.name.indexOf("TypeId"));
+      propertiesSymbols.sort((a, b) => ts.symbolName(b).indexOf("TypeId") - ts.symbolName(a).indexOf("TypeId"));
       for (const propertySymbol of propertiesSymbols) {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
         const varianceArgs = yield* option(effectSchemaVarianceStruct(
@@ -2655,7 +2739,7 @@ function make2(ts, tsUtils, typeChecker) {
     "TypeParser.effectSchemaType",
     (type) => type
   );
-  const contextTagVarianceStruct = (type, atLocation) => map3(
+  const contextTagVarianceStruct = (type, atLocation) => map4(
     all(
       varianceStructInvariantType(type, atLocation, "_Identifier"),
       varianceStructInvariantType(type, atLocation, "_Service")
@@ -2668,7 +2752,7 @@ function make2(ts, tsUtils, typeChecker) {
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
         (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
       );
-      propertiesSymbols.sort((a, b) => b.name.indexOf("TypeId") - a.name.indexOf("TypeId"));
+      propertiesSymbols.sort((a, b) => ts.symbolName(b).indexOf("TypeId") - ts.symbolName(a).indexOf("TypeId"));
       for (const propertySymbol of propertiesSymbols) {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
         const varianceArgs = yield* option(contextTagVarianceStruct(
@@ -2686,7 +2770,7 @@ function make2(ts, tsUtils, typeChecker) {
   );
   const pipeCall = cachedBy(
     function(node) {
-      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && node.expression.name.text === "pipe") {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && ts.idText(node.expression.name) === "pipe") {
         return succeed({
           node,
           subject: node.expression.expression,
@@ -2694,7 +2778,7 @@ function make2(ts, tsUtils, typeChecker) {
           kind: "pipeable"
         });
       }
-      if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "pipe" && node.arguments.length > 0) {
+      if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && ts.idText(node.expression) === "pipe" && node.arguments.length > 0) {
         const [subject, ...args2] = node.arguments;
         return succeed({ node, subject, args: args2, kind: "pipe" });
       }
@@ -2709,11 +2793,13 @@ function make2(ts, tsUtils, typeChecker) {
       const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
         (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
       );
-      propertiesSymbols.sort((a, b) => b.name.indexOf("ScopeTypeId") - a.name.indexOf("ScopeTypeId"));
+      propertiesSymbols.sort(
+        (a, b) => ts.symbolName(b).indexOf("ScopeTypeId") - ts.symbolName(a).indexOf("ScopeTypeId")
+      );
       for (const propertySymbol of propertiesSymbols) {
         const computedPropertyExpression = propertySymbol.valueDeclaration.name;
         const symbol3 = typeChecker.getSymbolAtLocation(computedPropertyExpression.expression);
-        if (symbol3 && symbol3.name === "ScopeTypeId") {
+        if (symbol3 && ts.symbolName(symbol3) === "ScopeTypeId") {
           return type;
         }
       }
@@ -2728,19 +2814,19 @@ function make2(ts, tsUtils, typeChecker) {
       if (!thenProperty) return typeParserIssue("not a promise - missing then property", type, atLocation);
       const thenType = typeChecker.getTypeOfSymbolAtLocation(thenProperty, atLocation);
       if (!thenType) return typeParserIssue("not a promise - missing then property", type, atLocation);
-      for (const callSignature of thenType.getCallSignatures()) {
+      for (const callSignature of typeChecker.getSignaturesOfType(thenType, ts.SignatureKind.Call)) {
         const parameter = callSignature.parameters[0];
         if (!parameter) continue;
-        const parameterType = callSignature.getTypeParameterAtPosition(0);
+        const parameterType = typeCheckerUtils.getTypeParameterAtPosition(callSignature, 0);
         if (!parameterType) continue;
         let callbackCallSignatures = [];
         let toTest = [parameterType];
         while (toTest.length > 0) {
           const type2 = toTest.shift();
           if (!type2) continue;
-          const callSignatures = type2.getCallSignatures();
+          const callSignatures = typeChecker.getSignaturesOfType(type2, ts.SignatureKind.Call);
           callbackCallSignatures = callbackCallSignatures.concat(callSignatures);
-          if (type2.isUnion()) {
+          if (typeCheckerUtils.isUnion(type2)) {
             toTest = toTest.concat(type2.types);
           }
         }
@@ -2749,7 +2835,7 @@ function make2(ts, tsUtils, typeChecker) {
           if (!callbackParameter) {
             continue;
           }
-          const callbackParameterType = callableType.getTypeParameterAtPosition(0);
+          const callbackParameterType = typeCheckerUtils.getTypeParameterAtPosition(callableType, 0);
           if (!callbackParameterType) {
             continue;
           }
@@ -2781,7 +2867,7 @@ function make2(ts, tsUtils, typeChecker) {
               if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
                 const selfTypeNode = schemaCall.typeArguments[0];
                 const schemaIdentifier = schemaCall.expression;
-                if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && schemaIdentifier.name.text === "Class") {
+                if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && ts.idText(schemaIdentifier.name) === "Class") {
                   const parsedSchemaModule = yield* pipe(
                     importedSchemaModule(schemaIdentifier.expression),
                     option
@@ -2817,25 +2903,24 @@ function make2(ts, tsUtils, typeChecker) {
         for (const typeX of heritageClause.types) {
           if (ts.isExpressionWithTypeArguments(typeX)) {
             const expression = typeX.expression;
-            if (ts.isCallExpression(expression)) {
-              const tagCall = expression.expression;
-              if (ts.isCallExpression(tagCall)) {
-                const schemaCall = tagCall.expression;
-                if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
-                  const selfTypeNode = schemaCall.typeArguments[0];
-                  const schemaIdentifier = schemaCall.expression;
-                  if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && schemaIdentifier.name.text === "TaggedClass") {
-                    const parsedSchemaModule = yield* pipe(
-                      importedSchemaModule(schemaIdentifier.expression),
-                      option
-                    );
-                    if (isSome2(parsedSchemaModule)) {
-                      return {
-                        className: atLocation.name,
-                        selfTypeNode,
-                        Schema: parsedSchemaModule.value
-                      };
-                    }
+            if (ts.isCallExpression(expression) && expression.arguments.length > 0) {
+              const schemaTaggedClassTCall = expression.expression;
+              if (ts.isCallExpression(schemaTaggedClassTCall) && schemaTaggedClassTCall.typeArguments && schemaTaggedClassTCall.typeArguments.length > 0) {
+                const selfTypeNode = schemaTaggedClassTCall.typeArguments[0];
+                const schemaIdentifier = schemaTaggedClassTCall.expression;
+                if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && ts.idText(schemaIdentifier.name) === "TaggedClass") {
+                  const parsedSchemaModule = yield* pipe(
+                    importedSchemaModule(schemaIdentifier.expression),
+                    option
+                  );
+                  if (isSome2(parsedSchemaModule)) {
+                    return {
+                      className: atLocation.name,
+                      selfTypeNode,
+                      keyStringLiteral: schemaTaggedClassTCall.arguments.length > 0 && ts.isStringLiteral(schemaTaggedClassTCall.arguments[0]) ? schemaTaggedClassTCall.arguments[0] : void 0,
+                      tagStringLiteral: expression.arguments.length > 0 && ts.isStringLiteral(expression.arguments[0]) ? expression.arguments[0] : void 0,
+                      Schema: parsedSchemaModule.value
+                    };
                   }
                 }
               }
@@ -2862,24 +2947,23 @@ function make2(ts, tsUtils, typeChecker) {
           if (ts.isExpressionWithTypeArguments(typeX)) {
             const expression = typeX.expression;
             if (ts.isCallExpression(expression)) {
-              const tagCall = expression.expression;
-              if (ts.isCallExpression(tagCall)) {
-                const schemaCall = tagCall.expression;
-                if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
-                  const selfTypeNode = schemaCall.typeArguments[0];
-                  const schemaIdentifier = schemaCall.expression;
-                  if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && schemaIdentifier.name.text === "TaggedError") {
-                    const parsedSchemaModule = yield* pipe(
-                      importedSchemaModule(schemaIdentifier.expression),
-                      option
-                    );
-                    if (isSome2(parsedSchemaModule)) {
-                      return {
-                        className: atLocation.name,
-                        selfTypeNode,
-                        Schema: parsedSchemaModule.value
-                      };
-                    }
+              const schemaTaggedErrorTCall = expression.expression;
+              if (ts.isCallExpression(schemaTaggedErrorTCall) && schemaTaggedErrorTCall.typeArguments && schemaTaggedErrorTCall.typeArguments.length > 0) {
+                const selfTypeNode = schemaTaggedErrorTCall.typeArguments[0];
+                const schemaIdentifier = schemaTaggedErrorTCall.expression;
+                if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && ts.idText(schemaIdentifier.name) === "TaggedError") {
+                  const parsedSchemaModule = yield* pipe(
+                    importedSchemaModule(schemaIdentifier.expression),
+                    option
+                  );
+                  if (isSome2(parsedSchemaModule)) {
+                    return {
+                      className: atLocation.name,
+                      selfTypeNode,
+                      keyStringLiteral: schemaTaggedErrorTCall.arguments.length > 0 && ts.isStringLiteral(schemaTaggedErrorTCall.arguments[0]) ? schemaTaggedErrorTCall.arguments[0] : void 0,
+                      tagStringLiteral: expression.arguments.length > 0 && ts.isStringLiteral(expression.arguments[0]) ? expression.arguments[0] : void 0,
+                      Schema: parsedSchemaModule.value
+                    };
                   }
                 }
               }
@@ -2892,6 +2976,82 @@ function make2(ts, tsUtils, typeChecker) {
     "TypeParser.extendsSchemaTaggedError",
     (atLocation) => atLocation
   );
+  const extendsDataTaggedError = cachedBy(
+    fn("TypeParser.extendsDataTaggedError")(function* (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 dataTaggedErrorCall = expression;
+              const dataIdentifier = dataTaggedErrorCall.expression;
+              if (ts.isPropertyAccessExpression(dataIdentifier) && ts.isIdentifier(dataIdentifier.name) && ts.idText(dataIdentifier.name) === "TaggedError") {
+                const parsedDataModule = yield* pipe(
+                  importedDataModule(dataIdentifier.expression),
+                  option
+                );
+                if (isSome2(parsedDataModule)) {
+                  return {
+                    className: atLocation.name,
+                    keyStringLiteral: dataTaggedErrorCall.arguments.length > 0 && ts.isStringLiteral(dataTaggedErrorCall.arguments[0]) ? dataTaggedErrorCall.arguments[0] : void 0,
+                    Data: parsedDataModule.value
+                  };
+                }
+              }
+            }
+          }
+        }
+      }
+      return yield* typeParserIssue("Class does not extend Data.TaggedError", void 0, atLocation);
+    }),
+    "TypeParser.extendsDataTaggedError",
+    (atLocation) => atLocation
+  );
+  const extendsDataTaggedClass = cachedBy(
+    fn("TypeParser.extendsDataTaggedClass")(function* (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 dataTaggedClassCall = expression;
+              const dataIdentifier = dataTaggedClassCall.expression;
+              if (ts.isPropertyAccessExpression(dataIdentifier) && ts.isIdentifier(dataIdentifier.name) && ts.idText(dataIdentifier.name) === "TaggedClass") {
+                const parsedDataModule = yield* pipe(
+                  importedDataModule(dataIdentifier.expression),
+                  option
+                );
+                if (isSome2(parsedDataModule)) {
+                  return {
+                    className: atLocation.name,
+                    keyStringLiteral: dataTaggedClassCall.arguments.length > 0 && ts.isStringLiteral(dataTaggedClassCall.arguments[0]) ? dataTaggedClassCall.arguments[0] : void 0,
+                    Data: parsedDataModule.value
+                  };
+                }
+              }
+            }
+          }
+        }
+      }
+      return yield* typeParserIssue("Class does not extend Data.TaggedClass", void 0, atLocation);
+    }),
+    "TypeParser.extendsDataTaggedClass",
+    (atLocation) => atLocation
+  );
   const extendsSchemaTaggedRequest = cachedBy(
     fn("TypeParser.extendsSchemaTaggedRequest")(function* (atLocation) {
       if (!atLocation.name) {
@@ -2906,24 +3066,23 @@ function make2(ts, tsUtils, typeChecker) {
           if (ts.isExpressionWithTypeArguments(typeX)) {
             const expression = typeX.expression;
             if (ts.isCallExpression(expression)) {
-              const tagCall = expression.expression;
-              if (ts.isCallExpression(tagCall)) {
-                const schemaCall = tagCall.expression;
-                if (ts.isCallExpression(schemaCall) && schemaCall.typeArguments && schemaCall.typeArguments.length > 0) {
-                  const selfTypeNode = schemaCall.typeArguments[0];
-                  const schemaIdentifier = schemaCall.expression;
-                  if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && schemaIdentifier.name.text === "TaggedRequest") {
-                    const parsedSchemaModule = yield* pipe(
-                      importedSchemaModule(schemaIdentifier.expression),
-                      option
-                    );
-                    if (isSome2(parsedSchemaModule)) {
-                      return {
-                        className: atLocation.name,
-                        selfTypeNode,
-                        Schema: parsedSchemaModule.value
-                      };
-                    }
+              const schemaTaggedRequestTCall = expression.expression;
+              if (ts.isCallExpression(schemaTaggedRequestTCall) && schemaTaggedRequestTCall.typeArguments && schemaTaggedRequestTCall.typeArguments.length > 0) {
+                const selfTypeNode = schemaTaggedRequestTCall.typeArguments[0];
+                const schemaIdentifier = schemaTaggedRequestTCall.expression;
+                if (ts.isPropertyAccessExpression(schemaIdentifier) && ts.isIdentifier(schemaIdentifier.name) && ts.idText(schemaIdentifier.name) === "TaggedRequest") {
+                  const parsedSchemaModule = yield* pipe(
+                    importedSchemaModule(schemaIdentifier.expression),
+                    option
+                  );
+                  if (isSome2(parsedSchemaModule)) {
+                    return {
+                      className: atLocation.name,
+                      selfTypeNode,
+                      tagStringLiteral: expression.arguments.length > 0 && ts.isStringLiteral(expression.arguments[0]) ? expression.arguments[0] : void 0,
+                      keyStringLiteral: schemaTaggedRequestTCall.arguments.length > 0 && ts.isStringLiteral(schemaTaggedRequestTCall.arguments[0]) ? schemaTaggedRequestTCall.arguments[0] : void 0,
+                      Schema: parsedSchemaModule.value
+                    };
                   }
                 }
               }
@@ -2941,9 +3100,6 @@ function make2(ts, tsUtils, typeChecker) {
       if (!atLocation.name) {
         return yield* typeParserIssue("Class has no name", void 0, atLocation);
       }
-      const classSym = typeChecker.getSymbolAtLocation(atLocation.name);
-      if (!classSym) return yield* typeParserIssue("Class has no symbol", void 0, atLocation);
-      const type = typeChecker.getTypeOfSymbol(classSym);
       const heritageClauses = atLocation.heritageClauses;
       if (!heritageClauses) {
         return yield* typeParserIssue("Class has no heritage clauses", void 0, atLocation);
@@ -2957,16 +3113,20 @@ function make2(ts, tsUtils, typeChecker) {
               if (ts.isCallExpression(contextTagCall) && wholeCall.typeArguments && wholeCall.typeArguments.length > 0) {
                 const contextTagIdentifier = contextTagCall.expression;
                 const selfTypeNode = wholeCall.typeArguments[0];
-                if (ts.isPropertyAccessExpression(contextTagIdentifier) && ts.isIdentifier(contextTagIdentifier.name) && contextTagIdentifier.name.text === "Tag") {
+                if (ts.isPropertyAccessExpression(contextTagIdentifier) && ts.isIdentifier(contextTagIdentifier.name) && ts.idText(contextTagIdentifier.name) === "Tag") {
                   const parsedContextModule = yield* pipe(
                     importedContextModule(contextTagIdentifier.expression),
                     option
                   );
                   if (isSome2(parsedContextModule)) {
+                    const classSym = typeChecker.getSymbolAtLocation(atLocation.name);
+                    if (!classSym) return yield* typeParserIssue("Class has no symbol", void 0, atLocation);
+                    const type = typeChecker.getTypeOfSymbol(classSym);
                     const tagType = yield* contextTag(type, atLocation);
                     return {
                       className: atLocation.name,
                       selfTypeNode,
+                      keyStringLiteral: ts.isStringLiteral(contextTagCall.arguments[0]) ? contextTagCall.arguments[0] : void 0,
                       args: contextTagCall.arguments,
                       Identifier: tagType.Identifier,
                       Tag: parsedContextModule.value
@@ -2988,9 +3148,6 @@ function make2(ts, tsUtils, typeChecker) {
       if (!atLocation.name) {
         return yield* typeParserIssue("Class has no name", void 0, atLocation);
       }
-      const classSym = typeChecker.getSymbolAtLocation(atLocation.name);
-      if (!classSym) return yield* typeParserIssue("Class has no symbol", void 0, atLocation);
-      const type = typeChecker.getTypeOfSymbol(classSym);
       const heritageClauses = atLocation.heritageClauses;
       if (!heritageClauses) {
         return yield* typeParserIssue("Class has no heritage clauses", void 0, atLocation);
@@ -3004,7 +3161,10 @@ function make2(ts, tsUtils, typeChecker) {
               if (ts.isCallExpression(effectServiceCall) && effectServiceCall.typeArguments && effectServiceCall.typeArguments.length > 0) {
                 const effectServiceIdentifier = effectServiceCall.expression;
                 const selfTypeNode = effectServiceCall.typeArguments[0];
-                if (ts.isPropertyAccessExpression(effectServiceIdentifier) && ts.isIdentifier(effectServiceIdentifier.name) && effectServiceIdentifier.name.text === "Service") {
+                if (ts.isPropertyAccessExpression(effectServiceIdentifier) && ts.isIdentifier(effectServiceIdentifier.name) && ts.idText(effectServiceIdentifier.name) === "Service") {
+                  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(
                     importedEffectModule(effectServiceIdentifier.expression),
                     flatMap2(() => contextTag(type, atLocation)),
@@ -3017,10 +3177,10 @@ function make2(ts, tsUtils, typeChecker) {
                       const args2 = wholeCall.arguments[1];
                       if (ts.isObjectLiteralExpression(args2)) {
                         for (const property of args2.properties) {
-                          if (ts.isPropertyAssignment(property) && property.name && ts.isIdentifier(property.name) && property.name.text === "accessors" && property.initializer && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
+                          if (ts.isPropertyAssignment(property) && property.name && ts.isIdentifier(property.name) && ts.idText(property.name) === "accessors" && property.initializer && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
                             accessors2 = true;
                           }
-                          if (ts.isPropertyAssignment(property) && property.name && ts.isIdentifier(property.name) && property.name.text === "dependencies" && property.initializer && ts.isArrayLiteralExpression(property.initializer)) {
+                          if (ts.isPropertyAssignment(property) && property.name && ts.isIdentifier(property.name) && ts.idText(property.name) === "dependencies" && property.initializer && ts.isArrayLiteralExpression(property.initializer)) {
                             dependencies = property.initializer.elements;
                           }
                         }
@@ -3031,6 +3191,7 @@ function make2(ts, tsUtils, typeChecker) {
                       className: atLocation.name,
                       selfTypeNode,
                       args: wholeCall.arguments,
+                      keyStringLiteral: ts.isStringLiteral(wholeCall.arguments[0]) ? wholeCall.arguments[0] : void 0,
                       options: wholeCall.arguments[1],
                       accessors: accessors2,
                       dependencies
@@ -3069,6 +3230,8 @@ function make2(ts, tsUtils, typeChecker) {
     extendsSchemaClass,
     extendsSchemaTaggedClass,
     extendsSchemaTaggedError,
+    extendsDataTaggedError,
+    extendsDataTaggedClass,
     extendsSchemaTaggedRequest
   };
 }
@@ -3104,12 +3267,12 @@ var classSelfMismatch = createDiagnostic({
           let actualName = "";
           if (ts.isTypeReferenceNode(selfTypeNode)) {
             if (ts.isIdentifier(selfTypeNode.typeName)) {
-              actualName = selfTypeNode.typeName.text;
+              actualName = ts.idText(selfTypeNode.typeName);
             } else if (ts.isQualifiedName(selfTypeNode.typeName)) {
-              actualName = selfTypeNode.typeName.right.text;
+              actualName = ts.idText(selfTypeNode.typeName.right);
             }
           }
-          const expectedName = className.text;
+          const expectedName = ts.idText(className);
           if (actualName !== expectedName) {
             report({
               location: selfTypeNode,
@@ -3194,19 +3357,20 @@ var effectInVoidSuccess = createDiagnostic({
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const checkForEffectInVoid = fn("effectInVoidSuccess.checkForEffectInVoid")(function* (node, expectedType, valueNode, realType) {
       const expectedEffect = yield* typeParser.effectType(expectedType, node);
       const realEffect = yield* typeParser.effectType(realType, valueNode);
       if (expectedEffect.A.flags & ts.TypeFlags.Void) {
-        const voidValueTypes = unrollUnionMembers(realEffect.A);
+        const voidValueTypes = typeCheckerUtils.unrollUnionMembers(realEffect.A);
         const voidedEffect = yield* firstSuccessOf(
-          voidValueTypes.map((_) => map3(typeParser.strictEffectType(_, node), () => _))
+          voidValueTypes.map((_) => map4(typeParser.strictEffectType(_, node), () => _))
         );
         return { voidedEffect };
       }
       return yield* fail(typeParserIssue("expectedEffect success is not void"));
     });
-    const entries = yield* expectedAndRealType(sourceFile);
+    const entries = typeCheckerUtils.expectedAndRealType(sourceFile);
     for (const [node, expectedType, valueNode, realType] of entries) {
       if (expectedType !== realType) {
         yield* pipe(
@@ -3216,7 +3380,7 @@ var effectInVoidSuccess = createDiagnostic({
             valueNode,
             realType
           ),
-          map3(({ voidedEffect }) => {
+          map4(({ voidedEffect }) => {
             report(
               {
                 location: node,
@@ -3311,7 +3475,7 @@ var genericEffectServices = createDiagnostic({
       for (const [type, reportAt] of typesToCheck) {
         yield* pipe(
           typeParser.contextTag(type, node),
-          map3(() => {
+          map4(() => {
             report({
               location: reportAt,
               messageText: `Effect Services with type parameters are not supported because they cannot be properly discriminated at runtime, which may cause unexpected behavior.`,
@@ -3360,12 +3524,14 @@ var importFromBarrel = createDiagnostic({
       const moduleSymbol = resolveExternalModuleName(importDeclaration.moduleSpecifier);
       if (!moduleSymbol) return;
       if (!moduleSymbol.exports) return;
-      const sourceFile2 = importDeclaration.getSourceFile();
+      const sourceFile2 = tsUtils.getSourceFileOfNode(importDeclaration);
+      if (!sourceFile2) return;
       const nodeForSymbol = element.propertyName || element.name;
       const aliasSymbol = element.name || element.propertyName;
-      const aliasedName = aliasSymbol.text;
+      const aliasedName = ts.idText(aliasSymbol);
       if (!ts.isIdentifier(nodeForSymbol)) return;
-      const importedName = nodeForSymbol.text;
+      const importedName = ts.idText(nodeForSymbol);
+      if (!importedName) return;
       const reexportedSymbol = moduleSymbol.exports.get(ts.escapeLeadingUnderscores(importedName));
       if (!reexportedSymbol) return;
       if (!(reexportedSymbol.declarations && reexportedSymbol.declarations.length === 1)) return;
@@ -3377,7 +3543,8 @@ var importFromBarrel = createDiagnostic({
       const originalModuleSymbol = resolveExternalModuleName(exportDeclaration.moduleSpecifier);
       if (!originalModuleSymbol) return;
       if (!originalModuleSymbol.valueDeclaration) return;
-      const originalSourceFile = originalModuleSymbol.valueDeclaration.getSourceFile();
+      const originalSourceFile = tsUtils.getSourceFileOfNode(originalModuleSymbol.valueDeclaration);
+      if (!originalSourceFile) return;
       const unbarrelledFileName = getModuleSpecifier(
         program.getCompilerOptions(),
         sourceFile2,
@@ -3470,8 +3637,8 @@ var leakingRequirements = createDiagnostic({
   apply: fn("leakingRequirements.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const typeParser = yield* service(TypeParser);
-    const typeOrder = yield* deterministicTypeOrder;
     const parseLeakedRequirements = cachedBy(
       fn("leakingServices.checkServiceLeaking")(
         function* (service2, atLocation) {
@@ -3485,13 +3652,19 @@ var leakingRequirements = createDiagnostic({
             let effectContextType = void 0;
             yield* pipe(
               typeParser.effectType(servicePropertyType, atLocation),
-              map3((_) => effectContextType = _.R),
+              map4((_) => effectContextType = _.R),
               orElse2(() => {
-                const servicePropertyCallSignatures = servicePropertyType.getCallSignatures();
+                const servicePropertyCallSignatures = typeChecker.getSignaturesOfType(
+                  servicePropertyType,
+                  ts.SignatureKind.Call
+                );
                 if (servicePropertyCallSignatures.length === 1) {
                   return pipe(
-                    typeParser.effectType(servicePropertyCallSignatures[0].getReturnType(), atLocation),
-                    map3((_) => {
+                    typeParser.effectType(
+                      typeChecker.getReturnTypeOfSignature(servicePropertyCallSignatures[0]),
+                      atLocation
+                    ),
+                    map4((_) => {
                       effectContextType = _.R;
                     })
                   );
@@ -3502,14 +3675,14 @@ var leakingRequirements = createDiagnostic({
             );
             if (effectContextType) {
               effectMembers++;
-              const { allIndexes } = yield* appendToUniqueTypesMap(
+              const { allIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
                 memory,
                 effectContextType,
                 (type) => {
                   if (type.flags & ts.TypeFlags.Never) return succeed(true);
                   return pipe(
                     typeParser.scopeType(type, atLocation),
-                    map3(() => true),
+                    map4(() => true),
                     orElse2(() => succeed(false))
                   );
                 }
@@ -3550,7 +3723,7 @@ More info at https://effect.website/docs/requirements-management/layers/#avoidin
     while (nodeToVisit.length > 0) {
       const node = nodeToVisit.shift();
       const typesToCheck = [];
-      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && node.expression.name.text === "GenericTag") {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && ts.idText(node.expression.name) === "GenericTag") {
         typesToCheck.push([typeChecker.getTypeAtLocation(node), node]);
       } else if (ts.isClassDeclaration(node) && node.name && node.heritageClauses) {
         const classSym = typeChecker.getSymbolAtLocation(node.name);
@@ -3568,7 +3741,9 @@ More info at https://effect.website/docs/requirements-management/layers/#avoidin
           flatMap2(
             ({ Service }) => pipe(
               parseLeakedRequirements(Service, node),
-              map3((requirements) => reportLeakingRequirements(reportAt, sort(requirements, typeOrder)))
+              map4(
+                (requirements) => reportLeakingRequirements(reportAt, sort(requirements, typeCheckerUtils.deterministicTypeOrder))
+              )
             )
           ),
           orElse2(() => sync(() => ts.forEachChild(node, appendNodeToVisit))),
@@ -3587,21 +3762,21 @@ var missingEffectContext = createDiagnostic({
   apply: fn("missingEffectContext.apply")(function* (sourceFile, report) {
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
-    const typeOrder = yield* deterministicTypeOrder;
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const checkForMissingContextTypes = (node, expectedType, valueNode, realType) => pipe(
       all(
         typeParser.effectType(expectedType, node),
         typeParser.effectType(realType, valueNode)
       ),
-      flatMap2(
-        ([expectedEffect, realEffect]) => getMissingTypeEntriesInTargetType(
+      map4(
+        ([expectedEffect, realEffect]) => typeCheckerUtils.getMissingTypeEntriesInTargetType(
           realEffect.R,
           expectedEffect.R
         )
       )
     );
-    const sortTypes = sort(typeOrder);
-    const entries = yield* expectedAndRealType(sourceFile);
+    const sortTypes = sort(typeCheckerUtils.deterministicTypeOrder);
+    const entries = getEffectLspPatchSourceFileMetadata(sourceFile)?.relationErrors || typeCheckerUtils.expectedAndRealType(sourceFile);
     for (const [node, expectedType, valueNode, realType] of entries) {
       if (expectedType !== realType) {
         yield* pipe(
@@ -3611,7 +3786,7 @@ var missingEffectContext = createDiagnostic({
             valueNode,
             realType
           ),
-          map3(
+          map4(
             (missingTypes) => missingTypes.length > 0 ? report(
               {
                 location: node,
@@ -3636,8 +3811,8 @@ var missingEffectError = createDiagnostic({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const typeParser = yield* service(TypeParser);
-    const typeOrder = yield* deterministicTypeOrder;
     const effectModuleIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
       sourceFile,
       "effect",
@@ -3656,18 +3831,18 @@ var missingEffectError = createDiagnostic({
         typeParser.effectType(expectedType, node),
         typeParser.effectType(realType, valueNode)
       ),
-      flatMap2(
+      map4(
         ([expectedEffect, realEffect]) => pipe(
-          getMissingTypeEntriesInTargetType(
+          typeCheckerUtils.getMissingTypeEntriesInTargetType(
             realEffect.E,
             expectedEffect.E
           ),
-          map3((missingErrorTypes) => ({ missingErrorTypes, expectedErrorType: expectedEffect.E }))
+          (missingErrorTypes) => ({ missingErrorTypes, expectedErrorType: expectedEffect.E })
         )
       )
     );
-    const sortTypes = sort(typeOrder);
-    const entries = yield* expectedAndRealType(sourceFile);
+    const sortTypes = sort(typeCheckerUtils.deterministicTypeOrder);
+    const entries = getEffectLspPatchSourceFileMetadata(sourceFile)?.relationErrors || typeCheckerUtils.expectedAndRealType(sourceFile);
     for (const [node, expectedType, valueNode, realType] of entries) {
       if (expectedType !== realType) {
         yield* pipe(
@@ -3677,7 +3852,7 @@ var missingEffectError = createDiagnostic({
             valueNode,
             realType
           ),
-          map3((result) => {
+          map4((result) => {
             if (result.missingErrorTypes.length === 0) return;
             const fixes = [];
             if (ts.isExpression(valueNode) && result.expectedErrorType.flags & ts.TypeFlags.Never) {
@@ -3686,31 +3861,35 @@ var missingEffectError = createDiagnostic({
                 description: "Catch all errors with Effect.catchAll",
                 apply: gen(function* () {
                   const changeTracker = yield* service(ChangeTracker);
-                  changeTracker.insertText(sourceFile, valueNode.getStart(), effectModuleIdentifier + ".catchAll(");
-                  changeTracker.insertText(sourceFile, valueNode.getEnd(), ", () => ");
+                  changeTracker.insertText(
+                    sourceFile,
+                    ts.getTokenPosOfNode(valueNode, sourceFile),
+                    effectModuleIdentifier + ".catchAll("
+                  );
+                  changeTracker.insertText(sourceFile, valueNode.end, ", () => ");
                   changeTracker.insertNodeAt(
                     sourceFile,
-                    valueNode.getEnd(),
+                    valueNode.end,
                     createDieMessage("TODO: catchAll not implemented")
                   );
-                  changeTracker.insertText(sourceFile, valueNode.getEnd(), ")");
+                  changeTracker.insertText(sourceFile, valueNode.end, ")");
                 })
               });
             }
             if (ts.isExpression(valueNode)) {
               const propertyAssignments = pipe(
                 result.missingErrorTypes,
-                map2((_) => typeChecker.getPropertyOfType(_, "_tag")),
+                map3((_) => typeChecker.getPropertyOfType(_, "_tag")),
                 filter((_) => !!_),
-                map2((_) => typeChecker.getTypeOfSymbolAtLocation(_, valueNode)),
+                map3((_) => typeChecker.getTypeOfSymbolAtLocation(_, valueNode)),
                 filter((_) => !!(_.flags & ts.TypeFlags.Literal)),
-                map2((_) => typeChecker.typeToTypeNode(_, void 0, ts.NodeBuilderFlags.NoTruncation)),
+                map3((_) => typeChecker.typeToTypeNode(_, void 0, ts.NodeBuilderFlags.NoTruncation)),
                 filter((_) => !!_ && ts.isLiteralTypeNode(_)),
-                map2((_) => _.literal),
+                map3((_) => _.literal),
                 filter((_) => ts.isLiteralExpression(_)),
-                map2((_) => _.text),
+                map3((_) => _.text),
                 sort(string2),
-                map2(
+                map3(
                   (_) => ts.factory.createPropertyAssignment(
                     ts.factory.createIdentifier(_),
                     ts.factory.createArrowFunction(
@@ -3730,22 +3909,27 @@ var missingEffectError = createDiagnostic({
                   description: "Catch unexpected errors with Effect.catchTag",
                   apply: gen(function* () {
                     const changeTracker = yield* service(ChangeTracker);
-                    changeTracker.insertText(sourceFile, valueNode.getStart(), effectModuleIdentifier + ".catchTags(");
-                    changeTracker.insertText(sourceFile, valueNode.getEnd(), ", ");
+                    changeTracker.insertText(
+                      sourceFile,
+                      ts.getTokenPosOfNode(valueNode, sourceFile),
+                      effectModuleIdentifier + ".catchTags("
+                    );
+                    changeTracker.insertText(sourceFile, valueNode.end, ", ");
                     changeTracker.insertNodeAt(
                       sourceFile,
-                      valueNode.getEnd(),
+                      valueNode.end,
                       ts.factory.createObjectLiteralExpression(propertyAssignments)
                     );
-                    changeTracker.insertText(sourceFile, valueNode.getEnd(), ")");
+                    changeTracker.insertText(sourceFile, valueNode.end, ")");
                   })
                 });
               }
             }
+            const typeNames = sortTypes(result.missingErrorTypes).map((_) => typeChecker.typeToString(_));
             report(
               {
                 location: node,
-                messageText: `Missing '${sortTypes(result.missingErrorTypes).map((_) => typeChecker.typeToString(_)).join(" | ")}' in the expected Effect errors.`,
+                messageText: `Missing '${typeNames.join(" | ")}' in the expected Effect errors.`,
                 fixes
               }
             );
@@ -3765,6 +3949,7 @@ var missingEffectServiceDependency = createDiagnostic({
   apply: fn("missingEffectServiceDependency.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const typeParser = yield* service(TypeParser);
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
@@ -3795,7 +3980,7 @@ var missingEffectServiceDependency = createDiagnostic({
               if (layerResult) {
                 const servicesMemory = /* @__PURE__ */ new Map();
                 const excludeNever = (type) => succeed((type.flags & ts.TypeFlags.Never) !== 0);
-                const { allIndexes: requiredIndexes } = yield* appendToUniqueTypesMap(
+                const { allIndexes: requiredIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
                   servicesMemory,
                   layerResult.RIn,
                   excludeNever
@@ -3806,8 +3991,8 @@ var missingEffectServiceDependency = createDiagnostic({
                 let types = [];
                 if (dependenciesProperty) {
                   const dependenciesTypes = typeChecker.getTypeOfSymbolAtLocation(dependenciesProperty, options);
-                  const numberIndexType = dependenciesTypes.getNumberIndexType();
-                  types = numberIndexType ? unrollUnionMembers(numberIndexType) : [];
+                  const numberIndexType = typeChecker.getIndexTypeOfType(dependenciesTypes, ts.IndexKind.Number);
+                  types = numberIndexType ? typeCheckerUtils.unrollUnionMembers(numberIndexType) : [];
                 }
                 for (const depType of types) {
                   const depLayerResult = yield* pipe(
@@ -3815,7 +4000,7 @@ var missingEffectServiceDependency = createDiagnostic({
                     orElse2(() => void_)
                   );
                   if (depLayerResult) {
-                    const { allIndexes } = yield* appendToUniqueTypesMap(
+                    const { allIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
                       servicesMemory,
                       depLayerResult.ROut,
                       excludeNever
@@ -3940,7 +4125,7 @@ var missingStarInYieldEffectGen = createDiagnostic({
             typeParser.effectGen(effectGenNode),
             orElse2(() => typeParser.effectFnUntracedGen(effectGenNode)),
             orElse2(() => typeParser.effectFnGen(effectGenNode)),
-            map3(({ functionStar }) => {
+            map4(({ functionStar }) => {
               if (functionStar) {
                 brokenGenerators.add(functionStar);
               }
@@ -4004,13 +4189,13 @@ var multipleEffectProvide = createDiagnostic({
       "Layer"
     ) || "Layer";
     const parseEffectProvideLayer = (node) => {
-      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && node.expression.name.text === "provide" && node.arguments.length > 0) {
+      if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && ts.idText(node.expression.name) === "provide" && node.arguments.length > 0) {
         const layer = node.arguments[0];
         const type = typeChecker.getTypeAtLocation(layer);
         return pipe(
           typeParser.importedEffectModule(node.expression.expression),
           flatMap2(() => typeParser.layerType(type, layer)),
-          map3(() => ({ layer, node })),
+          map4(() => ({ layer, node })),
           orElse2(() => void_)
         );
       }
@@ -4040,8 +4225,8 @@ var multipleEffectProvide = createDiagnostic({
             apply: gen(function* () {
               const changeTracker = yield* service(ChangeTracker);
               changeTracker.deleteRange(sourceFile, {
-                pos: chunk[0].node.getStart(sourceFile),
-                end: chunk[chunk.length - 1].node.getEnd()
+                pos: ts.getTokenPosOfNode(chunk[0].node, sourceFile),
+                end: chunk[chunk.length - 1].node.end
               });
               const newNode = ts.factory.createCallExpression(
                 ts.factory.createPropertyAccessExpression(
@@ -4058,7 +4243,7 @@ var multipleEffectProvide = createDiagnostic({
                   chunk.map((c) => c.layer)
                 )]
               );
-              changeTracker.insertNodeAt(sourceFile, chunk[0].node.getStart(sourceFile), newNode);
+              changeTracker.insertNodeAt(sourceFile, ts.getTokenPosOfNode(chunk[0].node, sourceFile), newNode);
             })
           }]
         });
@@ -4087,7 +4272,7 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
   const typeChecker = yield* service(TypeCheckerApi);
   const typeParser = yield* service(TypeParser);
   const changeTracker = yield* service(ChangeTracker);
-  const insertLocation = atLocation.members.length > 0 ? atLocation.members[0].pos : atLocation.getEnd() - 1;
+  const insertLocation = atLocation.members.length > 0 ? atLocation.members[0].pos : atLocation.end - 1;
   const effectIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
     sourceFile,
     "effect",
@@ -4101,7 +4286,7 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
       ),
       void 0,
       [
-        ts.factory.createIdentifier(className2.text),
+        ts.factory.createIdentifier(ts.idText(className2)),
         ts.factory.createArrowFunction(
           void 0,
           void 0,
@@ -4151,9 +4336,9 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
   const generateReturnType = (type, atLocation2, className2) => pipe(
     typeParser.effectType(type, atLocation2),
     flatMap2((returnedEffect) => {
-      const contextType = returnedEffect.R.flags & ts.TypeFlags.Never ? ts.factory.createTypeReferenceNode(className2.text) : ts.factory.createUnionTypeNode(
+      const contextType = returnedEffect.R.flags & ts.TypeFlags.Never ? ts.factory.createTypeReferenceNode(ts.idText(className2)) : ts.factory.createUnionTypeNode(
         [
-          ts.factory.createTypeReferenceNode(className2.text),
+          ts.factory.createTypeReferenceNode(ts.idText(className2)),
           typeChecker.typeToTypeNode(returnedEffect.R, atLocation2, ts.NodeBuilderFlags.NoTruncation)
         ]
       );
@@ -4201,7 +4386,7 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
                   ts.factory.createIdentifier("UnknownException")
                 )
               ),
-              ts.factory.createTypeReferenceNode(className2.text)
+              ts.factory.createTypeReferenceNode(ts.idText(className2))
             ]
           ));
         })
@@ -4218,7 +4403,7 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
         [
           successType,
           ts.factory.createTypeReferenceNode("never"),
-          ts.factory.createTypeReferenceNode(className2.text)
+          ts.factory.createTypeReferenceNode(ts.idText(className2))
         ]
       );
       return succeed(typeNode);
@@ -4232,7 +4417,11 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
       ts.NodeBuilderFlags.NoTruncation
     );
     if (!signatureDeclaration) return yield* fail("error generating signature");
-    const returnType = yield* generateReturnType(signature.getReturnType(), atLocation2, className2);
+    const returnType = yield* generateReturnType(
+      typeChecker.getReturnTypeOfSignature(signature),
+      atLocation2,
+      className2
+    );
     return ts.factory.createFunctionTypeNode(
       signatureDeclaration.typeParameters,
       signatureDeclaration.parameters,
@@ -4242,10 +4431,10 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
   for (const { property, propertyType } of involvedMembers) {
     const callSignatures = [];
     let propertyDeclaration = void 0;
-    for (const signature of propertyType.getCallSignatures()) {
+    for (const signature of typeChecker.getSignaturesOfType(propertyType, ts.SignatureKind.Call)) {
       yield* pipe(
         proxySignature(signature, atLocation, className),
-        map3((sig) => {
+        map4((sig) => {
           callSignatures.push(sig);
         }),
         ignore
@@ -4253,17 +4442,18 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
     }
     const allSignatures = ts.factory.createIntersectionTypeNode(callSignatures);
     const type = tsUtils.simplifyTypeNode(allSignatures);
-    propertyDeclaration = createFunctionProperty(className, property.getName(), type, callSignatures.length > 1);
+    propertyDeclaration = createFunctionProperty(className, ts.symbolName(property), type, callSignatures.length > 1);
     const oldProperty = atLocation.members.filter(ts.isPropertyDeclaration).find((p) => {
       const symbol3 = typeChecker.getSymbolAtLocation(p.name);
-      return symbol3?.getName() === property.getName();
+      return symbol3 && ts.symbolName(symbol3) === ts.symbolName(property);
     });
     if (oldProperty) {
+      const start = ts.getTokenPosOfNode(oldProperty, sourceFile);
       changeTracker.deleteRange(sourceFile, {
-        pos: oldProperty.getStart(sourceFile),
-        end: oldProperty.getEnd()
+        pos: start,
+        end: oldProperty.end
       });
-      changeTracker.insertNodeAt(sourceFile, oldProperty.getStart(sourceFile), propertyDeclaration);
+      changeTracker.insertNodeAt(sourceFile, start, propertyDeclaration);
     } else {
       changeTracker.insertNodeAt(sourceFile, insertLocation, propertyDeclaration, { suffix: "\n" });
     }
@@ -4282,15 +4472,15 @@ var parse2 = fn("writeTagClassAccessors.parse")(function* (node) {
   const involvedMembers = [];
   for (const property of typeChecker.getPropertiesOfType(Service)) {
     const propertyType = typeChecker.getTypeOfSymbolAtLocation(property, node);
-    const callSignatures = propertyType.getCallSignatures();
+    const callSignatures = typeChecker.getSignaturesOfType(propertyType, ts.SignatureKind.Call);
     if (callSignatures.length > 0) {
       const withTypeParameters = callSignatures.filter((_) => _.typeParameters && _.typeParameters.length > 0);
       if (callSignatures.length > 1 || withTypeParameters.length > 0) involvedMembers.push({ property, propertyType });
     }
   }
   const hash2 = involvedMembers.map(({ property, propertyType }) => {
-    return property.getName() + ": " + typeChecker.typeToString(propertyType);
-  }).concat([className.text]).join("\n");
+    return ts.symbolName(property) + ": " + typeChecker.typeToString(propertyType);
+  }).concat([ts.idText(className)]).join("\n");
   return { Service, className, atLocation: node, hash: cyrb53(hash2), involvedMembers };
 });
 var writeTagClassAccessors = createRefactor({
@@ -4303,7 +4493,7 @@ var writeTagClassAccessors = createRefactor({
     const typeParser = yield* service(TypeParser);
     const parseNode = (node) => pipe(
       parse2(node),
-      map3(({ Service, atLocation, className, involvedMembers }) => ({
+      map4(({ Service, atLocation, className, involvedMembers }) => ({
         kind: "refactor.rewrite.effect.writeTagClassAccessors",
         description: "Implement Service accessors",
         apply: pipe(
@@ -4335,7 +4525,7 @@ var accessors = createCodegen({
     if (!nodeAndCommentRange) return yield* fail(new CodegenNotApplicableError("no node and comment range"));
     return yield* pipe(
       parse2(nodeAndCommentRange.node),
-      map3(
+      map4(
         (_) => ({
           hash: _.hash,
           description: "Generate accessors for the service",
@@ -4366,7 +4556,7 @@ var outdatedEffectCodegen = createDiagnostic({
     for (const { codegen, hash: hash2, range } of codegensWithRanges) {
       yield* pipe(
         getEditsForCodegen([codegen], sourceFile, range),
-        map3((applicable) => {
+        map4((applicable) => {
           if (applicable.hash !== hash2) {
             _report({
               location: range,
@@ -4426,7 +4616,7 @@ var overriddenSchemaConstructor = createDiagnostic({
               const typeAtLocation = typeChecker.getTypeAtLocation(type.expression);
               const isSchema = yield* pipe(
                 typeParser.effectSchemaType(typeAtLocation, type.expression),
-                map3(() => true),
+                map4(() => true),
                 orElse2(() => succeed(false))
               );
               if (isSchema) {
@@ -4497,7 +4687,7 @@ var returnEffectInGen = createDiagnostic({
               typeParser.effectGen(effectGenNode),
               orElse2(() => typeParser.effectFnUntracedGen(effectGenNode)),
               orElse2(() => typeParser.effectFnGen(effectGenNode)),
-              map3(() => {
+              map4(() => {
                 const fix = node.expression ? [{
                   fixName: "returnEffectInGen_fix",
                   description: "Add yield* statement",
@@ -4540,6 +4730,7 @@ var scopeInLayerEffect = createDiagnostic({
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const layerModuleIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
       sourceFile,
       "effect",
@@ -4550,25 +4741,16 @@ var scopeInLayerEffect = createDiagnostic({
       const expression = node.expression;
       if (!ts.isPropertyAccessExpression(expression)) return;
       const calledModule = expression.expression;
-      if (!(ts.isIdentifier(calledModule) && calledModule.text === layerModuleIdentifier)) return;
+      if (!(ts.isIdentifier(calledModule) && ts.idText(calledModule) === layerModuleIdentifier)) return;
       const methodIdentifier = expression.name;
-      if (!(ts.isIdentifier(methodIdentifier) && methodIdentifier.text.toLowerCase().startsWith("effect"))) return;
+      if (!(ts.isIdentifier(methodIdentifier) && ts.idText(methodIdentifier).toLowerCase().startsWith("effect"))) return;
       return { methodIdentifier };
     }
     const reportIfLayerRequireScope = (type, node, methodIdentifier) => {
-      let toCheck = [type];
-      const entries = [];
-      while (toCheck.length > 0) {
-        const type2 = toCheck.pop();
-        if (type2.isUnion()) {
-          toCheck = toCheck.concat(type2.types);
-        } else {
-          entries.push(type2);
-        }
-      }
+      const entries = typeCheckerUtils.unrollUnionMembers(type);
       return pipe(
         firstSuccessOf(entries.map((type2) => typeParser.scopeType(type2, node))),
-        map3(
+        map4(
           () => report({
             location: node,
             messageText: `Seems like you are constructing a layer with a scope in the requirements.
@@ -4637,6 +4819,7 @@ var strictBooleanExpressions = createDiagnostic({
   apply: fn("strictBooleanExpressions.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const conditionChecks = /* @__PURE__ */ new WeakMap();
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
@@ -4677,7 +4860,7 @@ var strictBooleanExpressions = createDiagnostic({
         let typesToCheck = [constrainedType || nodeType];
         while (typesToCheck.length > 0) {
           const type = typesToCheck.pop();
-          if (type.isUnion()) {
+          if (typeCheckerUtils.isUnion(type)) {
             typesToCheck = typesToCheck.concat(type.types);
             continue;
           }
@@ -4726,7 +4909,7 @@ var tryCatchInEffectGen = createDiagnostic({
             typeParser.effectGen(effectGenNode),
             orElse2(() => typeParser.effectFnUntracedGen(effectGenNode)),
             orElse2(() => typeParser.effectFnGen(effectGenNode)),
-            map3(() => {
+            map4(() => {
               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).",
@@ -4761,7 +4944,7 @@ var unnecessaryEffectGen = createDiagnostic({
       if (ts.isCallExpression(node)) {
         yield* pipe(
           typeParser.unnecessaryEffectGen(node),
-          map3(
+          map4(
             ({ replacementNode }) => report({
               location: node,
               messageText: `This Effect.gen contains a single return statement.`,
@@ -4804,7 +4987,7 @@ var unnecessaryPipe = createDiagnostic({
       if (ts.isCallExpression(node)) {
         yield* pipe(
           typeParser.pipeCall(node),
-          map3(({ args: args2, subject }) => {
+          map4(({ args: args2, subject }) => {
             if (args2.length === 0) {
               report({
                 location: node,
@@ -4850,9 +5033,9 @@ var unnecessaryPipeChain = createDiagnostic({
         yield* pipe(
           typeParser.pipeCall(node),
           flatMap2(
-            (pipeCall) => map3(typeParser.pipeCall(pipeCall.subject), (innerCall) => ({ pipeCall, innerCall }))
+            (pipeCall) => map4(typeParser.pipeCall(pipeCall.subject), (innerCall) => ({ pipeCall, innerCall }))
           ),
-          map3(({ innerCall, pipeCall }) => {
+          map4(({ innerCall, pipeCall }) => {
             report({
               location: node,
               messageText: `Chained pipe calls can be simplified to a single pipe call`,
@@ -4929,15 +5112,15 @@ var unsupportedServiceAccessors = createDiagnostic({
           node.members?.forEach((member) => {
             if (ts.isPropertyDeclaration(member) && member.modifiers?.some((mod) => mod.kind === ts.SyntaxKind.StaticKeyword)) {
               if (member.name && ts.isIdentifier(member.name)) {
-                existingStaticMembers.add(member.name.text);
+                existingStaticMembers.add(ts.idText(member.name));
               }
             }
           });
           const missingMembers = parseResult.involvedMembers.filter(
-            ({ property }) => !existingStaticMembers.has(property.getName())
+            ({ property }) => !existingStaticMembers.has(ts.symbolName(property))
           );
           if (missingMembers.length > 0) {
-            const memberNames = missingMembers.map(({ property }) => `'${property.getName()}'`).join(", ");
+            const memberNames = missingMembers.map(({ property }) => `'${ts.symbolName(property)}'`).join(", ");
             report({
               location: parseResult.className,
               messageText: `Even if accessors are enabled, accessors for ${memberNames} won't be available because the signature have generic type parameters or multiple call signatures.`,
@@ -4947,7 +5130,7 @@ var unsupportedServiceAccessors = createDiagnostic({
                 apply: gen(function* () {
                   const changeTracker = yield* service(ChangeTracker);
                   const comment = "// @effect-codegens accessors\n";
-                  changeTracker.insertText(sourceFile, node.getStart(sourceFile), comment);
+                  changeTracker.insertText(sourceFile, ts.getTokenPosOfNode(node, sourceFile), comment);
                 })
               }]
             });
@@ -4991,6 +5174,7 @@ function transform_default(program, pluginConfig, { addDiagnostic, ts: tsInstanc
     return (sourceFile) => {
       pipe(
         getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
+        nanoLayer3,
         nanoLayer2,
         nanoLayer,
         provideService(TypeCheckerApi, program.getTypeChecker()),
@@ -5008,7 +5192,7 @@ function transform_default(program, pluginConfig, { addDiagnostic, ts: tsInstanc
           )
         ),
         getOrElse(() => []),
-        map2(addDiagnostic)
+        map3(addDiagnostic)
       );
       return sourceFile;
     };