@effect/language-service 0.58.2 → 0.58.4

package/index.js

@@ -1845,6 +1845,9 @@ function makeTypeScriptUtils(ts) {
     }
     return node;
   }
+  function isDeclarationKind(kind) {
+    return kind === ts.SyntaxKind.ArrowFunction || kind === ts.SyntaxKind.BindingElement || kind === ts.SyntaxKind.ClassDeclaration || kind === ts.SyntaxKind.ClassExpression || kind === ts.SyntaxKind.ClassStaticBlockDeclaration || kind === ts.SyntaxKind.Constructor || kind === ts.SyntaxKind.EnumDeclaration || kind === ts.SyntaxKind.EnumMember || kind === ts.SyntaxKind.ExportSpecifier || kind === ts.SyntaxKind.FunctionDeclaration || kind === ts.SyntaxKind.FunctionExpression || kind === ts.SyntaxKind.GetAccessor || kind === ts.SyntaxKind.ImportClause || kind === ts.SyntaxKind.ImportEqualsDeclaration || kind === ts.SyntaxKind.ImportSpecifier || kind === ts.SyntaxKind.InterfaceDeclaration || kind === ts.SyntaxKind.JsxAttribute || kind === ts.SyntaxKind.MethodDeclaration || kind === ts.SyntaxKind.MethodSignature || kind === ts.SyntaxKind.ModuleDeclaration || kind === ts.SyntaxKind.NamespaceExportDeclaration || kind === ts.SyntaxKind.NamespaceImport || kind === ts.SyntaxKind.NamespaceExport || kind === ts.SyntaxKind.Parameter || kind === ts.SyntaxKind.PropertyAssignment || kind === ts.SyntaxKind.PropertyDeclaration || kind === ts.SyntaxKind.PropertySignature || kind === ts.SyntaxKind.SetAccessor || kind === ts.SyntaxKind.ShorthandPropertyAssignment || kind === ts.SyntaxKind.TypeAliasDeclaration || kind === ts.SyntaxKind.TypeParameter || kind === ts.SyntaxKind.VariableDeclaration || kind === ts.SyntaxKind.JSDocTypedefTag || kind === ts.SyntaxKind.JSDocCallbackTag || kind === ts.SyntaxKind.JSDocPropertyTag || kind === ts.SyntaxKind.NamedTupleMember;
+  }
   return {
     findNodeAtPositionIncludingTrivia,
     parsePackageContentNameAndVersionFromScope,
@@ -1867,7 +1870,8 @@ function makeTypeScriptUtils(ts) {
     parseAccessedExpressionForCompletion,
     getSourceFileOfNode,
     isOuterExpression,
-    skipOuterExpressions
+    skipOuterExpressions,
+    isDeclarationKind
   };
 }
 
@@ -2770,7 +2774,16 @@ function make3(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
         const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
         if (!moduleSymbol) continue;
         const memberSymbol = typeChecker.tryGetMemberInModuleExports(memberName, moduleSymbol);
-        if (memberSymbol && memberSymbol === symbol3) result.push({ memberSymbol, moduleSymbol, sourceFile });
+        if (memberSymbol) {
+          if (memberSymbol === symbol3) {
+            result.push({ memberSymbol, moduleSymbol, sourceFile });
+          } else if (memberSymbol.flags & ts.SymbolFlags.Alias) {
+            const aliased = typeChecker.getAliasedSymbol(memberSymbol);
+            if (aliased === symbol3) {
+              result.push({ memberSymbol, moduleSymbol, sourceFile });
+            }
+          }
+        }
       }
       if (result.length > 0) {
         return result;
@@ -4168,18 +4181,12 @@ var annotate = createCodegen({
       for (const variableDeclaration of variableDeclarations) {
         if (!variableDeclaration.initializer) continue;
         const initializerType = typeChecker.getTypeAtLocation(variableDeclaration.initializer);
+        const enclosingNode = ts.findAncestor(variableDeclaration, (_) => tsUtils.isDeclarationKind(_.kind)) || sourceFile;
         const initializerTypeNode = fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
           initializerType,
-          node,
-          ts.NodeBuilderFlags.NoTruncation
+          enclosingNode,
+          ts.NodeBuilderFlags.NoTruncation | ts.NodeBuilderFlags.IgnoreErrors
         )).pipe(
-          orElse(
-            () => fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
-              initializerType,
-              void 0,
-              ts.NodeBuilderFlags.NoTruncation
-            ))
-          ),
           getOrUndefined
         );
         if (!initializerTypeNode) continue;
@@ -16481,10 +16488,11 @@ var toggleReturnTypeAnnotation = createRefactor({
     }
     const returnType = typeCheckerUtils.getInferredReturnType(node);
     if (!returnType) return yield* fail(new RefactorNotApplicableError());
+    const enclosingNode = ts.findAncestor(node, (_) => tsUtils.isDeclarationKind(_.kind)) || sourceFile;
     const returnTypeNode = typeCheckerUtils.typeToSimplifiedTypeNode(
       returnType,
-      node,
-      ts.NodeBuilderFlags.NoTruncation
+      enclosingNode,
+      ts.NodeBuilderFlags.NoTruncation | ts.NodeBuilderFlags.IgnoreErrors
     );
     if (!returnTypeNode) return yield* fail(new RefactorNotApplicableError());
     return {
@@ -16528,18 +16536,12 @@ var toggleTypeAnnotation = createRefactor({
           }
           const initializer = node.initializer;
           const initializerType = typeChecker.getTypeAtLocation(initializer);
+          const enclosingNode = ts.findAncestor(node, (_) => tsUtils.isDeclarationKind(_.kind)) || sourceFile;
           const initializerTypeNode = fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
             initializerType,
-            node,
-            ts.NodeBuilderFlags.NoTruncation
+            enclosingNode,
+            ts.NodeBuilderFlags.NoTruncation | ts.NodeBuilderFlags.IgnoreErrors
           )).pipe(
-            orElse(
-              () => fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
-                initializerType,
-                void 0,
-                ts.NodeBuilderFlags.NoTruncation
-              ))
-            ),
             getOrUndefined
           );
           if (initializerTypeNode) {