Merge 852ec04 into 1e7914e

src/pointfree/both.js

@@ -21,7 +21,7 @@ function both(m) {
     return m.both()
   }
 
-  throw new TypeError('both: Arrow, Function or Star required')
+  throw new TypeError('both: Strong Function or Profunctor required')
 }
 
 module.exports = both

src/pointfree/both.spec.js

@@ -20,7 +20,7 @@ test('both pointfree', t => {
 
   t.ok(isFunction(both), 'is a function')
 
-  const err = /both: Arrow, Function or Star required/
+  const err = /both: Strong Function or Profunctor required/
   t.throws(f(undefined), err, 'throws if arg is undefined')
   t.throws(f(null), err, 'throws if arg is null')
   t.throws(f(0), err, 'throws if arg is a falsey number')

src/pointfree/coalesce.js

@@ -16,7 +16,7 @@ function coalesce(f, g, m) {
   }
 
   throw new TypeError(
-    'coalesce: Async, Either, Maybe or Result required for third argument'
+    'coalesce: Sum Type required for third argument'
   )
 }
 

src/pointfree/coalesce.spec.js

@@ -41,7 +41,7 @@ test('coalesce pointfree', t => {
   t.throws(m(unit, [], f), err, 'throws if second arg is an array')
   t.throws(m(unit, {}, f), err, 'throws if second arg is an object')
 
-  const last = /coalesce: Async, Either, Maybe or Result required for third argument/
+  const last = /coalesce: Sum Type required for third argument/
   t.throws(m(unit, unit, undefined), last, 'throws if third arg is undefined')
   t.throws(m(unit, unit, null), last, 'throws if third arg is null')
   t.throws(m(unit, unit, 0), last, 'throws if third arg is a falsey number')

src/pointfree/either.js

@@ -13,7 +13,7 @@ function either(lf, rf, m) {
 
   if(!(m && isFunction(m.either))) {
     throw new TypeError(
-      'either: Last argument must be an Either or Maybe'
+      'either: Last argument must be a Sum Type'
     )
   }
 

src/pointfree/either.spec.js

@@ -41,7 +41,7 @@ test('either pointfree', t => {
   t.throws(f(unit, [], m), err, 'throws if second arg passed an array')
   t.throws(f(unit, {}, m), err, 'throws if second arg passed an object')
 
-  const last = /either: Last argument must be an Either or Maybe/
+  const last = /either: Last argument must be a Sum Type/
   t.throws(f(unit, unit, undefined), last, 'throws if third arg undefined')
   t.throws(f(unit, unit, null), last, 'throws if third arg passed null')
   t.throws(f(unit, unit, 0), last, 'throws if third arg passed a falsey number')

src/pointfree/option.js

@@ -6,7 +6,7 @@ const isFunction = require('../core/isFunction')
 
 function option(x, m) {
   if(!(m && isFunction(m.option))) {
-    throw new TypeError('option: Last argument must be a Maybe')
+    throw new TypeError('option: Last argument must be a Maybe, First or Last')
   }
 
   return m.option(x)

src/pointfree/option.spec.js

@@ -18,7 +18,7 @@ test('option pointfree', t => {
 
   t.ok(isFunction(option), 'is a function')
 
-  const err = /option: Last argument must be a Maybe/
+  const err = /option: Last argument must be a Maybe, First or Last/
   t.throws(f(0, undefined), err, 'throws if undefined in second arg')
   t.throws(f(0, null), err, 'throws if passed null in second arg')
   t.throws(f(0, 0), err, 'throws if passed a falsey number in second arg')

src/pointfree/second.js

@@ -23,7 +23,7 @@ function second(m) {
     return m.second()
   }
 
-  throw new TypeError('second: Arrow, Function or Star required')
+  throw new TypeError('second: Strong Function or Profunctor required')
 }
 
 module.exports = second

src/pointfree/second.spec.js

@@ -19,7 +19,7 @@ test('second pointfree', t => {
 
   t.ok(isFunction(second), 'is a function')
 
-  const err = /second: Arrow, Function or Star required/
+  const err = /second: Strong Function or Profunctor required/
   t.throws(s(undefined), err, 'throws if arg is undefined')
   t.throws(s(null), err, 'throws if arg is null')
   t.throws(s(0), err, 'throws if arg is a falsey number')