@effect/language-service 0.19.0 → 0.20.1

package/README.md

@@ -60,6 +60,9 @@ And you're done! You'll now be able to use a set of refactor and diagnostics tha
 - Remove unnecessary `Effect.gen` definitions that contains a single `yield` statement.
 - Wrap an `Effect` expression with `Effect.gen`
 
+### Miscellaneous
+- "Go to definition" for RpcClient will resolve to the Rpc definition
+
 ## Options
 
 Few options can be provided alongside the initialization of the Language Service Plugin.

package/index.js

@@ -5,7 +5,7 @@ var __export = (target, all3) => {
     __defProp(target, name, { get: all3[name], enumerable: true });
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Function.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Function.js
 var isFunction = (input) => typeof input === "function";
 var dual = function(arity, body) {
   if (typeof arity === "function") {
@@ -102,7 +102,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Either.js
 var Either_exports = {};
 __export(Either_exports, {
   Do: () => Do,
@@ -146,7 +146,7 @@ __export(Either_exports, {
   zipWith: () => zipWith
 });
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Equivalence.js
+// node_modules/.pnpm/effect@3.16.5/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) {
@@ -161,7 +161,7 @@ var array = (item) => make((self, that) => {
   return true;
 });
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/doNotation.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/doNotation.js
 var let_ = (map5) => dual(3, (self, name, f) => map5(self, (a) => Object.assign({}, a, {
   [name]: f(a)
 })));
@@ -172,11 +172,11 @@ var bind = (map5, flatMap4) => dual(3, (self, name, f) => flatMap4(self, (a) =>
   [name]: b
 }))));
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/version.js
-var moduleVersion = "3.16.3";
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/version.js
+var moduleVersion = "3.16.5";
 var getCurrentVersion = () => moduleVersion;
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/GlobalValue.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/GlobalValue.js
 var globalStoreId = `effect/GlobalValue/globalStoreId/${/* @__PURE__ */ getCurrentVersion()}`;
 var globalStore;
 var globalValue = (id, compute) => {
@@ -190,7 +190,7 @@ var globalValue = (id, compute) => {
   return globalStore.get(id);
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Predicate.js
+// node_modules/.pnpm/effect@3.16.5/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";
@@ -199,10 +199,10 @@ var isRecordOrArray = (input) => typeof input === "object" && input !== null;
 var isObject = (input) => isRecordOrArray(input) || isFunction2(input);
 var hasProperty = /* @__PURE__ */ dual(2, (self, property) => isObject(self) && property in self);
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/errors.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/errors.js
 var getBugErrorMessage = (message) => `BUG: ${message} - please report an issue at https://github.com/Effect-TS/effect/issues`;
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Utils.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var isGenKind = (u) => isObject(u) && GenKindTypeId in u;
 var GenKindImpl = class {
@@ -338,7 +338,7 @@ var internalCall = isNotOptimizedAway ? standard.effect_internal_function : forc
 var genConstructor = function* () {
 }.constructor;
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Hash.js
+// node_modules/.pnpm/effect@3.16.5/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) => {
@@ -437,7 +437,7 @@ var cached = function() {
   return hash2;
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Equal.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Equal.js
 var symbol2 = /* @__PURE__ */ Symbol.for("effect/Equal");
 function equals() {
   if (arguments.length === 1) {
@@ -490,7 +490,7 @@ function compareBoth(self, that) {
 }
 var isEqual = (u) => hasProperty(u, symbol2);
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Inspectable.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJSON = (x) => {
   try {
@@ -542,7 +542,7 @@ var redact = (u) => {
   return u;
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Pipeable.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Pipeable.js
 var pipeArguments = (self, args) => {
   switch (args.length) {
     case 0:
@@ -575,10 +575,10 @@ var pipeArguments = (self, args) => {
   }
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/opCodes/effect.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/opCodes/effect.js
 var OP_COMMIT = "Commit";
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/effectable.js
+// node_modules/.pnpm/effect@3.16.5/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");
@@ -665,7 +665,7 @@ var StructuralCommitPrototype = {
   ...StructuralPrototype
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/option.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/option.js
 var TypeId = /* @__PURE__ */ Symbol.for("effect/Option");
 var CommonProto = {
   ...EffectPrototype,
@@ -723,7 +723,7 @@ var some = (value) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/either.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/either.js
 var TypeId2 = /* @__PURE__ */ Symbol.for("effect/Either");
 var CommonProto2 = {
   ...EffectPrototype,
@@ -788,7 +788,7 @@ var getLeft = (self) => isRight(self) ? none : some(self.left);
 var getRight = (self) => isLeft(self) ? none : some(self.right);
 var fromOption = /* @__PURE__ */ dual(2, (self, onNone) => isNone(self) ? left(onNone()) : right(self.value));
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Either.js
 var TypeId3 = TypeId2;
 var right2 = right;
 var void_ = /* @__PURE__ */ right2(void 0);
@@ -898,13 +898,13 @@ var transposeOption = (self) => {
 };
 var transposeMapOption = /* @__PURE__ */ dual(2, (self, f) => isNone(self) ? right2(none) : map(f(self.value), some));
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/array.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Order.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Order.js
 var make2 = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Option.js
+// node_modules/.pnpm/effect@3.16.5/node_modules/effect/dist/esm/Option.js
 var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
@@ -919,7 +919,7 @@ var fromNullable2 = (nullableValue) => nullableValue == null ? none2() : some2(n
 var getOrUndefined2 = /* @__PURE__ */ getOrElse2(constUndefined);
 var map2 = /* @__PURE__ */ dual(2, (self, f) => isNone2(self) ? none2() : some2(f(self.value)));
 
-// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Array.js
+// node_modules/.pnpm/effect@3.16.5/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)));
@@ -1137,6 +1137,27 @@ var all2 = (...args) => gen2(function* () {
 var TypeScriptApi = Tag("TypeScriptApi");
 var TypeScriptProgram = Tag("TypeScriptProgram");
 var ChangeTracker = Tag("ChangeTracker");
+function parsePackageContentNameAndVersionFromScope(v) {
+  if (!isObject(v)) return;
+  if (!hasProperty(v, "packageJsonScope")) return;
+  if (!v.packageJsonScope) return;
+  const packageJsonScope = v.packageJsonScope;
+  if (!hasProperty(packageJsonScope, "contents")) return;
+  if (!hasProperty(packageJsonScope.contents, "packageJsonContent")) return;
+  const packageJsonContent = packageJsonScope.contents.packageJsonContent;
+  if (!hasProperty(packageJsonContent, "name")) return;
+  if (!hasProperty(packageJsonContent, "version")) return;
+  const { name, version } = packageJsonContent;
+  if (!isString(name)) return;
+  if (!isString(version)) return;
+  const hasEffectInPeerDependencies = hasProperty(packageJsonContent, "peerDependencies") && isObject(packageJsonContent.peerDependencies) && hasProperty(packageJsonContent.peerDependencies, "effect");
+  return {
+    name: name.toLowerCase(),
+    version: version.toLowerCase(),
+    hasEffectInPeerDependencies,
+    contents: packageJsonContent
+  };
+}
 
 // src/core/AST.ts
 function collectSelfAndAncestorNodesInRange(node, textRange) {
@@ -1485,6 +1506,19 @@ var createReturnYieldStarStatement = fn("AST.createReturnYieldStarStatement")(
     );
   }
 );
+var parsePipeCall = fn("AST.parsePipeCall")(
+  function* (node) {
+    const ts = yield* service(TypeScriptApi);
+    if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && node.expression.name.text === "pipe") {
+      return { node, subject: node.expression.expression, args: node.arguments };
+    }
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "pipe" && node.arguments.length > 0) {
+      const [subject, ...args] = node.arguments;
+      return { node, subject, args };
+    }
+    return yield* fail(new NodeNotFoundError());
+  }
+);
 
 // src/core/LSP.ts
 var RefactorNotApplicableError = class {
@@ -2616,11 +2650,45 @@ var genFunctionStar = createCompletion({
   })
 });
 
+// src/completions/rpcMakeClasses.ts
+var rpcMakeClasses = createCompletion({
+  name: "rpcMakeClasses",
+  apply: fn("rpcMakeClasses")(function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const maybeInfos = yield* option(
+      parseDataForExtendsClassCompletion(sourceFile, position)
+    );
+    if (isNone2(maybeInfos)) return [];
+    const { accessedObject, className, replacementSpan } = maybeInfos.value;
+    const rpcName = yield* option(
+      findImportedModuleIdentifierByPackageAndNameOrBarrel(
+        sourceFile,
+        "@effect/rpc",
+        "Rpc"
+      )
+    );
+    const rpcIdentifier = match2(rpcName, {
+      onNone: () => "Rpc",
+      onSome: (_) => _.text
+    });
+    if (rpcIdentifier !== accessedObject.text) return [];
+    const name = className.text;
+    return [{
+      name: `make("${name}")`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `${rpcIdentifier}.make("${name}", {${"${0}"}}) {}`,
+      replacementSpan,
+      isSnippet: true
+    }];
+  })
+});
+
 // src/completions.ts
 var completions = [
   effectSchemaSelfInClasses,
   effectSelfInClasses,
   contextSelfInClasses,
+  rpcMakeClasses,
   genFunctionStar,
   fnFunctionStar,
   effectDataClasses
@@ -2640,27 +2708,6 @@ function parse(config) {
 // src/diagnostics/duplicatePackage.ts
 var checkedPackagesCache = /* @__PURE__ */ new Map();
 var programResolvedCacheSize = /* @__PURE__ */ new Map();
-function parsePackageContentNameAndVersion(v) {
-  if (!isObject(v)) return;
-  if (!hasProperty(v, "packageJsonScope")) return;
-  if (!v.packageJsonScope) return;
-  const packageJsonScope = v.packageJsonScope;
-  if (!hasProperty(packageJsonScope, "contents")) return;
-  if (!hasProperty(packageJsonScope.contents, "packageJsonContent")) return;
-  const packageJsonContent = packageJsonScope.contents.packageJsonContent;
-  if (!hasProperty(packageJsonContent, "name")) return;
-  if (!hasProperty(packageJsonContent, "version")) return;
-  const { name, version } = packageJsonContent;
-  if (!isString(name)) return;
-  if (!isString(version)) return;
-  const hasEffectInPeerDependencies = hasProperty(packageJsonContent, "peerDependencies") && isObject(packageJsonContent.peerDependencies) && hasProperty(packageJsonContent.peerDependencies, "effect");
-  return {
-    name: name.toLowerCase(),
-    version: version.toLowerCase(),
-    hasEffectInPeerDependencies,
-    contents: packageJsonContent
-  };
-}
 var duplicatePackage = createDiagnostic({
   name: "duplicatePackage",
   code: 6,
@@ -2677,7 +2724,7 @@ var duplicatePackage = createDiagnostic({
       const seenPackages = /* @__PURE__ */ new Set();
       resolvedPackages = {};
       program.getSourceFiles().map((_) => {
-        const packageInfo = parsePackageContentNameAndVersion(_);
+        const packageInfo = parsePackageContentNameAndVersionFromScope(_);
         if (!packageInfo) return;
         const packageNameAndVersion = packageInfo.name + "@" + packageInfo.version;
         if (seenPackages.has(packageNameAndVersion)) return;
@@ -2858,6 +2905,75 @@ var missingEffectError = createDiagnostic({
   })
 });
 
+// src/diagnostics/missingReturnYieldStar.ts
+var missingReturnYieldStar = createDiagnostic({
+  name: "missingReturnYieldStar",
+  code: 7,
+  apply: fn("missingReturnYieldStar.apply")(function* (sourceFile) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const effectDiagnostics = [];
+    const brokenYields = /* @__PURE__ */ new Set();
+    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.isYieldExpression(node) && node.expression && node.asteriskToken) {
+        const type = typeChecker.getTypeAtLocation(node.expression);
+        const maybeEffect = yield* option(effectType(type, node.expression));
+        if (isSome2(maybeEffect) && maybeEffect.value.A.flags & ts.TypeFlags.Never) {
+          const generatorFunctionOrReturnStatement = ts.findAncestor(
+            node,
+            (_) => ts.isFunctionExpression(_) || ts.isFunctionDeclaration(_) || ts.isMethodDeclaration(_) || ts.isReturnStatement(_)
+          );
+          if (generatorFunctionOrReturnStatement && !ts.isReturnStatement(generatorFunctionOrReturnStatement)) {
+            if (generatorFunctionOrReturnStatement && generatorFunctionOrReturnStatement.parent) {
+              const effectGenNode = generatorFunctionOrReturnStatement.parent;
+              const effectGenLike = yield* pipe(
+                effectGen(effectGenNode),
+                orElse3(() => effectFnUntracedGen(effectGenNode)),
+                orElse3(() => effectFnGen(effectGenNode)),
+                option
+              );
+              if (isSome2(effectGenLike)) {
+                brokenYields.add(node);
+              }
+            }
+          }
+        }
+      }
+    }
+    brokenYields.forEach((node) => {
+      const fix = node.expression ? [{
+        fixName: "missingReturnYieldStar_fix",
+        description: "Add return statement",
+        apply: gen2(function* () {
+          const changeTracker = yield* service(ChangeTracker);
+          changeTracker.replaceNode(
+            sourceFile,
+            node,
+            ts.factory.createReturnStatement(
+              node
+            )
+          );
+        })
+      }] : [];
+      effectDiagnostics.push({
+        node,
+        category: ts.DiagnosticCategory.Error,
+        messageText: `Yielded Effect never completes, so it is best to use a 'return yield*' instead.`,
+        fixes: fix
+      });
+    });
+    return effectDiagnostics;
+  })
+});
+
 // src/diagnostics/missingStarInYieldEffectGen.ts
 var missingStarInYieldEffectGen = createDiagnostic({
   name: "missingStarInYieldEffectGen",
@@ -2983,9 +3099,115 @@ var diagnostics = [
   missingEffectError,
   floatingEffect,
   missingStarInYieldEffectGen,
-  unnecessaryEffectGen2
+  unnecessaryEffectGen2,
+  missingReturnYieldStar
 ];
 
+// src/goto/effectRpcDefinition.ts
+function effectRpcDefinition(applicableGotoDefinition, sourceFile, position) {
+  return gen2(function* () {
+    const program = yield* service(TypeScriptProgram);
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const textRange = toTextRange(position);
+    function isSymbolFromEffectRpcModule(symbol3) {
+      if (symbol3.valueDeclaration) {
+        const sourceFile2 = symbol3.valueDeclaration.getSourceFile();
+        const packageInfo = 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 = 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;
+    }
+    let rpcName = null;
+    let callNode = null;
+    for (const node of yield* getAncestorNodesInRange(sourceFile, textRange)) {
+      if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name) && isNodeInRange(textRange)(node.name)) {
+        const type = typeChecker.getTypeAtLocation(node);
+        for (const callSig of type.getCallSignatures()) {
+          if (callSig.parameters.length >= 2 && isSymbolFromEffectRpcClientModule(callSig.parameters[1])) {
+            rpcName = node.name.text;
+            callNode = node.name;
+          }
+        }
+      }
+    }
+    if (rpcName === null || callNode === null) return applicableGotoDefinition;
+    const result = [];
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    const filesToTest = [];
+    for (const programFile of program.getSourceFiles()) {
+      if (programFile.isDeclarationFile) continue;
+      if (programFile.text.indexOf("make") === -1 && programFile.text.indexOf("fromTaggedRequest") === -1) continue;
+      if (programFile.text.indexOf(rpcName) > -1) {
+        filesToTest.unshift(programFile);
+      } else {
+        filesToTest.push(programFile);
+      }
+    }
+    for (const fileToTest of filesToTest) {
+      if (result.length > 0) break;
+      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")) {
+          const symbol3 = typeChecker.getSymbolAtLocation(node.expression.name);
+          if (symbol3 && isSymbolFromEffectRpcModule(symbol3)) {
+            const type = typeChecker.getTypeAtLocation(node);
+            const _tag = type.getProperty("_tag");
+            if (_tag) {
+              const tagValue = typeChecker.getTypeOfSymbolAtLocation(_tag, node);
+              if ("value" in tagValue && tagValue.value === rpcName) result.push([node, symbol3]);
+            }
+          }
+        }
+        ts.forEachChild(node, appendNodeToVisit);
+      }
+    }
+    if (result.length === 0) return applicableGotoDefinition;
+    const effectRpcResult = result.map(([node]) => ({
+      fileName: node.getSourceFile().fileName,
+      textSpan: ts.createTextSpan(node.getStart(), node.getEnd() - node.getStart()),
+      kind: ts.ScriptElementKind.constElement,
+      name: rpcName,
+      containerKind: ts.ScriptElementKind.constElement,
+      containerName: rpcName
+    }));
+    if (applicableGotoDefinition) {
+      return {
+        ...applicableGotoDefinition,
+        definitions: (applicableGotoDefinition.definitions || []).concat(effectRpcResult)
+      };
+    }
+    return {
+      textSpan: ts.createTextSpan(callNode.getStart(), callNode.getEnd() - callNode.getStart()),
+      definitions: effectRpcResult
+    };
+  });
+}
+
+// src/goto.ts
+function goto(applicableGotoDefinition, sourceFile, position) {
+  return effectRpcDefinition(applicableGotoDefinition, sourceFile, position);
+}
+
 // src/quickinfo/dedupeJsDocs.ts
 var SymbolDisplayPartEq = make((fa, fb) => fa.kind === fb.kind && fa.text === fb.text);
 var JSDocTagInfoEq = make(
@@ -3093,20 +3315,14 @@ function processLayerGraphNode(ctx, node, pipedInGraphNode) {
   return gen2(function* () {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
-    if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === "pipe") {
-      let graphNode = yield* processLayerGraphNode(ctx, node.expression.expression, void 0);
-      for (const entry of node.arguments) {
+    const maybePipe = yield* option(parsePipeCall(node));
+    if (isSome2(maybePipe)) {
+      let graphNode = yield* processLayerGraphNode(ctx, maybePipe.value.subject, void 0);
+      for (const entry of maybePipe.value.args) {
         graphNode = yield* processLayerGraphNode(ctx, entry, graphNode);
       }
       return graphNode;
     }
-    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "pipe" && node.arguments.length > 0) {
-      let graphNode = yield* processLayerGraphNode(ctx, node.arguments[0], void 0);
-      for (let i = 1; i < node.arguments.length; i++) {
-        graphNode = yield* processLayerGraphNode(ctx, node.arguments[i], graphNode);
-      }
-      return graphNode;
-    }
     if (ts.isCallExpression(node)) {
       const type = typeChecker.getTypeAtLocation(node);
       const maybeLayer = yield* option(layerType(type, node));
@@ -3635,14 +3851,14 @@ var effectGenToFn = createRefactor({
           nodeToReplace2 = parent;
           continue;
         }
-        if (ts.isPropertyAccessExpression(parent) && parent.expression === nodeToReplace2 && parent.name.text === "pipe" && ts.isCallExpression(parent.parent)) {
-          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.parent.arguments));
-          nodeToReplace2 = parent.parent;
-          continue;
-        }
-        if (ts.isCallExpression(parent) && ts.isIdentifier(parent.expression) && parent.expression.text === "pipe" && parent.arguments.length > 0 && parent.arguments[0] === nodeToReplace2) {
-          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.arguments.slice(1)));
-          nodeToReplace2 = parent;
+        const maybePipe = yield* pipe(
+          parsePipeCall(parent),
+          orElse3((e) => parent.parent ? parsePipeCall(parent.parent) : fail(e)),
+          option
+        );
+        if (isSome2(maybePipe) && maybePipe.value.subject === nodeToReplace2) {
+          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(maybePipe.value.args));
+          nodeToReplace2 = maybePipe.value.node;
           continue;
         }
         break;
@@ -4501,12 +4717,21 @@ var processNode = (node, isVirtualTypeNode) => gen2(function* () {
       [ts.factory.createObjectLiteralExpression(properties, true)].concat(records)
     );
   }
+  if (ts.isParenthesizedTypeNode(node)) {
+    return yield* processNode(node.type, isVirtualTypeNode);
+  }
   if (ts.isTypeQueryNode(node)) {
     const typeChecker = yield* service(TypeCheckerApi);
     const type = typeChecker.getTypeAtLocation(node.exprName);
     const typeNode = typeChecker.typeToTypeNode(type, void 0, ts.NodeBuilderFlags.NoTruncation);
     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()) {
+    const typeChecker = yield* service(TypeCheckerApi);
+    const type = typeChecker.getTypeAtLocation(node);
+    const typeNode = typeChecker.typeToTypeNode(type, void 0, ts.NodeBuilderFlags.NoTruncation);
+    if (typeNode) return yield* processNode(typeNode, true);
+  }
   if (ts.isTypeReferenceNode(node)) {
     const parsedName = entityNameToDataTypeName(node.typeName);
     if (isSome2(parsedName)) {
@@ -5131,6 +5356,21 @@ var init = (modules) => {
       }
       return applicableCompletions;
     };
+    proxy.getDefinitionAndBoundSpan = (fileName, position, ...args) => {
+      const applicableDefinition = languageService.getDefinitionAndBoundSpan(fileName, position, ...args);
+      const program = languageService.getProgram();
+      if (program) {
+        const sourceFile = program.getSourceFile(fileName);
+        if (sourceFile) {
+          return pipe(
+            goto(applicableDefinition, sourceFile, position),
+            runNano(program),
+            Either_exports.getOrElse(() => applicableDefinition)
+          );
+        }
+      }
+      return applicableDefinition;
+    };
     return proxy;
   }
   return { create };