@effect/language-service 0.47.3 → 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",
@@ -2495,17 +2496,21 @@ function makeTypeCheckerUtils(ts, typeChecker, tsUtils) {
     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) {
+    if (members.length > 1 && !(type.flags & ts.TypeFlags.Boolean)) {
       const typeNodes = [];
       members.sort(deterministicTypeOrder);
       for (const member of members) {
-        const memberNode = typeToSimplifiedTypeNode(member, enclosingNode, flags);
+        const memberNode = typeToSimplifiedTypeNodeWorker(member, enclosingNode, flags, depth + 1);
         if (!memberNode) return fallbackStandard();
         typeNodes.push(memberNode);
       }
@@ -2515,7 +2520,7 @@ function makeTypeCheckerUtils(ts, typeChecker, tsUtils) {
       const intersectionType = type;
       const typeNodes = [];
       for (const member of intersectionType.types) {
-        const memberNode = typeToSimplifiedTypeNode(member, enclosingNode, flags);
+        const memberNode = typeToSimplifiedTypeNodeWorker(member, enclosingNode, flags, depth + 1);
         if (!memberNode) return fallbackStandard();
         typeNodes.push(memberNode);
       }
@@ -2551,7 +2556,7 @@ function makeTypeCheckerUtils(ts, typeChecker, tsUtils) {
       if (signatures.length !== 1) return standard2;
       const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
       if (!returnType) return standard2;
-      const returnTypeNode = typeToSimplifiedTypeNode(returnType, enclosingNode, flags);
+      const returnTypeNode = typeToSimplifiedTypeNodeWorker(returnType, enclosingNode, flags, depth + 1);
       if (!returnTypeNode) return standard2;
       return tsUtils.simplifyTypeNode(ts.factory.updateFunctionTypeNode(
         standard2,
@@ -5769,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(_)
@@ -12429,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;
     };