TypeScriptToLua · Perryvw · May 2, 2019 · Apr 6, 2019 · Apr 6, 2019 · Apr 6, 2019
diff --git a/.prettierignore b/.prettierignore
@@ -1,6 +1,5 @@
 /dist
 /coverage
-/test/compiler/testfiles/invalid_syntax.ts
 /test/translation/transformation/characterEscapeSequence.ts
 
 /src

diff --git a/build_lualib.ts b/build_lualib.ts
@@ -1,34 +1,27 @@
 import * as fs from "fs";
 import * as glob from "glob";
-import { compile } from "./src/Compiler";
-import { LuaLib as luaLib, LuaLibFeature } from "./src/LuaLib";
+import * as path from "path";
+import * as ts from "typescript";
+import * as tstl from "./src";
+import { LuaLib } from "./src/LuaLib";
 
-const bundlePath = "./dist/lualib/lualib_bundle.lua";
+const options: tstl.CompilerOptions = {
+    skipLibCheck: true,
+    types: [],
+    luaLibImport: tstl.LuaLibImportKind.None,
+    luaTarget: tstl.LuaTarget.Lua51,
+    noHeader: true,
+    outDir: path.join(__dirname, "./dist/lualib"),
+    rootDir: path.join(__dirname, "./src/lualib"),
+};
 
-compile([
-    "--skipLibCheck",
-    "--types",
-    "node",
-    "--luaLibImport",
-    "none",
-    "--luaTarget",
-    "5.1",
-    "--noHeader",
-    "--outDir",
-    "./dist/lualib",
-    "--rootDir",
-    "./src/lualib",
-    "--noHeader",
-    "true",
-    ...glob.sync("./src/lualib/**/*.ts"),
-]);
+// TODO: Check diagnostics
+const { emitResult } = tstl.transpileFiles(glob.sync("./src/lualib/**/*.ts"), options);
+emitResult.forEach(({ name, text }) => ts.sys.writeFile(name, text));
 
+const bundlePath = path.join(__dirname, "./dist/lualib/lualib_bundle.lua");
 if (fs.existsSync(bundlePath)) {
     fs.unlinkSync(bundlePath);
 }
 
-const features = Object.keys(LuaLibFeature).map(
-    lib => LuaLibFeature[lib as keyof typeof LuaLibFeature],
-);
-const bundle = luaLib.loadFeatures(features);
-fs.writeFileSync(bundlePath, bundle);
+fs.writeFileSync(bundlePath, LuaLib.loadFeatures(Object.values(tstl.LuaLibFeature)));
diff --git a/jest.config.js b/jest.config.js
@@ -3,9 +3,15 @@ const isCI = require("is-ci");
 /** @type {Partial<import("@jest/types").Config.DefaultOptions>} */
 module.exports = {
     testMatch: ["**/test/**/*.spec.ts"],
-    collectCoverageFrom: ["<rootDir>/src/**/*", "!<rootDir>/src/lualib/**/*"],
-    watchPathIgnorePatterns: ["/watch\\.ts$"],
+    collectCoverageFrom: [
+        "<rootDir>/src/**/*",
+        "!<rootDir>/src/lualib/**/*",
+        // https://github.com/facebook/jest/issues/5274
+        "!<rootDir>/src/tstl.ts",
+    ],
+    watchPathIgnorePatterns: ["cli/watch/[^/]+$"],
 
+    setupFilesAfterEnv: ["<rootDir>/test/setup.ts"],
     testEnvironment: "node",
     testRunner: "jest-circus/runner",
     preset: "ts-jest",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "devDependencies": {
         "@types/glob": "^5.0.35",
         "@types/jest": "^24.0.11",
-        "@types/node": "^9.6.23",
+        "@types/node": "^11.13.0",
         "fengari": "^0.1.2",
         "glob": "^7.1.2",
         "jest": "^24.5.0",