Fixed incorrect handling of declare module statements with non-rela…

…tive module name

Fixes #186

src/helpers/typescript.ts

@@ -1,6 +1,5 @@
 import * as ts from 'typescript';
 
-import { fixPath } from './fix-path';
 import { getLibraryName } from './node-modules';
 
 const namedDeclarationKinds = [
@@ -110,20 +109,6 @@ export function isDeclareModule(node: ts.Node): node is ts.ModuleDeclaration {
 	return ts.isModuleDeclaration(node) && !(node.flags & ts.NodeFlags.Namespace) && !isGlobalScopeAugmentation(node);
 }
 
-/**
- * Returns whether a node is `declare module` ModuleDeclaration with a relative path
- */
-export function isRelativeDeclareModule(node: ts.Node): node is ts.ModuleDeclaration {
-	// `declare module ""`, `declare global` and `namespace {}` are ModuleDeclaration
-	// but here we need to check only `declare module` statements
-	if (!isDeclareModule(node) || !ts.isStringLiteral(node.name)) {
-		return false;
-	}
-
-	const moduleName = fixPath(node.name.text);
-	return moduleName.startsWith('./') || moduleName.startsWith('../');
-}
-
 /**
  * Returns whether statement is `declare global` ModuleDeclaration
  */

src/types-usage-evaluator.ts

@@ -1,9 +1,9 @@
 import * as ts from 'typescript';
 import {
 	getActualSymbol,
+	isDeclareModule,
 	isNamedTupleMember,
 	isNodeNamedDeclaration,
-	isRelativeDeclareModule,
 	splitTransientSymbol,
 } from './helpers/typescript';
 
@@ -59,7 +59,7 @@ export class TypesUsageEvaluator {
 	}
 
 	private computeUsageForNode(node: ts.Node): void {
-		if (isRelativeDeclareModule(node) && node.body !== undefined && ts.isModuleBlock(node.body)) {
+		if (isDeclareModule(node) && node.body !== undefined && ts.isModuleBlock(node.body)) {
 			for (const statement of node.body.statements) {
 				this.computeUsageForNode(statement);
 			}

tests/e2e/test-cases/inline-from-deps/config.ts

@@ -2,7 +2,7 @@ import { TestCaseConfig } from '../test-case-config';
 
 const config: TestCaseConfig = {
 	libraries: {
-		inlinedLibraries: ['fake-package'],
+		inlinedLibraries: ['fake-package', 'fake-types-lib-2'],
 	},
 };
 

tests/e2e/test-cases/inline-from-deps/input.ts

@@ -1,5 +1,7 @@
 import { Interface, Type } from 'fake-package';
+import { Derived } from 'fake-types-lib-2';
 import { SomeClass } from 'fake-package/some-class';
 
 export type TestType = Interface | Type;
 export class MyClass extends SomeClass {}
+export type ReExportedTypes = Derived;

tests/e2e/test-cases/inline-from-deps/output.d.ts

@@ -1,12 +1,19 @@
 export interface Interface {
 }
 export type Type = number | string;
+export interface Base {
+	id: string;
+}
+export interface Derived extends Base {
+	name: string;
+}
 declare class SomeClass {
 	private x;
 	public constructor();
 }
 export declare type TestType = Interface | Type;
 export declare class MyClass extends SomeClass {
 }
+export declare type ReExportedTypes = Derived;
 
 export {};