Merge pull request #77 from cwmyers/develop

Fix Free monad

README.md

@@ -35,7 +35,7 @@ Simply download and add to your html pages or we also support [bower].  You can
 bower install monet --save
 
 # or to install a specific version
-bower install monet#0.9.0-alpha.0
+bower install monet#0.9.0-alpha.1
 ```
 
 ### Node installation
@@ -44,7 +44,7 @@ bower install monet#0.9.0-alpha.0
 npm install monet --save
 
 # or to install a specific version
-npm install [email protected].0
+npm install [email protected].1
 ```
 
 ## A note on types

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "monet",
-  "version": "0.9.0-alpha.0",
+  "version": "0.9.0-alpha.1",
   "main": "src/main/javascript/monet.js",
   "ignore": [
     "**/.*",

dist/monet-pimp.js

@@ -1,5 +1,5 @@
 /**
- * monet-pimp.js 0.8.10
+ * monet-pimp.js 0.9.0-alpha.1
  *
  * This file needs to be included after monet.js
  *

dist/monet.js

@@ -1,5 +1,5 @@
 /**
- * Monet.js 0.8.10
+ * Monet.js 0.9.0-alpha.1
  *
  * (c) 2012-2016 Chris Myers
  * @license Monet.js may be freely distributed under the MIT license.
@@ -298,7 +298,13 @@
         ap: function(list) {
             return listAp(this, list);
         },
-        isNEL: falseFunction
+        isNEL: falseFunction,
+        toString: function() {
+            return this.isNil ? "Nil" : "List(" + this.toArray().join(", ") + ")";
+        },
+        inspect: function() {
+            return this.toString();
+        }
     };
     List.fn.init.prototype = List.fn;
     List.prototype.empty = function() {
@@ -397,7 +403,13 @@
         size: function() {
             return this.size_;
         },
-        isNEL: trueFunction
+        isNEL: trueFunction,
+        toString: function() {
+            return "NEL(" + this.toArray().join(", ") + ")";
+        },
+        inspect: function() {
+            return this.toString();
+        }
     };
     NEL.fromList = function(list) {
         return list.isNil ? None() : Some(NEL(list.head(), list.tail()));
@@ -494,6 +506,12 @@
             return self.flatMap(function(a) {
                 return fn(a) ? self : None();
             });
+        },
+        toString: function() {
+            return this.isSome() ? "Just(" + this.val + ")" : "Nothing";
+        },
+        inspect: function() {
+            return this.toString();
         }
     };
     Maybe.prototype.orJust = Maybe.prototype.orSome;
@@ -572,6 +590,12 @@
         },
         toEither: function() {
             return (this.isSuccess() ? Right : Left)(this.val);
+        },
+        toString: function() {
+            return (this.isSuccess() ? "Success(" : "Fail(") + this.val + ")";
+        },
+        inspect: function() {
+            return this.toString();
         }
     };
     Validation.fn.init.prototype = Validation.fn;
@@ -729,6 +753,16 @@
         },
         toValidation: function() {
             return this.isRight() ? Success(this.value) : Fail(this.value);
+        },
+        toString: function() {
+            return this.cata(function(left) {
+                return "Left(" + left + ")";
+            }, function(right) {
+                return "Right(" + right + ")";
+            });
+        },
+        inspect: function() {
+            return this.toString();
         }
     };
     Either.fn.init.prototype = Either.fn;
@@ -807,7 +841,9 @@
             });
         },
         bind: function(fn) {
-            return this.isSuspend ? Suspend(this.functor.map(function(free) {
+            return this.isSuspend ? Suspend(isFunction(this.functor) ? compose(function(free) {
+                return free.bind(fn);
+            }, this.functor) : this.functor.map(function(free) {
                 return free.bind(fn);
             })) : fn(this.val);
         },
@@ -858,6 +894,12 @@
         },
         equals: function(other) {
             return isFunction(other.get) && equals(this.get())(other.get());
+        },
+        toString: function() {
+            return "Identity(" + this.val + ")";
+        },
+        inspect: function() {
+            return this.toString();
         }
     };
     Identity.fn.init.prototype = Identity.fn;

package.json

@@ -5,7 +5,7 @@
   ],
   "name": "monet",
   "description": "Monadic types library for JavaScript",
-  "version": "0.9.0-alpha.0",
+  "version": "0.9.0-alpha.1",
   "homepage": "https://github.com/cwmyers/monet.js",
   "repository": {
     "type": "git",

src/monet-pimp.js

@@ -1,5 +1,5 @@
 /**
- * monet-pimp.js 0.9.0-alpha.0
+ * monet-pimp.js 0.9.0-alpha.1
  *
  * This file needs to be included after monet.js
  *

src/monet.js

@@ -1,5 +1,5 @@
 /**
- * Monet.js 0.9.0-alpha.0
+ * Monet.js 0.9.0-alpha.1
  *
  * (c) 2012-2016 Chris Myers
  * @license Monet.js may be freely distributed under the MIT license.
@@ -978,11 +978,13 @@
         },
         bind: function (fn) {
             return this.isSuspend ?
-                Suspend(
-                    this.functor.map(
-                        function (free) {
-                            return free.bind(fn)
-                        })) :
+                Suspend(isFunction(this.functor) ?
+                    compose(function (free) {
+                        return free.bind(fn)
+                    }, this.functor) :
+                    this.functor.map(function (free) {
+                        return free.bind(fn)
+                    })) :
                 fn(this.val)
         },
         ap: function (ff) {