Fix array.sort compare function not working (#458)

ark120202 · Perryvw · commit 10002b59e8e3 · 2019-02-26T20:22:45.000+01:00
* Fix array.sort compare function not working

* Fix compare function not being passed

* Change array.sort tests to compare with js results
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -3715,7 +3715,7 @@ export class LuaTransformer {
             case "unshift":
                 return this.transformLuaLibFunction(LuaLibFeature.ArrayUnshift, node, caller, ...params);
             case "sort":
-                return this.transformLuaLibFunction(LuaLibFeature.ArraySort, node, caller);
+                return this.transformLuaLibFunction(LuaLibFeature.ArraySort, node, caller, ...params);
             case "pop":
                 return tstl.createCallExpression(
                     tstl.createTableIndexExpression(tstl.createIdentifier("table"), tstl.createStringLiteral("remove")),
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,29 @@ export class LuaLibTests
         // Assert
         Expect(result).toBe(JSON.stringify(expected));
     }
+
+    @Test("array.sort with compare function")
+    @TestCase([1, 2, 3, 4, 5], "a - b", (a: number, b: number) => a - b)
+    @TestCase(["4", "5", "3", "2", "1"], "tonumber(a) - tonumber(b)", (a: string, b: string) => Number(a) - Number(b))
+    @TestCase(["4", "5", "3", "2", "1"], "tonumber(b) - tonumber(a)", (a: string, b: string) => Number(b) - Number(a))
+    public arraySortWithCompareFunction(
+        array: any[],
+        compareStr: string,
+        compareFn: (a: any, b: any) => number
+    ): void {
+        const result = util.transpileAndExecute(
+            `let testArray = ${JSON.stringify(array)};
+            testArray.sort((a, b) => ${compareStr});
+            return JSONStringify(testArray)`,
+            undefined,
+            undefined,
+            `declare function tonumber(e: any): number`
+        );
+
+        // Assert
+        Expect(result).toBe(JSON.stringify(array.sort(compareFn)));
+    }
+
     @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`	`}`