rubico 2.7.10 → 2.8.1

package/index.js

@@ -1,5 +1,5 @@
 /**
- * rubico v2.7.10
+ * rubico v2.8.1
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2026 Richard Tong
  * rubico may be freely distributed under the MIT license.
@@ -1068,7 +1068,9 @@ const objectMapPool = function (o, concurrency, f) {
   return result
 }
 
-const _curryArity = (arity, func, args) => function curried(...curriedArgs) {
+const funcApply2 = (func, context, args) => func.apply(context, args)
+
+const _curryArity = (arity, func, context, args) => function curried(...curriedArgs) {
   const argsLength = args.length,
     curriedArgsLength = curriedArgs.length,
     nextArgs = []
@@ -1087,10 +1089,16 @@ const _curryArity = (arity, func, args) => function curried(...curriedArgs) {
     } else {
       nextArgs.push(arg)
     }
+
     if (nextArgs.length == arity) {
+      if (areAnyValuesPromises(nextArgs)) {
+        return numCurriedPlaceholders == 0
+          ? promiseAll(nextArgs).then(curry3(funcApply2, func, context, __))
+          : promiseAll(nextArgs).then(curry4(curryArity, arity, func, context, __))
+      }
       return numCurriedPlaceholders == 0
-        ? func(...nextArgs)
-        : curryArity(arity, func, nextArgs)
+        ? func.apply(context, nextArgs)
+        : curryArity(arity, func, context, nextArgs)
     }
   }
 
@@ -1100,28 +1108,37 @@ const _curryArity = (arity, func, args) => function curried(...curriedArgs) {
       numCurriedPlaceholders += 1
     }
     nextArgs.push(curriedArg)
+
     if (nextArgs.length == arity) {
+      if (areAnyValuesPromises(nextArgs)) {
+        return numCurriedPlaceholders == 0
+          ? promiseAll(nextArgs).then(curry3(funcApply2, func, context, __))
+          : promiseAll(nextArgs).then(curry4(curryArity, arity, func, context, __))
+      }
       return numCurriedPlaceholders == 0
-        ? func(...nextArgs)
-        : curryArity(arity, func, nextArgs)
+        ? func.apply(context, nextArgs)
+        : curryArity(arity, func, context, nextArgs)
     }
   }
-  return curryArity(arity, func, nextArgs)
+
+  return areAnyValuesPromises(nextArgs)
+    ? promiseAll(nextArgs).then(curry4(curryArity, arity, func, context, __))
+    : curryArity(arity, func, context, nextArgs)
 }
 
-const curryArity = function (arity, func, args) {
+const curryArity = function (arity, func, context, args) {
   const argsLength = args.length
   if (argsLength < arity) {
-    return _curryArity(arity, func, args)
+    return _curryArity(arity, func, context, args)
   }
   let argsIndex = -1
   while (++argsIndex < argsLength) {
     const arg = args[argsIndex]
     if (arg == __) {
-      return _curryArity(arity, func, args)
+      return _curryArity(arity, func, context, args)
     }
   }
-  return func(...args)
+  return func.apply(context, args)
 }
 
 const spread2 = func => function spreading2([arg0, arg1]) {
@@ -1136,7 +1153,7 @@ const objectMapEntries = function (object, mapper) {
       mapping = mapper([key, value])
     if (isPromise(mapping)) {
       promises.push(mapping.then(
-        spread2(curryArity(3, objectSet, [result]))))
+        spread2(curryArity(3, objectSet, this, [result]))))
     } else {
       result[mapping[0]] = mapping[1]
     }
@@ -1152,7 +1169,7 @@ const mapMapEntriesForEachCallback = (
 ) => function callback(value, key) {
   const mapping = mapper([key, value])
   if (isPromise(mapping)) {
-    promises.push(mapping.then(spread2(curryArity(3, mapSet, [result]))))
+    promises.push(mapping.then(spread2(curryArity(3, mapSet, this, [result]))))
   } else {
     result.set(mapping[0], mapping[1])
   }
@@ -3284,17 +3301,45 @@ const omit = function (arg0, arg1) {
   return _omit(arg0, arg1)
 }
 
-const thunkify = (func, ...args) => function thunk() {
+function _thunkifyArgs(func, context, args) {
+  return function thunk() {
+    return func.apply(context, args)
+  }
+}
+
+const thunkify = function thunkify(func, ...args) {
   if (areAnyValuesPromises(args)) {
-    return promiseAll(args).then(curry2(funcApply, func, __))
+    return promiseAll(args).then(curry3(_thunkifyArgs, func, this, __))
   }
-  return func(...args)
+  return _thunkifyArgs(func, this, args)
+}
+
+thunkify.call = function thunkifyCall(func, context, ...args) {
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args).then(curry3(_thunkifyArgs, func, context, __))
+  }
+  return _thunkifyArgs(func, context, args)
 }
 
-const curry = (func, ...args) => curryArity(func.length, func, args)
+const curry = (func, ...args) => {
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args).then(curry4(curryArity, func.length, func, this, __))
+  }
+  return curryArity(func.length, func, this, args)
+}
 
 curry.arity = function curryArity_(arity, func, ...args) {
-  return curryArity(arity, func, args)
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args).then(curry4(curryArity, arity, func, this, __))
+  }
+  return curryArity(arity, func, this, args)
+}
+
+curry.call = function call(func, context, ...args) {
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args).then(curry4(curryArity, func.length, func, context, __))
+  }
+  return curryArity(func.length, func, context, args)
 }
 
 const rubico = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubico",
-  "version": "2.7.10",
+  "version": "2.8.1",
   "description": "[a]synchronous functional programming",
   "author": "Richard Tong",
   "license": "MIT",

package/thunkify.js

@@ -1,8 +1,22 @@
 const areAnyValuesPromises = require('./_internal/areAnyValuesPromises')
 const promiseAll = require('./_internal/promiseAll')
-const curry2 = require('./_internal/curry2')
+const curry3 = require('./_internal/curry3')
 const __ = require('./_internal/placeholder')
-const funcApply = require('./_internal/funcApply')
+const funcApply2 = require('./_internal/funcApply2')
+
+/**
+ * @name _thunkifyArgs
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * _thunkifyArgs(func function, context object, args Array) -> thunk
+ * ```
+ */
+function _thunkifyArgs(func, context, args) {
+  return function thunk() {
+    return func.apply(context, args)
+  }
+}
 
 /**
  * @name thunkify
@@ -15,7 +29,7 @@ const funcApply = require('./_internal/funcApply')
  * ```
  *
  * @description
- * Create a thunk function from another function and any number of arguments. The thunk function takes no arguments, and when called, executes the other function with the provided arguments. The other function is said to be "thunkified".
+ * Creates a thunk from a function and arguments. A thunk takes no arguments, and when called, executes the other function with the arguments. The other function is said to be "thunkified".
  *
  * ```javascript [playground]
  * const add = (a, b) => a + b
@@ -27,17 +41,63 @@ const funcApply = require('./_internal/funcApply')
  *
  * See also:
  *  * [eq](/docs/eq)
+ *  * [thunkify.call](/docs/thunkify.call)
+ *  * [always](/docs/always)
+ *  * [curry](/docs/curry)
+ *  * [__](/docs/__)
+ *  * [Transducer.map](/docs/Transducer.map)
+ *
+ */
+const thunkify = function thunkify(func, ...args) {
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args).then(curry3(_thunkifyArgs, func, this, __))
+  }
+  return _thunkifyArgs(func, this, args)
+}
+
+/**
+ * @name thunkify.call
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * args Array<any>
+ *
+ * thunkify.call(func function, context object, ...args) -> thunk ()=>func(...args)
+ * ```
+ *
+ * Creates a thunk that calls a function with the specified context and arguments.
+ *
+ * ```javascript [playground]
+ * class Point {
+ *   constructor(x, y) {
+ *     this.x = x
+ *     this.y = y
+ *   }
+ *
+ *   toString() {
+ *     return `(${this.x}, ${this.y})`
+ *   }
+ * }
+ *
+ * const thunk = thunkify.call(toString, point)
+ *
+ * console.log(thunk())
+ * ```
+ *
+ * See also:
+ *  * [eq](/docs/eq)
+ *  * [thunkify](/docs/thunkify)
  *  * [always](/docs/always)
  *  * [curry](/docs/curry)
  *  * [__](/docs/__)
  *  * [Transducer.map](/docs/Transducer.map)
  *
  */
-const thunkify = (func, ...args) => function thunk() {
+thunkify.call = function thunkifyCall(func, context, ...args) {
   if (areAnyValuesPromises(args)) {
-    return promiseAll(args).then(curry2(funcApply, func, __))
+    return promiseAll(args).then(curry3(_thunkifyArgs, func, context, __))
   }
-  return func(...args)
+  return _thunkifyArgs(func, context, args)
 }
 
 module.exports = thunkify