rubico 1.9.7 → 2.0.1

package/lt.js

@@ -1,26 +1,25 @@
-const spread2 = require('./_internal/spread2')
-const isPromise = require('./_internal/isPromise')
-const promiseAll = require('./_internal/promiseAll')
+const ComparisonOperator = require('./_internal/ComparisonOperator')
 const lessThan = require('./_internal/lessThan')
-const curry2 = require('./_internal/curry2')
-const always = require('./_internal/always')
-const __ = require('./_internal/placeholder')
 
 /**
  * @name lt
  *
  * @synopsis
  * ```coffeescript [specscript]
- * lt(leftValue any, rightValue any) -> boolean
- * lt(leftValue any, right function)(value any) -> Promise|boolean
- * lt(left function, rightValue any)(value any) -> Promise|boolean
- * lt(left function, right function)(value any) -> Promise|boolean
+ * lt(leftValue Promise|any, rightValue Promise|any) -> boolean
+ *
+ * lt(leftValue Promise|any, right function)(...args) -> Promise|boolean
+ * lt(...args, leftValue Promise|any, right function) -> Promise|boolean
+ *
+ * lt(left function, rightValue Promise|any)(...args) -> Promise|boolean
+ * lt(...args, left function, rightValue Promise|any) -> Promise|boolean
+ *
+ * lt(left function, right function)(...args) -> Promise|boolean
+ * lt(...args, left function, right function) -> Promise|boolean
  * ```
  *
  * @description
- * Test if a left value is less than (`<`) a right value. Either parameter may be an actual value.
- *
- * If both arguments are values, `lt` eagerly computes and returns a boolean value.
+ * Test if a value is less than (`<`) another value.
  *
  * ```javascript [playground]
  * console.log(lt(1, 3)) // true
@@ -28,60 +27,18 @@ const __ = require('./_internal/placeholder')
  * console.log(lt(4, 3)) // false
  * ```
  *
- * If both arguments are functions, `lt` treats those functions as argument resolvers and returns a function that first resolves its arguments by the argument resolvers before making the comparison.
- *
- * If only one argument is a function, `lt` still returns a function that resolves its arguments by the argument resolver, treating the value (non function) argument as an already resolved value for comparison.
+ * If either of the two values are resolver functions, `lt` returns a function that resolves the values to compare from its arguments.
  *
  * ```javascript [playground]
  * const identity = value => value
  *
  * const isLessThan3 = lt(identity, 3)
  *
- * console.log(isLessThan3(1), true)
- * console.log(isLessThan3(3), false)
- * console.log(isLessThan3(5), false)
+ * console.log(isLessThan3(1)) // true
+ * console.log(isLessThan3(3)) // false
+ * console.log(isLessThan3(5)) // false
  * ```
  */
-const lt = function (left, right) {
-  const isLeftResolver = typeof left == 'function',
-    isRightResolver = typeof right == 'function'
-
-  if (isLeftResolver && isRightResolver) {
-    return function lessThanBy(value) {
-      const leftResolve = left(value),
-        rightResolve = right(value)
-      const isLeftPromise = isPromise(leftResolve),
-        isRightPromise = isPromise(rightResolve)
-      if (isLeftPromise && isRightPromise) {
-        return promiseAll(
-          [leftResolve, rightResolve]).then(spread2(lessThan))
-      } else if (isLeftPromise) {
-        return leftResolve.then(curry2(lessThan, __, rightResolve))
-      } else if (isRightPromise) {
-        return rightResolve.then(curry2(lessThan, leftResolve, __))
-      }
-      return leftResolve < rightResolve
-    }
-  }
-
-  if (isLeftResolver) {
-    return function lessThanBy(value) {
-      const leftResolve = left(value)
-      return isPromise(leftResolve)
-        ? leftResolve.then(curry2(lessThan, __, right))
-        : leftResolve < right
-    }
-  }
-  if (isRightResolver) {
-    return function lessThanBy(value) {
-      const rightResolve = right(value)
-      return isPromise(rightResolve)
-        ? rightResolve.then(curry2(lessThan, left, __))
-        : left < rightResolve
-    }
-  }
-
-  return left < right
-}
+const lt = ComparisonOperator(lessThan)
 
 module.exports = lt

package/lte.js

@@ -1,26 +1,25 @@
-const spread2 = require('./_internal/spread2')
-const isPromise = require('./_internal/isPromise')
-const promiseAll = require('./_internal/promiseAll')
+const ComparisonOperator = require('./_internal/ComparisonOperator')
 const lessThanOrEqual = require('./_internal/lessThanOrEqual')
-const curry2 = require('./_internal/curry2')
-const always = require('./_internal/always')
-const __ = require('./_internal/placeholder')
 
 /**
  * @name lte
  *
  * @synopsis
  * ```coffeescript [specscript]
- * lte(leftValue any, rightValue any) -> boolean
- * lte(leftValue any, right function)(value any) -> Promise|boolean
- * lte(left function, rightValue any)(value any) -> Promise|boolean
- * lte(left function, right function)(value any) -> Promise|boolean
+ * lte(leftValue Promise|any, rightValue Promise|any) -> boolean
+ *
+ * lte(leftValue Promise|any, right function)(...args) -> Promise|boolean
+ * lte(...args, leftValue Promise|any, right function) -> Promise|boolean
+ *
+ * lte(left function, rightValue Promise|any)(...args) -> Promise|boolean
+ * lte(...args, left function, rightValue Promise|any) -> Promise|boolean
+ *
+ * lte(left function, right function)(...args) -> Promise|boolean
+ * lte(...args, left function, right function) -> Promise|boolean
  * ```
  *
  * @description
- * Test if a left value is less than or equal (`<=`) to a right value. Either parameter may be an actual value.
- *
- * If both arguments are values, `lte` eagerly computes and returns a boolean value.
+ * Test if a value is less than or equal (`<=`) to another value.
  *
  * ```javascript [playground]
  * console.log(lte(1, 3)) // true
@@ -28,9 +27,7 @@ const __ = require('./_internal/placeholder')
  * console.log(lte(4, 3)) // false
  * ```
  *
- * If both arguments are functions, `lte` treats those functions as argument resolvers and returns a function that first resolves its arguments by the argument resolvers before making the comparison.
- *
- * If only one argument is a function, `lte` still returns a function that resolves its arguments by the argument resolver, treating the value (non function) argument as an already resolved value for comparison.
+ * If either of the two values are resolver functions, `lte` returns a function that resolves the values to compare from its arguments.
  *
  * ```javascript [playground]
  * const identity = value => value
@@ -42,46 +39,6 @@ const __ = require('./_internal/placeholder')
  * console.log(isLessThanOrEqualTo3(5), false)
  * ```
  */
-const lte = function (left, right) {
-  const isLeftResolver = typeof left == 'function',
-    isRightResolver = typeof right == 'function'
-
-  if (isLeftResolver && isRightResolver) {
-    return function lessThanOrEqualBy(value) {
-      const leftResolve = left(value),
-        rightResolve = right(value)
-      const isLeftPromise = isPromise(leftResolve),
-        isRightPromise = isPromise(rightResolve)
-      if (isLeftPromise && isRightPromise) {
-        return promiseAll(
-          [leftResolve, rightResolve]).then(spread2(lessThanOrEqual))
-      } else if (isLeftPromise) {
-        return leftResolve.then(curry2(lessThanOrEqual, __, rightResolve))
-      } else if (isRightPromise) {
-        return rightResolve.then(curry2(lessThanOrEqual, leftResolve, __))
-      }
-      return leftResolve <= rightResolve
-    }
-  }
-
-  if (isLeftResolver) {
-    return function lessThanOrEqualBy(value) {
-      const leftResolve = left(value)
-      return isPromise(leftResolve)
-        ? leftResolve.then(curry2(lessThanOrEqual, __, right))
-        : leftResolve <= right
-    }
-  }
-  if (isRightResolver) {
-    return function lessThanOrEqualBy(value) {
-      const rightResolve = right(value)
-      return isPromise(rightResolve)
-        ? rightResolve.then(curry2(lessThanOrEqual, left, __))
-        : left <= rightResolve
-    }
-  }
-
-  return left <= right
-}
+const lte = ComparisonOperator(lessThanOrEqual)
 
 module.exports = lte

package/map.js

@@ -1,23 +1,17 @@
+const isPromise = require('./_internal/isPromise')
 const MappingIterator = require('./_internal/MappingIterator')
 const MappingAsyncIterator = require('./_internal/MappingAsyncIterator')
 const __ = require('./_internal/placeholder')
 const curry2 = require('./_internal/curry2')
 const isArray = require('./_internal/isArray')
 const isObject = require('./_internal/isObject')
-const isGeneratorFunction = require('./_internal/isGeneratorFunction')
-const isAsyncGeneratorFunction = require('./_internal/isAsyncGeneratorFunction')
 const arrayMap = require('./_internal/arrayMap')
-const generatorFunctionMap = require('./_internal/generatorFunctionMap')
-const asyncGeneratorFunctionMap = require('./_internal/asyncGeneratorFunctionMap')
-const reducerMap = require('./_internal/reducerMap')
 const stringMap = require('./_internal/stringMap')
 const setMap = require('./_internal/setMap')
 const mapMap = require('./_internal/mapMap')
 const objectMap = require('./_internal/objectMap')
 const arrayMapSeries = require('./_internal/arrayMapSeries')
 const arrayMapPool = require('./_internal/arrayMapPool')
-const arrayMapWithIndex = require('./_internal/arrayMapWithIndex')
-const objectMapOwn = require('./_internal/objectMapOwn')
 const objectMapEntries = require('./_internal/objectMapEntries')
 const mapMapEntries = require('./_internal/mapMapEntries')
 const symbolIterator = require('./_internal/symbolIterator')
@@ -69,15 +63,6 @@ const _map = function (value, mapper) {
   if (isArray(value)) {
     return arrayMap(value, mapper)
   }
-  if (typeof value == 'function') {
-    if (isGeneratorFunction(value)) {
-      return generatorFunctionMap(value, mapper)
-    }
-    if (isAsyncGeneratorFunction(value)) {
-      return asyncGeneratorFunctionMap(value, mapper)
-    }
-    return reducerMap(value, mapper)
-  }
   if (value == null) {
     return value
   }
@@ -285,10 +270,15 @@ const _map = function (value, mapper) {
 
 const map = (...args) => {
   const mapper = args.pop()
-  if (args.length > 0) {
-    return _map(args[0], mapper)
+  if (args.length == 0) {
+    return curry2(_map, __, mapper)
   }
-  return curry2(_map, __, mapper)
+
+  const collection = args[0]
+  if (isPromise(collection)) {
+    return collection.then(curry2(_map, __, mapper))
+  }
+  return _map(collection, mapper)
 }
 
 /**
@@ -407,79 +397,4 @@ map.pool = (concurrencyLimit, mapper) => function concurrentPoolMapping(value) {
   throw new TypeError(`${value} is not an Array`)
 }
 
-/**
- * @name map.withIndex
- *
- * @synopsis
- * ```coffeescript [specscript]
- * map.withIndex(
- *   indexedMapperFunc (item any, index numberl, array Array)=>Promise|any,
- * )(array Array) -> result Promise|Array
- * ```
- *
- * @description
- * `map` with an indexed mapper.
- *
- * ```javascript [playground]
- * const range = length =>
- *   map.withIndex((_, index) => index + 1)(Array(length))
- *
- * console.log(range(5)) // [1, 2, 3, 4, 5]
- * ```
- *
- * @execution concurrent
- *
- * @related
- * map, filter.withIndex
- *
- * @DEPRECATED
- */
-map.withIndex = mapper => function mappingWithIndex(value) {
-  if (isArray(value)) {
-    return arrayMapWithIndex(value, mapper)
-  }
-  throw new TypeError(`${value} is not an Array`)
-}
-
-/**
- * @name map.own
- *
- * @synopsis
- * ```coffeescript [specscript]
- * map.own(
- *   mapperFunc (item any)=>Promise|any,
- * )(object Object) -> result Promise|Object
- * ```
- *
- * @description
- * Applies a mapper function concurrently to an object's own values, returning an object of results. Mapper may be asynchronous.
- * Guards mapping by validating that each property is the object's own and not inherited from the prototype chain.
- *
- * ```javascript [playground]
- * const Person = function (name) {
- *   this.name = name
- * }
- *
- * Person.prototype.greet = function () {}
- *
- * const david = new Person('david')
- * david.a = 1
- * david.b = 2
- * david.c = 3
- *
- * const square = number => number ** 2
- * console.log(
- *   map.own(square)(david)
- * ) // { name: NaN, a: 1, b: 4, c: 9 }
- * ```
- *
- * @DEPRECATED
- */
-map.own = mapper => function mappingOwnProperties(value) {
-  if (isObject(value) && !isArray(value)) {
-    return objectMapOwn(value, mapper)
-  }
-  throw new TypeError(`${value} is not an Object`)
-}
-
 module.exports = map

package/memory-usage/reduce.js

@@ -15,7 +15,7 @@ const asyncGenerator = async function*(i) {
   yield 3
 }
 
-void (async () => {
+setImmediate(async () => {
   let i = 0, maxHeapUsed = 0
   while (i < iterations) {
     const p = reduce((a, b) => a + b, 0)(asyncGenerator(i))
@@ -35,6 +35,6 @@ void (async () => {
   }
 
   console.log('maxHeapUsed (MiB)', maxHeapUsed / 1024 / 1024)
-})()
+})
 
 // https://stackoverflow.com/questions/62336381/is-this-promise-cancellation-implementation-for-reducing-an-async-iterable-on-th

package/not.js

@@ -1,7 +1,18 @@
+const areAnyValuesPromises = require('./_internal/areAnyValuesPromises')
 const isPromise = require('./_internal/isPromise')
+const promiseAll = require('./_internal/promiseAll')
+const __ = require('./_internal/placeholder')
+const curry2 = require('./_internal/curry2')
+const curryArgs2 = require('./_internal/curryArgs2')
 
-// true -> false
-const _not = value => !value
+// negate(value boolean) -> inverse boolean
+const negate = value => !value
+
+// _not(args Array, predicate function)
+const _not = function (args, predicate) {
+  const boolean = predicate(...args)
+  return isPromise(boolean) ? boolean.then(negate) : !boolean
+}
 
 /**
  * @name not
@@ -10,7 +21,9 @@ const _not = value => !value
  * ```coffeescript [specscript]
  * not(value boolean) -> negated boolean
  *
- * not(predicate function)(...args) -> negatedPredicateResult boolean
+ * not(...args, predicate function) -> negated boolean
+ *
+ * not(predicate function)(...args) -> negated boolean
  * ```
  *
  * @description
@@ -33,50 +46,19 @@ const _not = value => !value
  * ) // false
  * ```
  */
-const not = function (funcOrValue) {
-  if (typeof funcOrValue == 'function') {
-    return function logicalInverter(value) {
-      const boolean = funcOrValue(value)
-      return isPromise(boolean) ? boolean.then(_not) : !boolean
+
+const not = function (...args) {
+  const predicateOrValue = args.pop()
+  if (typeof predicateOrValue == 'function') {
+    if (args.length == 0) {
+      return curryArgs2(_not, __, predicateOrValue)
     }
+    if (areAnyValuesPromises(args)) {
+      return promiseAll(args).then(curry2(_not, __, predicateOrValue))
+    }
+    return _not(args, predicateOrValue)
   }
-  return !funcOrValue
+  return !predicateOrValue
 }
 
-/**
- * @name notSync
- *
- * @synopsis
- * ```coffeescript [specscript]
- * notSync(func ...any=>boolean) -> negated ...any=>boolean
- * ```
- */
-const notSync = func => function notSync(...args) {
-  return !func(...args)
-}
-
-/**
- * @name not.sync
- *
- * @synopsis
- * ```coffeescript [specscript]
- * var args ...any,
- *   syncPredicate ...args=>boolean
- *
- * not.sync(syncPredicate)(...args) -> boolean
- * ```
- *
- * @description
- * `not` without promise handling.
- *
- * ```javascript [playground]
- * const isOdd = number => number % 2 == 1
- *
- * console.log(
- *   not.sync(isOdd)(2),
- * ) // true
- * ```
- */
-not.sync = notSync
-
 module.exports = not

package/omit.js

@@ -1,3 +1,4 @@
+const isPromise = require('./_internal/isPromise')
 const deleteByPath = require('./_internal/deleteByPath')
 const copyDeep = require('./_internal/copyDeep')
 const curry2 = require('./_internal/curry2')
@@ -66,6 +67,9 @@ const omit = function (arg0, arg1) {
   if (arg1 == null) {
     return curry2(_omit, __, arg0)
   }
+  if (isPromise(arg0)) {
+    return arg0.then(curry2(_omit, __, arg1))
+  }
   return _omit(arg0, arg1)
 }
 

package/or.js

@@ -1,6 +1,10 @@
+const promiseAll = require('./_internal/promiseAll')
 const isPromise = require('./_internal/isPromise')
-const curry3 = require('./_internal/curry3')
+const areAnyValuesPromises = require('./_internal/areAnyValuesPromises')
 const __ = require('./_internal/placeholder')
+const curry2 = require('./_internal/curry2')
+const curry3 = require('./_internal/curry3')
+const curryArgs2 = require('./_internal/curryArgs2')
 const thunkConditional = require('./_internal/thunkConditional')
 const areAllValuesNonfunctions = require('./_internal/areAllValuesNonfunctions')
 const thunkify2 = require('./_internal/thunkify2')
@@ -18,7 +22,7 @@ const always = require('./_internal/always')
 const areAnyNonfunctionsTruthy = function (predicates, index) {
   const length = predicates.length
   while (++index < length) {
-    let predicate = predicates[index]
+    const predicate = predicates[index]
     if (isPromise(predicate)) {
       return predicate.then(curry3(
         thunkConditional,
@@ -40,20 +44,19 @@ const areAnyNonfunctionsTruthy = function (predicates, index) {
  * @synopsis
  * ```coffeescript [specscript]
  * asyncAreAnyPredicatesTruthy(
+ *   args Array,
  *   predicates Array<predicate function|nonfunction>,
- *   point any,
  *   index number,
  * ) -> allTruthy boolean
  * ```
  */
-const asyncAreAnyPredicatesTruthy = async function (predicates, point, index) {
+const asyncAreAnyPredicatesTruthy = async function (args, predicates, index) {
   const length = predicates.length
   while (++index < length) {
     let predicate = predicates[index]
     if (typeof predicate == 'function') {
-      predicate = predicate(point)
+      predicate = predicate(...args)
     }
-    console.log('hey - or', predicate)
     if (isPromise(predicate)) {
       predicate = await predicate
     }
@@ -64,6 +67,31 @@ const asyncAreAnyPredicatesTruthy = async function (predicates, point, index) {
   return false
 }
 
+// areAnyPredicatesTruthy(args Array, predicates Array<function>) -> Promise|boolean
+const areAnyPredicatesTruthy = function (args, predicates) {
+  const length = predicates.length
+  let index = -1
+
+  while (++index < length) {
+    let predicate = predicates[index]
+    if (typeof predicate == 'function') {
+      predicate = predicate(...args)
+    }
+    if (isPromise(predicate)) {
+      return predicate.then(curry3(
+        thunkConditional,
+        __,
+        always(true),
+        thunkify3(asyncAreAnyPredicatesTruthy, args, predicates, index),
+      ))
+    }
+    if (predicate) {
+      return true
+    }
+  }
+  return false
+}
+
 /**
  * @name or
  *
@@ -71,9 +99,9 @@ const asyncAreAnyPredicatesTruthy = async function (predicates, point, index) {
  * ```coffeescript [specscript]
  * or(values Array<boolean>) -> result boolean
  *
- * or(
- *   predicatesOrValues Array<function|boolean>
- * )(value any) -> result Promise|boolean
+ * or(...args, predicatesOrValues Array<function|boolean>) -> Promise|boolean
+ *
+ * or(predicatesOrValues Array<function|boolean>)(...args) -> Promise|boolean
  * ```
  *
  * @description
@@ -105,33 +133,22 @@ const asyncAreAnyPredicatesTruthy = async function (predicates, point, index) {
  *
  * @note ...args slows down here by an order of magnitude
  */
-const or = predicates => {
-  if (areAllValuesNonfunctions(predicates)) {
-    return areAnyNonfunctionsTruthy(predicates, -1)
+const or = function (...args) {
+  const predicatesOrValues = args.pop()
+  if (areAllValuesNonfunctions(predicatesOrValues)) {
+    return areAnyNonfunctionsTruthy(predicatesOrValues, -1)
   }
-  return function areAnyPredicatesTruthy(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,
-          __,
-          always(true),
-          thunkify3(asyncAreAnyPredicatesTruthy, predicates, point, index),
-        ))
-      }
-      if (predicate) {
-        return true
-      }
-    }
-    return false
+  if (args.length == 0) {
+    return curryArgs2(areAnyPredicatesTruthy, __, predicatesOrValues)
   }
+
+  if (areAnyValuesPromises(args)) {
+    return promiseAll(args)
+      .then(curry2(areAnyPredicatesTruthy, __, predicatesOrValues))
+  }
+
+  return areAnyPredicatesTruthy(args, predicatesOrValues)
 }
 
 module.exports = or

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubico",
-  "version": "1.9.7",
+  "version": "2.0.1",
   "description": "[a]synchronous functional programming",
   "author": "Richard Tong",
   "license": "MIT",
@@ -33,23 +33,23 @@
     "operator"
   ],
   "devDependencies": {
+    "async": "^3.2.4",
     "bluebird": "^3.7.2",
     "codecov": "^3.7.1",
     "eslint": "^8.4.1",
     "fantasy-land": "^4.1.0",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "mocha": "^7.2.0",
     "node-fetch": "^2.6.1",
     "nyc": "^15.1.0",
-    "ramda": "^0.27.1",
+    "ramda": "^0.29.0",
     "terser": "^5.10.0",
     "thunk-test": "latest"
   },
   "scripts": {
-    "test": "mocha test.js x/*.test.js monad/*.test.js",
+    "test": "mocha test.js *.test.js */**.test.js",
     "test-coverage": "nyc mocha test.js x/*.test.js monad/*.test.js",
-    "lint": "eslint _internal rubico.js x monad",
-    "lint-fix": "eslint --fix _internal rubico.js x monad",
-    "build": "node distributor.js"
+    "lint": "eslint .",
+    "build": "./build"
   }
 }

package/pick.js

@@ -1,3 +1,4 @@
+const isPromise = require('./_internal/isPromise')
 const getByPath = require('./_internal/getByPath')
 const setByPath = require('./_internal/setByPath')
 const curry2 = require('./_internal/curry2')
@@ -62,10 +63,13 @@ const _pick = function (source, keys) {
  * ])
  * ```
  */
-const pick = (arg0, arg1) => {
+const pick = function (arg0, arg1) {
   if (arg1 == null) {
     return curry2(_pick, __, arg0)
   }
+  if (isPromise(arg0)) {
+    return arg0.then(curry2(_pick, __, arg1))
+  }
   return _pick(arg0, arg1)
 }