issue-#57 - Progress on idiomatic curry - converted methods up to, an…

…d including, 'src/list/'.

packages/fjl/src/list/sortBy.ts

@@ -1,4 +1,3 @@
-import {curry} from "../function/curry";
 import {genericAscOrdering} from "./utils";
 import {sliceCopy} from "./utils/sliceCopy";
 
@@ -10,4 +9,5 @@ export const
   sortBy = <T>(orderingFn, xs: T[]): T[] => (sliceCopy(xs) as T[])
     .sort(orderingFn || genericAscOrdering),
 
-  $sortBy = curry(sortBy);
+  $sortBy = <T>(orderingFn) =>
+    (xs: T[]): T[] => sortBy(orderingFn, xs);

packages/fjl/src/list/sortOn.ts

@@ -1,4 +1,3 @@
-import {curry2, CurryOf2} from "../function/curry";
 import {map} from "./map";
 import {sortBy} from "./sortBy";
 import {genericAscOrdering} from "./utils";
@@ -42,4 +41,6 @@ export const
 export type SortOn = typeof sortOn;
 export type SortOnParams = Parameters<SortOn>;
 
-export const $sortOn = curry2(sortOn) as CurryOf2<SortOnParams[0], SortOnParams[1]>;
+export const $sortOn = <T = any>(valueFn: Unary<T>) =>
+  (xs: T[]): T[] =>
+    sortOn(valueFn, xs);

packages/fjl/src/list/span.ts

@@ -1,4 +1,3 @@
-import {curry} from "../function/curry";
 import {negateF3} from "../function/negate";
 import {findIndexWhere} from "./utils";
 import {of} from "../object/of";
@@ -20,4 +19,5 @@ export const
       splitAt(splitPoint, list);
   },
 
-  $span = curry(span);
+  $span = <T>(pred: PredForSlice<T>) =>
+    (list: Slice<T>): [Slice<T>, Slice<T>] => span(pred, list);

packages/fjl/src/list/splitAt.ts

@@ -1,7 +1,6 @@
 import {sliceFrom} from "./utils/sliceFrom";
 import {sliceTo} from "./utils/sliceTo";
 import {Slice} from "../types";
-import {curry} from "../function";
 
 export const
 
@@ -12,4 +11,6 @@ export const
   splitAt = <T>(ind: number, list: Slice<T>): [Slice<T>, Slice<T>] =>
     [sliceTo(ind, list), sliceFrom(ind, list)],
 
-  $splitAt = curry(splitAt);
+  $splitAt = <T>(ind: number) =>
+    (list: Slice<T>): [Slice<T>, Slice<T>] =>
+      splitAt(ind, list);

packages/fjl/src/list/stripPrefix.ts

@@ -15,4 +15,6 @@ export const
       splitAt(length(prefix), list)[1] :
       sliceCopy(list),
 
-  $stripPrefix = curry(stripPrefix);
+  $stripPrefix = <T>(prefix: Slice<T>) =>
+    (list: Slice<T>): Slice<T> =>
+      stripPrefix(prefix, list)

packages/fjl/src/list/takeWhile.ts

@@ -1,4 +1,3 @@
-import {curry, CurryOf2} from "../function/curry";
 import {negateF3} from "../function/negate";
 import {reduceUntil} from "./utils";
 import {isString} from "../object/is";
@@ -21,4 +20,6 @@ export const
       xs
     ),
 
-  $takeWhile = curry(takeWhile) as CurryOf2<PredForSlice<any>, Slice<any>, Slice<any>>;
+  $takeWhile = <T>(pred: PredForSlice<T>) =>
+    (xs: Slice<T>): Slice<T> =>
+      takeWhile(pred, xs);

packages/fjl/src/list/unfoldr.ts

@@ -25,4 +25,7 @@ export const
     return out;
   },
 
-  $unfoldr = curry(unfoldr);
+  $unfoldr = <A, B>(op: ((b: B | undefined, i?: number, as?: A[]) => [A, B] | undefined)) =>
+    (bs: B): A[] =>
+      unfoldr(op, bs)
+;

packages/fjl/src/list/union.ts

@@ -1,4 +1,3 @@
-import {curry} from "../function/curry";
 import {append} from "./append";
 import {filter} from "./filter";
 import {includes, } from "../platform/slice";
@@ -17,4 +16,6 @@ export const
       filter(elm => !includes(arr1, elm), arr2) as Slice<T>
     ),
 
-  $union = curry(union);
+  $union = <T>(arr1: Slice<T>) =>
+    (arr2: Slice<T>): Slice<T> => union(arr1, arr2)
+;

packages/fjl/src/list/unionBy.ts

@@ -25,4 +25,7 @@ export const
     return foldl(foldOp, sliceCopy(xs1) as Slice<T>, xs2) as Slice<T>;
   },
 
-  $unionBy = curry(unionBy);
+  $unionBy = <T>(pred: BinaryPred<T, T>) =>
+    (xs1: Slice<T>) =>
+      (xs2: Slice<T>): Slice<T> =>
+        unionBy(pred, xs1, xs2);

packages/fjl/src/list/zip.ts

@@ -24,4 +24,7 @@ export const
       [], a1);
   },
 
-  $zip = curry(zip);
+  $zip = <T, T2>(arr1: T[]) =>
+    (arr2: T2[]): [T, T2][] => zip(arr1, arr2)
+
+;

packages/fjl/src/list/zip3.ts

@@ -12,4 +12,6 @@ export const
    */
   zip3 = <T = any>(arr1: T[], arr2: T[], arr3: T[]): T[][] => zipN(arr1, arr2, arr3),
 
-  $zip3 = curry(zip3);
+  $zip3 = <T = any>(arr1: T[]) =>
+    (arr2: T[]) =>
+      (arr3: T[]): T[][] => zip3(arr1, arr2, arr3);

packages/fjl/src/list/zip4.ts

@@ -12,4 +12,7 @@ export const /**
    */
   zip4 = <T = any>(arr1: T[], arr2: T[], arr3: T[], arr4: T[]): T[][] => zipN(arr1, arr2, arr3, arr4),
 
-  $zip4 = curry(zip4);
+  $zip4 = <T = any>(arr1: T[]) =>
+    (arr2: T[]) =>
+      (arr3: T[]) =>
+        (arr4: T[]): T[][] => zip4(arr1, arr2, arr3, arr4);

packages/fjl/src/list/zipN.ts

@@ -1,4 +1,3 @@
-import {curry2} from "../function/curry";
 import {reduce} from "./utils/reduce";
 import {toShortest} from "./utils/toShortest";
 import {push} from "./push";
@@ -17,4 +16,8 @@ export const
       [], trimmedLists[0]);
   },
 
-  $zipN = curry2(zipN);
+  $zipN = <T = any>(arr1: T[]) =>
+    (...lists: T[][]): T[][] =>
+      zipN(arr1, ...lists)
+
+;

packages/fjl/src/list/zipWith.ts

@@ -1,4 +1,3 @@
-import {curry} from "../function/curry";
 import {length} from "./length";
 import {reduce, toShortest} from "./utils";
 import {push} from "./push";
@@ -39,4 +38,7 @@ export const
       [], a1);
   },
 
-  $zipWith = curry(zipWith);
+  $zipWith = <T, T2>(op: Binary<T, T2, [T, T2]>) =>
+    (xs1: Slice<T>) =>
+      (xs2: Slice<T2>): [T, T2][] =>
+        zipWith(op, xs1, xs2);

packages/fjl/src/list/zipWith3.ts

@@ -1,4 +1,3 @@
-import {curry} from "../function/curry";
 import {zipWithN} from "./zipWithN";
 import {Slice} from "../types";
 
@@ -19,4 +18,7 @@ export const
    */
   zipWith3 = <T = any>(op: ZipWith3Op<T>, xs1: T[], xs2: T[], xs3: T[]): Slice<T>[] => zipWithN(op, xs1, xs2, xs3),
 
-  $zipWith3 = curry(zipWith3);
+  $zipWith3 = <T = any>(op: ZipWith3Op<T>) =>
+    (xs1: T[]) =>
+      (xs2: T[]) =>
+        (xs3: T[]): Slice<T>[] => zipWith3(op, xs1, xs2, xs3);

packages/fjl/src/list/zipWithN.ts

@@ -1,8 +1,5 @@
-import {curry3} from "../function/curry";
-import {length} from "./length";
 import {toShortest} from "./utils";
 import {map} from "./map";
-import {sliceTo} from "./utils/sliceTo";
 import {Slice} from "../types";
 
 export const
@@ -27,5 +24,7 @@ export const
     );
   },
 
-  $zipWithN = curry3(zipWithN);
+  $zipWithN = <T = any>(op) =>
+    (...lists: T[][]): Slice<T>[] =>
+      zipWithN(op, ...lists);