@effect/language-service 0.78.0 → 0.80.0

package/index.js

@@ -2198,10 +2198,151 @@ var defaults = {
   extendedKeyDetection: false,
   ignoreEffectWarningsInTscExitCode: false,
   ignoreEffectSuggestionsInTscExitCode: true,
+  ignoreEffectErrorsInTscExitCode: false,
   pipeableMinArgCount: 2,
   effectFn: ["span"],
   layerGraphFollowDepth: 0,
-  mermaidProvider: "mermaid.live"
+  mermaidProvider: "mermaid.live",
+  skipDisabledOptimization: false
+};
+var booleanSchema = (description, defaultValue) => ({
+  type: "boolean",
+  description,
+  default: defaultValue
+});
+var stringArraySchema = (description, defaultValue) => ({
+  type: "array",
+  description,
+  default: defaultValue,
+  items: { type: "string" }
+});
+var stringEnumSchema = (description, values2, defaultValue) => ({
+  type: "string",
+  description,
+  enum: values2,
+  default: defaultValue
+});
+var languageServicePluginAdditionalPropertiesJsonSchema = {
+  refactors: booleanSchema("Controls Effect refactors.", defaults.refactors),
+  diagnostics: booleanSchema("Controls Effect diagnostics.", defaults.diagnostics),
+  diagnosticsName: booleanSchema(
+    "Controls whether to include the rule name in diagnostic messages.",
+    defaults.diagnosticsName
+  ),
+  missingDiagnosticNextLine: stringEnumSchema(
+    "Controls the severity of warnings for unused @effect-diagnostics-next-line comments.",
+    ["off", "error", "warning", "message", "suggestion"],
+    defaults.missingDiagnosticNextLine
+  ),
+  includeSuggestionsInTsc: booleanSchema(
+    "When patch mode is enabled, reports suggestion diagnostics as messages in TSC with a [suggestion] prefix.",
+    defaults.includeSuggestionsInTsc
+  ),
+  ignoreEffectWarningsInTscExitCode: booleanSchema(
+    "When enabled, Effect warnings do not affect the patched tsc exit code.",
+    defaults.ignoreEffectWarningsInTscExitCode
+  ),
+  ignoreEffectErrorsInTscExitCode: booleanSchema(
+    "When enabled, Effect errors do not affect the patched tsc exit code.",
+    defaults.ignoreEffectErrorsInTscExitCode
+  ),
+  ignoreEffectSuggestionsInTscExitCode: booleanSchema(
+    "When enabled, Effect suggestions do not affect the patched tsc exit code.",
+    defaults.ignoreEffectSuggestionsInTscExitCode
+  ),
+  quickinfoEffectParameters: stringEnumSchema(
+    "Controls when Effect quickinfo should include full type parameters.",
+    ["always", "never", "whentruncated"],
+    defaults.quickinfoEffectParameters
+  ),
+  quickinfo: booleanSchema("Controls Effect quickinfo.", defaults.quickinfo),
+  quickinfoMaximumLength: {
+    type: "number",
+    description: "Controls the maximum quickinfo length. Use -1 to disable truncation.",
+    default: defaults.quickinfoMaximumLength
+  },
+  keyPatterns: {
+    type: "array",
+    description: "Configures key patterns used for generated Effect service and error keys.",
+    default: defaults.keyPatterns,
+    items: {
+      type: "object",
+      properties: {
+        target: stringEnumSchema("The key builder target.", ["service", "error", "custom"], "service"),
+        pattern: stringEnumSchema(
+          "The key generation pattern.",
+          ["package-identifier", "default", "default-hashed"],
+          "default"
+        ),
+        skipLeadingPath: stringArraySchema("Path prefixes to strip before generating keys.", ["src/"])
+      }
+    }
+  },
+  extendedKeyDetection: booleanSchema(
+    "Enables extended heuristics when detecting key sources.",
+    defaults.extendedKeyDetection
+  ),
+  completions: booleanSchema("Controls Effect completions.", defaults.completions),
+  goto: booleanSchema("Controls Effect goto references support.", defaults.goto),
+  inlays: booleanSchema("Controls Effect inlay hints.", defaults.inlays),
+  allowedDuplicatedPackages: stringArraySchema(
+    "Package names that are allowed to duplicate Effect as a peer dependency.",
+    defaults.allowedDuplicatedPackages
+  ),
+  namespaceImportPackages: stringArraySchema(
+    "Package names that should prefer namespace imports.",
+    defaults.namespaceImportPackages
+  ),
+  topLevelNamedReexports: stringEnumSchema(
+    "For namespaceImportPackages, controls how top-level named re-exports are handled.",
+    ["ignore", "follow"],
+    defaults.topLevelNamedReexports
+  ),
+  barrelImportPackages: stringArraySchema(
+    "Package names that should prefer imports from their top-level barrel file.",
+    defaults.barrelImportPackages
+  ),
+  importAliases: {
+    type: "object",
+    description: "Custom aliases to use for imported identifiers.",
+    default: defaults.importAliases,
+    additionalProperties: {
+      type: "string"
+    }
+  },
+  renames: booleanSchema("Controls Effect rename helpers.", defaults.renames),
+  noExternal: booleanSchema(
+    "Disables features that link to external websites.",
+    defaults.noExternal
+  ),
+  pipeableMinArgCount: {
+    type: "number",
+    description: "Minimum argument count required before pipeable suggestions are emitted.",
+    default: defaults.pipeableMinArgCount
+  },
+  effectFn: {
+    type: "array",
+    description: "Configures which Effect.fn variants should be suggested.",
+    default: defaults.effectFn,
+    items: {
+      type: "string",
+      enum: ["untraced", "span", "suggested-span", "inferred-span", "no-span"]
+    }
+  },
+  layerGraphFollowDepth: {
+    type: "number",
+    description: "Controls how deeply layer graph analysis follows dependencies.",
+    default: defaults.layerGraphFollowDepth
+  },
+  mermaidProvider: {
+    type: "string",
+    description: "Controls which Mermaid renderer is used for layer graphs.",
+    default: defaults.mermaidProvider
+  },
+  skipDisabledOptimization: booleanSchema(
+    "When enabled, disabled diagnostics are still processed so comment-based overrides can be honored.",
+    defaults.skipDisabledOptimization
+  )
 };
 function parseKeyPatterns(patterns) {
   const result = [];
@@ -2225,6 +2366,7 @@ function parse(config) {
     includeSuggestionsInTsc: isObject(config) && hasProperty(config, "includeSuggestionsInTsc") && isBoolean(config.includeSuggestionsInTsc) ? config.includeSuggestionsInTsc : defaults.includeSuggestionsInTsc,
     ignoreEffectWarningsInTscExitCode: isObject(config) && hasProperty(config, "ignoreEffectWarningsInTscExitCode") && isBoolean(config.ignoreEffectWarningsInTscExitCode) ? config.ignoreEffectWarningsInTscExitCode : defaults.ignoreEffectWarningsInTscExitCode,
     ignoreEffectSuggestionsInTscExitCode: isObject(config) && hasProperty(config, "ignoreEffectSuggestionsInTscExitCode") && isBoolean(config.ignoreEffectSuggestionsInTscExitCode) ? config.ignoreEffectSuggestionsInTscExitCode : defaults.ignoreEffectSuggestionsInTscExitCode,
+    ignoreEffectErrorsInTscExitCode: isObject(config) && hasProperty(config, "ignoreEffectErrorsInTscExitCode") && isBoolean(config.ignoreEffectErrorsInTscExitCode) ? config.ignoreEffectErrorsInTscExitCode : defaults.ignoreEffectErrorsInTscExitCode,
     quickinfo: isObject(config) && hasProperty(config, "quickinfo") && isBoolean(config.quickinfo) ? config.quickinfo : defaults.quickinfo,
     quickinfoEffectParameters: isObject(config) && hasProperty(config, "quickinfoEffectParameters") && isString(config.quickinfoEffectParameters) && ["always", "never", "whentruncated"].includes(config.quickinfoEffectParameters.toLowerCase()) ? config.quickinfoEffectParameters.toLowerCase() : defaults.quickinfoEffectParameters,
     quickinfoMaximumLength: isObject(config) && hasProperty(config, "quickinfoMaximumLength") && isNumber(config.quickinfoMaximumLength) ? config.quickinfoMaximumLength : defaults.quickinfoMaximumLength,
@@ -2245,7 +2387,8 @@ function parse(config) {
       (_) => _.toLowerCase()
     ) : defaults.effectFn,
     layerGraphFollowDepth: isObject(config) && hasProperty(config, "layerGraphFollowDepth") && isNumber(config.layerGraphFollowDepth) ? config.layerGraphFollowDepth : defaults.layerGraphFollowDepth,
-    mermaidProvider: isObject(config) && hasProperty(config, "mermaidProvider") && isString(config.mermaidProvider) ? config.mermaidProvider : defaults.mermaidProvider
+    mermaidProvider: isObject(config) && hasProperty(config, "mermaidProvider") && isString(config.mermaidProvider) ? config.mermaidProvider : defaults.mermaidProvider,
+    skipDisabledOptimization: isObject(config) && hasProperty(config, "skipDisabledOptimization") && isBoolean(config.skipDisabledOptimization) ? config.skipDisabledOptimization : defaults.skipDisabledOptimization
   };
 }
 
@@ -3042,7 +3185,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       if (skippedRules.indexOf(ruleNameLowered) > -1 || skippedRules.indexOf("*") > -1) {
         return { diagnostics: diagnostics2, codeFixes };
       }
-      if (defaultLevel === "off" && (lineOverrides[ruleNameLowered] || sectionOverrides[ruleNameLowered] || lineOverrides["*"] || sectionOverrides["*"] || []).length === 0) {
+      if (!pluginOptions.skipDisabledOptimization && defaultLevel === "off" && (lineOverrides[ruleNameLowered] || sectionOverrides[ruleNameLowered] || lineOverrides["*"] || sectionOverrides["*"] || []).length === 0) {
         return { diagnostics: diagnostics2, codeFixes };
       }
       const fixByDisableNextLine = (node) => ({
@@ -7011,6 +7154,8 @@ var anyUnknownInErrorContext = createDiagnostic({
   code: 28,
   description: "Detects 'any' or 'unknown' types in Effect error or requirements channels",
   severity: "off",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("anyUnknownInErrorContext.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -7114,6 +7259,8 @@ var catchAllToMapError = createDiagnostic({
   code: 39,
   description: "Suggests using Effect.mapError instead of Effect.catchAll when the callback only wraps the error with Effect.fail",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("catchAllToMapError.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -7211,6 +7358,8 @@ var catchUnfailableEffect = createDiagnostic({
   code: 2,
   description: "Warns when using error handling on Effects that never fail (error type is 'never')",
   severity: "suggestion",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("catchUnfailableEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -7260,6 +7409,8 @@ var classSelfMismatch = createDiagnostic({
   code: 20,
   description: "Ensures Self type parameter matches the class name in Service/Tag/Schema classes",
   severity: "error",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("classSelfMismatch.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -7332,6 +7483,8 @@ var deterministicKeys = createDiagnostic({
   code: 25,
   description: "Enforces deterministic naming for service/tag/error identifiers based on class names",
   severity: "off",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("deterministicKeys.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -7449,6 +7602,8 @@ var duplicatePackage = createDiagnostic({
   code: 6,
   description: "Detects when multiple versions of the same Effect package are loaded",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("duplicatePackage.apply")(function* (sourceFile, report) {
     const typeParser = yield* service(TypeParser);
     const options = yield* service(LanguageServicePluginOptions);
@@ -7478,6 +7633,8 @@ var effectFnIife = createDiagnostic({
   code: 46,
   description: "Effect.fn or Effect.fnUntraced is called as an IIFE (Immediately Invoked Function Expression). Use Effect.gen instead.",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectFnIife.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -7580,6 +7737,8 @@ var effectFnOpportunity = createDiagnostic({
   code: 41,
   description: "Suggests using Effect.fn for functions that returns an Effect",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectFnOpportunity.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -8172,6 +8331,8 @@ var effectGenUsesAdapter = createDiagnostic({
   code: 23,
   description: "Warns when using the deprecated adapter parameter in Effect.gen",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectGenUsesAdapter.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8210,6 +8371,8 @@ var effectInFailure = createDiagnostic({
   code: 49,
   description: "Warns when an Effect is used inside an Effect failure channel",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectInFailure.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -8274,6 +8437,8 @@ var effectInVoidSuccess = createDiagnostic({
   code: 14,
   description: "Detects nested Effects in void success channels that may cause unexecuted effects",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectInVoidSuccess.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -8323,6 +8488,8 @@ var effectMapVoid = createDiagnostic({
   code: 40,
   description: "Suggests using Effect.asVoid instead of Effect.map(() => void 0), Effect.map(() => undefined), or Effect.map(() => {})",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectMapVoid.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8387,6 +8554,8 @@ var effectSucceedWithVoid = createDiagnostic({
   code: 47,
   description: "Suggests using Effect.void instead of Effect.succeed(undefined) or Effect.succeed(void 0)",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("effectSucceedWithVoid.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8432,12 +8601,66 @@ var effectSucceedWithVoid = createDiagnostic({
   })
 });
 
+// src/diagnostics/extendsNativeError.ts
+var extendsNativeError = createDiagnostic({
+  name: "extendsNativeError",
+  code: 50,
+  description: "Warns when a class directly extends the native Error class",
+  severity: "off",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
+  apply: fn("extendsNativeError.apply")(function* (sourceFile, report) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const errorSymbol = typeChecker.resolveName("Error", void 0, ts.SymbolFlags.Type, false);
+    if (!errorSymbol) return;
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      if (ts.isClassDeclaration(node) && node.heritageClauses) {
+        for (const clause of node.heritageClauses) {
+          if (clause.token === ts.SyntaxKind.ExtendsKeyword && clause.types.length > 0) {
+            const typeExpression = clause.types[0].expression;
+            const exprSymbol = typeChecker.getSymbolAtLocation(typeExpression);
+            const resolvedSymbol = exprSymbol && exprSymbol.flags & ts.SymbolFlags.Alias ? typeChecker.getAliasedSymbol(exprSymbol) : exprSymbol;
+            const isNativeError = resolvedSymbol === errorSymbol || (() => {
+              if (!resolvedSymbol || resolvedSymbol === errorSymbol) return false;
+              const exprType = typeChecker.getTypeAtLocation(typeExpression);
+              const constructSignatures = typeChecker.getSignaturesOfType(exprType, ts.SignatureKind.Construct);
+              if (constructSignatures.length > 0) {
+                const instanceType = typeChecker.getReturnTypeOfSignature(constructSignatures[0]);
+                return instanceType.symbol === errorSymbol;
+              }
+              return false;
+            })();
+            if (isNativeError) {
+              report({
+                location: node.name ?? typeExpression,
+                messageText: "Avoid extending the native 'Error' class directly. Consider using a tagged error (e.g. Data.TaggedError) to maintain type safety in the Effect failure channel.",
+                fixes: []
+              });
+            }
+          }
+        }
+      }
+      ts.forEachChild(node, appendNodeToVisit);
+    }
+  })
+});
+
 // src/diagnostics/floatingEffect.ts
 var floatingEffect = createDiagnostic({
   name: "floatingEffect",
   code: 3,
   description: "Ensures Effects are yielded or assigned to variables, not left floating",
   severity: "error",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("floatingEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -8489,6 +8712,8 @@ var genericEffectServices = createDiagnostic({
   code: 10,
   description: "Prevents services with type parameters that cannot be discriminated at runtime",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("genericEffectServices.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8536,6 +8761,8 @@ var globalErrorInEffectCatch = createDiagnostic({
   code: 36,
   description: "Warns when catch callbacks return global Error type instead of typed errors",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("globalErrorInEffectCatch.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8596,6 +8823,8 @@ var globalErrorInEffectFailure = createDiagnostic({
   code: 35,
   description: "Warns when the global Error type is used in an Effect failure channel",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("globalErrorInEffectFailure.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8649,6 +8878,8 @@ var importFromBarrel = createDiagnostic({
   code: 12,
   description: "Suggests importing from specific module paths instead of barrel exports",
   severity: "off",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("importFromBarrel.apply")(function* (sourceFile, report) {
     const languageServicePluginOptions = yield* service(LanguageServicePluginOptions);
     if (languageServicePluginOptions.namespaceImportPackages.length === 0) return;
@@ -8789,6 +9020,8 @@ var instanceOfSchema = createDiagnostic({
   code: 45,
   description: "Suggests using Schema.is instead of instanceof for Effect Schema types",
   severity: "off",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("instanceOfSchema.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -8852,6 +9085,8 @@ var layerMergeAllWithDependencies = createDiagnostic({
   code: 37,
   description: "Detects interdependencies in Layer.mergeAll calls where one layer provides a service that another layer requires",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("layerMergeAllWithDependencies.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -8965,6 +9200,8 @@ var leakingRequirements = createDiagnostic({
   code: 8,
   description: "Detects implementation services leaked in service methods",
   severity: "suggestion",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("leakingRequirements.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -9119,6 +9356,8 @@ var missedPipeableOpportunity = createDiagnostic({
   code: 26,
   description: "Enforces the use of pipeable style for nested function calls",
   severity: "off",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missedPipeableOpportunity.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -9299,6 +9538,8 @@ var missingEffectContext = createDiagnostic({
   code: 1,
   description: "Reports missing service requirements in Effect context channel",
   severity: "error",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missingEffectContext.apply")(function* (sourceFile, report) {
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
@@ -9348,6 +9589,8 @@ var missingEffectError = createDiagnostic({
   code: 1,
   description: "Reports missing error types in Effect error channel",
   severity: "error",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missingEffectError.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
@@ -9489,6 +9732,8 @@ var missingEffectServiceDependency = createDiagnostic({
   code: 22,
   description: "Checks that Effect.Service dependencies satisfy all required layer inputs",
   severity: "off",
+  fixable: false,
+  supportedEffect: ["v3"],
   apply: fn("missingEffectServiceDependency.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -9583,6 +9828,8 @@ var missingLayerContext = createDiagnostic({
   code: 38,
   description: "Reports missing service requirements in Layer context channel",
   severity: "error",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missingLayerContext.apply")(function* (sourceFile, report) {
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
@@ -9632,6 +9879,8 @@ var missingReturnYieldStar = createDiagnostic({
   code: 7,
   description: "Suggests using 'return yield*' for Effects with never success for better type narrowing",
   severity: "error",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missingReturnYieldStar.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
@@ -9682,6 +9931,8 @@ var missingStarInYieldEffectGen = createDiagnostic({
   code: 4,
   description: "Enforces using 'yield*' instead of 'yield' when yielding Effects in generators",
   severity: "error",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("missingStarInYieldEffectGen.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -9757,6 +10008,8 @@ var multipleEffectProvide = createDiagnostic({
   code: 18,
   description: "Warns against chaining Effect.provide calls which can cause service lifecycle issues",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("multipleEffectProvide.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
@@ -9843,12 +10096,85 @@ var multipleEffectProvide = createDiagnostic({
   })
 });
 
+// src/diagnostics/nodeBuiltinImport.ts
+var moduleAlternativesV3 = /* @__PURE__ */ new Map([
+  ["fs", { alternative: "FileSystem", module: "fs", package: "@effect/platform" }],
+  ["node:fs", { alternative: "FileSystem", module: "fs", package: "@effect/platform" }],
+  ["fs/promises", { alternative: "FileSystem", module: "fs", package: "@effect/platform" }],
+  ["node:fs/promises", { alternative: "FileSystem", module: "fs", package: "@effect/platform" }],
+  ["path", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["node:path", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["path/posix", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["node:path/posix", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["path/win32", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["node:path/win32", { alternative: "Path", module: "path", package: "@effect/platform" }],
+  ["child_process", { alternative: "CommandExecutor", module: "child_process", package: "@effect/platform" }],
+  ["node:child_process", { alternative: "CommandExecutor", module: "child_process", package: "@effect/platform" }]
+]);
+var moduleAlternativesV4 = /* @__PURE__ */ new Map([
+  ["fs", { alternative: "FileSystem", module: "fs", package: "effect" }],
+  ["node:fs", { alternative: "FileSystem", module: "fs", package: "effect" }],
+  ["fs/promises", { alternative: "FileSystem", module: "fs", package: "effect" }],
+  ["node:fs/promises", { alternative: "FileSystem", module: "fs", package: "effect" }],
+  ["path", { alternative: "Path", module: "path", package: "effect" }],
+  ["node:path", { alternative: "Path", module: "path", package: "effect" }],
+  ["path/posix", { alternative: "Path", module: "path", package: "effect" }],
+  ["node:path/posix", { alternative: "Path", module: "path", package: "effect" }],
+  ["path/win32", { alternative: "Path", module: "path", package: "effect" }],
+  ["node:path/win32", { alternative: "Path", module: "path", package: "effect" }],
+  ["child_process", { alternative: "ChildProcess", module: "child_process", package: "effect" }],
+  ["node:child_process", { alternative: "ChildProcess", module: "child_process", package: "effect" }]
+]);
+var nodeBuiltinImport = createDiagnostic({
+  name: "nodeBuiltinImport",
+  code: 52,
+  description: "Warns when importing Node.js built-in modules that have Effect-native counterparts",
+  severity: "off",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
+  apply: fn("nodeBuiltinImport.apply")(function* (sourceFile, report) {
+    const ts = yield* service(TypeScriptApi);
+    const typeParser = yield* service(TypeParser);
+    const moduleAlternatives = typeParser.supportedEffect() === "v3" ? moduleAlternativesV3 : moduleAlternativesV4;
+    for (const statement of sourceFile.statements) {
+      if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
+        const specifier = statement.moduleSpecifier.text;
+        const match2 = moduleAlternatives.get(specifier);
+        if (match2) {
+          report({
+            location: statement.moduleSpecifier,
+            messageText: `Prefer using ${match2.alternative} from ${match2.package} instead of the Node.js '${match2.module}' module.`,
+            fixes: []
+          });
+        }
+      } else if (ts.isVariableStatement(statement)) {
+        for (const decl of statement.declarationList.declarations) {
+          if (decl.initializer && ts.isCallExpression(decl.initializer) && ts.isIdentifier(decl.initializer.expression) && ts.idText(decl.initializer.expression) === "require" && decl.initializer.arguments.length === 1 && ts.isStringLiteral(decl.initializer.arguments[0])) {
+            const arg = decl.initializer.arguments[0];
+            const specifier = arg.text;
+            const match2 = moduleAlternatives.get(specifier);
+            if (match2) {
+              report({
+                location: arg,
+                messageText: `Prefer using ${match2.alternative} from ${match2.package} instead of the Node.js '${match2.module}' module.`,
+                fixes: []
+              });
+            }
+          }
+        }
+      }
+    }
+  })
+});
+
 // src/diagnostics/nonObjectEffectServiceType.ts
 var nonObjectEffectServiceType = createDiagnostic({
   name: "nonObjectEffectServiceType",
   code: 24,
   description: "Ensures Effect.Service types are objects, not primitives",
   severity: "error",
+  fixable: false,
+  supportedEffect: ["v3"],
   apply: fn("nonObjectEffectServiceType.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -10631,6 +10957,8 @@ var outdatedApi = createDiagnostic({
   code: 48,
   description: "Detects usage of APIs that have been removed or renamed in Effect v4",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v4"],
   apply: fn("outdatedApi.apply")(function* (sourceFile, report) {
     const typeParser = yield* service(TypeParser);
     const ts = yield* service(TypeScriptApi);
@@ -10698,6 +11026,8 @@ var outdatedEffectCodegen = createDiagnostic({
   code: 19,
   description: "Detects when generated code is outdated and needs to be regenerated",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("outdatedEffectCodegen.apply")(function* (sourceFile, _report) {
     const codegensWithRanges = yield* getCodegensForSourceFile(codegens, sourceFile);
     for (const { codegen, hash: hash2, range } of codegensWithRanges) {
@@ -10744,6 +11074,8 @@ var overriddenSchemaConstructor = createDiagnostic({
   code: 30,
   description: "Prevents overriding constructors in Schema classes which breaks decoding behavior",
   severity: "error",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("overriddenSchemaConstructor.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -10881,6 +11213,8 @@ var preferSchemaOverJson = createDiagnostic({
   code: 44,
   description: "Suggests using Effect Schema for JSON operations instead of JSON.parse/JSON.stringify which may throw",
   severity: "suggestion",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("preferSchemaOverJson.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -10991,6 +11325,8 @@ var redundantSchemaTagIdentifier = createDiagnostic({
   code: 42,
   description: "Suggests removing redundant identifier argument when it equals the tag value in Schema.TaggedClass/TaggedError/TaggedRequest",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("redundantSchemaTagIdentifier.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11041,6 +11377,8 @@ var returnEffectInGen = createDiagnostic({
   code: 11,
   description: "Warns when returning an Effect in a generator causes nested Effect<Effect<...>>",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("returnEffectInGen.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
@@ -11110,6 +11448,8 @@ var runEffectInsideEffect = createDiagnostic({
   code: 32,
   description: "Suggests using Runtime methods instead of Effect.run* inside Effect contexts",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3"],
   apply: fn("runEffectInsideEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11234,6 +11574,8 @@ var schemaStructWithTag = createDiagnostic({
   code: 34,
   description: "Suggests using Schema.TaggedStruct instead of Schema.Struct with _tag field",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("schemaStructWithTag.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11326,6 +11668,8 @@ var schemaSyncInEffect = createDiagnostic({
   code: 43,
   description: "Suggests using Effect-based Schema methods instead of sync methods inside Effect generators",
   severity: "suggestion",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("schemaSyncInEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11375,6 +11719,8 @@ var schemaUnionOfLiterals = createDiagnostic({
   code: 33,
   description: "Simplifies Schema.Union of multiple Schema.Literal calls into single Schema.Literal",
   severity: "off",
+  fixable: true,
+  supportedEffect: ["v3"],
   apply: fn("schemaUnionOfLiterals.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11450,6 +11796,8 @@ var scopeInLayerEffect = createDiagnostic({
   code: 13,
   description: "Suggests using Layer.scoped instead of Layer.effect when Scope is in requirements",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3"],
   apply: fn("scopeInLayerEffect.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
@@ -11539,12 +11887,91 @@ Consider using "scoped" instead to get rid of the scope in the requirements.`,
   })
 });
 
+// src/diagnostics/serviceNotAsClass.ts
+var serviceNotAsClass = createDiagnostic({
+  name: "serviceNotAsClass",
+  code: 51,
+  description: "Warns when ServiceMap.Service is used as a variable instead of a class declaration",
+  severity: "off",
+  fixable: true,
+  supportedEffect: ["v4"],
+  apply: fn("serviceNotAsClass.apply")(function* (sourceFile, report) {
+    const ts = yield* service(TypeScriptApi);
+    const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v3") return;
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      ts.forEachChild(node, appendNodeToVisit);
+      if (!ts.isVariableDeclaration(node)) continue;
+      if (!node.initializer || !ts.isCallExpression(node.initializer)) continue;
+      const callExpr = node.initializer;
+      if (!callExpr.typeArguments || callExpr.typeArguments.length === 0) continue;
+      const typeArgs = callExpr.typeArguments;
+      const declList = node.parent;
+      if (!ts.isVariableDeclarationList(declList)) continue;
+      if (!(declList.flags & ts.NodeFlags.Const)) continue;
+      const isServiceMapService = yield* pipe(
+        typeParser.isNodeReferenceToServiceMapModuleApi("Service")(callExpr.expression),
+        orUndefined
+      );
+      if (!isServiceMapService) continue;
+      const variableName = ts.isIdentifier(node.name) ? ts.idText(node.name) : sourceFile.text.substring(ts.getTokenPosOfNode(node.name, sourceFile), node.name.end);
+      const variableStatement = declList.parent;
+      const argsText = callExpr.arguments.length > 0 ? callExpr.arguments.map((a) => sourceFile.text.substring(ts.getTokenPosOfNode(a, sourceFile), a.end)).join(", ") : "";
+      const shapeText = typeArgs.length > 0 ? typeArgs.map((t) => sourceFile.text.substring(ts.getTokenPosOfNode(t, sourceFile), t.end)).join(", ") : "Shape";
+      report({
+        location: callExpr,
+        messageText: `ServiceMap.Service should be used in a class declaration instead of as a variable. Use: class ${variableName} extends ServiceMap.Service<${variableName}, ${shapeText}>()("${argsText.replace(/['"]/g, "")}") {}`,
+        fixes: [{
+          fixName: "serviceNotAsClass",
+          description: `Convert to class declaration`,
+          apply: gen(function* () {
+            const changeTracker = yield* service(ChangeTracker);
+            const targetNode = ts.isVariableStatement(variableStatement) ? variableStatement : declList;
+            const innerCall = ts.factory.createCallExpression(
+              callExpr.expression,
+              [ts.factory.createTypeReferenceNode(variableName), ...typeArgs],
+              []
+            );
+            const outerCall = ts.factory.createCallExpression(
+              innerCall,
+              void 0,
+              [...callExpr.arguments]
+            );
+            const heritageClause = ts.factory.createHeritageClause(
+              ts.SyntaxKind.ExtendsKeyword,
+              [ts.factory.createExpressionWithTypeArguments(outerCall, void 0)]
+            );
+            const modifiers = ts.isVariableStatement(variableStatement) ? variableStatement.modifiers : void 0;
+            const classDeclaration = ts.factory.createClassDeclaration(
+              modifiers,
+              ts.isIdentifier(node.name) ? node.name : ts.factory.createIdentifier(variableName),
+              void 0,
+              [heritageClause],
+              []
+            );
+            changeTracker.replaceNode(sourceFile, targetNode, classDeclaration);
+          })
+        }]
+      });
+    }
+  })
+});
+
 // src/diagnostics/strictBooleanExpressions.ts
 var strictBooleanExpressions = createDiagnostic({
   name: "strictBooleanExpressions",
   code: 17,
   description: "Enforces boolean types in conditional expressions for type safety",
   severity: "off",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("strictBooleanExpressions.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -11616,6 +12043,8 @@ var strictEffectProvide = createDiagnostic({
   code: 27,
   description: "Warns when using Effect.provide with layers outside of application entry points",
   severity: "off",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("strictEffectProvide.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
@@ -11667,6 +12096,8 @@ var tryCatchInEffectGen = createDiagnostic({
   code: 15,
   description: "Discourages try/catch in Effect generators in favor of Effect error handling",
   severity: "suggestion",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("tryCatchInEffectGen.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11724,6 +12155,8 @@ var unknownInEffectCatch = createDiagnostic({
   code: 31,
   description: "Warns when catch callbacks return unknown instead of typed errors",
   severity: "warning",
+  fixable: false,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unknownInEffectCatch.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11785,6 +12218,8 @@ var unnecessaryEffectGen = createDiagnostic({
   code: 5,
   description: "Suggests removing Effect.gen when it contains only a single return statement",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unnecessaryEffectGen.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11829,6 +12264,8 @@ var unnecessaryFailYieldableError = createDiagnostic({
   code: 29,
   description: "Suggests yielding yieldable errors directly instead of wrapping with Effect.fail",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unnecessaryFailYieldableError.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11888,6 +12325,8 @@ var unnecessaryPipe = createDiagnostic({
   code: 9,
   description: "Removes pipe calls with no arguments",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unnecessaryPipe.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -11934,6 +12373,8 @@ var unnecessaryPipeChain = createDiagnostic({
   code: 16,
   description: "Simplifies chained pipe calls into a single pipe call",
   severity: "suggestion",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unnecessaryPipeChain.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
@@ -12009,6 +12450,8 @@ var unsupportedServiceAccessors = createDiagnostic({
   code: 21,
   description: "Warns about service accessors that need codegen due to generic/complex signatures",
   severity: "warning",
+  fixable: true,
+  supportedEffect: ["v3", "v4"],
   apply: fn("unsupportedServiceAccessors.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const nodeToVisit = [];
@@ -12111,7 +12554,10 @@ var diagnostics = [
   effectFnOpportunity,
   redundantSchemaTagIdentifier,
   schemaSyncInEffect,
-  preferSchemaOverJson
+  preferSchemaOverJson,
+  extendsNativeError,
+  serviceNotAsClass,
+  nodeBuiltinImport
 ];
 
 // src/completions/effectDiagnosticsComment.ts
@@ -13335,7 +13781,10 @@ 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.end - node.getStart()),
+      textSpan: ts.createTextSpan(
+        ts.getTokenPosOfNode(node, node.getSourceFile()),
+        node.end - ts.getTokenPosOfNode(node, node.getSourceFile())
+      ),
       kind: ts.ScriptElementKind.constElement,
       name: rpcName,
       containerKind: ts.ScriptElementKind.constElement,
@@ -13348,7 +13797,10 @@ function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
       };
     }
     return {
-      textSpan: ts.createTextSpan(callNode.getStart(), callNode.end - callNode.getStart()),
+      textSpan: ts.createTextSpan(
+        ts.getTokenPosOfNode(callNode, callNode.getSourceFile()),
+        callNode.end - ts.getTokenPosOfNode(callNode, callNode.getSourceFile())
+      ),
       definitions: effectRpcResult
     };
   });
@@ -13384,7 +13836,7 @@ var middlewareGenLike = fn("middlewareGenLike")(function* (sourceFile, _span, pr
           parseType(possiblyGen),
           map5((_) => {
             const argsCloseParen = ts.findChildOfKind(_.generatorFunction, ts.SyntaxKind.CloseParenToken, sourceFile);
-            if (argsCloseParen && _.body && inlayHint.position >= argsCloseParen.end && inlayHint.position <= _.body.getStart(sourceFile)) {
+            if (argsCloseParen && _.body && inlayHint.position >= argsCloseParen.end && inlayHint.position <= ts.getTokenPosOfNode(_.body, sourceFile)) {
               shouldOmit = true;
             }
           }),
@@ -20164,7 +20616,8 @@ var OnlyLiteralPropertiesSupportedError = class {
   }
   _tag = "@effect/language-service/OnlyLiteralPropertiesSupportedError";
   toString() {
-    return `Could not process ${this.node.getText()} as only literal properties are supported.`;
+    const sourceFile = this.node.getSourceFile();
+    return `Could not process ${sourceFile.text.substring(this.node.pos, this.node.end)} as only literal properties are supported.`;
   }
 };
 var RequiredExplicitTypesError = class {
@@ -20173,7 +20626,8 @@ var RequiredExplicitTypesError = class {
   }
   _tag = "@effect/language-service/RequiredExplicitTypesError";
   toString() {
-    return `Could not process ${this.node.getText()} as only explicit types are supported.`;
+    const sourceFile = this.node.getSourceFile();
+    return `Could not process ${sourceFile.text.substring(this.node.pos, this.node.end)} as only explicit types are supported.`;
   }
 };
 var IndexSignatureWithMoreThanOneParameterError = class {
@@ -20182,7 +20636,8 @@ var IndexSignatureWithMoreThanOneParameterError = class {
   }
   _tag = "@effect/language-service/IndexSignatureWithMoreThanOneParameterError";
   toString() {
-    return `Could not process ${this.node.getText()} as only index signatures with one parameter are supported.`;
+    const sourceFile = this.node.getSourceFile();
+    return `Could not process ${sourceFile.text.substring(this.node.pos, this.node.end)} as only index signatures with one parameter are supported.`;
   }
 };
 var SchemaGenContext = Tag("SchemaGenContext");
@@ -20282,7 +20737,7 @@ var parseAllLiterals = fn(
 var createUnsupportedNodeComment = (ts, sourceFile, node) => ts.addSyntheticTrailingComment(
   ts.factory.createIdentifier(""),
   ts.SyntaxKind.MultiLineCommentTrivia,
-  " Not supported conversion: " + node.getText(sourceFile) + " "
+  " Not supported conversion: " + sourceFile.text.substring(ts.getTokenPosOfNode(node, sourceFile), node.end) + " "
 );
 var processNode = fn("SchemaGen.processNode")(function* (node, isVirtualTypeNode) {
   const { createApiCall, createApiPropertyAccess, entityNameToDataTypeName, sourceFile, supportedEffect, ts } = yield* service(
@@ -20368,7 +20823,13 @@ var processNode = fn("SchemaGen.processNode")(function* (node, isVirtualTypeNode
       if (typeNode) return yield* processNode(typeNode, true);
     }
   }
-  if (!isVirtualTypeNode && ts.isIndexedAccessTypeNode(node) && ts.isParenthesizedTypeNode(node.objectType) && ts.isTypeQueryNode(node.objectType.type) && ts.isTypeOperatorNode(node.indexType) && node.indexType.operator === ts.SyntaxKind.KeyOfKeyword && ts.isTypeQueryNode(node.indexType.type) && node.indexType.type.exprName.getText().trim() === node.objectType.type.exprName.getText().trim()) {
+  if (!isVirtualTypeNode && ts.isIndexedAccessTypeNode(node) && ts.isParenthesizedTypeNode(node.objectType) && ts.isTypeQueryNode(node.objectType.type) && ts.isTypeOperatorNode(node.indexType) && node.indexType.operator === ts.SyntaxKind.KeyOfKeyword && ts.isTypeQueryNode(node.indexType.type) && sourceFile.text.substring(
+    ts.getTokenPosOfNode(node.indexType.type.exprName, sourceFile),
+    node.indexType.type.exprName.end
+  ).trim() === sourceFile.text.substring(
+    ts.getTokenPosOfNode(node.objectType.type.exprName, sourceFile),
+    node.objectType.type.exprName.end
+  ).trim()) {
     const typeChecker = yield* service(TypeCheckerApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const type = typeCheckerUtils.getTypeAtLocation(node);