pepka 1.6.16 → 1.6.17

package/dist/bundle.cjs

@@ -46,16 +46,17 @@ const endlessph = (fn) => {
     }
     return _endlessph;
 };
+const zero = 0;
 function curry2(fn) {
-    function curried2(a, b) {
+    function curried2(a, ...args) {
         const withPlaceholder1 = a === __;
-        const aln = arguments.length;
-        if (aln === 1 && withPlaceholder1)
+        const aln = Boolean(args.length);
+        if (aln && withPlaceholder1)
             throw new Error('Senseless placeholder usage.');
-        return aln > 1
+        return aln
             ? withPlaceholder1
-                ? endlessph((a) => fn(a, b))
-                : fn(a, b)
+                ? endlessph((a) => fn(a, args[zero]))
+                : fn(a, args[zero])
             : (b) => fn(a, b);
     }
     return curried2;

package/dist/bundle.mjs

@@ -44,16 +44,17 @@ const endlessph = (fn) => {
     }
     return _endlessph;
 };
+const zero = 0;
 function curry2(fn) {
-    function curried2(a, b) {
+    function curried2(a, ...args) {
         const withPlaceholder1 = a === __;
-        const aln = arguments.length;
-        if (aln === 1 && withPlaceholder1)
+        const aln = Boolean(args.length);
+        if (aln && withPlaceholder1)
             throw new Error('Senseless placeholder usage.');
-        return aln > 1
+        return aln
             ? withPlaceholder1
-                ? endlessph((a) => fn(a, b))
-                : fn(a, b)
+                ? endlessph((a) => fn(a, args[zero]))
+                : fn(a, args[zero])
             : (b) => fn(a, b);
     }
     return curried2;

package/package.json

@@ -41,7 +41,7 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.6.16",
+  "version": "1.6.17",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/curry.ts

@@ -60,7 +60,33 @@ const endlessph = <Func extends AnyFunc>(fn: Func) => {
   return _endlessph
 }
 
+type Curried2<p0, p1, ReturnT> = {
+  (a: Placeholder, b: p1): (a: p0) => ReturnT
+  (a: p0, b: Placeholder): (b: p1) => ReturnT
+  (a: p0): (b: p1) => ReturnT
+  (a: p0, b: p1): ReturnT
+}
+
+const curried2 =
+  <p0, p1, ReturnT>(fn: (a: p0, b: p1) => ReturnT) => {
+
+    const impl = (
+      a: p0 | Placeholder,
+      ...args: [b?: p1]
+    ): ReturnT | ((b: p1) => ReturnT) => {
+      if (args.length === 0) {
+        return (b: p1) => fn(a as p0, b)
+      }
+      const b = args[0]
+      return fn(a as p0, b as p1)
+    }
+
+    return impl as Curried2<p0, p1, ReturnT>
+  }
+
+
 type Func2 = (a: any, b: any) => any
+const zero = 0
 export function curry2<Func extends Func2>(fn: Func) {
   type p0 = Parameters<Func>[0]
   type p1 = Parameters<Func>[1]
@@ -69,16 +95,16 @@ export function curry2<Func extends Func2>(fn: Func) {
   function curried2(a: p0, b: Placeholder): (b: p1) => ReturnT
   function curried2(a: p0 ): (b: p1) => ReturnT
   function curried2(a: p0, b: p1): ReturnT
-  function curried2(a: p0 | Placeholder, b?: p1) {
+  function curried2(a: p0 | Placeholder, ...args: [b?: p1]) {
     const withPlaceholder1 = a===__
-    const aln = arguments.length
-    if(aln === 1 && withPlaceholder1)
+    const aln = Boolean(args.length)
+    if(aln && withPlaceholder1)
       throw new Error('Senseless placeholder usage.')
-    return aln>1
+    return aln
       ? withPlaceholder1
-        ? endlessph((a: p0) => fn(a, b) as ReturnType<Func>)
-        : fn(a, b) as ReturnType<Func>
-      : (b: p1) => fn(a, b) as ReturnType<Func>
+        ? endlessph((a: p0) => fn(a, args[zero]) as ReturnType<Func>)
+        : fn(a, args[zero]) as ReturnType<Func>
+      : (b: p1) => fn(a, b) as Curried2<p0, p1, ReturnT>
   }
   return curried2
 }