Fix: Prefix function declarations in TS namespaces (fixes #78) (#82)

* Fix: Prefix function declarations in TS namespaces (fixes #78)

* Improve the new type namespaces

Author: JamesHenry

lib/ast-converter.js

@@ -215,8 +215,18 @@ function fixExports(node, result, ast) {
         result.range[0] = varToken.getStart();
         result.loc = getLocFor(result.range[0], result.range[1], ast);
 
+        var declarationType = declarationIsDefault ? "ExportDefaultDeclaration" : "ExportNamedDeclaration";
+
+        /**
+         * Prefix exports from TypeScript namespaces with "TS" to distinguish
+         * them from ES2015 exports
+         */
+        if (node.parent && node.parent.kind === SyntaxKind.ModuleBlock) {
+            declarationType = "TSNamespaceExportDeclaration";
+        }
+
         var newResult = {
-            type: declarationIsDefault ? "ExportDefaultDeclaration" : "ExportNamedDeclaration",
+            type: declarationType,
             declaration: result,
             range: [ exportKeyword.getStart(), result.range[1] ],
             loc: getLocFor(exportKeyword.getStart(), result.range[1], ast)
@@ -776,6 +786,13 @@ module.exports = function(ast, extra) {
                     }
                 }
 
+                /**
+                 * Prefix FunctionDeclarations within TypeScript namespaces with "TS"
+                 */
+                if (node.parent && node.parent.kind === SyntaxKind.ModuleBlock) {
+                    functionDeclarationType = "TSNamespaceFunctionDeclaration";
+                }
+
                 assign(result, {
                     type: functionDeclarationType,
                     id: convertChild(node.name),