Skip to content

Commit

Permalink
further refactoring of .then, very pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
@wizardwerdna
wizardwerdna committed Apr 20, 2013
1 parent ef06bca commit 365f968
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 29 deletions.
22 changes: 10 additions & 12 deletions covenant.coffee
View file
Expand Up @@ -9,16 +9,19 @@ root.Covenant = class Covenant

root.Core = class Core extends Covenant
constructor: (resolver=->)->
return (new Core(resolver)) unless this instanceof Covenant
return (new Core(resolver)) unless this instanceof Core
throw new TypeError("resolver must be a function") unless typeof resolver == 'function'
@_buildPromise(resolver)
_buildPromise: (resolver) ->
@state = new PendingState
@promise = @promise ? new Covenant(@then)
try
resolver.call(this, @resolve, @reject, this)
catch e
@reject e
then: (onFulfill, onReject) => new @constructor (resolve, reject) =>
@state.applyThen(onFulfill, onReject, resolve, reject)
@state.schedule (state) ->
state.then(onFulfill, onReject).then(resolve, reject)
fulfill: (value) => @state = @state.fulfill(value)
reject: (reason) => @state = @state.reject(reason)
resolve: (value) =>
Expand All @@ -44,32 +47,27 @@ class PendingState
constructor: -> @pendeds = []
fulfill: (value) -> new FulfilledState value, @pendeds
reject: (reason) -> new RejectedState reason, @pendeds
applyThen: (onFulfilled, onRejected, resolve, reject) ->
@pendeds.push (state) ->
state.then(onFulfilled, onRejected).then(resolve, reject)
schedule: (f)=> @pendeds.push f

class CompletedState
constructor: (pendeds=[]) ->
enqueue => pended(@) for pended in pendeds
fulfill: -> @
reject: -> @
then: (valueOrReason, onFulfilledOrRejected) ->
then: (onFulfilledOrRejected, valueOrReason) ->
try
if typeof onFulfilledOrRejected isnt 'function'
@
else
new FulfilledState onFulfilledOrRejected(valueOrReason)
catch e
new RejectedState e
applyThen: (onFulfilled, onRejected, resolve, reject) ->
enqueue => @.then(onFulfilled, onRejected).then(resolve, reject)
schedule: (f)=> enqueue => f(@)

class FulfilledState extends CompletedState
constructor: (@value, pended) -> super pended
then: (onFulfill, onReject) ->
super(@value, onFulfill)
then: (onFulfill, onReject) -> super(onFulfill, @value)

class RejectedState extends CompletedState
constructor: (@reason, pended) -> super pended
then: (onFulfill, onReject) ->
super(@reason, onReject)
then: (onFulfill, onReject) -> super(onReject, @reason)
43 changes: 27 additions & 16 deletions covenant.js
View file
Expand Up @@ -27,8 +27,7 @@
__extends(Core, _super);

function Core(resolver) {
var _ref,
_this = this;
var _this = this;
if (resolver == null) {
resolver = function() {};
}
Expand All @@ -47,25 +46,32 @@
this.then = function(onFulfill, onReject) {
return Core.prototype.then.apply(_this, arguments);
};
if (!(this instanceof Covenant)) {
if (!(this instanceof Core)) {
return new Core(resolver);
}
if (typeof resolver !== 'function') {
throw new TypeError("resolver must be a function");
}
this._buildPromise(resolver);
}

Core.prototype._buildPromise = function(resolver) {
var _ref;
this.state = new PendingState;
this.promise = (_ref = this.promise) != null ? _ref : new Covenant(this.then);
try {
resolver.call(this, this.resolve, this.reject, this);
return resolver.call(this, this.resolve, this.reject, this);
} catch (e) {
this.reject(e);
return this.reject(e);
}
}
};

Core.prototype.then = function(onFulfill, onReject) {
var _this = this;
return new this.constructor(function(resolve, reject) {
return _this.state.applyThen(onFulfill, onReject, resolve, reject);
return _this.state.schedule(function(state) {
return state.then(onFulfill, onReject).then(resolve, reject);
});
});
};

Expand Down Expand Up @@ -120,6 +126,10 @@
PendingState = (function() {

function PendingState() {
var _this = this;
this.schedule = function(f) {
return PendingState.prototype.schedule.apply(_this, arguments);
};
this.pendeds = [];
}

Expand All @@ -131,10 +141,8 @@
return new RejectedState(reason, this.pendeds);
};

PendingState.prototype.applyThen = function(onFulfilled, onRejected, resolve, reject) {
return this.pendeds.push(function(state) {
return state.then(onFulfilled, onRejected).then(resolve, reject);
});
PendingState.prototype.schedule = function(f) {
return this.pendeds.push(f);
};

return PendingState;
Expand All @@ -148,6 +156,9 @@
if (pendeds == null) {
pendeds = [];
}
this.schedule = function(f) {
return CompletedState.prototype.schedule.apply(_this, arguments);
};
enqueue(function() {
var pended, _i, _len, _results;
_results = [];
Expand All @@ -167,7 +178,7 @@
return this;
};

CompletedState.prototype.then = function(valueOrReason, onFulfilledOrRejected) {
CompletedState.prototype.then = function(onFulfilledOrRejected, valueOrReason) {
try {
if (typeof onFulfilledOrRejected !== 'function') {
return this;
Expand All @@ -179,10 +190,10 @@
}
};

CompletedState.prototype.applyThen = function(onFulfilled, onRejected, resolve, reject) {
CompletedState.prototype.schedule = function(f) {
var _this = this;
return enqueue(function() {
return _this.then(onFulfilled, onRejected).then(resolve, reject);
return f(_this);
});
};

Expand All @@ -200,7 +211,7 @@
}

FulfilledState.prototype.then = function(onFulfill, onReject) {
return FulfilledState.__super__.then.call(this, this.value, onFulfill);
return FulfilledState.__super__.then.call(this, onFulfill, this.value);
};

return FulfilledState;
Expand All @@ -217,7 +228,7 @@
}

RejectedState.prototype.then = function(onFulfill, onReject) {
return RejectedState.__super__.then.call(this, this.reason, onReject);
return RejectedState.__super__.then.call(this, onReject, this.reason);
};

return RejectedState;
Expand Down
2 changes: 1 addition & 1 deletion covenant.map
View file
Expand Up @@ -6,5 +6,5 @@
"covenant.coffee"
],
"names": [],
"mappings": "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"
"mappings": "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"
}

0 comments on commit 365f968

Please sign in to comment.