@effect/language-service 0.47.2 → 0.48.0

package/index.js

@@ -1225,7 +1225,7 @@ function parseKeyPatterns(patterns) {
     if (!isObject(entry)) continue;
     result.push({
       target: hasProperty(entry, "target") && isString(entry.target) && ["service", "error", "custom"].includes(entry.target.toLowerCase()) ? entry.target.toLowerCase() : "service",
-      pattern: hasProperty(entry, "pattern") && isString(entry.pattern) && ["package-identifier", "default"].includes(entry.pattern.toLowerCase()) ? entry.pattern.toLowerCase() : "default",
+      pattern: hasProperty(entry, "pattern") && isString(entry.pattern) && ["package-identifier", "default", "default-hashed"].includes(entry.pattern.toLowerCase()) ? entry.pattern.toLowerCase() : "default",
       skipLeadingPath: hasProperty(entry, "skipLeadingPath") && isArray(entry.skipLeadingPath) && entry.skipLeadingPath.every(isString) ? entry.skipLeadingPath : ["src/"]
     });
   }
@@ -1811,71 +1811,6 @@ function makeTypeScriptUtils(ts) {
   };
 }
 
-// src/core/KeyBuilder.ts
-var makeKeyBuilder = fn("KeyBuilder")(
-  function* (sourceFile) {
-    const ts = yield* service(TypeScriptApi);
-    const tsUtils = yield* service(TypeScriptUtils);
-    const program = yield* service(TypeScriptProgram);
-    const options = yield* service(LanguageServicePluginOptions);
-    const packageInfo = tsUtils.resolveModuleWithPackageInfoFromSourceFile(program, sourceFile);
-    function createString2(classNameText, kind) {
-      if (!packageInfo) return;
-      for (const keyPattern of options.keyPatterns) {
-        if (keyPattern.target !== kind) continue;
-        const lastIndex = sourceFile.fileName.lastIndexOf("/");
-        let onlyFileName = lastIndex === -1 ? "" : sourceFile.fileName.slice(lastIndex + 1);
-        const lastExtensionIndex = onlyFileName.lastIndexOf(".");
-        if (lastExtensionIndex !== -1) onlyFileName = onlyFileName.slice(0, lastExtensionIndex);
-        if (onlyFileName.toLowerCase().endsWith("/index")) onlyFileName = onlyFileName.slice(0, -6);
-        if (onlyFileName.startsWith("/")) onlyFileName = onlyFileName.slice(1);
-        let subDirectory = getDirectoryPath(ts, sourceFile.fileName);
-        if (!subDirectory.startsWith(packageInfo.packageDirectory)) continue;
-        subDirectory = subDirectory.slice(packageInfo.packageDirectory.length);
-        if (!subDirectory.endsWith("/")) subDirectory = subDirectory + "/";
-        if (subDirectory.startsWith("/")) subDirectory = subDirectory.slice(1);
-        for (const prefix of keyPattern.skipLeadingPath) {
-          if (subDirectory.startsWith(prefix)) {
-            subDirectory = subDirectory.slice(prefix.length);
-            break;
-          }
-        }
-        let parts = [packageInfo.name, subDirectory, onlyFileName].concat(
-          onlyFileName.toLowerCase() === classNameText.toLowerCase() ? [] : [classNameText]
-        );
-        if (keyPattern.pattern === "package-identifier") {
-          parts = [packageInfo.name, onlyFileName].concat(
-            onlyFileName.toLowerCase() === classNameText.toLowerCase() ? [] : [classNameText]
-          );
-        }
-        parts = parts.map((part) => part.startsWith("/") ? part.slice(1) : part).map(
-          (part) => part.endsWith("/") ? part.slice(0, -1) : part
-        );
-        return parts.filter((_) => String(_).trim().length > 0).join("/");
-      }
-    }
-    return {
-      createString: createString2
-    };
-  }
-);
-var keyBuilderCache = /* @__PURE__ */ new Map();
-var getOrMakeKeyBuilder = fn("getOrMakeKeyBuilder")(function* (sourceFile) {
-  while (keyBuilderCache.size > 5) {
-    const oldest = keyBuilderCache.keys().next().value;
-    if (oldest) keyBuilderCache.delete(oldest);
-  }
-  const keyBuilder = keyBuilderCache.get(sourceFile.fileName) || (yield* makeKeyBuilder(sourceFile));
-  keyBuilderCache.set(sourceFile.fileName, keyBuilder);
-  return keyBuilder;
-});
-function createString(sourceFile, identifier, kind) {
-  return map5(
-    getOrMakeKeyBuilder(sourceFile),
-    (identifierBuilder) => identifierBuilder.createString(identifier, kind)
-  );
-}
-
 // src/core/LSP.ts
 var RefactorNotApplicableError = class {
   _tag = "@effect/language-service/RefactorNotApplicableError";
@@ -2207,6 +2142,72 @@ var getEffectLspPatchSourceFileMetadata = (sourceFile) => {
   return sourceFile["@effect-lsp-patch/metadata"];
 };
 
+// src/core/KeyBuilder.ts
+var makeKeyBuilder = fn("KeyBuilder")(
+  function* (sourceFile) {
+    const ts = yield* service(TypeScriptApi);
+    const tsUtils = yield* service(TypeScriptUtils);
+    const program = yield* service(TypeScriptProgram);
+    const options = yield* service(LanguageServicePluginOptions);
+    const packageInfo = tsUtils.resolveModuleWithPackageInfoFromSourceFile(program, sourceFile);
+    function createString2(classNameText, kind) {
+      if (!packageInfo) return;
+      for (const keyPattern of options.keyPatterns) {
+        if (keyPattern.target !== kind) continue;
+        const lastIndex = sourceFile.fileName.lastIndexOf("/");
+        let onlyFileName = lastIndex === -1 ? "" : sourceFile.fileName.slice(lastIndex + 1);
+        const lastExtensionIndex = onlyFileName.lastIndexOf(".");
+        if (lastExtensionIndex !== -1) onlyFileName = onlyFileName.slice(0, lastExtensionIndex);
+        if (onlyFileName.toLowerCase().endsWith("/index")) onlyFileName = onlyFileName.slice(0, -6);
+        if (onlyFileName.startsWith("/")) onlyFileName = onlyFileName.slice(1);
+        let subDirectory = getDirectoryPath(ts, sourceFile.fileName);
+        if (!subDirectory.startsWith(packageInfo.packageDirectory)) continue;
+        subDirectory = subDirectory.slice(packageInfo.packageDirectory.length);
+        if (!subDirectory.endsWith("/")) subDirectory = subDirectory + "/";
+        if (subDirectory.startsWith("/")) subDirectory = subDirectory.slice(1);
+        for (const prefix of keyPattern.skipLeadingPath) {
+          if (subDirectory.startsWith(prefix)) {
+            subDirectory = subDirectory.slice(prefix.length);
+            break;
+          }
+        }
+        let parts = [packageInfo.name, subDirectory, onlyFileName].concat(
+          onlyFileName.toLowerCase() === classNameText.toLowerCase() ? [] : [classNameText]
+        );
+        if (keyPattern.pattern === "package-identifier") {
+          parts = [packageInfo.name, onlyFileName].concat(
+            onlyFileName.toLowerCase() === classNameText.toLowerCase() ? [] : [classNameText]
+          );
+        }
+        parts = parts.map((part) => part.startsWith("/") ? part.slice(1) : part).map(
+          (part) => part.endsWith("/") ? part.slice(0, -1) : part
+        );
+        const fullKey = parts.filter((_) => String(_).trim().length > 0).join("/");
+        return keyPattern.pattern === "default-hashed" ? cyrb53(fullKey) : fullKey;
+      }
+    }
+    return {
+      createString: createString2
+    };
+  }
+);
+var keyBuilderCache = /* @__PURE__ */ new Map();
+var getOrMakeKeyBuilder = fn("getOrMakeKeyBuilder")(function* (sourceFile) {
+  while (keyBuilderCache.size > 5) {
+    const oldest = keyBuilderCache.keys().next().value;
+    if (oldest) keyBuilderCache.delete(oldest);
+  }
+  const keyBuilder = keyBuilderCache.get(sourceFile.fileName) || (yield* makeKeyBuilder(sourceFile));
+  keyBuilderCache.set(sourceFile.fileName, keyBuilder);
+  return keyBuilder;
+});
+function createString(sourceFile, identifier, kind) {
+  return map5(
+    getOrMakeKeyBuilder(sourceFile),
+    (identifierBuilder) => identifierBuilder.createString(identifier, kind)
+  );
+}
+
 // src/completions/contextSelfInClasses.ts
 var contextSelfInClasses = createCompletion({
   name: "contextSelfInClasses",
@@ -2251,10 +2252,10 @@ var TypeCheckerUtils = Tag("TypeCheckerUtils");
 var nanoLayer2 = (fa) => pipe(
   service(TypeScriptApi),
   flatMap2(
-    (ts) => flatMap2(service(TypeCheckerApi), (typeChecker) => pipe(fa, provideService(TypeCheckerUtils, makeTypeCheckerUtils(ts, typeChecker))))
+    (ts) => flatMap2(service(TypeCheckerApi), (typeChecker) => flatMap2(service(TypeScriptUtils), (typeScriptUtils) => pipe(fa, provideService(TypeCheckerUtils, makeTypeCheckerUtils(ts, typeChecker, typeScriptUtils)))))
   )
 );
-function makeTypeCheckerUtils(ts, typeChecker) {
+function makeTypeCheckerUtils(ts, typeChecker, tsUtils) {
   function isUnion(type) {
     return !!(type.flags & ts.TypeFlags.Union);
   }
@@ -2494,6 +2495,78 @@ function makeTypeCheckerUtils(ts, typeChecker) {
     expectedAndRealTypeCache.set(sourceFile, result);
     return result;
   };
+  function typeToSimplifiedTypeNode(type, enclosingNode, flags) {
+    return typeToSimplifiedTypeNodeWorker(type, enclosingNode, flags, 0);
+  }
+  function typeToSimplifiedTypeNodeWorker(type, enclosingNode, flags, depth) {
+    const fallbackStandard = () => {
+      const typeNode = typeChecker.typeToTypeNode(type, enclosingNode, flags);
+      if (!typeNode) return void 0;
+      return tsUtils.simplifyTypeNode(typeNode);
+    };
+    if (depth > 20) return fallbackStandard();
+    const members = unrollUnionMembers(type);
+    if (members.length > 1 && !(type.flags & ts.TypeFlags.Boolean)) {
+      const typeNodes = [];
+      members.sort(deterministicTypeOrder);
+      for (const member of members) {
+        const memberNode = typeToSimplifiedTypeNodeWorker(member, enclosingNode, flags, depth + 1);
+        if (!memberNode) return fallbackStandard();
+        typeNodes.push(memberNode);
+      }
+      return tsUtils.simplifyTypeNode(ts.factory.createUnionTypeNode(typeNodes));
+    }
+    if (type.flags & ts.TypeFlags.Intersection) {
+      const intersectionType = type;
+      const typeNodes = [];
+      for (const member of intersectionType.types) {
+        const memberNode = typeToSimplifiedTypeNodeWorker(member, enclosingNode, flags, depth + 1);
+        if (!memberNode) return fallbackStandard();
+        typeNodes.push(memberNode);
+      }
+      return tsUtils.simplifyTypeNode(ts.factory.createIntersectionTypeNode(typeNodes));
+    }
+    if (type.flags & ts.TypeFlags.Object && type.objectFlags & ts.ObjectFlags.Reference) {
+      const typeReference = type;
+      const standard2 = fallbackStandard();
+      if (!standard2) return void 0;
+      if (!ts.isTypeReferenceNode(standard2)) return standard2;
+      if (typeReference.target.typeParameters?.length !== typeReference.typeArguments?.length) return standard2;
+      if (standard2.typeArguments?.length !== typeReference.typeArguments?.length) return standard2;
+      const typeParametersCount = (typeReference.target.typeParameters || []).length;
+      for (let i = typeParametersCount - 1; i >= 0; i--) {
+        const typeParameter = typeReference.target.typeParameters[i];
+        const typeArgument = typeReference.typeArguments[i];
+        const defaultType = typeChecker.getDefaultFromTypeParameter(typeParameter);
+        if (defaultType !== typeArgument || i === 0) {
+          return tsUtils.simplifyTypeNode(ts.factory.updateTypeReferenceNode(
+            standard2,
+            standard2.typeName,
+            ts.factory.createNodeArray((standard2.typeArguments || []).slice(0, Math.min(typeParametersCount, i + 1)))
+          ));
+        }
+      }
+      return standard2;
+    }
+    if (type.flags & ts.TypeFlags.Object) {
+      const standard2 = fallbackStandard();
+      if (!standard2) return void 0;
+      if (!ts.isFunctionTypeNode(standard2)) return standard2;
+      const signatures = typeChecker.getSignaturesOfType(type, ts.SignatureKind.Call);
+      if (signatures.length !== 1) return standard2;
+      const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
+      if (!returnType) return standard2;
+      const returnTypeNode = typeToSimplifiedTypeNodeWorker(returnType, enclosingNode, flags, depth + 1);
+      if (!returnTypeNode) return standard2;
+      return tsUtils.simplifyTypeNode(ts.factory.updateFunctionTypeNode(
+        standard2,
+        standard2.typeParameters,
+        standard2.parameters,
+        returnTypeNode
+      ));
+    }
+    return fallbackStandard();
+  }
   return {
     isUnion,
     getTypeParameterAtPosition,
@@ -2502,7 +2575,8 @@ function makeTypeCheckerUtils(ts, typeChecker) {
     appendToUniqueTypesMap,
     deterministicTypeOrder,
     getInferredReturnType,
-    expectedAndRealType
+    expectedAndRealType,
+    typeToSimplifiedTypeNode
   };
 }
 
@@ -5700,7 +5774,7 @@ var tryCatchInEffectGen = createDiagnostic({
     while (nodeToVisit.length > 0) {
       const node = nodeToVisit.shift();
       ts.forEachChild(node, appendNodeToVisit);
-      if (ts.isTryStatement(node)) {
+      if (ts.isTryStatement(node) && node.catchClause) {
         const generatorOrRegularFunction = ts.findAncestor(
           node,
           (_) => ts.isFunctionExpression(_) || ts.isFunctionDeclaration(_) || ts.isMethodDeclaration(_) || ts.isArrowFunction(_) || ts.isGetAccessor(_) || ts.isFunctionLike(_)
@@ -12360,11 +12434,8 @@ var layerMagic = createRefactor({
       (node) => node
     );
     const adjustedNode = (node) => {
-      if (ts.isIdentifier(node) && ts.isVariableDeclaration(node.parent) && node.parent.initializer) {
-        return adjustedNode(node.parent.initializer);
-      }
-      if (ts.isIdentifier(node) && ts.isPropertyDeclaration(node.parent) && node.parent.initializer) {
-        return adjustedNode(node.parent.initializer);
+      if (node.parent && (ts.isVariableDeclaration(node.parent) || ts.isPropertyDeclaration(node.parent)) && ts.isIdentifier(node) && node.parent.initializer && node.parent.name === node) {
+        return node.parent.initializer;
       }
       return node;
     };
@@ -13049,7 +13120,6 @@ var toggleReturnTypeAnnotation = createRefactor({
   apply: fn("toggleReturnTypeAnnotation.apply")(function* (sourceFile, textRange) {
     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);
@@ -13100,7 +13170,7 @@ var toggleReturnTypeAnnotation = createRefactor({
     }
     const returnType = typeCheckerUtils.getInferredReturnType(node);
     if (!returnType) return yield* fail(new RefactorNotApplicableError());
-    const returnTypeNode = typeChecker.typeToTypeNode(
+    const returnTypeNode = typeCheckerUtils.typeToSimplifiedTypeNode(
       returnType,
       node,
       ts.NodeBuilderFlags.NoTruncation
@@ -13111,9 +13181,7 @@ var toggleReturnTypeAnnotation = createRefactor({
       description: "Toggle return type annotation",
       apply: pipe(
         service(ChangeTracker),
-        map5(
-          (changeTracker) => addReturnTypeAnnotation(sourceFile, changeTracker, node, tsUtils.simplifyTypeNode(returnTypeNode))
-        )
+        map5((changeTracker) => addReturnTypeAnnotation(sourceFile, changeTracker, node, returnTypeNode))
       )
     };
   })
@@ -13127,6 +13195,7 @@ var toggleTypeAnnotation = createRefactor({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const maybeNode = pipe(
       tsUtils.getAncestorNodesInRange(sourceFile, textRange),
       filter((node2) => ts.isVariableDeclaration(node2) || ts.isPropertyDeclaration(node2)),
@@ -13148,13 +13217,13 @@ var toggleTypeAnnotation = createRefactor({
           }
           const initializer = node.initializer;
           const initializerType = typeChecker.getTypeAtLocation(initializer);
-          const initializerTypeNode = fromNullable(typeChecker.typeToTypeNode(
+          const initializerTypeNode = fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
             initializerType,
             node,
             ts.NodeBuilderFlags.NoTruncation
           )).pipe(
             orElse(
-              () => fromNullable(typeChecker.typeToTypeNode(
+              () => fromNullable(typeCheckerUtils.typeToSimplifiedTypeNode(
                 initializerType,
                 void 0,
                 ts.NodeBuilderFlags.NoTruncation
@@ -13166,7 +13235,7 @@ var toggleTypeAnnotation = createRefactor({
             changeTracker.insertNodeAt(
               sourceFile,
               node.name.end,
-              tsUtils.simplifyTypeNode(initializerTypeNode),
+              initializerTypeNode,
               {
                 prefix: ": "
               }