rubico 2.6.1 → 2.6.2

package/es.js

@@ -1,17 +1,29 @@
 /**
- * rubico v2.6.1
+ * rubico v2.6.2
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2024 Richard Tong
  * rubico may be freely distributed under the MIT license.
  */
 
+const isArray = Array.isArray
+
 const isPromise = value => value != null && typeof value.then == 'function'
 
 const areAnyValuesPromises = function (values) {
-  const length = values.length
-  let index = -1
-  while (++index < length) {
-    const value = values[index]
+  if (isArray(values)) {
+    const length = values.length
+    let index = -1
+    while (++index < length) {
+      const value = values[index]
+      if (isPromise(value)) {
+        return true
+      }
+    }
+    return false
+  }
+
+  for (const key in values) {
+    const value = values[key]
     if (isPromise(value)) {
       return true
     }
@@ -228,14 +240,58 @@ tap.if = function (...args) {
   return _tapIf(predicate, f, args)
 }
 
-const isArray = Array.isArray
+const areAllValuesNonfunctions = function (values) {
+  if (isArray(values)) {
+    const length = values.length
+    let index = -1
+    while (++index < length) {
+      if (typeof values[index] == 'function') {
+        return false
+      }
+    }
+    return true
+  }
+
+  for (const key in values) {
+    if (typeof values[key] == 'function') {
+      return false
+    }
+  }
+  return true
+}
+
+const promiseObjectAllExecutor = object => function executor(resolve) {
+  const result = {}
+  let numPromises = 0
+  for (const key in object) {
+    const value = object[key]
+    if (isPromise(value)) {
+      numPromises += 1
+      value.then((key => function (res) {
+        result[key] = res
+        numPromises -= 1
+        if (numPromises == 0) {
+          resolve(result)
+        }
+      })(key))
+    } else {
+      result[key] = value
+    }
+  }
+  if (numPromises == 0) {
+    resolve(result)
+  }
+}
+
+const promiseObjectAll = object => new Promise(promiseObjectAllExecutor(object))
 
 const functionArrayAll = function (funcs, args) {
   const funcsLength = funcs.length,
     result = Array(funcsLength)
   let funcsIndex = -1, isAsync = false
   while (++funcsIndex < funcsLength) {
-    const resultItem = funcs[funcsIndex](...args)
+    const f = funcs[funcsIndex]
+    const resultItem = typeof f == 'function' ? f(...args) : f
     if (isPromise(resultItem)) {
       isAsync = true
     }
@@ -317,7 +373,8 @@ const functionArrayAllSeries = function (funcs, args) {
 const functionObjectAll = function (funcs, args) {
   const result = {}, promises = []
   for (const key in funcs) {
-    const resultItem = funcs[key](...args)
+    const f = funcs[key]
+    const resultItem = typeof f == 'function' ? f(...args) : f
     if (isPromise(resultItem)) {
       promises.push(resultItem.then(curry3(objectSet, result, key, __)))
     } else {
@@ -327,7 +384,48 @@ const functionObjectAll = function (funcs, args) {
   return promises.length == 0 ? result : promiseAll(promises).then(always(result))
 }
 
+const _allValues = function (values) {
+  if (isArray(values)) {
+    return areAnyValuesPromises(values)
+      ? promiseAll(values)
+      : values
+  }
+  return areAnyValuesPromises(values)
+    ? promiseObjectAll(values)
+    : values
+}
+
 const all = function (...args) {
+  if (args.length == 1) {
+    const resolversOrValues = args[0]
+    if (isPromise(resolversOrValues)) {
+      return resolversOrValues.then(_allValues)
+    }
+    if (areAllValuesNonfunctions(resolversOrValues)) {
+      return _allValues(resolversOrValues)
+    }
+    return isArray(resolversOrValues)
+      ? curryArgs2(functionArrayAll, resolversOrValues, __)
+      : curryArgs2(functionObjectAll, resolversOrValues, __)
+  }
+
+  const resolversOrValues = args[args.length - 1]
+  const argValues = args.slice(0, -1)
+
+  if (areAnyValuesPromises(argValues)) {
+    return isArray(resolversOrValues)
+      ? promiseAll(argValues)
+        .then(curry2(functionArrayAll, resolversOrValues, __))
+      : promiseAll(argValues)
+        .then(curry2(functionObjectAll, resolversOrValues, __))
+  }
+
+  return isArray(resolversOrValues)
+    ? functionArrayAll(resolversOrValues, argValues)
+    : functionObjectAll(resolversOrValues, argValues)
+
+  /*
+  ////////////////////////////////////////////////////////////////
   const funcs = args.pop()
   if (args.length == 0) {
     return isArray(funcs)
@@ -344,6 +442,7 @@ const all = function (...args) {
   return isArray(funcs)
     ? functionArrayAll(funcs, args)
     : functionObjectAll(funcs, args)
+  */
 }
 
 all.series = function allSeries(...args) {
@@ -454,17 +553,6 @@ const arrayConditional = function (array, args, funcsIndex) {
     : defaultResolverOrValue
 }
 
-const areAllValuesNonfunctions = function (values) {
-  const length = values.length
-  let index = -1
-  while (++index < length) {
-    if (typeof values[index] == 'function') {
-      return false
-    }
-  }
-  return true
-}
-
 const thunkify2 = (func, arg0, arg1) => function thunk() {
   return func(arg0, arg1)
 }
@@ -613,31 +701,6 @@ const mapMap = function (value, mapper) {
     : promiseAll(promises).then(always(result))
 }
 
-const promiseObjectAllExecutor = object => function executor(resolve) {
-  const result = {}
-  let numPromises = 0
-  for (const key in object) {
-    const value = object[key]
-    if (isPromise(value)) {
-      numPromises += 1
-      value.then((key => function (res) {
-        result[key] = res
-        numPromises -= 1
-        if (numPromises == 0) {
-          resolve(result)
-        }
-      })(key))
-    } else {
-      result[key] = value
-    }
-  }
-  if (numPromises == 0) {
-    resolve(result)
-  }
-}
-
-const promiseObjectAll = object => new Promise(promiseObjectAllExecutor(object))
-
 const objectMap = function (object, mapper) {
   const result = {}
   let isAsync = false

package/index.js

@@ -1,5 +1,5 @@
 /**
- * rubico v2.6.1
+ * rubico v2.6.2
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2024 Richard Tong
  * rubico may be freely distributed under the MIT license.
@@ -11,13 +11,25 @@
   else (root.rubico = rubico) // Browser
 }(typeof globalThis == 'object' ? globalThis : this, (function () { 'use strict'
 
+const isArray = Array.isArray
+
 const isPromise = value => value != null && typeof value.then == 'function'
 
 const areAnyValuesPromises = function (values) {
-  const length = values.length
-  let index = -1
-  while (++index < length) {
-    const value = values[index]
+  if (isArray(values)) {
+    const length = values.length
+    let index = -1
+    while (++index < length) {
+      const value = values[index]
+      if (isPromise(value)) {
+        return true
+      }
+    }
+    return false
+  }
+
+  for (const key in values) {
+    const value = values[key]
     if (isPromise(value)) {
       return true
     }
@@ -234,14 +246,58 @@ tap.if = function (...args) {
   return _tapIf(predicate, f, args)
 }
 
-const isArray = Array.isArray
+const areAllValuesNonfunctions = function (values) {
+  if (isArray(values)) {
+    const length = values.length
+    let index = -1
+    while (++index < length) {
+      if (typeof values[index] == 'function') {
+        return false
+      }
+    }
+    return true
+  }
+
+  for (const key in values) {
+    if (typeof values[key] == 'function') {
+      return false
+    }
+  }
+  return true
+}
+
+const promiseObjectAllExecutor = object => function executor(resolve) {
+  const result = {}
+  let numPromises = 0
+  for (const key in object) {
+    const value = object[key]
+    if (isPromise(value)) {
+      numPromises += 1
+      value.then((key => function (res) {
+        result[key] = res
+        numPromises -= 1
+        if (numPromises == 0) {
+          resolve(result)
+        }
+      })(key))
+    } else {
+      result[key] = value
+    }
+  }
+  if (numPromises == 0) {
+    resolve(result)
+  }
+}
+
+const promiseObjectAll = object => new Promise(promiseObjectAllExecutor(object))
 
 const functionArrayAll = function (funcs, args) {
   const funcsLength = funcs.length,
     result = Array(funcsLength)
   let funcsIndex = -1, isAsync = false
   while (++funcsIndex < funcsLength) {
-    const resultItem = funcs[funcsIndex](...args)
+    const f = funcs[funcsIndex]
+    const resultItem = typeof f == 'function' ? f(...args) : f
     if (isPromise(resultItem)) {
       isAsync = true
     }
@@ -323,7 +379,8 @@ const functionArrayAllSeries = function (funcs, args) {
 const functionObjectAll = function (funcs, args) {
   const result = {}, promises = []
   for (const key in funcs) {
-    const resultItem = funcs[key](...args)
+    const f = funcs[key]
+    const resultItem = typeof f == 'function' ? f(...args) : f
     if (isPromise(resultItem)) {
       promises.push(resultItem.then(curry3(objectSet, result, key, __)))
     } else {
@@ -333,7 +390,48 @@ const functionObjectAll = function (funcs, args) {
   return promises.length == 0 ? result : promiseAll(promises).then(always(result))
 }
 
+const _allValues = function (values) {
+  if (isArray(values)) {
+    return areAnyValuesPromises(values)
+      ? promiseAll(values)
+      : values
+  }
+  return areAnyValuesPromises(values)
+    ? promiseObjectAll(values)
+    : values
+}
+
 const all = function (...args) {
+  if (args.length == 1) {
+    const resolversOrValues = args[0]
+    if (isPromise(resolversOrValues)) {
+      return resolversOrValues.then(_allValues)
+    }
+    if (areAllValuesNonfunctions(resolversOrValues)) {
+      return _allValues(resolversOrValues)
+    }
+    return isArray(resolversOrValues)
+      ? curryArgs2(functionArrayAll, resolversOrValues, __)
+      : curryArgs2(functionObjectAll, resolversOrValues, __)
+  }
+
+  const resolversOrValues = args[args.length - 1]
+  const argValues = args.slice(0, -1)
+
+  if (areAnyValuesPromises(argValues)) {
+    return isArray(resolversOrValues)
+      ? promiseAll(argValues)
+        .then(curry2(functionArrayAll, resolversOrValues, __))
+      : promiseAll(argValues)
+        .then(curry2(functionObjectAll, resolversOrValues, __))
+  }
+
+  return isArray(resolversOrValues)
+    ? functionArrayAll(resolversOrValues, argValues)
+    : functionObjectAll(resolversOrValues, argValues)
+
+  /*
+  ////////////////////////////////////////////////////////////////
   const funcs = args.pop()
   if (args.length == 0) {
     return isArray(funcs)
@@ -350,6 +448,7 @@ const all = function (...args) {
   return isArray(funcs)
     ? functionArrayAll(funcs, args)
     : functionObjectAll(funcs, args)
+  */
 }
 
 all.series = function allSeries(...args) {
@@ -460,17 +559,6 @@ const arrayConditional = function (array, args, funcsIndex) {
     : defaultResolverOrValue
 }
 
-const areAllValuesNonfunctions = function (values) {
-  const length = values.length
-  let index = -1
-  while (++index < length) {
-    if (typeof values[index] == 'function') {
-      return false
-    }
-  }
-  return true
-}
-
 const thunkify2 = (func, arg0, arg1) => function thunk() {
   return func(arg0, arg1)
 }
@@ -619,31 +707,6 @@ const mapMap = function (value, mapper) {
     : promiseAll(promises).then(always(result))
 }
 
-const promiseObjectAllExecutor = object => function executor(resolve) {
-  const result = {}
-  let numPromises = 0
-  for (const key in object) {
-    const value = object[key]
-    if (isPromise(value)) {
-      numPromises += 1
-      value.then((key => function (res) {
-        result[key] = res
-        numPromises -= 1
-        if (numPromises == 0) {
-          resolve(result)
-        }
-      })(key))
-    } else {
-      result[key] = value
-    }
-  }
-  if (numPromises == 0) {
-    resolve(result)
-  }
-}
-
-const promiseObjectAll = object => new Promise(promiseObjectAllExecutor(object))
-
 const objectMap = function (object, mapper) {
   const result = {}
   let isAsync = false

package/package.json

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