@esportsplus/typescript 0.25.1 → 0.26.0

package/build/compiler/imports.d.ts

@@ -11,8 +11,7 @@ type ModifyOptions = {
 };
 declare const _default: {
     find: (sourceFile: ts.SourceFile, packageName: string) => ImportInfo[];
-    isFromPackage: (node: ts.Identifier, packageName: string, checker?: ts.TypeChecker) => boolean;
-    isSymbolFromPackage: (checker: ts.TypeChecker, node: ts.Node, packageName: string, symbolName?: string) => boolean;
+    inPackage: (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolName?: string, packageImports?: Set<string>) => boolean;
     modify: (sourceCode: string, sourceFile: ts.SourceFile, packageName: string, options: ModifyOptions) => string;
     trace: (node: ts.Identifier, checker: ts.TypeChecker) => string | null;
 };

package/build/compiler/imports.js

@@ -22,34 +22,35 @@ const find = (sourceFile, packageName) => {
     }
     return imports;
 };
-const isFromPackage = (node, packageName, checker) => {
-    if (!checker) {
-        return true;
+const inPackage = (checker, node, pkg, symbolName, packageImports) => {
+    if (packageImports && ts.isIdentifier(node) && packageImports.has(node.text)) {
+        if (!symbolName || node.text === symbolName) {
+            return true;
+        }
     }
-    let origin = trace(node, checker);
-    return origin === null || origin.includes(packageName);
-};
-const isSymbolFromPackage = (checker, node, packageName, symbolName) => {
     let symbol = checker.getSymbolAtLocation(node);
     if (!symbol) {
+        if (packageImports && ts.isIdentifier(node) && packageImports.has(node.text)) {
+            return true;
+        }
         return false;
     }
     if (symbol.flags & ts.SymbolFlags.Alias) {
         symbol = checker.getAliasedSymbol(symbol);
     }
     if (symbolName && symbol.name !== symbolName) {
-        return false;
+        return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
     }
     let declarations = symbol.getDeclarations();
     if (!declarations || declarations.length === 0) {
-        return false;
+        return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
     }
     for (let i = 0, n = declarations.length; i < n; i++) {
-        if (declarations[i].getSourceFile().fileName.includes(packageName)) {
+        if (declarations[i].getSourceFile().fileName.includes(pkg)) {
             return true;
         }
     }
-    return false;
+    return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
 };
 const modify = (sourceCode, sourceFile, packageName, options) => {
     let { namespace } = options;
@@ -114,4 +115,4 @@ const trace = (node, checker) => {
     }
     return declarations[0].getSourceFile().fileName;
 };
-export default { find, isFromPackage, isSymbolFromPackage, modify, trace };
+export default { find, inPackage, modify, trace };

package/package.json

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

package/src/compiler/imports.ts

@@ -52,29 +52,29 @@ const find = (sourceFile: ts.SourceFile, packageName: string): ImportInfo[] => {
     return imports;
 };
 
-// Check if identifier traces back to a specific package
-const isFromPackage = (node: ts.Identifier, packageName: string, checker?: ts.TypeChecker): boolean => {
-    if (!checker) {
-        return true;
-    }
-
-    let origin = trace(node, checker);
-
-    // If can't resolve symbol (e.g., sourceFile not in program), assume valid
-    // False positives cause compile errors; false negatives silently skip transforms
-    return origin === null || origin.includes(packageName);
-};
-
 // Check if node's symbol originates from a specific package (with optional symbol name validation)
-const isSymbolFromPackage = (
+const inPackage = (
     checker: ts.TypeChecker,
     node: ts.Node,
-    packageName: string,
-    symbolName?: string
+    pkg: string,
+    symbolName?: string,
+    packageImports?: Set<string>
 ): boolean => {
+    // Fast path: identifier matches known import and expected name
+    if (packageImports && ts.isIdentifier(node) && packageImports.has(node.text)) {
+        if (!symbolName || node.text === symbolName) {
+            return true;
+        }
+    }
+
     let symbol = checker.getSymbolAtLocation(node);
 
     if (!symbol) {
+        // Fallback: aliased import - check if local name is in imports
+        if (packageImports && ts.isIdentifier(node) && packageImports.has(node.text)) {
+            return true;
+        }
+
         return false;
     }
 
@@ -85,23 +85,23 @@ const isSymbolFromPackage = (
 
     // Check symbol name if specified
     if (symbolName && symbol.name !== symbolName) {
-        return false;
+        return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
     }
 
     let declarations = symbol.getDeclarations();
 
     if (!declarations || declarations.length === 0) {
-        return false;
+        return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
     }
 
     // Check if any declaration is from the expected package
     for (let i = 0, n = declarations.length; i < n; i++) {
-        if (declarations[i].getSourceFile().fileName.includes(packageName)) {
+        if (declarations[i].getSourceFile().fileName.includes(pkg)) {
             return true;
         }
     }
 
-    return false;
+    return packageImports ? ts.isIdentifier(node) && packageImports.has(node.text) : false;
 };
 
 // Modify imports: remove specified, add needed, delete if empty
@@ -204,5 +204,5 @@ const trace = (node: ts.Identifier, checker: ts.TypeChecker): string | null => {
 };
 
 
-export default { find, isFromPackage, isSymbolFromPackage, modify, trace };
+export default { find, inPackage, modify, trace };
 export type { ImportInfo, ModifyOptions };