Fixed lualib cleanup, Fixed IndexOf and added tests for indexof

lolleko · lolleko · commit 8942097ec527 · 2018-07-20T09:58:35.000+02:00
diff --git a/gulpfile.ts b/gulpfile.ts
@@ -18,23 +18,27 @@ gulp.task("build", () => {
   return tsProject.src().pipe(tsProject()).js.pipe(gulp.dest("dist"));
 });
 
-gulp.task("lualib", () => {
-  compile([
-    "-ah",
-    "--dontRequireLuaLib",
-    "--luaTarget",
-    "5.1",
-    "--outDir",
-    "./dist/lualib",
-    "--rootDir",
-    "./src/lualib",
-    ...glob.sync("./src/lualib/*.ts"),
-  ]);
-
-  return gulp.src("./dist/lualib/*.lua")
-      .pipe(concat("lualib_bundle.lua"))
-      .pipe(gulp.dest("./dist/lualib"));
-});
+gulp.task("clean-lualib", () => del("./dist/lualib/*.lua"));
+
+gulp.task("build-lualib", () => {
+    compile([
+      "-ah",
+      "--dontRequireLuaLib",
+      "--luaTarget",
+      "5.1",
+      "--outDir",
+      "./dist/lualib",
+      "--rootDir",
+      "./src/lualib",
+      ...glob.sync("./src/lualib/*.ts"),
+    ]);
+
+    return gulp.src("./dist/lualib/*.lua")
+        .pipe(concat("lualib_bundle.lua"))
+        .pipe(gulp.dest("./dist/lualib"));
+  });
+
+gulp.task("lualib", gulp.series("clean-lualib", "build-lualib"));
 
 gulp.task("default", gulp.series("build", "lualib"));
 
diff --git a/src/lualib/ArrayIndexOf.ts b/src/lualib/ArrayIndexOf.ts
@@ -15,7 +15,7 @@ function __TS__ArrayIndexOf<T>(arr: T[], searchElement: T, fromIndex?: number) {
 
     let k;
     if (n >= 0) {
-        k = 0;
+        k = n;
     } else {
         k = len + n;
         if (k < 0) {
@@ -30,4 +30,4 @@ function __TS__ArrayIndexOf<T>(arr: T[], searchElement: T, fromIndex?: number) {
     }
 
     return -1;
-}
+}
diff --git a/test/unit/lualib.spec.ts b/test/unit/lualib.spec.ts
@@ -204,20 +204,26 @@ export class LuaLibArrayTests {
     @TestCase([], "test1")
     @TestCase(["test1"], "test1")
     @TestCase(["test1", "test2"], "test2")
+    @TestCase(["test1", "test2", "test3"], "test3", 1)
+    @TestCase(["test1", "test2", "test3"], "test1", 2)
+    @TestCase(["test1", "test2", "test3"], "test1", -2)
+    @TestCase(["test1", "test2", "test3"], "test1", 12)
     @Test("array.indexOf")
-    public indexOf(inp: string[], element: string) {
-        // Transpile
-        const lua = util.transpileString(
-            `return ${JSON.stringify(inp)}.indexOf("${element}"))`
+    public indexOf(inp: string[], element: string, fromIndex?: number) {
+        let str = `return ${JSON.stringify(inp)}.indexOf("${element}"))`;
+        if (fromIndex) {
+            str = `return ${JSON.stringify(inp)}.indexOf("${element}", ${fromIndex}))`;
+        }
 
-        );
+        // Transpile
+        const lua = util.transpileString(str);
 
         // Execute
         const result = util.executeLua(lua);
 
         // Assert
-        // Acount for lua indexing (-1)
-        Expect(result).toBe(inp.indexOf(element));
+        // Account for lua indexing (-1)
+        Expect(result).toBe(inp.indexOf(element, fromIndex));
     }
 
     @TestCase([1, 2, 3], 3)
