Simplify pseudo re-export handling

webpro-nl · May 23, 2024 · 94cfb94 · 94cfb94
1 parent 0b1ce0b
commit 94cfb94
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 55 deletions.
diff --git a/packages/knip/src/typescript/getImportsAndExports.ts b/packages/knip/src/typescript/getImportsAndExports.ts
@@ -213,60 +213,31 @@ const getImportsAndExports = (
   const addExport = ({ node, symbol, identifier, type, pos, members = [], fix }: ExportNode) => {
     if (options.skipExports) return;
 
-    const isExportSpecifier = ts.isExportSpecifier(node);
-    const isExportAssignment = ts.isExportAssignment(node);
-
-    if (isExportSpecifier || isExportAssignment) {
-      // Re-exports are handled in import visitors (because module resolution),
-      // but in other export declarations we can't (easily) get the imported symbol for pseudo re-exports
-      if (isExportSpecifier && node.propertyName) {
-        // TODO Tried to sort it out in visitors/exports/exportDeclaration.ts,
-        // but seems we need `typeChecker.getSymbolAtLocation` which isn't available over there
-        const symbol = typeChecker.getSymbolAtLocation(node.propertyName);
-        if (symbol) {
-          const importedSymbolFilePath = importedInternalSymbols.get(symbol);
-          if (importedSymbolFilePath) {
-            const internalImport = internalImports[importedSymbolFilePath];
-            if (symbol.declarations && ts.isNamespaceImport(symbol.declarations[0])) {
-              // import { id } from 'specifier';
-              // export { id }
-              if (internalImport.reExportedNs.has(identifier)) {
-                internalImport.reExportedNs.get(identifier)?.add(sourceFile.fileName);
-              } else {
-                internalImport.reExportedNs.set(identifier, new Set([sourceFile.fileName]));
-              }
-            } else {
-              const identifier = String(symbol.escapedName);
-              if (internalImport.reExportedAs.has(identifier)) {
-                internalImport.reExportedAs.get(identifier)?.add([node.name.getText(), sourceFile.fileName]);
-              } else {
-                internalImport.reExportedAs.set(identifier, new Set([[node.name.getText(), sourceFile.fileName]]));
-              }
-            }
+    if (symbol) {
+      const importedSymbolFilePath = importedInternalSymbols.get(symbol);
+      if (importedSymbolFilePath) {
+        const importId = String(symbol.escapedName);
+        const internalImport = internalImports[importedSymbolFilePath];
+        if (symbol.declarations && ts.isNamespaceImport(symbol.declarations[0])) {
+          // import * as NS from 'specifier'; export { NS }; export { NS as aliased }
+          if (internalImport.reExportedNs.has(identifier)) {
+            internalImport.reExportedNs.get(identifier)?.add(sourceFile.fileName);
+          } else {
+            internalImport.reExportedNs.set(identifier, new Set([sourceFile.fileName]));
           }
-        }
-      } else if (symbol) {
-        const importedSymbolFilePath = importedInternalSymbols.get(symbol);
-        if (importedSymbolFilePath) {
-          const internalImport = internalImports[importedSymbolFilePath];
-          if (isExportAssignment) {
-            // import { id } from 'specifier';
-            // export = id
-            const identifier = String(symbol.escapedName);
-            if (internalImport.reExportedAs.has(identifier)) {
-              internalImport.reExportedAs.get(identifier)?.add(['default', sourceFile.fileName]);
-            } else {
-              internalImport.reExportedAs.set(identifier, new Set([['default', sourceFile.fileName]]));
-            }
+        } else if (importId === identifier) {
+          // import { id } from 'specifier'; export { id };
+          if (internalImport.reExportedBy.has(importId)) {
+            internalImport.reExportedBy.get(importId)?.add(sourceFile.fileName);
           } else {
-            // import * as NS from './3-branch';
-            // export { NS };
-            const identifier = String(symbol.escapedName);
-            if (internalImport.reExportedNs.has(identifier)) {
-              internalImport.reExportedNs.get(identifier)?.add(sourceFile.fileName);
-            } else {
-              internalImport.reExportedNs.set(identifier, new Set([sourceFile.fileName]));
-            }
+            internalImport.reExportedBy.set(importId, new Set([sourceFile.fileName]));
+          }
+        } else {
+          // import { id } from 'specifier'; export = id; export default id;
+          if (internalImport.reExportedAs.has(importId)) {
+            internalImport.reExportedAs.get(importId)?.add(['default', sourceFile.fileName]);
+          } else {
+            internalImport.reExportedAs.set(importId, new Set([['default', sourceFile.fileName]]));
           }
         }
       }

diff --git a/packages/knip/src/typescript/visitors/exports/exportDeclaration.ts b/packages/knip/src/typescript/visitors/exports/exportDeclaration.ts
@@ -17,11 +17,13 @@ export default visit(
         const declarations = sourceFile.getNamedDeclarations?.();
         return node.exportClause.elements.map(element => {
           const identifier = String(element.name.escapedText);
-          const declaration = declarations?.get(identifier)?.find((d: ts.Node) => d !== element);
+          const propName = element.propertyName?.escapedText;
+          // @ts-expect-error TODO Fix (convenience in addExport)
+          // const symbol = element.symbol ?? declarations?.get(identifier)?.find((d: ts.Node) => d !== element)?.symbol;
+          const symbol = declarations?.get(propName ?? identifier)?.[0]?.symbol;
           const pos = element.name.pos;
           const fix: Fix = isFixExports || isFixTypes ? [element.getStart(), element.getEnd()] : undefined;
-          // @ts-expect-error TODO Fix (convenience in addExport)
-          return { node: element, symbol: declaration?.symbol, identifier, type, pos, fix };
+          return { node: element, symbol, identifier, type, pos, fix };
         });
       }
     }