Make standard transformers have lowest priority

ark120202 · ark120202 · commit 2da441c43d91 · 2019-11-02T21:56:48.000Z
diff --git a/src/transformation/index.ts b/src/transformation/index.ts
@@ -2,7 +2,7 @@ import * as ts from "typescript";
 import * as lua from "../LuaAST";
 import { LuaLibFeature } from "../LuaLib";
 import { getOrUpdate } from "../utils";
-import { ObjectVisitor, TransformationContext, VisitorMap, Visitors } from "./context";
+import { FunctionVisitor, ObjectVisitor, TransformationContext, VisitorMap, Visitors } from "./context";
 import { standardVisitors } from "./transformers";
 import { TranspileError } from "./utils/errors";
 import { getUsedLuaLibFeatures } from "./utils/lualib";
@@ -20,13 +20,15 @@ const transpileErrorDiagnostic = (error: TranspileError): ts.Diagnostic => ({
 export function createVisitorMap(customVisitors: Visitors[]): VisitorMap {
     const visitorMap: VisitorMap = new Map();
     for (const visitors of [standardVisitors, ...customVisitors]) {
+        const priority = visitors === standardVisitors ? -Infinity : 0;
         for (const [syntaxKindKey, visitor] of Object.entries(visitors)) {
             if (!visitor) continue;
 
             const syntaxKind = Number(syntaxKindKey) as ts.SyntaxKind;
             const nodeVisitors = getOrUpdate(visitorMap, syntaxKind, () => []);
 
-            const objectVisitor: ObjectVisitor<any> = typeof visitor === "function" ? { transform: visitor } : visitor;
+            const objectVisitor: ObjectVisitor<any> =
+                typeof visitor === "function" ? { transform: visitor, priority } : visitor;
             nodeVisitors.push(objectVisitor);
         }
     }
