Fix bind using function param. Add Exe.

README.md

@@ -127,6 +127,25 @@ ArrayDo([
 ]) // [3, 4, 6, 8]
 ```
 
+## Scope init
+By default Do start the computation with an empty scope {}.
+It's possibile to start computation with an initial scope using Exe.
+
+```js
+import {Exe, bind, returns} from 'yado-js'
+
+const ArrayDo = Exe({
+    pure: x => [x],
+    bind: xs => f => xs.map(f).reduce((a, b) => a.concat(b)
+})
+
+ArrayDo([
+    bind('x')([1, 2]),
+    bind('y')([3, 4]),
+    returns(s => s.x * s.y + s.k)
+])({k: 1}) // [4, 5, 7, 9]
+```
+
 **See below for more example and use cases**
 
 <!-- STATEMENTS -->

index.js

@@ -12,17 +12,21 @@ const isFunction = statement => typeof statement === 'function'
 const resultOrChain = chain => scope =>
     scope[RESULT] !== undefined ? scope[RESULT] : chain(scope)
 
+const resolveArgument = (argument, scope) =>
+    isFunction(argument) ? argument(scope) : argument
+
 const tokenChain = ({ pure, bind }) => (chain, [token, argument]) => {
     if (token === 'return') {
         return scope =>
             chain({
                 ...scope,
-                [RESULT]: pure(
-                    isFunction(argument) ? argument(scope) : argument
-                )
+                [RESULT]: pure(resolveArgument(argument, scope))
             })
     }
-    return scope => bind(argument)(v => chain({ ...scope, [token]: v }))
+    return scope =>
+        bind(resolveArgument(argument, scope))(v =>
+            chain({ ...scope, [token]: v })
+        )
 }
 
 const blockResolve = Monad => {
@@ -54,8 +58,10 @@ const getMonad = MonadDef =>
         }
         : MonadDef
 
-const Do = MonadDef => statemens =>
-    blockResolve(getMonad(MonadDef))(statemens)(scope => scope[RESULT])({})
+const Exe = MonadDef => statemens =>
+    blockResolve(getMonad(MonadDef))(statemens)(scope => scope[RESULT])
+
+const Do = MonadDef => statemens => Exe(MonadDef)(statemens)({})
 
 // Command utility
 const bind = identifier => argument => ({ [identifier]: argument })
@@ -69,4 +75,4 @@ Do.bind = bind
 Do.returns = returns
 Do.to = to
 
-export { Do }
+export { Do, Exe }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "yado-js",
-    "version": "0.0.1",
+    "version": "0.0.3",
     "description": "Yet Another DO notation for Javascript",
     "main": "index.js",
     "repository": "https://github.com/FbN/yado-js",

tests/features.test.js

@@ -32,3 +32,21 @@ test('with scope', t => {
     }
     t.deepEqual(BurridoArrayDo(burr), ArrayDo(yado)) // [ 4, 5, 7, 9 ]
 })
+
+test('by function', t => {
+    const yado = [
+        { x: () => [1, 2] },
+        s => ({ ...s, z: 1 }),
+        { y: [3, 4] },
+        {
+            return: s => s.x * s.y + s.z
+        }
+    ]
+    const burr = function * () {
+        const x = yield [1, 2]
+        const z = 1
+        const y = yield [3, 4]
+        return x * y + z
+    }
+    t.deepEqual(BurridoArrayDo(burr), ArrayDo(yado)) // [ 4, 5, 7, 9 ]
+})