TypeScriptToLua · Perryvw · Jun 4, 2019 · May 2, 2019 · May 3, 2019 · May 5, 2019
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,13 +39,15 @@
         "node": ">=8.5.0"
     },
     "dependencies": {
+        "resolve": "^1.10.1",
         "source-map": "^0.7.3",
         "typescript": "^3.4.5"
     },
     "devDependencies": {
         "@types/glob": "^7.1.1",
         "@types/jest": "^24.0.12",
         "@types/node": "^11.13.0",
+        "@types/resolve": "0.0.8",
         "fengari": "^0.1.4",
         "jest": "^24.8.0",
         "jest-circus": "^24.8.0",

diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts
@@ -1,7 +1,7 @@
 import * as path from "path";
 import * as ts from "typescript";
 import { CompilerOptions, LuaLibImportKind, LuaTarget } from "./CompilerOptions";
-import * as diagnostics from "./diagnostics";
+import * as diagnosticFactories from "./diagnostics";
 
 export interface ParsedCommandLine extends ts.ParsedCommandLine {
     options: CompilerOptions;
@@ -10,7 +10,7 @@ export interface ParsedCommandLine extends ts.ParsedCommandLine {
 interface CommandLineOptionBase {
     name: string;
     aliases?: string[];
-    describe: string;
+    description: string;
 }
 
 interface CommandLineOptionOfEnum extends CommandLineOptionBase {
@@ -23,33 +23,34 @@ interface CommandLineOptionOfBoolean extends CommandLineOptionBase {
 }
 
 type CommandLineOption = CommandLineOptionOfEnum | CommandLineOptionOfBoolean;
+
 const optionDeclarations: CommandLineOption[] = [
     {
         name: "luaLibImport",
-        describe: "Specifies how js standard features missing in lua are imported.",
+        description: "Specifies how js standard features missing in lua are imported.",
         type: "enum",
         choices: Object.values(LuaLibImportKind),
     },
     {
         name: "luaTarget",
         aliases: ["lt"],
-        describe: "Specify Lua target version.",
+        description: "Specify Lua target version.",
         type: "enum",
         choices: Object.values(LuaTarget),
     },
     {
         name: "noHeader",
-        describe: "Specify if a header will be added to compiled files.",
+        description: "Specify if a header will be added to compiled files.",
         type: "boolean",
     },
     {
         name: "noHoisting",
-        describe: "Disables hoisting.",
+        description: "Disables hoisting.",
         type: "boolean",
     },
     {
         name: "sourceMapTraceback",
-        describe: "Applies the source map to show source TS files and lines in error tracebacks.",
+        description: "Applies the source map to show source TS files and lines in error tracebacks.",
         type: "boolean",
     },
 ];
@@ -78,7 +79,7 @@ export function getHelpString(): string {
         const valuesHint = option.type === "enum" ? option.choices.join("|") : option.type;
         const spacing = " ".repeat(Math.max(1, 45 - optionString.length - valuesHint.length));
 
-        result += `\n ${optionString} <${valuesHint}>${spacing}${option.describe}\n`;
+        result += `\n ${optionString} <${valuesHint}>${spacing}${option.description}\n`;
     }
 
     return result;
@@ -97,13 +98,15 @@ export function updateParsedConfigFile(parsedConfigFile: ts.ParsedCommandLine):
 
     if (parsedConfigFile.raw.tstl) {
         if (hasRootLevelOptions) {
-            parsedConfigFile.errors.push(diagnostics.tstlOptionsAreMovingToTheTstlObject(parsedConfigFile.raw.tstl));
+            parsedConfigFile.errors.push(
+                diagnosticFactories.tstlOptionsAreMovingToTheTstlObject(parsedConfigFile.raw.tstl)
+            );
         }
 
         for (const key in parsedConfigFile.raw.tstl) {
             const option = optionDeclarations.find(option => option.name === key);
             if (!option) {
-                parsedConfigFile.errors.push(diagnostics.unknownCompilerOption(key));
+                parsedConfigFile.errors.push(diagnosticFactories.unknownCompilerOption(key));
                 continue;
             }
 
@@ -167,9 +170,11 @@ function readCommandLineArgument(option: CommandLineOption, value: any): Command
             // Set boolean arguments without supplied value to true
             return { value: true, increment: 0 };
         }
-    } else if (value === undefined) {
+    }
+
+    if (value === undefined) {
         return {
-            error: diagnostics.compilerOptionExpectsAnArgument(option.name),
+            error: diagnosticFactories.compilerOptionExpectsAnArgument(option.name),
             value: undefined,
             increment: 0,
         };
@@ -191,7 +196,7 @@ function readValue(option: CommandLineOption, value: unknown): ReadValueResult {
             if (typeof value !== "boolean") {
                 return {
                     value: undefined,
-                    error: diagnostics.compilerOptionRequiresAValueOfType(option.name, "boolean"),
+                    error: diagnosticFactories.compilerOptionRequiresAValueOfType(option.name, "boolean"),
                 };
             }
 
@@ -202,7 +207,7 @@ function readValue(option: CommandLineOption, value: unknown): ReadValueResult {
             if (typeof value !== "string") {
                 return {
                     value: undefined,
-                    error: diagnostics.compilerOptionRequiresAValueOfType(option.name, "string"),
+                    error: diagnosticFactories.compilerOptionRequiresAValueOfType(option.name, "string"),
                 };
             }
 
@@ -211,7 +216,7 @@ function readValue(option: CommandLineOption, value: unknown): ReadValueResult {
                 const optionChoices = option.choices.join(", ");
                 return {
                     value: undefined,
-                    error: diagnostics.argumentForOptionMustBe(`--${option.name}`, optionChoices),
+                    error: diagnosticFactories.argumentForOptionMustBe(`--${option.name}`, optionChoices),
                 };
             }
 

diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -1,12 +1,31 @@
 import * as ts from "typescript";
 
-export interface CompilerOptions extends ts.CompilerOptions {
+type KnownKeys<T> = { [K in keyof T]: string extends K ? never : number extends K ? never : K } extends {
+    [_ in keyof T]: infer U
+}
+    ? U
+    : never;
+
+type OmitIndexSignature<T extends Record<any, any>> = Pick<T, KnownKeys<T>>;
+
+export interface TransformerImport {
+    transform: string;
+    import?: string;
+    after?: boolean;
+    afterDeclarations?: boolean;
+    type?: "program" | "config" | "checker" | "raw" | "compilerOptions";
+    [option: string]: any;
+}
+
+export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
     noHeader?: boolean;
     luaTarget?: LuaTarget;
     luaLibImport?: LuaLibImportKind;
     noHoisting?: boolean;
     sourceMapTraceback?: boolean;
-}
+    plugins?: Array<ts.PluginImport | TransformerImport>;
+    [option: string]: ts.CompilerOptions[string] | Array<ts.PluginImport | TransformerImport>;
+};
 
 export enum LuaLibImportKind {
     None = "none",

diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -108,7 +108,12 @@ export class LuaTransformer {
         this.setupState();
 
         this.currentSourceFile = node;
-        this.resolver = this.checker.getEmitResolver(node);
+
+        // Use `getParseTreeNode` to get original SourceFile node, before it was substituted by custom transformers.
+        // It's required because otherwise `getEmitResolver` won't use cached diagnostics, produced in `emitWorker`
+        // and would try to re-analyze the file, which would fail because of replaced nodes.
+        const originalSourceFile = ts.getParseTreeNode(node, ts.isSourceFile) || node;
+        this.resolver = this.checker.getEmitResolver(originalSourceFile);
 
         let statements: tstl.Statement[] = [];
         if (node.flags & ts.NodeFlags.JsonFile) {