@effect/language-service 0.47.3 → 0.48.0

package/effect-lsp-patch-utils.js

@@ -1205,7 +1205,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/"]
     });
   }
@@ -2361,17 +2361,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);
       }
@@ -2381,7 +2385,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);
       }
@@ -2417,7 +2421,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,
@@ -3616,7 +3620,8 @@ var makeKeyBuilder = fn("KeyBuilder")(
         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("/");
+        const fullKey = parts.filter((_) => String(_).trim().length > 0).join("/");
+        return keyPattern.pattern === "default-hashed" ? cyrb53(fullKey) : fullKey;
       }
     }
     return {
@@ -5562,7 +5567,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(_)