fix 🪲 with prop and propPath and remove safe from core

src/Maybe/prop.js

@@ -3,19 +3,24 @@
 
 const curry = require('../core/curry')
 const isDefined = require('../core/isDefined')
+const isNil= require('../core/isNil')
 const isInteger = require('../core/isInteger')
 const isString = require('../core/isString')
-const safe = require('../core/safe')
+const { Nothing, Just } = require('../core/Maybe')
 
-const lift =
-  safe(isDefined)
+const lift = x =>
+  isDefined(x) ? Just(x) : Nothing()
 
 // prop : String | Number -> a -> Maybe b
 function prop(key, target) {
   if(!(isString(key) || isInteger(key))) {
     throw new TypeError('prop: String or integer required for first argument')
   }
 
+  if(isNil(target)) {
+    return Nothing()
+  }
+
   return lift(target[key])
 }
 

src/Maybe/prop.spec.js

@@ -42,5 +42,11 @@ test('prop function', t => {
   t.equals(arrBad.option('nothing'), 'nothing', 'returns a Nothing when index is not found')
   t.equals(arrNull(arr).option('nothing'), null, 'returns a Just null when index is found and value is null')
 
+  const fn =
+    x => prop('key', x).option('nothing')
+
+  t.equals(fn(undefined), 'nothing', 'returns Nothing when data is undefined')
+  t.equals(fn(null), 'nothing', 'returns Nothing when data is null')
+
   t.end()
 })

src/Maybe/propPath.js

@@ -2,22 +2,27 @@
 /** @author Ian Hofmann-Hicks (evil) */
 
 const Maybe = require('../core/Maybe')
+const { Nothing, Just } = Maybe
+
 const curry = require('../core/curry')
+const isArray = require('../core/isArray')
 const isDefined = require('../core/isDefined')
 const isInteger = require('../core/isInteger')
+const isNil= require('../core/isNil')
 const isString = require('../core/isString')
-const isArray = require('../core/isArray')
-const safe = require('../core/safe')
 
-const lift =
-  safe(isDefined)
+const lift = x =>
+  isDefined(x) ? Just(x) : Nothing()
 
 // propPath : [ String | Number ] -> a -> Maybe b
 function propPath(keys, target) {
   if(!isArray(keys)) {
     throw new TypeError('propPath: Array of strings or integers required for first argument')
   }
 
+  if(isNil(target)) {
+    return Nothing()
+  }
   return keys.reduce((maybe, key) => {
     if(!(isString(key) || isInteger(key))) {
       throw new TypeError('propPath: Array of strings or integers required for first argument')

src/Maybe/propPath.spec.js

@@ -56,5 +56,11 @@ test('propPath function', t => {
 
   t.equals(propPath([ 'things', 2 ], mixed).option('nothing'), value, 'allows for traversal with a mixed path on a mixed structure')
 
+  const fn =
+    x => propPath([ 'key' ], x).option('nothing')
+
+  t.equals(fn(undefined), 'nothing', 'returns Nothing when data is undefined')
+  t.equals(fn(null), 'nothing', 'returns Nothing when data is null')
+
   t.end()
 })

src/Maybe/safe.js

@@ -1,8 +1,9 @@
 /** @license ISC License (c) copyright 2016 original and current authors */
 /** @author Ian Hofmann-Hicks (evil) */
 
-const _safe = require('../core/safe')
 const Pred = require('../core/types').proxy('Pred')
+const { Nothing, Just } = require('../core/Maybe')
+const predOrFunc = require('../core/predOrFunc')
 
 const curry = require('../core/curry')
 const isFunction = require('../core/isFunction')
@@ -14,7 +15,9 @@ function safe(pred, x) {
     throw new TypeError('safe: Pred or predicate function required for first argument')
   }
 
-  return _safe(pred)(x)
+  return predOrFunc(pred, x)
+    ? Just(x)
+    : Nothing()
 }
 
 module.exports = curry(safe)

src/Maybe/safe.spec.js

@@ -32,3 +32,31 @@ test('safe helper', t => {
 
   t.end()
 })
+
+test('safe predicate function', t => {
+  const pred = x => !!x
+
+  const f = safe(pred)
+
+  const fResult = f(false).option('nothing')
+  const tResult = f('just').option('nothing')
+
+  t.equals(fResult, 'nothing', 'returns a Nothing when false')
+  t.equals(tResult, 'just', 'returns a Just when true')
+
+  t.end()
+})
+
+test('safe Pred', t => {
+  const pred = Pred(x => !!x)
+
+  const f = safe(pred)
+
+  const fResult = f(0).option('nothing')
+  const tResult = f('just').option('nothing')
+
+  t.equals(fResult, 'nothing', 'returns a Nothing when false')
+  t.equals(tResult, 'just', 'returns a Just when true')
+
+  t.end()
+})

src/Maybe/safeLift.js

@@ -7,7 +7,7 @@ const compose = require('../core/compose')
 const curry = require('../core/curry')
 const isFunction = require('../core/isFunction')
 const isSameType = require('../core/isSameType')
-const safe = require('../core/safe')
+const safe = require('./safe')
 
 const map =
   fn => m => m.map(fn)