rubico 1.9.0 → 1.9.3

package/.github/workflows/nodejs.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 15.x, 16.x, 17.x]
+        node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

package/CHANGELOG.md

@@ -1,4 +1,19 @@
-## v1.9.0 - latest
+## v1.9.3 - latest
+ * property value passed to set may be a resolver - [#224](https://github.com/a-synchronous/rubico/pull/224)
+ * rubico/x/isIn - counterpart to includes - [#228](https://github.com/a-synchronous/rubico/pull/228) - [lulldev](https://github.com/lulldev)
+ * rubico/x/maxBy - finds the item that is the max by a property denoted by path - [#229](https://github.com/a-synchronous/rubico/pull/229)
+ * eager map - [#225](https://github.com/a-synchronous/rubico/pull/225)
+ * eager filter - [#226](https://github.com/a-synchronous/rubico/pull/226)
+ * eager reduce - [#227](https://github.com/a-synchronous/rubico/pull/227)
+
+## v1.9.2
+ * eager tryCatch - [#222](https://github.com/a-synchronous/rubico/pull/218)
+
+## v1.9.1
+ * more performant uniq - [#218](https://github.com/a-synchronous/rubico/pull/218) - [jasir](https://github.com/jasir)
+ * and and or handle nonfunction values - [#221](https://github.com/a-synchronous/rubico/pull/221)
+
+## v1.9.0
  * switchCase handles non-function values - [#220](https://github.com/a-synchronous/rubico/pull/220)
 
 ## v1.8.15

package/_internal/areAllValuesNonfunctions.js

@@ -0,0 +1,20 @@
+/**
+ * @name areAllValuesNonfunctions
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * areAllValuesNonfunctions(values Array<function|value>) -> boolean
+ * ```
+ */
+const areAllValuesNonfunctions = function (values) {
+  const length = values.length
+  let index = -1
+  while (++index < length) {
+    if (typeof values[index] == 'function') {
+      return false
+    }
+  }
+  return true
+}
+
+module.exports = areAllValuesNonfunctions

package/_internal/arrayConditional.js

@@ -1,41 +1,67 @@
 const isPromise = require('./isPromise')
-const curry3 = require('./curry3')
-const always = require('./always')
-const thunkify2 = require('./thunkify2')
 const thunkConditional = require('./thunkConditional')
+const thunkifyArgs = require('./thunkifyArgs')
+const thunkify3 = require('./thunkify3')
 const __ = require('./placeholder')
+const curry3 = require('./curry3')
+const always = require('./always')
 
 /**
  * @name arrayConditional
  *
  * @synopsis
  * ```coffeescript [specscript]
- * arrayConditional(array Array<value>, index number) -> boolean
+ * arrayConditional(
+ *   array Array<function|value>,
+ *   args Array,
+ *   funcsIndex number,
+ * ) -> Promise|any
  * ```
+ *
+ * @description
+ * Conditional operator `a ? b : c ? d : e ? ...` for functions.
+ *
+ * @TODO isPromise conditional await
+ * @TODO benchmark vs regular promise handling
  */
-const arrayConditional = function (array, index) {
-  const length = array.length,
-    lastIndex = length - 1
-  while ((index += 2) < lastIndex) {
-    const predication = array[index],
-      value = array[index + 1]
+const arrayConditional = function (array, args, funcsIndex) {
+  const lastIndex = array.length - 1
+
+  while ((funcsIndex += 2) < lastIndex) {
+    const predicate = array[funcsIndex],
+      resolverOrValue = array[funcsIndex + 1]
+
+    const predication = typeof predicate == 'function'
+      ? predicate(...args)
+      : predicate
+
     if (isPromise(predication)) {
       return predication.then(curry3(
         thunkConditional,
         __,
-        always(value),
-        thunkify2(arrayConditional, array, index),
+        typeof resolverOrValue == 'function'
+          ? thunkifyArgs(resolverOrValue, args)
+          : always(resolverOrValue),
+        thunkify3(arrayConditional, array, args, funcsIndex),
       ))
     }
+
     if (predication) {
-      return value
+      return typeof resolverOrValue == 'function'
+        ? resolverOrValue(...args)
+        : resolverOrValue
     }
   }
-  // even number of array values
-  if (index == length) {
+
+  // even number of array
+  if (funcsIndex == array.length) {
     return undefined
   }
-  return array[index]
+
+  const defaultResolverOrValue = array[lastIndex]
+  return typeof defaultResolverOrValue == 'function'
+    ? defaultResolverOrValue(...args)
+    : defaultResolverOrValue
 }
 
 module.exports = arrayConditional

package/_internal/nonfunctionsConditional.js

@@ -0,0 +1,41 @@
+const isPromise = require('./isPromise')
+const curry3 = require('./curry3')
+const always = require('./always')
+const thunkify2 = require('./thunkify2')
+const thunkConditional = require('./thunkConditional')
+const __ = require('./placeholder')
+
+/**
+ * @name nonfunctionsConditional
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * nonfunctionsConditional(array Array<value>, index number) -> boolean
+ * ```
+ */
+const nonfunctionsConditional = function (array, index) {
+  const length = array.length,
+    lastIndex = length - 1
+  while ((index += 2) < lastIndex) {
+    const predication = array[index],
+      value = array[index + 1]
+    if (isPromise(predication)) {
+      return predication.then(curry3(
+        thunkConditional,
+        __,
+        always(value),
+        thunkify2(nonfunctionsConditional, array, index),
+      ))
+    }
+    if (predication) {
+      return value
+    }
+  }
+  // even number of array values
+  if (index == length) {
+    return undefined
+  }
+  return array[index]
+}
+
+module.exports = nonfunctionsConditional

package/and.js

@@ -2,29 +2,61 @@ const isPromise = require('./_internal/isPromise')
 const curry3 = require('./_internal/curry3')
 const __ = require('./_internal/placeholder')
 const thunkConditional = require('./_internal/thunkConditional')
+const areAllValuesNonfunctions = require('./_internal/areAllValuesNonfunctions')
+const thunkify2 = require('./_internal/thunkify2')
 const thunkify3 = require('./_internal/thunkify3')
 const always = require('./_internal/always')
 
 /**
- * @name asyncAnd
+ * @name areAllNonfunctionsTruthy
  *
  * @synopsis
  * ```coffeescript [specscript]
- * asyncAnd(
+ * areAllNonfunctionsTruthy(predicates Array<value>) -> Promise|boolean
+ * ```
+ */
+const areAllNonfunctionsTruthy = function (predicates, index) {
+  const length = predicates.length
+  while (++index < length) {
+    let predicate = predicates[index]
+    if (isPromise(predicate)) {
+      return predicate.then(curry3(
+        thunkConditional,
+        __,
+        thunkify2(areAllNonfunctionsTruthy, predicates, index),
+        always(false),
+      ))
+    }
+    if (!predicate) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * @name asyncArePredicatesAllTruthy
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * asyncArePredicatesAllTruthy(
  *   predicates Array<value=>Promise|boolean>
- *   value any,
+ *   point any,
  *   index number,
  * ) -> allTruthy boolean
  * ```
  */
-const asyncAnd = async function (predicates, value, index) {
+const asyncArePredicatesAllTruthy = async function (predicates, point, index) {
   const length = predicates.length
   while (++index < length) {
-    let predication = predicates[index](value)
-    if (isPromise(predication)) {
-      predication = await predication
+    let predicate = predicates[index]
+    if (typeof predicate == 'function') {
+      predicate = predicate(point)
+    }
+    if (isPromise(predicate)) {
+      predicate = await predicate
     }
-    if (!predication) {
+    if (!predicate) {
       return false
     }
   }
@@ -36,14 +68,13 @@ const asyncAnd = async function (predicates, value, index) {
  *
  * @synopsis
  * ```coffeescript [specscript]
- * var value any,
- *   predicates Array<value=>Promise|boolean>
- *
- * and(predicates)(value) -> Promise|boolean
+ * and(
+ *   predicates Array<predicate function|nonfunction>
+ * )(point any) -> Promise|boolean
  * ```
  *
  * @description
- * Test an array of predicates concurrently against a single input, returning true if all test truthy.
+ * Test an array of predicates or nonfunction values concurrently against a single input, returning true if all test truthy.
  *
  * ```javascript [playground]
  * const isOdd = number => number % 2 == 1
@@ -57,32 +88,45 @@ const asyncAnd = async function (predicates, value, index) {
  * ) // true
  * ```
  *
- * @execution serial
+ * `and` behaves eagerly if provided only nonfunction values
+ *
+ * ```javascript [playground]
+ * console.log(
+ *   and([true, true, true]),
+ * ) // true
+ * ```
+ *
+ * @execution series
  *
  * @note ...args slows down here by an order of magnitude
  */
-const and = predicates => function allPredicates(value) {
-  if (value != null && typeof value.and == 'function') {
-    return value.and(predicates)
+const and = predicates => {
+  if (areAllValuesNonfunctions(predicates)) {
+    return areAllNonfunctionsTruthy(predicates, -1)
   }
-  const length = predicates.length,
-    promises = []
-  let index = -1
+  return function arePredicatesAllTruthy(point) {
+    const length = predicates.length
+    let index = -1
 
-  while (++index < length) {
-    const predication = predicates[index](value)
-    if (isPromise(predication)) {
-      return predication.then(curry3(
-        thunkConditional,
-        __,
-        thunkify3(asyncAnd, predicates, value, index),
-        always(false)))
-    }
-    if (!predication) {
-      return false
+    while (++index < length) {
+      let predicate = predicates[index]
+      if (typeof predicate == 'function') {
+        predicate = predicate(point)
+      }
+      if (isPromise(predicate)) {
+        return predicate.then(curry3(
+          thunkConditional,
+          __,
+          thunkify3(asyncArePredicatesAllTruthy, predicates, point, index),
+          always(false),
+        ))
+      }
+      if (!predicate) {
+        return false
+      }
     }
+    return true
   }
-  return true
 }
 
 module.exports = and

package/benchmarks/tryCatch.js

@@ -1,5 +1,5 @@
-const { tryCatch } = require('..')
-const { timeInLoop } = require('../x')
+const tryCatch = require('../tryCatch')
+const timeInLoop = require('../x/timeInLoop')
 
 const isPromise = value => value != null && typeof value.then == 'function'
 
@@ -75,6 +75,8 @@ const tryCatch3 = (tryer, catcher) => function tryCatcher(...args) {
  * @benchmark
  * tryCatch2: 1e+6: 36.369ms
  * tryCatch3: 1e+6: 17.027ms
+ *
+ * TODO find the date
  */
 
 {
@@ -91,3 +93,16 @@ const tryCatch3 = (tryer, catcher) => function tryCatcher(...args) {
 
   // timeInLoop('tryCatch3', 1e6, () => tryCatch3(identity, noop)('yo'))
 }
+
+/**
+ * @name tryCatch 2022-06-13
+ *
+ * @benchmark
+ * tryCatch: 1e+6: tryCatch: 1e+6: 39.787ms
+ */
+
+{
+  const identity = value => value
+  const noop = () => {}
+  timeInLoop('tryCatch', 1e6, () => tryCatch2(identity, noop)('yo'))
+}

package/dist/__.es.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/__.es.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/__.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/__.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/__.min.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/__.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.es.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.es.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.min.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/all.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.es.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.es.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.min.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.min.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/always.mjs

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.

package/dist/and.es.js

@@ -1,5 +1,5 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.
@@ -44,48 +44,90 @@ const thunkConditional = (
   conditionalExpression, thunkOnTruthy, thunkOnFalsy,
 ) => conditionalExpression ? thunkOnTruthy() : thunkOnFalsy()
 
+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)
+}
+
 const thunkify3 = (func, arg0, arg1, arg2) => function thunk() {
   return func(arg0, arg1, arg2)
 }
 
 const always = value => function getter() { return value }
 
-const asyncAnd = async function (predicates, value, index) {
+const areAllNonfunctionsTruthy = function (predicates, index) {
   const length = predicates.length
   while (++index < length) {
-    let predication = predicates[index](value)
-    if (isPromise(predication)) {
-      predication = await predication
+    let predicate = predicates[index]
+    if (isPromise(predicate)) {
+      return predicate.then(curry3(
+        thunkConditional,
+        __,
+        thunkify2(areAllNonfunctionsTruthy, predicates, index),
+        always(false),
+      ))
     }
-    if (!predication) {
+    if (!predicate) {
       return false
     }
   }
   return true
 }
 
-const and = predicates => function allPredicates(value) {
-  if (value != null && typeof value.and == 'function') {
-    return value.and(predicates)
-  }
-  const length = predicates.length,
-    promises = []
-  let index = -1
-
+const asyncArePredicatesAllTruthy = async function (predicates, point, index) {
+  const length = predicates.length
   while (++index < length) {
-    const predication = predicates[index](value)
-    if (isPromise(predication)) {
-      return predication.then(curry3(
-        thunkConditional,
-        __,
-        thunkify3(asyncAnd, predicates, value, index),
-        always(false)))
+    let predicate = predicates[index]
+    if (typeof predicate == 'function') {
+      predicate = predicate(point)
+    }
+    if (isPromise(predicate)) {
+      predicate = await predicate
     }
-    if (!predication) {
+    if (!predicate) {
       return false
     }
   }
   return true
 }
 
+const and = predicates => {
+  if (areAllValuesNonfunctions(predicates)) {
+    return areAllNonfunctionsTruthy(predicates, -1)
+  }
+  return function arePredicatesAllTruthy(point) {
+    const length = predicates.length
+    let index = -1
+
+    while (++index < length) {
+      let predicate = predicates[index]
+      if (typeof predicate == 'function') {
+        predicate = predicate(point)
+      }
+      if (isPromise(predicate)) {
+        return predicate.then(curry3(
+          thunkConditional,
+          __,
+          thunkify3(asyncArePredicatesAllTruthy, predicates, point, index),
+          always(false),
+        ))
+      }
+      if (!predicate) {
+        return false
+      }
+    }
+    return true
+  }
+}
+
 export default and

package/dist/and.es.min.js

@@ -1,7 +1,7 @@
 /**
- * rubico v1.9.0
+ * rubico v1.9.3
  * https://github.com/a-synchronous/rubico
  * (c) 2019-2021 Richard Tong
  * rubico may be freely distributed under the MIT license.
  */
-const isPromise=r=>null!=r&&"function"==typeof r.then,__=Symbol.for("placeholder"),curry3ResolveArg0=(r,n,e)=>function(t){return r(t,n,e)},curry3ResolveArg1=(r,n,e)=>function(t){return r(n,t,e)},curry3ResolveArg2=(r,n,e)=>function(t){return r(n,e,t)},curry3=function(r,n,e,t){return n==__?curry3ResolveArg0(r,e,t):e==__?curry3ResolveArg1(r,n,t):curry3ResolveArg2(r,n,e)},thunkConditional=(r,n,e)=>r?n():e(),thunkify3=(r,n,e,t)=>function(){return r(n,e,t)},always=r=>function(){return r},asyncAnd=async function(r,n,e){const t=r.length;for(;++e<t;){let t=r[e](n);if(isPromise(t)&&(t=await t),!t)return!1}return!0},and=r=>function(n){if(null!=n&&"function"==typeof n.and)return n.and(r);const e=r.length;let t=-1;for(;++t<e;){const e=r[t](n);if(isPromise(e))return e.then((u=thunkConditional,o=__,c=thunkify3(asyncAnd,r,n,t),i=always(!1),o==__?curry3ResolveArg0(u,c,i):c==__?curry3ResolveArg1(u,o,i):curry3ResolveArg2(u,o,c)));if(!e)return!1}var u,o,c,i;return!0};export default and;
+const isPromise=n=>null!=n&&"function"==typeof n.then,__=Symbol.for("placeholder"),curry3ResolveArg0=(n,r,t)=>function(e){return n(e,r,t)},curry3ResolveArg1=(n,r,t)=>function(e){return n(r,e,t)},curry3ResolveArg2=(n,r,t)=>function(e){return n(r,t,e)},curry3=function(n,r,t,e){return r==__?curry3ResolveArg0(n,t,e):t==__?curry3ResolveArg1(n,r,e):curry3ResolveArg2(n,r,t)},thunkConditional=(n,r,t)=>n?r():t(),areAllValuesNonfunctions=function(n){const r=n.length;let t=-1;for(;++t<r;)if("function"==typeof n[t])return!1;return!0},thunkify2=(n,r,t)=>function(){return n(r,t)},thunkify3=(n,r,t,e)=>function(){return n(r,t,e)},always=n=>function(){return n},areAllNonfunctionsTruthy=function(n,r){const t=n.length;for(;++r<t;){let t=n[r];if(isPromise(t))return t.then(curry3(thunkConditional,__,thunkify2(areAllNonfunctionsTruthy,n,r),always(!1)));if(!t)return!1}return!0},asyncArePredicatesAllTruthy=async function(n,r,t){const e=n.length;for(;++t<e;){let e=n[t];if("function"==typeof e&&(e=e(r)),isPromise(e)&&(e=await e),!e)return!1}return!0},and=n=>areAllValuesNonfunctions(n)?areAllNonfunctionsTruthy(n,-1):function(r){const t=n.length;let e=-1;for(;++e<t;){let t=n[e];if("function"==typeof t&&(t=t(r)),isPromise(t))return t.then(curry3(thunkConditional,__,thunkify3(asyncArePredicatesAllTruthy,n,r,e),always(!1)));if(!t)return!1}return!0};export default and;