fix bug: if two files has same symbol name, should give a mangled name

Author: angrychow

ts-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcoder-ts-parser",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "TypeScript AST parser for UNIAST v0.1.3 specification",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

ts-parser/src/parser/test/FunctionParser.test.ts

@@ -513,5 +513,43 @@ describe('FunctionParser', () => {
 
       cleanup();
     });
+
+    it('should give mangled names for 2 symbol located in different files', () => {
+      const { project, sourceFile, cleanup } = createTestProjectWithMultipleFiles({
+        'file1.ts': `
+          export function sharedName() {
+            return 'from file1';
+          }
+        `,
+        'file2.ts': `
+          export function sharedName() {
+            return 'from file2';
+          }
+        `,
+        'test.ts': `
+          import { sharedName as sharedName1 } from './file1';
+          import { sharedName as sharedName2 } from './file2';
+
+          function testFunction() {
+            sharedName1();
+            sharedName2();
+          }
+        `
+      });
+
+      const parser = new FunctionParser(project, process.cwd());
+      let pkgPathAbsFile: string = sourceFile.getFilePath();
+      pkgPathAbsFile = pkgPathAbsFile.split('/').slice(0, -1).join('/');
+      const pkgPath = path.relative(process.cwd(), pkgPathAbsFile);
+
+      const functions = parser.parseFunctions(sourceFile, 'parser-tests', pkgPath);
+
+      const testFunction = expectToBeDefined(functions['testFunction']);
+      expect(testFunction.FunctionCalls).toBeDefined();
+
+      const callNames = expectToBeDefined(testFunction.FunctionCalls).map(call => call.Name);
+      expect(callNames).toHaveLength(2);
+      cleanup();
+    });
   });
 });

ts-parser/src/utils/symbol-resolver.ts

@@ -323,19 +323,22 @@ const symbolNameCache = new Map<string, Symbol>();
 
 export function assignSymbolName(symbol: Symbol): string {
 
-  const decls = symbol.getDeclarations()
-  if(decls.length === 0) {
-    return symbol.getName()
+  const decls = symbol.getDeclarations();
+  if (decls.length === 0) {
+    return symbol.getName();
   }
 
-  const declFile = decls[0].getSourceFile()
-  const declFilePath = declFile.getFilePath()
+  const declFile = decls[0].getSourceFile();
+  const declFilePath = declFile.getFilePath();
+  const declDirPath = path.dirname(declFilePath);
 
-  if(declFile.getDefaultExportSymbol() === symbol) {
-    return declFile.getBaseName() + '_default_export_symbol'
-  }
+  let rawName = symbol.getName(); // Initialize rawName here
+
+  const id = declDirPath + "#" + rawName;
 
-  let rawName = symbol.getName()
+  if (declFile.getDefaultExportSymbol() === symbol) {
+    return declFile.getBaseName() + '_default_export_symbol';
+  }
 
   // Handle methods, properties, constructors, and functions with proper naming
   const firstDecl = decls[0];
@@ -381,17 +384,12 @@ export function assignSymbolName(symbol: Symbol): string {
     }
   }
 
-  const id = declFilePath + "#" + rawName
   if(!symbolNameCache.has(id)) {
     symbolNameCache.set(id, symbol)
     return rawName
   }
 
-  const symbolExists = symbolNameCache.get(id)
-  // make ts happy
-  if(!symbolExists) {
-    return rawName
-  }
+  const symbolExists = symbolNameCache.get(id)!
 
   const getDeclsPos = (symbol: Symbol) => {
     const declsPos = []
@@ -404,10 +402,16 @@ export function assignSymbolName(symbol: Symbol): string {
 
   const arr1 = getDeclsPos(symbol)
   const arr2 = getDeclsPos(symbolExists)
-  if(arr1.join(',') === arr2.join(',')) {
+
+  const symbolExistsDecls = symbolExists.getDeclarations()
+  if(symbolExistsDecls.length === 0) {
+    return rawName
+  }
+  const symbolExistsDeclFile = symbolExistsDecls[0].getSourceFile()
+  if(arr1.join(',') === arr2.join(',') && symbolExistsDeclFile.getFilePath() === declFilePath) {
     return rawName
   }
 
   // mangled name
-  return rawName + "_" + getDeclsPos(symbol).join(".")
+  return rawName + "_" + path.basename(declFilePath) + "_" + getDeclsPos(symbol).join(".")
 }