@effect/language-service 0.23.4 → 0.23.5

package/package.json

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

package/transform.js

@@ -2600,6 +2600,8 @@ var importFromBarrel = createDiagnostic({
       if (!moduleSymbol.exports) return;
       const sourceFile2 = importDeclaration.getSourceFile();
       const nodeForSymbol = element.propertyName || element.name;
+      const aliasSymbol = element.name || element.propertyName;
+      const aliasedName = aliasSymbol.text;
       if (!ts.isIdentifier(nodeForSymbol)) return;
       const importedName = nodeForSymbol.text;
       const reexportedSymbol = moduleSymbol.exports.get(ts.escapeLeadingUnderscores(importedName));
@@ -2622,7 +2624,15 @@ var importFromBarrel = createDiagnostic({
         program
       );
       if (unbarrelledFileName.toLowerCase().indexOf(barrelModuleName.toLowerCase() + "/") === -1) return;
-      return { unbarrelledFileName, importedName, barrelModuleName, importClause, namedBindings, importDeclaration };
+      return {
+        unbarrelledFileName,
+        importedName,
+        barrelModuleName,
+        importClause,
+        namedBindings,
+        importDeclaration,
+        aliasedName
+      };
     };
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
@@ -2639,14 +2649,21 @@ var importFromBarrel = createDiagnostic({
       }
       const result = isImportedFromBarrelExport(node);
       if (!result) continue;
-      const { barrelModuleName, importClause, importDeclaration, importedName, namedBindings, unbarrelledFileName } = result;
+      const {
+        aliasedName,
+        barrelModuleName,
+        importClause,
+        importDeclaration,
+        namedBindings,
+        unbarrelledFileName
+      } = result;
       report({
         node,
         messageText: `Importing from barrel module ${barrelModuleName} is not allowed.`,
         fixes: [
           {
             fixName: "replaceWithUnbarrelledImport",
-            description: `Import * as ${importedName} from ${unbarrelledFileName}`,
+            description: `Import * as ${aliasedName} from ${unbarrelledFileName}`,
             apply: gen(function* () {
               const changeTracker = yield* service(ChangeTracker);
               const newImport = ts.factory.createImportDeclaration(
@@ -2654,7 +2671,7 @@ var importFromBarrel = createDiagnostic({
                 ts.factory.createImportClause(
                   importClause.isTypeOnly || node.isTypeOnly,
                   void 0,
-                  ts.factory.createNamespaceImport(ts.factory.createIdentifier(importedName))
+                  ts.factory.createNamespaceImport(ts.factory.createIdentifier(aliasedName))
                 ),
                 ts.factory.createStringLiteral(unbarrelledFileName)
               );