@effect/language-service 0.47.1 → 0.47.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/language-service",
-  "version": "0.47.1",
+  "version": "0.47.3",
   "description": "A Language-Service Plugin to Refactor and Diagnostic effect-ts projects",
   "main": "index.cjs",
   "bin": {

package/transform.js

@@ -2117,10 +2117,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);
   }
@@ -2360,6 +2360,74 @@ function makeTypeCheckerUtils(ts, typeChecker) {
     expectedAndRealTypeCache.set(sourceFile, result);
     return result;
   };
+  function typeToSimplifiedTypeNode(type, enclosingNode, flags) {
+    const fallbackStandard = () => {
+      const typeNode = typeChecker.typeToTypeNode(type, enclosingNode, flags);
+      if (!typeNode) return void 0;
+      return tsUtils.simplifyTypeNode(typeNode);
+    };
+    const members = unrollUnionMembers(type);
+    if (members.length > 1) {
+      const typeNodes = [];
+      members.sort(deterministicTypeOrder);
+      for (const member of members) {
+        const memberNode = typeToSimplifiedTypeNode(member, enclosingNode, flags);
+        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 = typeToSimplifiedTypeNode(member, enclosingNode, flags);
+        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 = typeToSimplifiedTypeNode(returnType, enclosingNode, flags);
+      if (!returnTypeNode) return standard2;
+      return tsUtils.simplifyTypeNode(ts.factory.updateFunctionTypeNode(
+        standard2,
+        standard2.typeParameters,
+        standard2.parameters,
+        returnTypeNode
+      ));
+    }
+    return fallbackStandard();
+  }
   return {
     isUnion,
     getTypeParameterAtPosition,
@@ -2368,7 +2436,8 @@ function makeTypeCheckerUtils(ts, typeChecker) {
     appendToUniqueTypesMap,
     deterministicTypeOrder,
     getInferredReturnType,
-    expectedAndRealType
+    expectedAndRealType,
+    typeToSimplifiedTypeNode
   };
 }
 
@@ -3557,6 +3626,10 @@ var makeKeyBuilder = fn("KeyBuilder")(
 );
 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;