@effect/language-service 0.35.2 → 0.37.0

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-// 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") {
@@ -96,7 +96,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Equivalence.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Equivalence.js
 var make = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
 var array = (item) => make((self, that) => {
   if (self.length !== that.length) {
@@ -111,7 +111,7 @@ var array = (item) => make((self, that) => {
   return true;
 });
 
-// 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) => {
@@ -125,7 +125,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";
@@ -135,7 +135,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;
@@ -257,7 +257,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) => {
@@ -324,10 +324,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);
 };
@@ -356,7 +356,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) {
@@ -410,7 +410,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 {
@@ -462,7 +462,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:
@@ -495,14 +495,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");
@@ -589,7 +589,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,
@@ -647,7 +647,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,
@@ -709,7 +709,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;
@@ -717,11 +717,11 @@ 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/Order.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Order.js
 var make2 = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 var string2 = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
 
-// 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;
@@ -829,6 +829,7 @@ var NanoFiber = class {
   _yielded = void 0;
   _services = {};
   _cache = {};
+  _perf = false;
   runLoop(nano) {
     let current = nano;
     while (true) {
@@ -852,6 +853,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);
@@ -913,7 +942,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) {
@@ -1036,10 +1065,22 @@ var TypeScriptApi = Tag("TypeScriptApi");
 var TypeScriptProgram = Tag("TypeScriptProgram");
 var ChangeTracker = Tag("ChangeTracker");
 
-// 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/Array.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Record.js
+var map4 = /* @__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)));
@@ -1082,7 +1123,7 @@ var intersectionWith = (isEquivalent) => {
 };
 var intersection = /* @__PURE__ */ intersectionWith(_equivalence);
 var empty = () => [];
-var map4 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
+var map5 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
 var flatMap2 = /* @__PURE__ */ dual(2, (self, f) => {
   if (isEmptyReadonlyArray(self)) {
     return [];
@@ -1179,7 +1220,7 @@ function makeTypeScriptUtils(ts) {
     return pipe(
       referencedPackages.concat(packageJsonScope?.referencedPackages || []),
       dedupe,
-      map4((packageName) => packageName.toLowerCase()),
+      map5((packageName) => packageName.toLowerCase()),
       filter(
         (packageName) => pattern.endsWith("*") && packageName.startsWith(pattern.toLowerCase().substring(0, pattern.length - 1))
       )
@@ -1203,7 +1244,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) {
@@ -1212,8 +1253,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);
@@ -1232,7 +1273,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;
@@ -1259,7 +1300,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;
   }
@@ -1296,7 +1336,7 @@ function makeTypeScriptUtils(ts) {
       fnCall = ts.factory.createCallExpression(
         fnCall,
         void 0,
-        [ts.factory.createStringLiteral(fnName.text)]
+        [ts.factory.createStringLiteral(ts.idText(fnName))]
       );
     }
     return tryPreserveDeclarationSemantics(
@@ -1368,7 +1408,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) {
@@ -1376,7 +1416,7 @@ function makeTypeScriptUtils(ts) {
             orElse(() => some2(importSpecifier.name))
           );
           if (test(importSpecifier.name, statement.moduleSpecifier, importProperty)) {
-            return importSpecifier.name.text;
+            return ts.idText(importSpecifier.name);
           }
         }
       }
@@ -1389,7 +1429,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;
@@ -1464,23 +1504,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;
@@ -1574,6 +1617,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,
@@ -1593,7 +1643,8 @@ function makeTypeScriptUtils(ts) {
     createEffectGenCallExpressionWithBlock,
     createReturnYieldStarStatement,
     makeGetModuleSpecifier,
-    parseAccessedExpressionForCompletion
+    parseAccessedExpressionForCompletion,
+    getSourceFileOfNode
   };
 }
 
@@ -1605,7 +1656,7 @@ function parseDiagnosticSeverity(config) {
     pipe(
       Object.entries(config),
       filter(([key, value]) => isString(key) && isString(value)),
-      map4(([key, value]) => [String(key).toLowerCase(), String(value).toLowerCase()]),
+      map5(([key, value]) => [String(key).toLowerCase(), String(value).toLowerCase()]),
       filter(
         ([_, value]) => value === "off" || value === "error" || value === "warning" || value === "message" || value === "suggestion"
       )
@@ -1623,8 +1674,10 @@ var defaults = {
   inlays: true,
   allowedDuplicatedPackages: [],
   namespaceImportPackages: [],
+  topLevelNamedReexports: "ignore",
   barrelImportPackages: [],
-  topLevelNamedReexports: "ignore"
+  importAliases: {},
+  renames: true
 };
 function parse(config) {
   return {
@@ -1639,7 +1692,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) ? map4(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
   };
 }
 
@@ -1653,6 +1708,18 @@ function createRefactor(definition) {
 function createDiagnostic(definition) {
   return definition;
 }
+function concatDiagnostics(fa, fb) {
+  const result = fa.slice(0);
+  for (const b of fb) {
+    const existing = result.find(
+      (a) => a.file === b.file && a.code === b.code && a.source === b.source && a.start === b.start && a.length === b.length && a.messageText === b.messageText
+    );
+    if (!existing) {
+      result.push(b);
+    }
+  }
+  return result;
+}
 function createCompletion(definition) {
   return definition;
 }
@@ -1753,7 +1820,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
                   });
@@ -1792,11 +1859,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`
             );
           })
@@ -1819,8 +1887,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,
@@ -1938,6 +2006,9 @@ var getEditsForCodegen = fn("LSP.getEditsForCodegen")(function* (codegens2, sour
     ignore: updateHashComment
   };
 });
+var getEffectLspPatchSourceFileMetadata = (sourceFile) => {
+  return sourceFile["@effect-lsp-patch/metadata"];
+};
 
 // src/completions/contextSelfInClasses.ts
 var contextSelfInClasses = createCompletion({
@@ -1953,8 +2024,8 @@ var contextSelfInClasses = createCompletion({
       "effect",
       "Context"
     ) || "Context";
-    if (contextIdentifier !== accessedObject.text) return [];
-    const name = className.text;
+    if (contextIdentifier !== ts.idText(accessedObject)) return [];
+    const name = ts.idText(className);
     return [{
       name: `Tag("${name}")`,
       kind: ts.ScriptElementKind.constElement,
@@ -1967,28 +2038,65 @@ var contextSelfInClasses = createCompletion({
 
 // src/core/TypeCheckerApi.ts
 var TypeCheckerApi = Tag("TypeChecker");
-var deterministicTypeOrder = gen(function* () {
-  const typeChecker = yield* service(TypeCheckerApi);
-  return make2((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),
+  flatMap(
+    (ts) => flatMap(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);
@@ -1998,77 +2106,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 = make2((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) => {
@@ -2086,7 +2216,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([
@@ -2105,11 +2235,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]);
+                }
               }
             }
           }
@@ -2123,12 +2256,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);
@@ -2144,10 +2277,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;
@@ -2160,75 +2293,18 @@ 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
   };
 }
 
@@ -2238,11 +2314,12 @@ var durationInput = createCompletion({
   apply: fn("durationInput")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     let isInString = false;
     const previousToken = ts.findPrecedingToken(position, sourceFile);
     if (previousToken && ts.isStringTextContainingNode(previousToken)) {
-      const start = previousToken.getStart(sourceFile);
-      const end = previousToken.getEnd();
+      const start = ts.getTokenPosOfNode(previousToken, sourceFile);
+      const end = previousToken.end;
       if (start < position && position < end) {
         isInString = true;
       }
@@ -2252,7 +2329,7 @@ var durationInput = createCompletion({
       if (isInString && ts.isExpression(previousToken)) {
         const type = typeChecker.getContextualType(previousToken);
         if (type) {
-          if (!type.isUnion()) return [];
+          if (!typeCheckerUtils.isUnion(type)) return [];
           for (const member of type.types) {
             if (member.flags & ts.TypeFlags.TemplateLiteral) {
               if (hasProperty(member, "texts") && isArray(member.texts) && member.texts.length === 2 && String(member.texts[1]).trim() === "nanos") {
@@ -2276,13 +2353,14 @@ var durationInput = createCompletion({
 
 // 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, make3(ts, tsUtils, typeChecker))
+    provideService(TypeParser, make3(ts, tsUtils, typeChecker, typeCheckerUtils))
   );
 });
 var TypeParserIssue = class _TypeParserIssue {
@@ -2292,27 +2370,27 @@ var TypeParserIssue = class _TypeParserIssue {
 function typeParserIssue(_message, _type, _node) {
   return TypeParserIssue.issue;
 }
-function make3(ts, tsUtils, typeChecker) {
+function make3(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) {
@@ -2321,7 +2399,7 @@ function make3(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);
       }
@@ -2376,7 +2454,9 @@ function make3(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)));
@@ -2388,7 +2468,7 @@ function make3(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);
@@ -2402,7 +2482,9 @@ function make3(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(
@@ -2497,6 +2579,21 @@ function make3(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)) {
@@ -2516,7 +2613,7 @@ function make3(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(
@@ -2560,7 +2657,7 @@ function make3(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,
@@ -2613,7 +2710,7 @@ function make3(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,
@@ -2712,7 +2809,7 @@ function make3(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(
@@ -2741,7 +2838,7 @@ function make3(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(
@@ -2759,7 +2856,7 @@ function make3(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,
@@ -2767,7 +2864,7 @@ function make3(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" });
       }
@@ -2782,11 +2879,13 @@ function make3(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;
         }
       }
@@ -2801,19 +2900,19 @@ function make3(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);
           }
         }
@@ -2822,7 +2921,7 @@ function make3(ts, tsUtils, typeChecker) {
           if (!callbackParameter) {
             continue;
           }
-          const callbackParameterType = callableType.getTypeParameterAtPosition(0);
+          const callbackParameterType = typeCheckerUtils.getTypeParameterAtPosition(callableType, 0);
           if (!callbackParameterType) {
             continue;
           }
@@ -2854,7 +2953,7 @@ function make3(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
@@ -2890,25 +2989,24 @@ function make3(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
+                    };
                   }
                 }
               }
@@ -2935,24 +3033,23 @@ function make3(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
+                    };
                   }
                 }
               }
@@ -2965,6 +3062,82 @@ function make3(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) {
@@ -2979,24 +3152,23 @@ function make3(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
+                    };
                   }
                 }
               }
@@ -3014,9 +3186,6 @@ function make3(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);
@@ -3030,16 +3199,20 @@ function make3(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
@@ -3061,9 +3234,6 @@ function make3(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);
@@ -3077,7 +3247,10 @@ function make3(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),
                     flatMap(() => contextTag(type, atLocation)),
@@ -3090,10 +3263,10 @@ function make3(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;
                           }
                         }
@@ -3104,6 +3277,7 @@ function make3(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
@@ -3142,6 +3316,8 @@ function make3(ts, tsUtils, typeChecker) {
     extendsSchemaClass,
     extendsSchemaTaggedClass,
     extendsSchemaTaggedError,
+    extendsDataTaggedError,
+    extendsDataTaggedClass,
     extendsSchemaTaggedRequest
   };
 }
@@ -3153,7 +3329,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",
@@ -3167,7 +3343,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,
@@ -3217,9 +3393,9 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
   const generateReturnType = (type, atLocation2, className2) => pipe(
     typeParser.effectType(type, atLocation2),
     flatMap((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)
         ]
       );
@@ -3267,7 +3443,7 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
                   ts.factory.createIdentifier("UnknownException")
                 )
               ),
-              ts.factory.createTypeReferenceNode(className2.text)
+              ts.factory.createTypeReferenceNode(ts.idText(className2))
             ]
           ));
         })
@@ -3284,7 +3460,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);
@@ -3298,7 +3474,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,
@@ -3308,7 +3488,7 @@ 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) => {
@@ -3319,17 +3499,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" });
     }
@@ -3348,15 +3529,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({
@@ -3463,8 +3644,8 @@ var effectDataClasses = createCompletion({
       "effect",
       "Data"
     ) || "Data";
-    if (effectDataIdentifier !== accessedObject.text) return [];
-    const name = className.text;
+    if (effectDataIdentifier !== ts.idText(accessedObject)) return [];
+    const name = ts.idText(className);
     return [{
       name: `TaggedError("${name}")`,
       kind: ts.ScriptElementKind.constElement,
@@ -3481,10 +3662,10 @@ var effectDataClasses = createCompletion({
   })
 });
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/encoding/common.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/encoding/common.js
 var encoder = /* @__PURE__ */ new TextEncoder();
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/encoding/base64.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/encoding/base64.js
 var encode = (bytes) => {
   const length = bytes.length;
   let result = "";
@@ -3510,10 +3691,10 @@ var encode = (bytes) => {
 };
 var base64abc = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "+", "/"];
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/internal/encoding/base64Url.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/encoding/base64Url.js
 var encode2 = (data) => encode(data).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
 
-// node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Encoding.js
+// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Encoding.js
 var encodeBase64Url = (input) => typeof input === "string" ? encode2(encoder.encode(input)) : encode2(input);
 
 // src/diagnostics/classSelfMismatch.ts
@@ -3547,12 +3728,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,
@@ -3637,11 +3818,12 @@ 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), () => _))
         );
@@ -3649,7 +3831,7 @@ var effectInVoidSuccess = createDiagnostic({
       }
       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(
@@ -3803,12 +3985,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;
@@ -3820,7 +4004,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,
@@ -3913,8 +4098,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) {
@@ -3930,10 +4115,16 @@ var leakingRequirements = createDiagnostic({
               typeParser.effectType(servicePropertyType, atLocation),
               map3((_) => 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),
+                    typeParser.effectType(
+                      typeChecker.getReturnTypeOfSignature(servicePropertyCallSignatures[0]),
+                      atLocation
+                    ),
                     map3((_) => {
                       effectContextType = _.R;
                     })
@@ -3945,7 +4136,7 @@ var leakingRequirements = createDiagnostic({
             );
             if (effectContextType) {
               effectMembers++;
-              const { allIndexes } = yield* appendToUniqueTypesMap(
+              const { allIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
                 memory,
                 effectContextType,
                 (type) => {
@@ -3993,7 +4184,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);
@@ -4011,7 +4202,9 @@ More info at https://effect.website/docs/requirements-management/layers/#avoidin
           flatMap(
             ({ Service }) => pipe(
               parseLeakedRequirements(Service, node),
-              map3((requirements) => reportLeakingRequirements(reportAt, sort(requirements, typeOrder)))
+              map3(
+                (requirements) => reportLeakingRequirements(reportAt, sort(requirements, typeCheckerUtils.deterministicTypeOrder))
+              )
             )
           ),
           orElse2(() => sync(() => ts.forEachChild(node, appendNodeToVisit))),
@@ -4030,21 +4223,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)
       ),
-      flatMap(
-        ([expectedEffect, realEffect]) => getMissingTypeEntriesInTargetType(
+      map3(
+        ([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(
@@ -4079,8 +4272,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",
@@ -4099,18 +4292,18 @@ var missingEffectError = createDiagnostic({
         typeParser.effectType(expectedType, node),
         typeParser.effectType(realType, valueNode)
       ),
-      flatMap(
+      map3(
         ([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(
@@ -4129,31 +4322,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,
-                map4((_) => typeChecker.getPropertyOfType(_, "_tag")),
+                map5((_) => typeChecker.getPropertyOfType(_, "_tag")),
                 filter((_) => !!_),
-                map4((_) => typeChecker.getTypeOfSymbolAtLocation(_, valueNode)),
+                map5((_) => typeChecker.getTypeOfSymbolAtLocation(_, valueNode)),
                 filter((_) => !!(_.flags & ts.TypeFlags.Literal)),
-                map4((_) => typeChecker.typeToTypeNode(_, void 0, ts.NodeBuilderFlags.NoTruncation)),
+                map5((_) => typeChecker.typeToTypeNode(_, void 0, ts.NodeBuilderFlags.NoTruncation)),
                 filter((_) => !!_ && ts.isLiteralTypeNode(_)),
-                map4((_) => _.literal),
+                map5((_) => _.literal),
                 filter((_) => ts.isLiteralExpression(_)),
-                map4((_) => _.text),
+                map5((_) => _.text),
                 sort(string2),
-                map4(
+                map5(
                   (_) => ts.factory.createPropertyAssignment(
                     ts.factory.createIdentifier(_),
                     ts.factory.createArrowFunction(
@@ -4173,22 +4370,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
               }
             );
@@ -4208,6 +4410,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) => {
@@ -4238,7 +4441,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
@@ -4249,8 +4452,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(
@@ -4258,7 +4461,7 @@ var missingEffectServiceDependency = createDiagnostic({
                     orElse2(() => void_)
                   );
                   if (depLayerResult) {
-                    const { allIndexes } = yield* appendToUniqueTypesMap(
+                    const { allIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
                       servicesMemory,
                       depLayerResult.ROut,
                       excludeNever
@@ -4447,7 +4650,7 @@ 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(
@@ -4483,8 +4686,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(
@@ -4501,7 +4704,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);
             })
           }]
         });
@@ -4707,6 +4910,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",
@@ -4717,22 +4921,13 @@ 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(
@@ -4804,6 +4999,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) => {
@@ -4844,7 +5040,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;
           }
@@ -5096,15 +5292,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.`,
@@ -5114,7 +5310,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);
                 })
               }]
             });
@@ -5199,8 +5395,8 @@ var effectSchemaSelfInClasses = createCompletion({
       "effect",
       "Schema"
     ) || "Schema";
-    if (schemaIdentifier !== accessedObject.text) return [];
-    const name = className.text;
+    if (schemaIdentifier !== ts.idText(accessedObject)) return [];
+    const name = ts.idText(className);
     return [{
       name: `Class<${name}>`,
       kind: ts.ScriptElementKind.constElement,
@@ -5243,8 +5439,8 @@ var effectSelfInClasses = createCompletion({
       "effect",
       "Effect"
     ) || "Effect";
-    if (effectIdentifier !== accessedObject.text) return [];
-    const name = className.text;
+    if (effectIdentifier !== ts.idText(accessedObject)) return [];
+    const name = ts.idText(className);
     return [{
       name: `Service<${name}>`,
       kind: ts.ScriptElementKind.constElement,
@@ -5274,7 +5470,7 @@ var fnFunctionStar = createCompletion({
     const maybeFnName = pipe(
       tsUtils.getAncestorNodesInRange(sourceFile, tsUtils.toTextRange(accessedObject.pos)),
       filter(ts.isVariableDeclaration),
-      map4((_) => _.name && ts.isIdentifier(_.name) ? _.name.text : ""),
+      map5((_) => _.name && ts.isIdentifier(_.name) ? ts.idText(_.name) : ""),
       filter((_) => _.length > 0),
       head,
       map2((name) => [
@@ -5318,7 +5514,7 @@ var genFunctionStar = createCompletion({
     const genMemberSymbol = type.getProperty("gen");
     if (!genMemberSymbol) return [];
     const genType = typeChecker.getTypeOfSymbolAtLocation(genMemberSymbol, accessedObject);
-    if (genType.getCallSignatures().length === 0) return [];
+    if (typeChecker.getSignaturesOfType(genType, ts.SignatureKind.Call).length === 0) return [];
     const span = ts.createTextSpan(
       accessedObject.end + 1,
       Math.max(0, position - accessedObject.end - 1)
@@ -5347,8 +5543,8 @@ var rpcMakeClasses = createCompletion({
       "@effect/rpc",
       "Rpc"
     ) || "Rpc";
-    if (rpcIdentifier !== accessedObject.text) return [];
-    const name = className.text;
+    if (rpcIdentifier !== ts.idText(accessedObject)) return [];
+    const name = ts.idText(className);
     return [{
       name: `make("${name}")`,
       kind: ts.ScriptElementKind.constElement,
@@ -5374,7 +5570,7 @@ var schemaBrand = createCompletion({
       "effect",
       "Schema"
     ) || "Schema";
-    if (schemaName !== accessedObject.text) return [];
+    if (schemaName !== ts.idText(accessedObject)) return [];
     const span = ts.createTextSpan(
       accessedObject.end + 1,
       Math.max(0, position - accessedObject.end - 1)
@@ -5382,7 +5578,7 @@ var schemaBrand = createCompletion({
     return pipe(
       tsUtils.getAncestorNodesInRange(sourceFile, tsUtils.toTextRange(accessedObject.pos)),
       filter(ts.isVariableDeclaration),
-      map4((_) => _.name && ts.isIdentifier(_.name) ? _.name.text : ""),
+      map5((_) => _.name && ts.isIdentifier(_.name) ? ts.idText(_.name) : ""),
       filter((_) => _.length > 0),
       head,
       map2((name) => [
@@ -5438,7 +5634,7 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
         namespaceExports.push({
           moduleSpecifier,
           exportClause,
-          name: exportClause.name.text
+          name: ts.idText(exportClause.name)
         });
       }
       if (ts.isNamedExports(exportClause)) {
@@ -5449,8 +5645,8 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
           namedExports.push({
             moduleSpecifier,
             exportClause,
-            name: exportName.text,
-            aliasName: exportSpecifier.name.text
+            name: ts.idText(exportName),
+            aliasName: ts.idText(exportSpecifier.name)
           });
         }
       }
@@ -5610,6 +5806,11 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
     if (!moduleSpecifier) return fileName;
     return moduleSpecifier;
   };
+  const resolveAliasName = (chosenName) => {
+    const aliasName = languageServicePluginOptions.importAliases[chosenName];
+    if (aliasName) return aliasName;
+    return void 0;
+  };
   const resolve = (exportFileName, exportName) => {
     const excludedExports = mapFilenameToExportExcludes.get(exportFileName);
     if (excludedExports && excludedExports.includes(exportName)) return;
@@ -5621,7 +5822,9 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
           _tag: "NamedImport",
           fileName: reexportedFile.fileName,
           moduleName: resolveModuleName(reexportedFile.fileName),
-          name: exportName
+          name: exportName,
+          aliasName: resolveAliasName(exportName),
+          introducedPrefix: void 0
         };
       }
     }
@@ -5636,6 +5839,7 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
             fileName: namespacedFileName,
             moduleName: resolveModuleName(namespacedFileName),
             name: introducedAlias2,
+            aliasName: resolveAliasName(introducedAlias2),
             introducedPrefix: void 0
           };
         }
@@ -5648,7 +5852,8 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
         fileName: exportFileName,
         moduleName: resolveModuleName(exportFileName),
         name: introducedAlias,
-        introducedPrefix: introducedAlias
+        aliasName: resolveAliasName(introducedAlias),
+        introducedPrefix: resolveAliasName(introducedAlias) || introducedAlias
       };
     }
     const mapToBarrel = mapFromNamespaceToBarrel.get(exportFileName);
@@ -5658,7 +5863,8 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
         fileName: mapToBarrel.fileName,
         moduleName: resolveModuleName(mapToBarrel.fileName),
         name: mapToBarrel.alias,
-        introducedPrefix: mapToBarrel.alias
+        aliasName: resolveAliasName(mapToBarrel.alias),
+        introducedPrefix: resolveAliasName(mapToBarrel.alias) || mapToBarrel.alias
       };
     }
   };
@@ -5701,7 +5907,7 @@ var parseImportOnlyChanges = fn("parseImportOnlyChanges")(function* (sourceFile,
           if (ts.isNamedImports(namedBindings)) {
             for (const importSpecifier of namedBindings.elements) {
               if (!ts.isIdentifier(importSpecifier.name)) return;
-              const exportName = importSpecifier.name.text;
+              const exportName = ts.idText(importSpecifier.name);
               imports.push({ moduleName, exportName });
               continue;
             }
@@ -5735,8 +5941,9 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
   let description = "";
   switch (effectAutoImport._tag) {
     case "NamespaceImport": {
+      const aliasName = effectAutoImport.aliasName || effectAutoImport.name;
       const importModule = effectAutoImport.moduleName || effectAutoImport.fileName;
-      description = `Import * as ${effectAutoImport.name} from "${importModule}"`;
+      description = `Import * as ${aliasName} from "${importModule}"`;
       ts.insertImports(
         changeTracker,
         sourceFile,
@@ -5745,7 +5952,7 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
           ts.factory.createImportClause(
             false,
             void 0,
-            ts.factory.createNamespaceImport(ts.factory.createIdentifier(effectAutoImport.name))
+            ts.factory.createNamespaceImport(ts.factory.createIdentifier(aliasName))
           ),
           ts.factory.createStringLiteral(importModule)
         ),
@@ -5756,7 +5963,11 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
     }
     case "NamedImport": {
       const importModule = effectAutoImport.moduleName || effectAutoImport.fileName;
-      description = `Import { ${effectAutoImport.name} } from "${importModule}"`;
+      if (effectAutoImport.aliasName) {
+        description = `Import { ${effectAutoImport.name} as ${effectAutoImport.aliasName} } from "${importModule}"`;
+      } else {
+        description = `Import { ${effectAutoImport.name} } from "${importModule}"`;
+      }
       let foundImportDeclaration = false;
       for (const statement of sourceFile.statements) {
         if (ts.isImportDeclaration(statement)) {
@@ -5765,9 +5976,12 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
             const importClause = statement.importClause;
             if (importClause && importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) {
               const namedImports = importClause.namedBindings;
-              const existingImportSpecifier = namedImports.elements.find(
-                (element) => element.name.text === effectAutoImport.name
-              );
+              const existingImportSpecifier = namedImports.elements.find((element) => {
+                if (effectAutoImport.aliasName) {
+                  return ts.idText(element.name) === effectAutoImport.name && element.propertyName && ts.isIdentifier(element.propertyName) && ts.idText(element.propertyName) === effectAutoImport.aliasName;
+                }
+                return ts.idText(element.name) === effectAutoImport.name;
+              });
               if (existingImportSpecifier) {
                 foundImportDeclaration = true;
                 break;
@@ -5779,8 +5993,8 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
                   namedImports.elements.concat([
                     ts.factory.createImportSpecifier(
                       false,
-                      void 0,
-                      ts.factory.createIdentifier(effectAutoImport.name)
+                      effectAutoImport.aliasName ? ts.factory.createIdentifier(effectAutoImport.name) : void 0,
+                      ts.factory.createIdentifier(effectAutoImport.aliasName || effectAutoImport.name)
                     )
                   ])
                 )
@@ -5804,8 +6018,8 @@ var addImport = (ts, sourceFile, changeTracker, preferences, effectAutoImport) =
                 [
                   ts.factory.createImportSpecifier(
                     false,
-                    void 0,
-                    ts.factory.createIdentifier(effectAutoImport.name)
+                    effectAutoImport.aliasName ? ts.factory.createIdentifier(effectAutoImport.name) : void 0,
+                    ts.factory.createIdentifier(effectAutoImport.aliasName || effectAutoImport.name)
                   )
                 ]
               )
@@ -6013,22 +6227,26 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
     const textRange = tsUtils.toTextRange(position);
     function isSymbolFromEffectRpcModule(symbol3) {
       if (symbol3.valueDeclaration) {
-        const sourceFile2 = symbol3.valueDeclaration.getSourceFile();
-        const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(sourceFile2);
-        if (packageInfo && packageInfo.name === "@effect/rpc") {
-          const fileSymbol = typeChecker.getSymbolAtLocation(sourceFile2);
-          return fileSymbol && fileSymbol.exports && fileSymbol.exports.has("isRpc") && fileSymbol.exports.has("make") && fileSymbol.exports.has("fromTaggedRequest");
+        const sourceFile2 = tsUtils.getSourceFileOfNode(symbol3.valueDeclaration);
+        if (sourceFile2) {
+          const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(sourceFile2);
+          if (packageInfo && packageInfo.name === "@effect/rpc") {
+            const fileSymbol = typeChecker.getSymbolAtLocation(sourceFile2);
+            return fileSymbol && fileSymbol.exports && fileSymbol.exports.has("isRpc") && fileSymbol.exports.has("make") && fileSymbol.exports.has("fromTaggedRequest");
+          }
         }
       }
       return false;
     }
     function isSymbolFromEffectRpcClientModule(symbol3) {
       if (symbol3.valueDeclaration) {
-        const sourceFile2 = symbol3.valueDeclaration.getSourceFile();
-        const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(sourceFile2);
-        if (packageInfo && packageInfo.name === "@effect/rpc") {
-          const fileSymbol = typeChecker.getSymbolAtLocation(sourceFile2);
-          return fileSymbol && fileSymbol.exports && fileSymbol.exports.has("RpcClient") && fileSymbol.exports.has("make");
+        const sourceFile2 = tsUtils.getSourceFileOfNode(symbol3.valueDeclaration);
+        if (sourceFile2) {
+          const packageInfo = tsUtils.parsePackageContentNameAndVersionFromScope(sourceFile2);
+          if (packageInfo && packageInfo.name === "@effect/rpc") {
+            const fileSymbol = typeChecker.getSymbolAtLocation(sourceFile2);
+            return fileSymbol && fileSymbol.exports && fileSymbol.exports.has("RpcClient") && fileSymbol.exports.has("make");
+          }
         }
       }
       return false;
@@ -6038,9 +6256,9 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
     for (const node of tsUtils.getAncestorNodesInRange(sourceFile, textRange)) {
       if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name) && tsUtils.isNodeInRange(textRange)(node.name)) {
         const type = typeChecker.getTypeAtLocation(node);
-        for (const callSig of type.getCallSignatures()) {
+        for (const callSig of typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call)) {
           if (callSig.parameters.length >= 2 && isSymbolFromEffectRpcClientModule(callSig.parameters[1])) {
-            rpcName = node.name.text;
+            rpcName = ts.idText(node.name);
             callNode = node.name;
           }
         }
@@ -6068,7 +6286,7 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
       ts.forEachChild(fileToTest, appendNodeToVisit);
       while (result.length === 0 && nodeToVisit.length > 0) {
         const node = nodeToVisit.shift();
-        if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && (node.expression.name.text === "make" || node.expression.name.text === "fromTaggedRequest")) {
+        if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && (ts.idText(node.expression.name) === "make" || ts.idText(node.expression.name) === "fromTaggedRequest")) {
           const symbol3 = typeChecker.getSymbolAtLocation(node.expression.name);
           if (symbol3 && isSymbolFromEffectRpcModule(symbol3)) {
             const type = typeChecker.getTypeAtLocation(node);
@@ -6085,7 +6303,7 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
     if (result.length === 0) return applicableGotoDefinition;
     const effectRpcResult = result.map(([node]) => ({
       fileName: node.getSourceFile().fileName,
-      textSpan: ts.createTextSpan(node.getStart(), node.getEnd() - node.getStart()),
+      textSpan: ts.createTextSpan(node.getStart(), node.end - node.getStart()),
       kind: ts.ScriptElementKind.constElement,
       name: rpcName,
       containerKind: ts.ScriptElementKind.constElement,
@@ -6098,7 +6316,7 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
       };
     }
     return {
-      textSpan: ts.createTextSpan(callNode.getStart(), callNode.getEnd() - callNode.getStart()),
+      textSpan: ts.createTextSpan(callNode.getStart(), callNode.end - callNode.getStart()),
       definitions: effectRpcResult
     };
   });
@@ -6134,7 +6352,7 @@ var middlewareGenLike = fn("middlewareGenLike")(function* (sourceFile, _span, pr
           parseType(possiblyGen),
           map3((_) => {
             const argsCloseParen = ts.findChildOfKind(_.generatorFunction, ts.SyntaxKind.CloseParenToken, sourceFile);
-            if (argsCloseParen && _.body && inlayHint.position >= argsCloseParen.getEnd() && inlayHint.position <= _.body.getStart(sourceFile)) {
+            if (argsCloseParen && _.body && inlayHint.position >= argsCloseParen.end && inlayHint.position <= _.body.getStart(sourceFile)) {
               shouldOmit = true;
             }
           }),
@@ -6230,9 +6448,9 @@ function effectTypeArgs(sourceFile, position, quickInfo2) {
         ),
         map3((_) => makeSymbolDisplayParts("Effect Type Parameters", _.A, _.E, _.R)),
         orElse2(() => {
-          const callSignatues = type.getCallSignatures();
+          const callSignatues = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
           if (callSignatues.length !== 1) return succeed([]);
-          const returnType = callSignatues[0].getReturnType();
+          const returnType = typeChecker.getReturnTypeOfSignature(callSignatues[0]);
           return pipe(
             typeParser.effectType(
               returnType,
@@ -6243,8 +6461,8 @@ function effectTypeArgs(sourceFile, position, quickInfo2) {
         })
       );
       if (!quickInfo2) {
-        const start = node.getStart();
-        const end = node.getEnd();
+        const start = ts.getTokenPosOfNode(node, sourceFile);
+        const end = node.end;
         return {
           kind: ts.ScriptElementKind.callSignatureElement,
           kindModifiers: "",
@@ -10473,6 +10691,7 @@ function processLayerGraphNode(ctx, node, pipedInGraphNode) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const excludeNever = (type) => succeed((type.flags & ts.TypeFlags.Never) !== 0);
     const maybePipe = yield* option(typeParser.pipeCall(node));
     if (isSome2(maybePipe)) {
@@ -10490,12 +10709,12 @@ function processLayerGraphNode(ctx, node, pipedInGraphNode) {
           all(...node.arguments.map((_) => processLayerGraphNode(ctx, _, void 0)))
         );
         if (isSome2(argNodes) && argNodes.value.length === node.arguments.length) {
-          const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+          const { allIndexes: outTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
             ctx.services,
             maybeLayer.value.ROut,
             excludeNever
           );
-          const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+          const { allIndexes: inTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
             ctx.services,
             maybeLayer.value.RIn,
             excludeNever
@@ -10513,18 +10732,18 @@ function processLayerGraphNode(ctx, node, pipedInGraphNode) {
     if (pipedInGraphNode && ts.isExpression(node)) {
       const type = typeChecker.getContextualType(node);
       if (type) {
-        const callSignatures = type.getCallSignatures();
+        const callSignatures = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
         if (callSignatures.length === 1) {
           const [signature] = callSignatures;
-          const returnType = signature.getReturnType();
+          const returnType = typeChecker.getReturnTypeOfSignature(signature);
           const maybeLayer = yield* option(typeParser.layerType(returnType, node));
           if (isSome2(maybeLayer)) {
-            const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+            const { allIndexes: outTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
               ctx.services,
               maybeLayer.value.ROut,
               excludeNever
             );
-            const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+            const { allIndexes: inTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
               ctx.services,
               maybeLayer.value.RIn,
               excludeNever
@@ -10569,12 +10788,12 @@ function processLayerGraphNode(ctx, node, pipedInGraphNode) {
       const type = typeChecker.getTypeAtLocation(node);
       const maybeLayer = yield* option(typeParser.layerType(type, node));
       if (isSome2(maybeLayer)) {
-        const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+        const { allIndexes: outTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
           ctx.services,
           maybeLayer.value.ROut,
           excludeNever
         );
-        const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+        const { allIndexes: inTypes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
           ctx.services,
           maybeLayer.value.RIn,
           excludeNever
@@ -10788,8 +11007,8 @@ function layerInfo(sourceFile, position, quickInfo2) {
         )
       );
       if (!quickInfo2) {
-        const start = node.getStart();
-        const end = node.getEnd();
+        const start = ts.getTokenPosOfNode(node, sourceFile);
+        const end = node.end;
         return {
           kind: ts.ScriptElementKind.callSignatureElement,
           kindModifiers: "",
@@ -11191,11 +11410,11 @@ var effectGenToFn = createRefactor({
       parentNodes,
       filter((_) => ts.isVariableDeclaration(_) && _.initializer ? true : false),
       filter((_) => tsUtils.isNodeInRange(textRange)(_.name)),
-      map4((_) => _.initializer)
+      map5((_) => _.initializer)
     );
     const maybeNode = yield* pipe(
       nodesFromInitializers.concat(parentNodes),
-      map4(parseFunctionLikeReturnEffectGen),
+      map5(parseFunctionLikeReturnEffectGen),
       firstSuccessOf,
       option
     );
@@ -11203,7 +11422,7 @@ var effectGenToFn = createRefactor({
     const { effectModule, fnIdentifier, generatorFunction, nodeToReplace, pipeArgs } = maybeNode.value;
     return {
       kind: "refactor.rewrite.effect.effectGenToFn",
-      description: fnIdentifier ? `Convert to Effect.fn("${fnIdentifier.text}")` : "Convert to Effect.fn",
+      description: fnIdentifier ? `Convert to Effect.fn("${ts.idText(fnIdentifier)}")` : "Convert to Effect.fn",
       apply: pipe(
         gen(function* () {
           const changeTracker = yield* service(ChangeTracker);
@@ -11213,7 +11432,7 @@ var effectGenToFn = createRefactor({
               "fn"
             ),
             void 0,
-            [ts.factory.createStringLiteral(fnIdentifier.text)]
+            [ts.factory.createStringLiteral(ts.idText(fnIdentifier))]
           ) : ts.factory.createPropertyAccessExpression(
             effectModule,
             "fn"
@@ -11334,7 +11553,7 @@ var _findSchemaVariableDeclaration = fn(
     );
     return yield* pipe(
       tsUtils.getAncestorNodesInRange(sourceFile, textRange),
-      map4(findSchema),
+      map5(findSchema),
       firstSuccessOf,
       option
     );
@@ -11436,15 +11655,15 @@ var makeSchemaOpaque = createRefactor({
             "effect",
             "Schema"
           ) || "Schema";
-          const newIdentifier = ts.factory.createIdentifier(identifier.text + "_");
+          const newIdentifier = ts.factory.createIdentifier(ts.idText(identifier) + "_");
           const { contextType, encodedType, opaqueType } = yield* _createOpaqueTypes(
             effectSchemaName,
-            newIdentifier.text,
+            ts.idText(newIdentifier),
             types.A,
-            identifier.text,
+            ts.idText(identifier),
             types.I,
-            identifier.text + "Encoded",
-            identifier.text + "Context"
+            ts.idText(identifier) + "Encoded",
+            ts.idText(identifier) + "Context"
           );
           changeTracker.replaceNode(
             sourceFile,
@@ -11469,10 +11688,10 @@ var makeSchemaOpaque = createRefactor({
             variableStatement.modifiers,
             ts.factory.createVariableDeclarationList(
               [ts.factory.createVariableDeclaration(
-                identifier.text,
+                ts.idText(identifier),
                 void 0,
                 newSchemaType,
-                ts.factory.createIdentifier(newIdentifier.text)
+                ts.factory.createIdentifier(ts.idText(newIdentifier))
               )],
               variableDeclarationList.flags
             )
@@ -11507,19 +11726,19 @@ var makeSchemaOpaqueWithNs = createRefactor({
             "effect",
             "Schema"
           ) || "Schema";
-          const newIdentifier = ts.factory.createIdentifier(identifier.text + "_");
+          const newIdentifier = ts.factory.createIdentifier(ts.idText(identifier) + "_");
           const { contextType, encodedType, opaqueType } = yield* _createOpaqueTypes(
             effectSchemaName,
-            newIdentifier.text,
+            ts.idText(newIdentifier),
             types.A,
-            identifier.text,
+            ts.idText(identifier),
             types.I,
             "Encoded",
             "Context"
           );
           const namespace = ts.factory.createModuleDeclaration(
             [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-            ts.factory.createIdentifier(identifier.text),
+            ts.factory.createIdentifier(ts.idText(identifier)),
             ts.factory.createModuleBlock([
               encodedType,
               contextType
@@ -11533,6 +11752,7 @@ var makeSchemaOpaqueWithNs = createRefactor({
           );
           changeTracker.insertNodeAfter(sourceFile, variableStatement, opaqueType);
           changeTracker.insertNodeAfter(sourceFile, variableStatement, namespace);
+          const namespaceName = ts.isStringLiteral(namespace.name) ? namespace.name.text : ts.idText(namespace.name);
           const newSchemaType = ts.factory.createTypeReferenceNode(
             ts.factory.createQualifiedName(
               ts.factory.createIdentifier(effectSchemaName),
@@ -11542,13 +11762,15 @@ var makeSchemaOpaqueWithNs = createRefactor({
               ts.factory.createTypeReferenceNode(opaqueType.name),
               ts.factory.createTypeReferenceNode(
                 ts.factory.createQualifiedName(
-                  ts.factory.createIdentifier(namespace.name.text),
-                  encodedType.name
+                  ts.factory.createIdentifier(
+                    namespaceName
+                  ),
+                  ts.idText(encodedType.name)
                 )
               ),
               ts.factory.createTypeReferenceNode(ts.factory.createQualifiedName(
-                ts.factory.createIdentifier(namespace.name.text),
-                contextType.name
+                ts.factory.createIdentifier(namespaceName),
+                ts.idText(contextType.name)
               ))
             ]
           );
@@ -11556,10 +11778,10 @@ var makeSchemaOpaqueWithNs = createRefactor({
             variableStatement.modifiers,
             ts.factory.createVariableDeclarationList(
               [ts.factory.createVariableDeclaration(
-                identifier.text,
+                ts.idText(identifier),
                 void 0,
                 newSchemaType,
-                ts.factory.createIdentifier(newIdentifier.text)
+                ts.factory.createIdentifier(ts.idText(newIdentifier))
               )],
               variableDeclarationList.flags
             )
@@ -11585,14 +11807,17 @@ var pipeableToDatafirst = createRefactor({
       if (!ts.isCallExpression(node2)) return false;
       const expression = node2.expression;
       if (!ts.isIdentifier(expression)) return false;
-      if (expression.text !== "pipe") return false;
+      if (ts.idText(expression) !== "pipe") return false;
       return true;
     }
     function asDataFirstExpression(node2, self) {
       if (!ts.isCallExpression(node2)) return none2();
       const signature = typeChecker.getResolvedSignature(node2);
       if (!signature) return none2();
-      const callSignatures = typeChecker.getTypeAtLocation(node2.expression).getCallSignatures();
+      const callSignatures = typeChecker.getSignaturesOfType(
+        typeChecker.getTypeAtLocation(node2.expression),
+        ts.SignatureKind.Call
+      );
       for (let i = 0; i < callSignatures.length; i++) {
         const callSignature = callSignatures[i];
         if (callSignature.parameters.length === node2.arguments.length + 1) {
@@ -11614,7 +11839,7 @@ var pipeableToDatafirst = createRefactor({
       filter(
         (node2) => node2.arguments.length > 0
       ),
-      map4((node2) => {
+      map5((node2) => {
         let newNode2 = node2.arguments[0];
         let didSomething = false;
         for (let i = 1; i < node2.arguments.length; i++) {
@@ -11641,7 +11866,7 @@ var pipeableToDatafirst = createRefactor({
         return didSomething ? some2([node2, newNode2]) : none2();
       }),
       filter(isSome2),
-      map4((_) => _.value),
+      map5((_) => _.value),
       head
     );
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
@@ -11791,6 +12016,7 @@ var toggleReturnTypeAnnotation = createRefactor({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     function addReturnTypeAnnotation(sourceFile2, changeTracker, declaration, typeNode) {
       const closeParen = ts.findChildOfKind(declaration, ts.SyntaxKind.CloseParenToken, sourceFile2);
       const needParens = ts.isArrowFunction(declaration) && closeParen === void 0;
@@ -11838,10 +12064,10 @@ var toggleReturnTypeAnnotation = createRefactor({
         )
       };
     }
-    const returnType = yield* option(getInferredReturnType(node));
-    if (isNone2(returnType)) return yield* fail(new RefactorNotApplicableError());
+    const returnType = typeCheckerUtils.getInferredReturnType(node);
+    if (!returnType) return yield* fail(new RefactorNotApplicableError());
     const returnTypeNode = typeChecker.typeToTypeNode(
-      returnType.value,
+      returnType,
       node,
       ts.NodeBuilderFlags.NoTruncation
     );
@@ -11986,12 +12212,12 @@ var makeSchemaGenContext = fn("SchemaGen.makeSchemaGenContext")(function* (sourc
     ),
     entityNameToDataTypeName: (name) => {
       if (ts.isIdentifier(name)) {
-        switch (name.text) {
+        switch (ts.idText(name)) {
           case "Date":
           case "Pick":
           case "Omit":
           case "Record":
-            return some2(name.text);
+            return some2(ts.idText(name));
           case "ReadonlyArray":
           case "Array":
             return some2("Array");
@@ -12000,7 +12226,7 @@ var makeSchemaGenContext = fn("SchemaGen.makeSchemaGenContext")(function* (sourc
       }
       if (!ts.isIdentifier(name.left)) return none2();
       for (const moduleName in moduleToImportedName) {
-        if (name.left.text === moduleToImportedName[moduleName] && name.right.text === moduleName) {
+        if (ts.idText(name.left) === moduleToImportedName[moduleName] && ts.idText(name.right) === moduleName) {
           return some2(moduleName);
         }
       }
@@ -12014,11 +12240,11 @@ var typeEntityNameToNode = fn(
 )(
   function* (entityName) {
     const { ts } = yield* service(SchemaGenContext);
-    if (ts.isIdentifier(entityName)) return ts.factory.createIdentifier(entityName.text);
+    if (ts.isIdentifier(entityName)) return ts.factory.createIdentifier(ts.idText(entityName));
     const left3 = yield* typeEntityNameToNode(entityName.left);
     return ts.factory.createPropertyAccessExpression(
       left3,
-      ts.factory.createIdentifier(entityName.right.text)
+      ts.factory.createIdentifier(ts.idText(entityName.right))
     );
   }
 );
@@ -12263,13 +12489,13 @@ var processInterfaceDeclaration = fn("SchemaGen.processInterfaceDeclaration")(
     );
     const { properties, records } = yield* processMembers(node.members, false);
     if (preferClass && records.length === 0) {
-      return yield* createExportSchemaClassDeclaration(node.name.text, properties);
+      return yield* createExportSchemaClassDeclaration(ts.idText(node.name), properties);
     }
     const schemaStruct = createApiCall(
       "Struct",
       [ts.factory.createObjectLiteralExpression(properties, true)].concat(records)
     );
-    return yield* createExportVariableDeclaration(node.name.text, schemaStruct);
+    return yield* createExportVariableDeclaration(ts.idText(node.name), schemaStruct);
   }
 );
 var processTypeAliasDeclaration = fn("SchemaGen.processInterfaceDeclaration")(
@@ -12281,11 +12507,11 @@ var processTypeAliasDeclaration = fn("SchemaGen.processInterfaceDeclaration")(
     if (preferClass && ts.isTypeLiteralNode(node.type)) {
       const { properties, records } = yield* processMembers(node.type.members, false);
       if (records.length === 0) {
-        return yield* createExportSchemaClassDeclaration(node.name.text, properties);
+        return yield* createExportSchemaClassDeclaration(ts.idText(node.name), properties);
       }
     }
     const effectSchema = yield* processNode(node.type, false);
-    return yield* createExportVariableDeclaration(node.name.text, effectSchema);
+    return yield* createExportVariableDeclaration(ts.idText(node.name), effectSchema);
   }
 );
 var createExportVariableDeclaration = fn("SchemaGen.createExportVariableDeclaration")(
@@ -12390,6 +12616,7 @@ var typeToEffectSchema = createRefactor({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const maybeNode = yield* findNodeToProcess(sourceFile, textRange);
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
     const node = maybeNode.value;
@@ -12400,7 +12627,8 @@ var typeToEffectSchema = createRefactor({
         applyAtNode(sourceFile, node, false),
         provideService(TypeCheckerApi, typeChecker),
         provideService(TypeScriptUtils, tsUtils),
-        provideService(TypeScriptApi, ts)
+        provideService(TypeScriptApi, ts),
+        provideService(TypeCheckerUtils, typeCheckerUtils)
       )
     };
   })
@@ -12414,6 +12642,7 @@ var typeToEffectSchemaClass = createRefactor({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const maybeNode = yield* findNodeToProcess(sourceFile, textRange);
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
     const node = maybeNode.value;
@@ -12424,7 +12653,8 @@ var typeToEffectSchemaClass = createRefactor({
         applyAtNode(sourceFile, node, true),
         provideService(TypeCheckerApi, typeChecker),
         provideService(TypeScriptUtils, tsUtils),
-        provideService(TypeScriptApi, ts)
+        provideService(TypeScriptApi, ts),
+        provideService(TypeCheckerUtils, typeCheckerUtils)
       )
     };
   })
@@ -12451,7 +12681,7 @@ var wrapWithEffectGen = createRefactor({
     );
     const maybeNode = yield* pipe(
       tsUtils.getAncestorNodesInRange(sourceFile, textRange),
-      map4(findEffectToWrap),
+      map5(findEffectToWrap),
       firstSuccessOf,
       option
     );
@@ -12523,6 +12753,57 @@ var refactors = [
   writeTagClassAccessors
 ];
 
+// src/renames/keyStrings.ts
+var renameKeyStrings = (sourceFile, position, _findInStrings, _findInComments, _preferences, renameLocations) => gen(function* () {
+  const ts = yield* service(TypeScriptApi);
+  const tsUtils = yield* service(TypeScriptUtils);
+  const typeParser = yield* service(TypeParser);
+  const additionalPositions = [];
+  const node = tsUtils.findNodeAtPositionIncludingTrivia(sourceFile, position);
+  if (node && ts.isIdentifier(node)) {
+    const textToReplace = ts.idText(node);
+    const parentClass = node.parent;
+    if (ts.isClassDeclaration(parentClass) && parentClass.name === node) {
+      const baseIdentifier = yield* pipe(
+        map3(typeParser.extendsContextTag(parentClass), (_) => [_.keyStringLiteral]),
+        orElse2(() => map3(typeParser.extendsEffectService(parentClass), (_) => [_.keyStringLiteral])),
+        orElse2(
+          () => map3(typeParser.extendsSchemaTaggedClass(parentClass), (_) => [_.keyStringLiteral, _.tagStringLiteral])
+        ),
+        orElse2(
+          () => map3(typeParser.extendsSchemaTaggedError(parentClass), (_) => [_.keyStringLiteral, _.tagStringLiteral])
+        ),
+        orElse2(() => map3(typeParser.extendsDataTaggedError(parentClass), (_) => [_.keyStringLiteral])),
+        orElse2(() => map3(typeParser.extendsDataTaggedClass(parentClass), (_) => [_.keyStringLiteral])),
+        orElse2(
+          () => map3(
+            typeParser.extendsSchemaTaggedRequest(parentClass),
+            (_) => [_.keyStringLiteral, _.tagStringLiteral]
+          )
+        ),
+        option
+      );
+      if (isSome2(baseIdentifier)) {
+        for (const keyStringLiteral of baseIdentifier.value) {
+          if (!keyStringLiteral) continue;
+          const baseText = sourceFile.text.slice(keyStringLiteral.pos, keyStringLiteral.end);
+          const lastIndex = baseText.lastIndexOf(textToReplace);
+          if (lastIndex !== -1) {
+            additionalPositions.push({
+              fileName: sourceFile.fileName,
+              textSpan: {
+                start: keyStringLiteral.pos + lastIndex,
+                length: textToReplace.length
+              }
+            });
+          }
+        }
+      }
+    }
+  }
+  return additionalPositions.length === 0 ? renameLocations : additionalPositions.concat(renameLocations || []);
+});
+
 // src/index.ts
 var LSP_INJECTED_URI = "@effect/language-service/injected";
 var init = (modules) => {
@@ -12552,6 +12833,7 @@ var init = (modules) => {
     function runNano(program) {
       return (fa) => pipe(
         fa,
+        nanoLayer3,
         nanoLayer2,
         nanoLayer,
         provideService(TypeCheckerApi, program.getTypeChecker()),
@@ -12586,7 +12868,7 @@ var init = (modules) => {
     };
     proxy.getSemanticDiagnostics = (fileName, ...args2) => {
       const applicableDiagnostics = languageService.getSemanticDiagnostics(fileName, ...args2);
-      return runDiagnosticsAndCacheCodeFixes(fileName).concat(applicableDiagnostics);
+      return concatDiagnostics(runDiagnosticsAndCacheCodeFixes(fileName), applicableDiagnostics);
     };
     proxy.getSupportedCodeFixes = (...args2) => languageService.getSupportedCodeFixes(...args2).concat(
       diagnosticsErrorCodes.map((_) => "" + _)
@@ -12854,6 +13136,37 @@ var init = (modules) => {
       }
       return applicableInlayHints;
     };
+    proxy.findRenameLocations = (fileName, position, findInStrings, findInComments, userPreferences, ...args2) => {
+      const applicableRenameInfo = languageService.findRenameLocations(
+        fileName,
+        position,
+        findInStrings,
+        findInComments,
+        userPreferences,
+        ...args2
+      );
+      if (languageServicePluginOptions.renames) {
+        const program = languageService.getProgram();
+        if (program) {
+          const sourceFile = program.getSourceFile(fileName);
+          if (sourceFile) {
+            return pipe(
+              renameKeyStrings(
+                sourceFile,
+                position,
+                findInStrings,
+                findInComments,
+                userPreferences,
+                applicableRenameInfo
+              ),
+              runNano(program),
+              getOrElse(() => applicableRenameInfo)
+            );
+          }
+        }
+      }
+      return applicableRenameInfo;
+    };
     return proxy;
   }
   return { create, onConfigurationChanged };