@esportsplus/typescript 0.27.3 → 0.27.4

package/build/compiler/imports.js

@@ -23,6 +23,12 @@ const all = (file, pkg) => {
     return imports;
 };
 const includes = (checker, node, pkg, symbolName) => {
+    if (!ts.isIdentifier(node)) {
+        return false;
+    }
+    if (symbolName && node.text !== symbolName) {
+        return false;
+    }
     let file = node.getSourceFile(), imports = cache.get(file);
     if (!imports) {
         imports = new Map();
@@ -39,17 +45,8 @@ const includes = (checker, node, pkg, symbolName) => {
         }
         imports.set(pkg, names);
     }
-    if (names.size === 0) {
-        return false;
-    }
-    if (ts.isIdentifier(node)) {
-        if (!names.has(node.text)) {
-            return false;
-        }
-        if (symbolName && node.text !== symbolName) {
-            return false;
-        }
-        let symbol = checker.getSymbolAtLocation(node);
+    if (names.has(node.text)) {
+        let symbol = checker?.getSymbolAtLocation(node);
         if (symbol) {
             let declarations = symbol.getDeclarations();
             if (declarations && declarations.length > 0) {
@@ -67,11 +64,38 @@ const includes = (checker, node, pkg, symbolName) => {
                         return true;
                     }
                 }
-                return false;
             }
         }
         return true;
     }
+    let symbol = checker?.getSymbolAtLocation(node);
+    if (!symbol) {
+        return false;
+    }
+    let declarations = symbol.getDeclarations();
+    if (declarations && declarations.length > 0) {
+        for (let i = 0, n = declarations.length; i < n; i++) {
+            let decl = declarations[i];
+            if (decl.getSourceFile().fileName.includes(pkg)) {
+                return true;
+            }
+        }
+    }
+    try {
+        let aliased = checker.getAliasedSymbol(symbol);
+        if (aliased && aliased !== symbol) {
+            let aliasedDecls = aliased.getDeclarations();
+            if (aliasedDecls) {
+                for (let i = 0, n = aliasedDecls.length; i < n; i++) {
+                    if (aliasedDecls[i].getSourceFile().fileName.includes(pkg)) {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    catch {
+    }
     return false;
 };
 export default { all, includes };

package/package.json

@@ -37,7 +37,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/imports.ts

@@ -55,6 +55,14 @@ const all = (file: ts.SourceFile, pkg: string): ImportInfo[] => {
 
 // Check if node's symbol originates from a specific package (with optional symbol name validation)
 const includes = (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolName?: string): boolean => {
+    if (!ts.isIdentifier(node)) {
+        return false;
+    }
+
+    if (symbolName && node.text !== symbolName) {
+        return false;
+    }
+
     let file = node.getSourceFile(),
         imports = cache.get(file);
 
@@ -79,33 +87,17 @@ const includes = (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolNam
         imports.set(pkg, names);
     }
 
-    // If no imports from this package, definitely not from it
-    if (names.size === 0) {
-        return false;
-    }
-
-    // For identifiers, check if name matches an import AND verify via symbol
-    if (ts.isIdentifier(node)) {
-        if (!names.has(node.text)) {
-            return false;
-        }
-
-        if (symbolName && node.text !== symbolName) {
-            return false;
-        }
-
-        // Try to verify via checker that this identifier refers to the import
-        let symbol = checker.getSymbolAtLocation(node);
+    // Fast path: direct import from package
+    if (names.has(node.text)) {
+        let symbol = checker?.getSymbolAtLocation(node);
 
         if (symbol) {
-            // Check if the symbol's declaration is an import specifier from this package
             let declarations = symbol.getDeclarations();
 
             if (declarations && declarations.length > 0) {
                 for (let i = 0, n = declarations.length; i < n; i++) {
                     let decl = declarations[i];
 
-                    // If declaration is an ImportSpecifier, check the import's module
                     if (ts.isImportSpecifier(decl)) {
                         let importDecl = decl.parent?.parent?.parent;
 
@@ -116,21 +108,57 @@ const includes = (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolNam
                         }
                     }
 
-                    // Also check if declaration is from a file in the package
                     if (decl.getSourceFile().fileName.includes(pkg)) {
                         return true;
                     }
                 }
-
-                // Symbol resolved but doesn't match package - it's shadowed
-                return false;
             }
         }
 
-        // Checker couldn't resolve - trust the name match if it's in import list
+        // If checker failed but name matches direct import, trust it
         return true;
     }
 
+    // Slow path: check for re-exports via aliased symbol
+    let symbol = checker?.getSymbolAtLocation(node);
+
+    if (!symbol) {
+        return false;
+    }
+
+    // Check declarations
+    let declarations = symbol.getDeclarations();
+
+    if (declarations && declarations.length > 0) {
+        for (let i = 0, n = declarations.length; i < n; i++) {
+            let decl = declarations[i];
+
+            if (decl.getSourceFile().fileName.includes(pkg)) {
+                return true;
+            }
+        }
+    }
+
+    // Check aliased symbol for re-exports
+    try {
+        let aliased = checker.getAliasedSymbol(symbol);
+
+        if (aliased && aliased !== symbol) {
+            let aliasedDecls = aliased.getDeclarations();
+
+            if (aliasedDecls) {
+                for (let i = 0, n = aliasedDecls.length; i < n; i++) {
+                    if (aliasedDecls[i].getSourceFile().fileName.includes(pkg)) {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // getAliasedSymbol can throw for non-alias symbols
+    }
+
     return false;
 };