TypeScriptToLua · Perryvw · May 18, 2019 · May 5, 2019 · May 5, 2019 · May 5, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
-node_js:
-  - stable
+node_js: "8.5.0"
 
 script:
   - npm run build

diff --git a/README.md b/README.md
@@ -42,11 +42,11 @@ Changelog can be found in [CHANGELOG.md](https://github.com/TypeScriptToLua/Type
 {
     "compilerOptions": {
         "target": "esnext",
-        "lib": ["es2015", "es2016", "es2017", "es2018", "esnext"],
+        "lib": ["esnext"],
         "strict": true
     },
     "tstl": {
-      "luaTarget": "JIT"
+        "luaTarget": "JIT"
     }
 }
 ```

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 # Test against the latest version of this Node.js version
 environment:
-  nodejs_version: "8"
+  nodejs_version: "8.5.0"
 
 # Do not build feature branch with open Pull Requests
 skip_branch_with_pr: true
@@ -13,15 +13,17 @@ cache:
 install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
-  # install modules
+  # Upgrade npm
+  - npm install --global npm@6
+  # Install modules
   - npm ci
 
 # Post-install test scripts.
 test_script:
   # Output useful info for debugging.
   - node --version
   - npm --version
-  # run tests
+  # Run tests
   - npm run build
   - npm test
 

diff --git a/build_lualib.ts b/build_lualib.ts
@@ -1,29 +1,17 @@
 import * as fs from "fs";
-import * as glob from "glob";
 import * as path from "path";
 import * as ts from "typescript";
 import * as tstl from "./src";
 import { LuaLib } from "./src/LuaLib";
 
-const options: tstl.CompilerOptions = {
-    skipLibCheck: true,
-    types: [],
-    target: ts.ScriptTarget.ESNext,
-    lib: ["lib.esnext.d.ts"],
-
-    outDir: path.join(__dirname, "./dist/lualib"),
-    rootDir: path.join(__dirname, "./src/lualib"),
-
-    luaLibImport: tstl.LuaLibImportKind.None,
-    luaTarget: tstl.LuaTarget.Lua51,
-    noHeader: true,
-};
-
-// TODO: Check diagnostics
-const { emitResult } = tstl.transpileFiles(glob.sync("./src/lualib/**/*.ts"), options);
+const configFileName = path.resolve(__dirname, "src/lualib/tsconfig.json");
+const { emitResult, diagnostics } = tstl.transpileProject(configFileName);
 emitResult.forEach(({ name, text }) => ts.sys.writeFile(name, text));
 
-const bundlePath = path.join(__dirname, "./dist/lualib/lualib_bundle.lua");
+const reportDiagnostic = tstl.createDiagnosticReporter(true);
+diagnostics.forEach(reportDiagnostic);
+
+const bundlePath = path.join(__dirname, "dist/lualib/lualib_bundle.lua");
 if (fs.existsSync(bundlePath)) {
     fs.unlinkSync(bundlePath);
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
         "test": "jest",
         "lint": "npm run lint:tslint && npm run lint:prettier",
         "lint:prettier": "prettier --check **/*.{js,ts,yml,json} || (echo 'Run `npm run fix:prettier` to fix it.' && exit 1)",
-        "lint:tslint": "tslint -p . && tslint -p test && tslint src/lualib/*.ts",
+        "lint:tslint": "tslint -p . && tslint -p test && tslint -p src/lualib",
         "fix:prettier": "prettier --check --write **/*.{js,ts,yml,json}",
         "release-major": "npm version major",
         "release-minor": "npm version minor",
@@ -40,20 +40,18 @@
     },
     "dependencies": {
         "source-map": "^0.7.3",
-        "typescript": "^3.3.1"
+        "typescript": "^3.4.5"
     },
     "devDependencies": {
-        "@types/glob": "^5.0.35",
-        "@types/jest": "^24.0.11",
+        "@types/glob": "^7.1.1",
+        "@types/jest": "^24.0.12",
         "@types/node": "^11.13.0",
-        "fengari": "^0.1.2",
-        "glob": "^7.1.2",
-        "jest": "^24.5.0",
-        "jest-circus": "^24.5.0",
-        "prettier": "^1.16.4",
-        "rimraf": "^2.6.3",
-        "ts-jest": "^24.0.0",
+        "fengari": "^0.1.4",
+        "jest": "^24.8.0",
+        "jest-circus": "^24.8.0",
+        "prettier": "^1.17.0",
+        "ts-jest": "^24.0.2",
         "ts-node": "^7.0.0",
-        "tslint": "^5.10.0"
+        "tslint": "^5.16.0"
     }
 }
diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts
@@ -211,16 +211,16 @@ function readValue(option: CommandLineOption, value: unknown): ReadValueResult {
                 };
             }
 
-            const normalizedValue = value.toLowerCase();
-            if (option.choices && !option.choices.includes(normalizedValue)) {
+            const enumValue = option.choices.find(c => c.toLowerCase() === value.toLowerCase());
+            if (enumValue === undefined) {
                 const optionChoices = option.choices.join(", ");
                 return {
                     value: undefined,
                     error: diagnostics.argumentForOptionMustBe(`--${option.name}`, optionChoices),
                 };
             }
 
-            return { value: normalizedValue };
+            return { value: enumValue };
         }
     }
 }
@@ -240,3 +240,14 @@ export function parseConfigFileWithSystem(
 
     return updateParsedConfigFile(parsedConfigFile);
 }
+
+export function createDiagnosticReporter(pretty: boolean, system = ts.sys): ts.DiagnosticReporter {
+    const reporter: ts.DiagnosticReporter = (ts as any).createDiagnosticReporter(system, pretty);
+    return diagnostic => {
+        if (diagnostic.source === "typescript-to-lua") {
+            diagnostic = { ...diagnostic, code: ("TL" + diagnostic.code) as any };
+        }
+
+        reporter(diagnostic);
+    };
+}
diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -19,5 +19,5 @@ export enum LuaTarget {
     Lua51 = "5.1",
     Lua52 = "5.2",
     Lua53 = "5.3",
-    LuaJIT = "jit",
+    LuaJIT = "JIT",
 }
diff --git a/src/LuaAST.ts b/src/LuaAST.ts
@@ -253,7 +253,7 @@ export function createVariableDeclarationStatement(
 // `test1, test2 = 12, 42`
 export interface AssignmentStatement extends Statement {
     kind: SyntaxKind.AssignmentStatement;
-    left: IdentifierOrTableIndexExpression[];
+    left: AssignmentLeftHandSideExpression[];
     right: Expression[];
 }
 
@@ -262,7 +262,7 @@ export function isAssignmentStatement(node: Node): node is AssignmentStatement {
 }
 
 export function createAssignmentStatement(
-    left: IdentifierOrTableIndexExpression | IdentifierOrTableIndexExpression[],
+    left: AssignmentLeftHandSideExpression | AssignmentLeftHandSideExpression[],
     right?: Expression | Expression[],
     tsOriginal?: ts.Node,
     parent?: Node
@@ -874,7 +874,7 @@ export function createTableIndexExpression(
     return expression;
 }
 
-export type IdentifierOrTableIndexExpression = Identifier | TableIndexExpression;
+export type AssignmentLeftHandSideExpression = Identifier | TableIndexExpression;
 
 export type FunctionDefinition = (VariableDeclarationStatement | AssignmentStatement) & {
     right: [FunctionExpression];