Added ignoring symbols from "fake" namespace generation if they aren'…

…t used by that namespace

Partially reverts eb862bf

Fixes #319

src/bundle-generator.ts

@@ -1002,6 +1002,12 @@ export function generateDtsBundle(entries: readonly EntryPointConfig[], options:
 
 		function createNamespaceForExports(exports: ts.SymbolTable, namespaceSymbol: ts.Symbol): string | null {
 			function addSymbolToNamespaceExports(namespaceExports: Map<string, string>, symbol: ts.Symbol): void {
+				// if a symbol isn't used by the namespace symbol it might mean that it shouldn't be included into the bundle because of tree-shaking
+				// in this case we shouldn't even try to add such symbol to the namespace
+				if (!typesUsageEvaluator.isSymbolUsedBySymbol(symbol, namespaceSymbol)) {
+					return;
+				}
+
 				const symbolKnownNames = collisionsResolver.namesForSymbol(symbol);
 				if (symbolKnownNames.size === 0) {
 					throw new Error(`Cannot get local names for symbol '${symbol.getName()}' while generating namespaced export`);

src/types-usage-evaluator.ts

@@ -237,29 +237,12 @@ export class TypesUsageEvaluator {
 	}
 
 	private computeUsagesRecursively(parent: ts.Node, parentSymbol: ts.Symbol): void {
-		const processUsageForChild = (child: ts.Node) => {
+		ts.forEachChild(parent, (child: ts.Node) => {
 			if (child.kind === ts.SyntaxKind.JSDoc) {
 				return;
 			}
 
-			let recursionStartNode = child;
-			if (ts.isQualifiedName(child) && !ts.isQualifiedName(child.parent)) {
-				const leftmostSymbol = this.getNodeOwnSymbol(child.left);
-
-				// i.e. `import * as NS from './local-module'`
-				const namespaceImport = getDeclarationsForSymbol(leftmostSymbol).find(ts.isNamespaceImport);
-				if (namespaceImport !== undefined) {
-					// if a node is a qualified name and its top-level part was created by a namespaced import
-					// then we shouldn't add usages of that "namespaced import" to the parent symbol
-					// because we can just import the referenced symbol directly, without wrapping with a namespace
-					recursionStartNode = child.right;
-
-					// recursive processing doesn't process a node itself so we need to handle it separately
-					processUsageForChild(recursionStartNode);
-				}
-			}
-
-			this.computeUsagesRecursively(recursionStartNode, parentSymbol);
+			this.computeUsagesRecursively(child, parentSymbol);
 
 			if (ts.isIdentifier(child) || child.kind === ts.SyntaxKind.DefaultKeyword) {
 				// identifiers in labelled tuples don't have symbols for their labels
@@ -289,9 +272,7 @@ export class TypesUsageEvaluator {
 					}
 				}
 			}
-		};
-
-		ts.forEachChild(parent, processUsageForChild);
+		});
 	}
 
 	private addUsages(childSymbol: ts.Symbol, parentSymbol: ts.Symbol): void {

tests/e2e/test-cases/names-collision-across-files/output.d.ts

@@ -1,3 +1,4 @@
+import * as fakePackage from 'fake-package';
 import { Interface as FPI1, Interface as FPI2, Interface as Interface$2 } from 'fake-package';
 
 export type ExportEqNs = string;
@@ -67,7 +68,7 @@ export interface Inter {
 	field2: AnotherInterface$1;
 	field3: TypeName;
 	field4: AnotherInterface;
-	field5: FPI1;
+	field5: fakePackage.Interface;
 	field6: FPI1;
 	field7: Interface$2;
 }
@@ -79,7 +80,7 @@ export interface Inter2 {
 	field2: AnotherInterface$1;
 	field3: TypeName;
 	field4: AnotherInterface;
-	field5: FPI1;
+	field5: fakePackage.Interface;
 	field6: FPI2;
 	field7: Interface$2;
 	field8: DefaultInterface;

tests/e2e/test-cases/namespaced-import/config.ts

@@ -0,0 +1,5 @@
+import { TestCaseConfig } from '../../test-cases/test-case-config';
+
+const config: TestCaseConfig = {};
+
+export = config;

tests/e2e/test-cases/namespaced-import/index.spec.js

@@ -0,0 +1 @@
+require('../run-test-case').runTestCase(__dirname);

tests/e2e/test-cases/namespaced-import/input.ts

@@ -0,0 +1,6 @@
+import * as fakePackage from 'fake-package';
+
+export declare class MyClass {
+	static func(): fakePackage.InterfaceWithFields;
+	static field: fakePackage.Interface;
+}

tests/e2e/test-cases/namespaced-import/output.d.ts

@@ -0,0 +1,8 @@
+import * as fakePackage from 'fake-package';
+
+export declare class MyClass {
+	static func(): fakePackage.InterfaceWithFields;
+	static field: fakePackage.Interface;
+}
+
+export {};

tests/e2e/test-cases/namespaced-import/tsconfig.json

@@ -0,0 +1,6 @@
+{
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"types": ["node"]
+	}
+}