Fix array.sort compare function not working

ark120202 · ark120202 · commit 4ef4aa13b2fb · 2019-02-26T20:53:40.000+05:00
diff --git a/src/lualib/ArraySort.ts b/src/lualib/ArraySort.ts
@@ -1,7 +1,11 @@
 declare namespace table {
-    function sort<T>(arr: T[], compareFn?: (a: T, b: T) => number): void;
+    function sort<T>(arr: T[], compareFn?: (a: T, b: T) => boolean): void;
 }
 function __TS__ArraySort<T>(arr: T[], compareFn?: (a: T, b: T) => number): T[] {
-    table.sort(arr, compareFn);
+    if (compareFn !== undefined) {
+        table.sort(arr, (a, b) => compareFn(a, b) < 0);
+    } else {
+        table.sort(arr);
+    }
     return arr;
 }
diff --git a/test/unit/lualib/lualib.spec.ts b/test/unit/lualib/lualib.spec.ts
@@ -352,6 +352,22 @@ export class LuaLibTests
         // Assert
         Expect(result).toBe(JSON.stringify(expected));
     }
+
+    @TestCase("[4, 5, 3, 2, 1]", [1, 2, 3, 4, 5], "a - b")
+    @TestCase('["4", "5", "3", "2", "1"]', ["1", "2", "3", "4", "5"], "tonumber(a) - tonumber(b)")
+    @TestCase('["4", "5", "3", "2", "1"]', ["5", "4", "3", "2", "1"], "tonumber(b) - tonumber(a)")
+    @Test("array.sort with compare function")
+    public arraySortWithCompareFunction(array: string, expected: any, compare: string): void
+    {
+        const result = util.transpileAndExecute(
+            `let testArray = ${array};
+            testArray.sort((a, b) => ${compare});
+            return JSONStringify(testArray)`);
+
+        // Assert
+        Expect(result).toBe(JSON.stringify(expected));
+    }
+
     @TestCase("true", "4", "5", 4)
     @TestCase("false", "4", "5", 5)
     @TestCase("3", "4", "5", 4)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
`1`	`1`	`declare namespace table {`
`2`		`- function sort<T>(arr: T[], compareFn?: (a: T, b: T) => number): void;`
	`2`	`+ function sort<T>(arr: T[], compareFn?: (a: T, b: T) => boolean): void;`
`3`	`3`	`}`
`4`	`4`	`function __TS__ArraySort<T>(arr: T[], compareFn?: (a: T, b: T) => number): T[] {`
`5`		`- table.sort(arr, compareFn);`
	`5`	`+ if (compareFn !== undefined) {`
	`6`	`+ table.sort(arr, (a, b) => compareFn(a, b) < 0);`
	`7`	`+ } else {`
	`8`	`+ table.sort(arr);`
	`9`	`+ }`
`6`	`10`	`return arr;`
`7`	`11`	`}`