@effect/language-service 0.41.0 → 0.41.1

package/cli.js

@@ -29125,10 +29125,48 @@ var all9 = fn2("all")(
 var TypeScriptApi = Tag4("TypeScriptApi");
 var TypeScriptProgram = Tag4("TypeScriptProgram");
 var ChangeTracker = Tag4("ChangeTracker");
+function getPackageJsonInfoCache(program) {
+  try {
+    if (hasProperty(program, "getModuleResolutionCache") && isFunction2(program.getModuleResolutionCache)) {
+      const moduleResolutionCache = program.getModuleResolutionCache();
+      if (hasProperty(moduleResolutionCache, "getPackageJsonInfoCache") && isFunction2(moduleResolutionCache.getPackageJsonInfoCache)) {
+        return moduleResolutionCache.getPackageJsonInfoCache();
+      }
+    }
+  } catch (_) {
+    return void 0;
+  }
+  return void 0;
+}
+function getDirectoryPath(ts4, path2) {
+  try {
+    if (hasProperty(ts4, "getDirectoryPath") && isFunction2(ts4.getDirectoryPath)) {
+      return ts4.getDirectoryPath(path2);
+    }
+    return path2;
+  } catch (_) {
+    return path2;
+  }
+}
+function makeGetTemporaryModuleResolutionState(ts4) {
+  if (hasProperty(ts4, "getTemporaryModuleResolutionState") && isFunction2(ts4.getTemporaryModuleResolutionState)) {
+    const _internal = ts4.getTemporaryModuleResolutionState;
+    return (cache, program, compilerOptions) => _internal(cache, program, compilerOptions);
+  }
+  return void 0;
+}
+function makeGetPackageScopeForPath(ts4) {
+  if (hasProperty(ts4, "getPackageScopeForPath") && isFunction2(ts4.getPackageScopeForPath)) {
+    const _internal = ts4.getPackageScopeForPath;
+    return (path2, state) => _internal(path2, state);
+  }
+}
 
 // src/core/TypeScriptUtils.ts
 var TypeScriptUtils = Tag4("TypeScriptUtils");
 function makeTypeScriptUtils(ts4) {
+  const getTemporaryModuleResolutionState = makeGetTemporaryModuleResolutionState(ts4);
+  const getPackageScopeForPath = makeGetPackageScopeForPath(ts4);
   function parsePackageContentNameAndVersionFromScope(v) {
     if (!isObject(v)) return;
     if (!hasProperty(v, "packageJsonScope")) return;
@@ -29163,20 +29201,26 @@ function makeTypeScriptUtils(ts4) {
       exportsKeys
     };
   }
-  function resolveModulePattern(program, sourceFile, pattern2) {
-    if (pattern2.indexOf("*") === -1) return [pattern2.toLowerCase()];
+  function resolveModuleWithPackageInfoFromSourceFile(program, sourceFile) {
     let packageJsonScope = parsePackageContentNameAndVersionFromScope(sourceFile);
-    if (!packageJsonScope && hasProperty(ts4, "getPackageScopeForPath") && isFunction2(ts4.getPackageScopeForPath) && hasProperty(ts4, "getTemporaryModuleResolutionState") && isFunction2(ts4.getTemporaryModuleResolutionState) && hasProperty(ts4, "getPackageScopeForPath") && isFunction2(ts4.getPackageScopeForPath)) {
-      const temporaryModuleResolutionState = ts4.getTemporaryModuleResolutionState(
-        void 0,
+    if (!packageJsonScope && getPackageScopeForPath && getTemporaryModuleResolutionState) {
+      const packageJsonInfoCache = getPackageJsonInfoCache(program);
+      const temporaryModuleResolutionState = getTemporaryModuleResolutionState(
+        packageJsonInfoCache,
         program,
         program.getCompilerOptions()
       );
+      const directoryPath = getDirectoryPath(ts4, sourceFile.fileName);
       packageJsonScope = parsePackageContentNameAndVersionFromScope({
         ...sourceFile,
-        packageJsonScope: ts4.getPackageScopeForPath(sourceFile.fileName, temporaryModuleResolutionState)
+        packageJsonScope: getPackageScopeForPath(directoryPath, temporaryModuleResolutionState)
       });
     }
+    return packageJsonScope;
+  }
+  function resolveModulePattern(program, sourceFile, pattern2) {
+    if (pattern2.indexOf("*") === -1) return [pattern2.toLowerCase()];
+    const packageJsonScope = resolveModuleWithPackageInfoFromSourceFile(program, sourceFile);
     const referencedPackages = [];
     for (const statement of sourceFile.statements) {
       if (ts4.isImportDeclaration(statement) && ts4.isStringLiteral(statement.moduleSpecifier)) {
@@ -29194,20 +29238,6 @@ function makeTypeScriptUtils(ts4) {
       )
     );
   }
-  function makeGetModuleSpecifier() {
-    if (!(hasProperty(ts4, "moduleSpecifiers") && hasProperty(ts4.moduleSpecifiers, "getModuleSpecifier") && isFunction2(ts4.moduleSpecifiers.getModuleSpecifier))) return;
-    const _internal = ts4.moduleSpecifiers.getModuleSpecifier;
-    return (compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, options3) => {
-      return _internal(
-        compilerOptions,
-        importingSourceFile,
-        importingSourceFileName,
-        toFileName,
-        host,
-        options3
-      );
-    };
-  }
   function findNodeWithLeadingCommentAtPosition(sourceFile, position) {
     const sourceText = sourceFile.text;
     let result;
@@ -29596,6 +29626,7 @@ function makeTypeScriptUtils(ts4) {
     findNodeAtPositionIncludingTrivia,
     parsePackageContentNameAndVersionFromScope,
     resolveModulePattern,
+    resolveModuleWithPackageInfoFromSourceFile,
     findNodeWithLeadingCommentAtPosition,
     getCommentAtPosition,
     getAncestorNodesInRange,
@@ -29610,7 +29641,6 @@ function makeTypeScriptUtils(ts4) {
     parseDataForExtendsClassCompletion,
     createEffectGenCallExpressionWithBlock,
     createReturnYieldStarStatement,
-    makeGetModuleSpecifier,
     parseAccessedExpressionForCompletion,
     getSourceFileOfNode
   };