TypeScriptToLua · lolleko · Mar 25, 2018 · Mar 25, 2018 · Mar 25, 2018
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,12 +21,9 @@
         "node": ">=8.5.0"
     },
     "dependencies": {
-        "dedent": "^0.7.0",
-        "fs-extra": "^5.0.0",
         "yargs": "^11.0.0"
     },
     "devDependencies": {
-        "@types/fs-extra": "^5.0.1",
         "@types/node": "^9.4.7",
         "@types/yargs": "^11.0.0",
         "alsatian": "^2.2.1",

diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts
@@ -3,9 +3,6 @@ import * as path from "path";
 import * as ts from "typescript";
 import * as yargs from "yargs";
 
-// ES6 syntax broken
-import dedent = require("dedent");
-
 export interface CompilerOptions extends ts.CompilerOptions {
     addHeader?: boolean;
     luaTarget?: string;

diff --git a/test/compiler/compiler.spec.ts b/test/compiler/compiler.spec.ts
@@ -0,0 +1,74 @@
+import { Expect, Setup, Teardown, Test, TestCase } from "alsatian";
+import * as fs from "fs";
+import * as path from "path";
+import { execCommandLine } from "../../src/Compiler";
+
+/**
+ * Find all files inside a dir, recursively.
+ */
+function getAllFiles(dir: string): string[] {
+    return fs.readdirSync(dir).reduce(
+        (files, file) => {
+            const name = path.join(dir, file);
+            const isDirectory = fs.statSync(name).isDirectory();
+            return isDirectory ? [...files, ...getAllFiles(name)] : [...files, name];
+        },
+        []
+    );
+}
+
+export class CompilerTests {
+
+    private existingFiles: string[];
+    private filesAfterCompile: string[];
+
+    @Setup
+    public setup() {
+      this.existingFiles = getAllFiles(path.resolve(__dirname, "./project"));
+      this.filesAfterCompile = [];
+    }
+
+    @TestCase("tsconfig.default.json",
+              "typescript_lualib.lua",
+              "test_src/test_lib/file.lua",
+              "test_src/main.lua")
+    @TestCase("tsconfig.outDir.json",
+              "out_dir/typescript_lualib.lua",
+              "out_dir/test_src/test_lib/file.lua",
+              "out_dir/test_src/main.lua")
+    @TestCase("tsconfig.rootDir.json",
+              "test_src/typescript_lualib.lua",
+              "test_src/test_lib/file.lua",
+              "test_src/main.lua")
+    @TestCase("tsconfig.bothDirOptions.json",
+              "out_dir/typescript_lualib.lua",
+              "out_dir/test_lib/file.lua",
+              "out_dir/main.lua")
+    @Test("Compile project")
+    public compileProject(tsconfig: string, ...expectedFiles: string[]) {
+        const tsconfigPath = path.resolve(__dirname, "project", tsconfig);
+
+        // Compile project
+        execCommandLine(["-p", tsconfigPath]);
+
+        this.filesAfterCompile = getAllFiles(path.resolve(__dirname, "project"));
+        expectedFiles = expectedFiles.map((relPath) => path.resolve(__dirname, "project", relPath));
+        expectedFiles.push(...this.existingFiles);
+
+        for (const existingFile of this.filesAfterCompile) {
+            Expect(expectedFiles).toContain(existingFile);
+        }
+    }
+
+    @Teardown
+    public teardown() {
+        // Remove files taht were created by the test
+        const createdFiles = this.filesAfterCompile.filter((v) => this.existingFiles.indexOf(v) < 0);
+        for (const file of createdFiles) {
+            fs.unlinkSync(file);
+        }
+        this.existingFiles = [];
+        this.filesAfterCompile = [];
+    }
+
+}
diff --git a/test/compiler/project/test_src/main.ts b/test/compiler/project/test_src/main.ts
@@ -0,0 +1,3 @@
+function main() {
+    const main = 10;
+}
diff --git a/test/compiler/project/test_src/test_lib/file.ts b/test/compiler/project/test_src/test_lib/file.ts
@@ -0,0 +1 @@
+const test = true;
diff --git a/test/compiler/project/tsconfig.bothDirOptions.json b/test/compiler/project/tsconfig.bothDirOptions.json
@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig.default.json",
+    "compilerOptions": {
+        "outDir": "out_dir",
+        "rootDir": "test_src"
+    }
+}
diff --git a/test/compiler/project/tsconfig.default.json b/test/compiler/project/tsconfig.default.json
@@ -0,0 +1,3 @@
+{
+    "luaTarget": "JIT"
+}
diff --git a/test/compiler/project/tsconfig.outDir.json b/test/compiler/project/tsconfig.outDir.json
@@ -0,0 +1,6 @@
+{
+    "extends": "./tsconfig.default.json",
+    "compilerOptions": {
+        "outDir": "out_dir"
+    }
+}
diff --git a/test/compiler/project/tsconfig.rootDir.json b/test/compiler/project/tsconfig.rootDir.json
@@ -0,0 +1,6 @@
+{
+    "extends": "./tsconfig.default.json",
+    "compilerOptions": {
+        "rootDir": "test_src"
+    }
+}
diff --git a/test/runner.ts b/test/runner.ts
@@ -1,4 +1,4 @@
-import { TestSet, TestRunner } from "alsatian";
+import { TestRunner, TestSet } from "alsatian";
 import { TapBark } from "tap-bark";
 
 // create test set
@@ -21,6 +21,6 @@ testRunner.outputStream
 // run the test set
 testRunner.run(testSet);
           // this will be called after all tests have been run
-          //.then((results) => done())
+          // .then((results) => done())
           // this will be called if there was a problem
-          //.catch((error) => doSomethingWith(error));
+          // .catch((error) => doSomethingWith(error));
diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -5,5 +5,6 @@
     },
     "exclude": [
         "translation/ts/*",
+        "compiler/project/*"
     ]
 }
diff --git a/test/unit/modules.spec.ts b/test/unit/modules.spec.ts
@@ -1,23 +1,21 @@
 import { Expect, Test, TestCase } from "alsatian";
-import * as util from "../src/util"
-
-const dedent = require('dedent')
+import * as util from "../src/util";
 
 export class LuaModuleTests {
 
     @Test("defaultImport")
     public defaultImport() {
         Expect(() => {
-            let lua = util.transpileString(`import TestClass from "test"`);
+            const lua = util.transpileString(`import TestClass from "test"`);
         }).toThrowError(Error, "Default Imports are not supported, please use named imports instead!");
     }
 
     @Test("lualibRequire")
     public lualibRequire() {
         // Transpile
-        let lua = util.transpileString(``, {dontRequireLuaLib: false, luaTarget: "JIT"});
+        const lua = util.transpileString(``, {dontRequireLuaLib: false, luaTarget: "JIT"});
 
         // Assert
-        Expect(dedent(lua)).toBe(`require("typescript_lualib")`);
+        Expect(lua).toBe(`require("typescript_lualib")`);
     }
 }