Comparing version 1.1.7 to 1.1.8
@@ -1,2 +0,9 @@ | ||
var isPromise = require('is-promise') | ||
/** | ||
* Determine whether passed object is a promise or not. | ||
* @param {Object} obj Value to be checked | ||
* @return {Boolean} Check result | ||
*/ | ||
function isPromise (obj) { | ||
return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function' | ||
} | ||
@@ -74,3 +81,2 @@ /** | ||
Breeze.prototype.run = function _breezeRun () { | ||
var system = this | ||
var args = this.args || [] | ||
@@ -104,4 +110,6 @@ var context = this.context || this | ||
switch (func[0]) { | ||
case 'when': this.hasWhenHappened = true; break; | ||
case 'some': this.hasSomeHappened = true; break; | ||
case 'when': this.hasWhenHappened = true | ||
break | ||
case 'some': this.hasSomeHappened = true | ||
break | ||
} | ||
@@ -115,4 +123,11 @@ | ||
} | ||
} catch (error) { | ||
console.error(error) | ||
} catch (err) { | ||
if (!this.onError && !this.onDeferredError) { | ||
this.err = err | ||
} else { | ||
if (this.onError) this.onError(err) | ||
if (this.onDeferredError) this.onDeferredError(err) | ||
} | ||
return (this.steps = [] && this.check()) | ||
} | ||
@@ -136,7 +151,7 @@ } | ||
if (pop && !this.steps.length) { | ||
return this.running = false | ||
return (this.running = false) | ||
} | ||
if (this.steps.length && !this.running) { | ||
this.run() | ||
return this.run() | ||
} | ||
@@ -188,3 +203,3 @@ } | ||
if (!this.hasSome) { | ||
throw new Error("Cannot add .none check before adding .some checks") | ||
throw new Error('Cannot add .none check before adding .some checks') | ||
} | ||
@@ -191,0 +206,0 @@ |
{ | ||
"name": "breeze", | ||
"version": "1.1.7", | ||
"version": "1.1.8", | ||
"description": "Functional async flow control library", | ||
@@ -35,6 +35,3 @@ "main": "breeze.js", | ||
"mocha": "^2.2.5" | ||
}, | ||
"dependencies": { | ||
"is-promise": "^2.0.0" | ||
} | ||
} |
@@ -123,2 +123,2 @@ # Breeze | ||
[download]: https://github.com/Nijikokun/breeze/archive/v1.0.1.zip | ||
[download]: https://github.com/Nijikokun/breeze/archive/v1.1.8.zip |
22330
0
605
- Removedis-promise@^2.0.0
- Removedis-promise@2.2.2(transitive)