@effect/language-service 0.58.1 → 0.58.3

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
   };
 }
 
@@ -4168,18 +4172,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,
+          enclosingNode,
           ts.NodeBuilderFlags.NoTruncation
         )).pipe(
-          orElse(
-            () => fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
-              initializerType,
-              void 0,
-              ts.NodeBuilderFlags.NoTruncation
-            ))
-          ),
           getOrUndefined
         );
         if (!initializerTypeNode) continue;
@@ -4318,9 +4316,11 @@ var anyUnknownInErrorContext = createDiagnostic({
       }
       if (ts.isParameter(node) || ts.isPropertyDeclaration(node) || ts.isVariableDeclaration(node)) {
         if (node.type) {
+          const typeNode = node.type;
           const type2 = typeChecker.getTypeAtLocation(node.type);
           const expectedEffect = yield* pipe(
             typeParser.strictEffectType(type2, node.type),
+            orElse2(() => typeParser.layerType(type2, typeNode)),
             orElse2(() => void_)
           );
           if (expectedEffect) continue;
@@ -4342,8 +4342,9 @@ var anyUnknownInErrorContext = createDiagnostic({
       if (!type) continue;
       yield* pipe(
         typeParser.strictEffectType(type, node),
-        map5((effect) => {
-          const { E, R } = effect;
+        orElse2(() => pipe(typeParser.layerType(type, node), map5(({ E, RIn }) => ({ E, R: RIn })))),
+        map5((effectOrLayer) => {
+          const { E, R } = effectOrLayer;
           const hasAnyUnknownR = isAnyOrUnknown(R);
           const hasAnyUnknownE = isAnyOrUnknown(E);
           if (hasAnyUnknownR || hasAnyUnknownE) {
@@ -4366,7 +4367,7 @@ var anyUnknownInErrorContext = createDiagnostic({
                 matchingNodes.splice(i, 1);
               }
             }
-            const suggestions = [`This Effect has ${channels.join(" and ")} which is not recommended.`];
+            const suggestions = [`This has ${channels.join(" and ")} which is not recommended.`];
             if (hasAnyUnknownR) {
               suggestions.push(`Only service identifiers should appear in the requirements channel.`);
             }
@@ -16478,9 +16479,10 @@ 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,
+      enclosingNode,
       ts.NodeBuilderFlags.NoTruncation
     );
     if (!returnTypeNode) return yield* fail(new RefactorNotApplicableError());
@@ -16525,18 +16527,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,
+            enclosingNode,
             ts.NodeBuilderFlags.NoTruncation
           )).pipe(
-            orElse(
-              () => fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
-                initializerType,
-                void 0,
-                ts.NodeBuilderFlags.NoTruncation
-              ))
-            ),
             getOrUndefined
           );
           if (initializerTypeNode) {