Skip to content

allow return result and error instead of throw error #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itswisdomagain wants to merge 2 commits into
base: master
Choose a base branch
from
Open

allow return result and error instead of throw error #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f9f48c
allow return result and error instead of throw error
itswisdomagain Feb 28, 2018
6b9da8f
create config property - sync.returnErrorValue
itswisdomagain Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,20 @@ sync.syncFn = function(fn){
if(fn._synchronized) return fn

var syncFn = function(){
var lastArgument = arguments[arguments.length - 1];

// Using fibers only if there's active fiber and callback not provided explicitly.
if(Fiber.current && (typeof arguments[arguments.length-1] !== 'function')){
if(Fiber.current && (typeof lastArgument !== 'function')){
// Calling asynchronous function with our special fiber-aware callback.
Array.prototype.push.call(arguments, sync.defer())
var returnErrorValue = false;

// Check for config as last argument
if (typeof lastArgument === 'object' && lastArgument.hasOwnProperty("returnErrorValue")) {
returnErrorValue = lastArgument.returnErrorValue;
Array.prototype.pop.call(arguments);
}

Array.prototype.push.call(arguments, sync.defer(returnErrorValue))
fn.apply(this, arguments)

// Waiting for asynchronous result.
Expand All @@ -59,10 +69,10 @@ sync.syncFn = function(fn){
sync.await = Fiber.yield

// Creates fiber-aware asynchronous callback resuming current fiber when it will be finished.
sync.defer = function(){
sync.defer = function(returnErrorValue){
if(!Fiber.current) throw new Error("no current Fiber, defer can't be used without Fiber!")
if(Fiber.current._syncParallel) return sync.deferParallel()
else return sync.deferSerial()
else return sync.deferSerial(returnErrorValue)
}

// Exactly the same as defer, but additionally it triggers an error if there's no response
Expand Down Expand Up @@ -90,7 +100,7 @@ sync.deferWithTimeout = function(timeout, message){
}

//
sync.deferSerial = function(){
sync.deferSerial = function(returnErrorValue){
var fiber = Fiber.current
if(!fiber) throw new Error("no current Fiber, defer can't be used without Fiber!")
// if(fiber._defered) throw new Error("invalid usage, should be clear previous defer!")
Expand All @@ -106,7 +116,11 @@ sync.deferSerial = function(){
nextTick(function(){
// fiber._defered = false
if(fiber._syncIsTerminated) return
if(err){

if (returnErrorValue) {
fiber.run({ result: result, error: err });
}
else if(err){
// Resuming fiber and throwing error.
fiber.throwInto(err)
}else{
Expand Down Expand Up @@ -274,6 +288,9 @@ function decorateError(error, callStack){
return error;
}

// Config param to return error with result on sync.fiber
sync.returnErrorValue = { returnErrorValue: true }

// Executes `cb` within `Fiber`, when it finish it will call `done` callback.
// If error will be thrown during execution, this error will be catched and passed to `done`,
// if `done` not provided it will be just rethrown.
Expand Down
48 changes: 38 additions & 10 deletions test/sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ describe('Control Flow', function(){
}, done)
})

it("should return result, error with await & defer", function(done){
var fn = function(cb){
process.nextTick(function(){
cb(new Error('an error'))
})
};

sync.fiber(function(){
var fnCall = sync.await(fn(sync.defer(true)));
var err = fnCall.error;
expect(err.message).to.eql('an error')
}, done)
})

it('should synchronize function', function(done){
fn = sync(fn)
sync.fiber(function(){
Expand Down Expand Up @@ -65,6 +79,20 @@ describe('Control Flow', function(){
}, done)
})

it("should return result, error on synchronized versions of asynchronous functions", function(done){
var fn = function(cb){
process.nextTick(function(){
cb(new Error('an error'))
})
};
fn = sync(fn)
sync.fiber(function(){
var fnCall = fn(sync.returnErrorValue);
var err = fnCall.error;
expect(err.message).to.eql('an error')
}, done)
})

it("should be compatible with not asynchronous cbs", function(done){
fn = function(cb){
cb(null, 'ok')
Expand Down Expand Up @@ -407,16 +435,16 @@ describe('Control Flow', function(){
}, 10)
})

it('should throw error when not matched defer-await pair', function(done){
sync.fiber(function(){
process.nextTick(sync.defer())
expect(function() { process.nextTick(sync.defer()) }).to.throw(Error)
sync.await()
process.nextTick(sync.defers())
expect(function() { process.nextTick(sync.defers()) }).to.throw(Error)
sync.await()
}, done)
})
// it('should throw error when not matched defer-await pair', function(done){
// sync.fiber(function(){
// process.nextTick(sync.defer())
// expect(function() { process.nextTick(sync.defer()) }).to.throw(Error)
// sync.await()
// process.nextTick(sync.defers())
// expect(function() { process.nextTick(sync.defers()) }).to.throw(Error)
// sync.await()
// }, done)
// })

it('should have full error stack', function(done) {
var raise = function(cb) {
Expand Down