Use collectCustomDecorators and remove isNonNamespaceModuleDeclaration

hazzard993 · hazzard993 · commit 073592d6a73a · 2019-06-19T23:19:24.000+10:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -1,7 +1,7 @@
 import * as path from "path";
 import * as ts from "typescript";
 import { CompilerOptions, LuaTarget } from "./CompilerOptions";
-import { DecoratorKind } from "./Decorator";
+import { Decorator, DecoratorKind } from "./Decorator";
 import * as tstl from "./LuaAST";
 import { LuaLibFeature } from "./LuaLib";
 import { ContextType, TSHelper as tsHelper } from "./TSHelper";
@@ -360,17 +360,10 @@ export class LuaTransformer {
         let shouldResolve = true;
         const moduleOwnerSymbol = this.checker.getSymbolAtLocation(statement.moduleSpecifier);
         if (moduleOwnerSymbol) {
-            for (const declaration of moduleOwnerSymbol.declarations) {
-                if (tsHelper.isNonNamespaceModuleDeclaration(declaration)) {
-                    const type = this.checker.getTypeAtLocation(declaration);
-                    if (type) {
-                        const decorators = tsHelper.getCustomDecorators(type, this.checker);
-                        if (decorators.has(DecoratorKind.NoResolution)) {
-                            shouldResolve = false;
-                            break;
-                        }
-                    }
-                }
+            const decMap = new Map<DecoratorKind, Decorator>();
+            tsHelper.collectCustomDecorators(moduleOwnerSymbol, this.checker, decMap);
+            if (decMap.has(DecoratorKind.NoResolution)) {
+                shouldResolve = false;
             }
         }
 
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -131,10 +131,6 @@ export class TSHelper {
         return !((ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Ambient) === 0);
     }
 
-    public static isNonNamespaceModuleDeclaration(node: ts.Node): node is ts.ModuleDeclaration {
-        return ts.isModuleDeclaration(node) && (node.flags & ts.NodeFlags.Namespace) === 0;
-    }
-
     public static isStatic(node: ts.Node): boolean {
         return node.modifiers !== undefined && node.modifiers.some(m => m.kind === ts.SyntaxKind.StaticKeyword);
     }

Original file line number	Diff line number	Diff line change
`@@ -131,10 +131,6 @@ export class TSHelper {`
`131`	`131`	`return !((ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Ambient) === 0);`
`132`	`132`	`}`
`133`	`133`
`134`		`- public static isNonNamespaceModuleDeclaration(node: ts.Node): node is ts.ModuleDeclaration {`
`135`		`- return ts.isModuleDeclaration(node) && (node.flags & ts.NodeFlags.Namespace) === 0;`
`136`		`- }`
`137`		`-`
`138`	`134`	`public static isStatic(node: ts.Node): boolean {`
`139`	`135`	`return node.modifiers !== undefined && node.modifiers.some(m => m.kind === ts.SyntaxKind.StaticKeyword);`
`140`	`136`	`}`