TypeScriptToLua
diff --git a/‎src/lualib/ArrayConcat.ts‎
Lines changed: 19 additions & 5 deletions b/‎src/lualib/ArrayConcat.ts‎
Lines changed: 19 additions & 5 deletions
diff --git a/‎test/unit/lualib/lualib.spec.ts‎
Lines changed: 30 additions & 1 deletion b/‎test/unit/lualib/lualib.spec.ts‎
Lines changed: 30 additions & 1 deletion
@@ -1,10 +1,24 @@
-function __TS__ArrayConcat<T>(arr1: T[], arr2: T[]): T[] {
-  const out: T[] = [];
+/* tslint:disable */
+declare function pcall(func: Function): any;
+declare function type(val: any): string;
+
+function __TS__ArrayConcat(arr1: any[], ...args: any[]): any[] {
+  const out: any[] = [];
   for (let i = 0; i < arr1.length; i++) {
-    out[i] = arr1[i];
+    out[out.length] = arr1[i];
   }
-  for (let i = 0; i < arr2.length; i++) {
-    out[i] = arr2[i];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    // Hack because we don't have an isArray function
+    if (pcall(() => (arg as any[]).length) && type(arg) !== "string") {
+        const argAsArray = (arg as any[]);
+        for (let j = 0; j < argAsArray.length; j++) {
+            out[out.length] = argAsArray[j];
+        }
+    } else {
+        out[out.length] = arg;
+    }
   }
+
   return out;
 }
@@ -172,6 +172,35 @@ export class LuaLibArrayTests {
         }
     }
 
+    @TestCase([], [])
+    @TestCase([1, 2, 3], [])
+    @TestCase([1, 2, 3], [4])
+    @TestCase([1, 2, 3], [4, 5])
+    @TestCase([1, 2, 3], [4, 5])
+    @TestCase([1, 2, 3], 4, [5])
+    @TestCase([1, 2, 3], 4, [5, 6])
+    @TestCase([1, 2, 3], 4, [5, 6], 7)
+    @TestCase([1, 2, 3], "test", [5, 6], 7, ["test1", "test2"])
+    @TestCase([1, 2, "test"], "test", ["test1", "test2"])
+    @Test("array.concat")
+    public concat<T>(arr: T[], ...args: T[]) {
+        const argStr = args.map(arg => JSON.stringify(arg)).join(",");
+        console.log(argStr);
+        console.log("\n");
+        // Transpile
+        const lua = util.transpileString(
+            `let concatTestTable = ${JSON.stringify(arr)};
+            return JSONStringify(concatTestTable.concat(${argStr}));`
+        );
+
+        // Execute
+        const result = util.executeLua(lua);
+
+        // Assert
+        const concatArr = arr.concat(...args);
+        Expect(result).toBe(JSON.stringify(concatArr));
+    }
+
     @TestCase([], "")
     @TestCase(["test1"], "test1")
     @TestCase(["test1", "test2"], "test1,test2")
@@ -308,7 +337,7 @@ export class LuaLibArrayTests {
         // Assert
         Expect(result).toBe(expected);
     }
-   
+
     @TestCase("true", 11)
     @TestCase("false", 13)
     @TestCase("a < 4", 13)