Merge a62c772 into 4bb0bb2

joelnet · May 15, 2019 · e4f7de4 · e4f7de4
2 parents 4bb0bb2 + a62c772
commit e4f7de4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -5,9 +5,7 @@ env:
   browser: false
 extends: airbnb-base
 parserOptions:
-  ecmaVersion: 2017
-  ecmaFeatures:
-    experimentalObjectRestSpread: true
+  ecmaVersion: 2018
 rules:
   indent:
   - error

diff --git a/type/Nothing.js b/type/Nothing.js
@@ -1,9 +1,5 @@
 const { typeNothing } = require('./_allTypes')
-
-function leftMap(func) {
-  const value = func()
-  return value
-}
+const Just = require('./Just')
 
 const Nothing = Object.freeze(Object.create(
   {
@@ -12,7 +8,7 @@ const Nothing = Object.freeze(Object.create(
     inspect: () => 'Nothing',
     ap: () => Nothing,
     map: () => Nothing,
-    leftMap,
+    leftMap: func => Just(func()),
     flatMap: () => Nothing,
     'fantasy-land/map': () => Nothing,
     toJSON: () => null

diff --git a/type/__tests__/Nothing.test.js b/type/__tests__/Nothing.test.js
@@ -31,15 +31,15 @@ describe('type/Nothing', () => {
     expect.assertions(1)
     const expected = 'Just ("ABC")'
     const nothing = Nothing
-    const actual = nothing.leftMap(() => Just('ABC')).inspect()
+    const actual = nothing.leftMap(() => 'ABC').inspect()
     expect(actual).toBe(expected)
   })
 
   test('leftMap with Nothing', () => {
     expect.assertions(1)
     const expected = Nothing
     const nothing = Nothing
-    const actual = nothing.leftMap(() => Nothing)
+    const actual = nothing.leftMap(() => Nothing).value
     expect(actual).toBe(expected)
   })