fix(typeof-alias-export): make sure alias exports will be transformed…

… correctly (#214)

src/transformer/descriptor/module/module.ts

@@ -6,6 +6,7 @@ import { TypescriptHelper } from '../helper/helper';
 import { GetMockPropertiesFromDeclarations } from '../mock/mockProperties';
 import { PropertyLike } from '../mock/propertyLike';
 import { GetTypeQueryDescriptorFromDeclaration } from '../typeQuery/typeQuery';
+type ExternalSource = ts.SourceFile | ts.ModuleDeclaration;
 
 export function GetModuleDescriptor(node: ts.NamedDeclaration, scope: Scope): ts.Expression {
   const typeChecker: ts.TypeChecker = TypeChecker();
@@ -14,21 +15,40 @@ export function GetModuleDescriptor(node: ts.NamedDeclaration, scope: Scope): ts
   const symbol: ts.Symbol = typeChecker.getAliasedSymbol(symbolAlias);
   const externalModuleDeclaration: ts.NamedDeclaration = symbol.declarations[0];
 
-  if (ts.isSourceFile(externalModuleDeclaration) || ts.isModuleDeclaration(externalModuleDeclaration)) {
-    const moduleExports: ts.Symbol[] = typeChecker.getExportsOfModule(symbol);
-
-    const properties: PropertyLike[] = moduleExports.map((prop: ts.Symbol): PropertyLike => {
-      const originalSymbol: ts.Symbol = TypescriptHelper.GetAliasedSymbolSafe(prop);
-      const originalDeclaration: ts.NamedDeclaration = originalSymbol.declarations[0];
-      const declaration: ts.Declaration = prop.declarations[0];
-      if (ts.isExportAssignment(declaration)) {
-        return TypescriptCreator.createProperty('default', ts.createTypeQueryNode(originalDeclaration.name as ts.Identifier));
-      }
-      return TypescriptCreator.createProperty(originalDeclaration.name as ts.Identifier, ts.createTypeQueryNode(originalDeclaration.name as ts.Identifier));
-    });
-
-    return GetMockPropertiesFromDeclarations(properties, [], scope);
+  if (isExternalSource(externalModuleDeclaration)) {
+    return GetPropertiesFromSourceFileOrModuleDeclaration(externalModuleDeclaration, symbol, scope);
   }
 
   return GetTypeQueryDescriptorFromDeclaration(externalModuleDeclaration, scope);
 }
+
+function isExternalSource(declaration: ts.Node): declaration is ExternalSource {
+  return ts.isSourceFile(declaration) || ts.isModuleDeclaration(declaration);
+}
+
+function GetPropertiesFromSourceFileOrModuleDeclaration(sourceFile: ExternalSource, symbol: ts.Symbol, scope: Scope): ts.Expression {
+  const typeChecker: ts.TypeChecker = TypeChecker();
+  const moduleExports: ts.Symbol[] = typeChecker.getExportsOfModule(symbol);
+
+  const properties: PropertyLike[] =  moduleExports.map((prop: ts.Symbol): PropertyLike => {
+    const originalSymbol: ts.Symbol = TypescriptHelper.GetAliasedSymbolSafe(prop);
+    const originalDeclaration: ts.NamedDeclaration = originalSymbol.declarations[0];
+    const declaration: ts.Declaration = prop.declarations[0];
+
+    if (ts.isExportAssignment(declaration)) {
+      return TypescriptCreator.createProperty('default', ts.createTypeQueryNode(originalDeclaration.name as ts.Identifier));
+    }
+
+    if (ts.isExportSpecifier(declaration) && ts.isSourceFile(originalDeclaration)) {
+      const exportSpecifierSymbol: ts.Symbol = typeChecker.getSymbolAtLocation(declaration.name);
+      const exportSpecifierAliasSymbol: ts.Symbol = typeChecker.getAliasedSymbol(exportSpecifierSymbol);
+      const exportSpecifierProperties: ts.Expression = GetPropertiesFromSourceFileOrModuleDeclaration(originalDeclaration, exportSpecifierAliasSymbol, scope);
+
+      return TypescriptCreator.createPropertyWitInitializer(declaration.name, exportSpecifierProperties);
+    }
+
+    return TypescriptCreator.createProperty(originalDeclaration.name as ts.Identifier, ts.createTypeQueryNode(originalDeclaration.name as ts.Identifier));
+  });
+
+  return GetMockPropertiesFromDeclarations(properties, [], scope);
+}

src/transformer/helper/creator.ts

@@ -40,6 +40,10 @@ export namespace TypescriptCreator {
     return ts.createProperty([], [], propertyName, undefined, type, undefined);
   }
 
+  export function createPropertyWitInitializer(propertyName: string | PropertyName, initializer: ts.Expression): ts.PropertyDeclaration {
+    return ts.createProperty([], [], propertyName, undefined, undefined, initializer);
+  }
+
   export function createParameter(parameterName: string): ts.ParameterDeclaration {
     return ts.createParameter(
       undefined,

test/transformer/descriptor/typeQuery/typeQueryOfExports.test.ts

@@ -0,0 +1,12 @@
+import { createMock } from 'ts-auto-mock';
+import exportAlias = require('../utils/export/exportAlias');
+
+describe('typeQuery exports ', () => {
+  describe('for export aliases ', () => {
+    it('should assign all the types as an object', () => {
+      const type: typeof exportAlias = createMock<typeof exportAlias>();
+
+      expect(new type.types.Class().a).toBe('');
+    });
+  });
+});

test/transformer/descriptor/utils/export/exportAlias.ts

@@ -0,0 +1,3 @@
+import * as allTypes from '../classes/class';
+
+export { allTypes as types };