@effect/language-service 0.23.2 → 0.23.3

package/index.js

@@ -3496,6 +3496,7 @@ var makeImportablePackagesMetadata = fn("makeImportablePackagesMetadata")(functi
   const excludedByFileName = /* @__PURE__ */ new Map();
   const unbarreledModulePathByFileName = /* @__PURE__ */ new Map();
   const barreledModulePathByFileName = /* @__PURE__ */ new Map();
+  const barreledFunctionPathByFileName = /* @__PURE__ */ new Map();
   const packages = [
     ...languageServicePluginOptions.namespaceImportPackages.map((packageName) => ({
       packageName,
@@ -3552,6 +3553,15 @@ var makeImportablePackagesMetadata = fn("makeImportablePackagesMetadata")(functi
                       excludedMethods.push(unbarreledModulePath);
                       excludedByFileName.set(methodName, excludedMethods);
                     }
+                    if (kind === "barrel") {
+                      const previousBarreledFunctionPath = barreledFunctionPathByFileName.get(unbarreledModulePath) || [];
+                      previousBarreledFunctionPath.push({
+                        fileName: barrelSource.fileName,
+                        exportName: methodName,
+                        packageName
+                      });
+                      barreledFunctionPathByFileName.set(unbarreledModulePath, previousBarreledFunctionPath);
+                    }
                   }
                 }
               }
@@ -3565,7 +3575,8 @@ var makeImportablePackagesMetadata = fn("makeImportablePackagesMetadata")(functi
     getImportNamespaceByFileName: (fileName) => namespaceByFileName.get(fileName),
     isExcludedFromNamespaceImport: (fileName, exportName) => (excludedByFileName.get(exportName) || []).includes(fileName),
     getUnbarreledModulePath: (fileName, exportName) => unbarreledModulePathByFileName.get(fileName)?.find((_) => _.exportName === exportName)?.fileName,
-    getBarreledModulePath: (fileName) => barreledModulePathByFileName.get(fileName)
+    getBarreledModulePath: (fileName) => barreledModulePathByFileName.get(fileName),
+    getBarreledFunctionPath: (fileName, exportName) => barreledFunctionPathByFileName.get(fileName)?.find((_) => _.exportName === exportName)
   };
 });
 var appendEffectCompletionEntryData = fn("appendEffectCompletionEntryData")(
@@ -3665,7 +3676,7 @@ var getImportFromNamespaceCodeActions = fn("getImportFromNamespaceCodeActions")(
     }
   ];
 });
-var getImportFromBarrelCodeActions = fn("getImportFromBarrelCodeActions")(function* (formatOptions, preferences, languageServiceHost, sourceFile, effectReplaceSpan, newModuleSpecifier, barrelExportName) {
+var getImportFromBarrelCodeActions = fn("getImportFromBarrelCodeActions")(function* (formatOptions, preferences, languageServiceHost, sourceFile, effectReplaceSpan, newModuleSpecifier, barrelExportName, shouldPrependExportName) {
   const ts = yield* service(TypeScriptApi);
   const formatContext = ts.formatting.getFormatContext(
     formatOptions || {},
@@ -3729,11 +3740,13 @@ var getImportFromBarrelCodeActions = fn("getImportFromBarrelCodeActions")(functi
           preferences || {}
         );
       }
-      changeTracker.insertText(
-        sourceFile,
-        effectReplaceSpan.start,
-        barrelExportName + "."
-      );
+      if (shouldPrependExportName) {
+        changeTracker.insertText(
+          sourceFile,
+          effectReplaceSpan.start,
+          barrelExportName + "."
+        );
+      }
     }
   );
   return [
@@ -3772,16 +3785,34 @@ var postprocessCompletionEntryDetails = fn("postprocessCompletionEntryDetails")(
       exportName
     );
     if (isExcluded) return applicableCompletionEntryDetails;
-    const asBarrelImport = packagesMetadata.getBarreledModulePath(fileName);
-    if (asBarrelImport) {
+    const asBarrelFunctionImport = packagesMetadata.getBarreledFunctionPath(fileName, exportName);
+    if (asBarrelFunctionImport) {
+      const codeActions = yield* getImportFromBarrelCodeActions(
+        formatOptions,
+        preferences,
+        languageServiceHost,
+        sourceFile,
+        effectReplaceSpan,
+        asBarrelFunctionImport.packageName,
+        asBarrelFunctionImport.exportName,
+        false
+      );
+      return {
+        ...applicableCompletionEntryDetails,
+        codeActions
+      };
+    }
+    const asBarrelModuleImport = packagesMetadata.getBarreledModulePath(fileName);
+    if (asBarrelModuleImport) {
       const codeActions = yield* getImportFromBarrelCodeActions(
         formatOptions,
         preferences,
         languageServiceHost,
         sourceFile,
         effectReplaceSpan,
-        asBarrelImport.packageName,
-        asBarrelImport.exportName
+        asBarrelModuleImport.packageName,
+        asBarrelModuleImport.exportName,
+        true
       );
       return {
         ...applicableCompletionEntryDetails,