Skip to content

refactor: flatten nested if-else blocks #6

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
cades wants to merge 5 commits into
base: master
Choose a base branch
from
Open

refactor: flatten nested if-else blocks #6

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7345bed
return early, avoid else
cades Jan 10, 2018
e083979
remove extra .then() call
cades Jan 11, 2018
01b6724
bugfix: resolve value instead of function
cades Jan 11, 2018
e031ffc
bugfix: utilize .then() to handle thrown error
cades Jan 12, 2018
4289eb1
fix: use function instead of a value
cades Jan 12, 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
42 changes: 20 additions & 22 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,28 @@ export default function workerize(code) {
};
*/
ctx.addEventListener('message', ({ data }) => {
if (data.type==='RPC') {
let id = data.id;
if (id!=null) {
if (data.method) {
let method = rpcMethods[data.method];
if (method==null) {
ctx.postMessage({ type: 'RPC', id, error: 'NO_SUCH_METHOD' });
}
else {
Promise.resolve()
.then( () => method.apply(null, data.params) )
.then( result => { ctx.postMessage({ type: 'RPC', id, result }); })
.catch( error => { ctx.postMessage({ type: 'RPC', id, error }); });
}
}
else {
let callback = callbacks[id];
if (callback==null) throw Error(`Unknown callback ${id}`);
delete callbacks[id];
if (data.error) callback.reject(Error(data.error));
else callback.resolve(data.result);
}
if (data.type!=='RPC') return;
let id = data.id;
if (id==null) return;
if (data.method) {
let method = rpcMethods[data.method];
if (method==null) {
ctx.postMessage({ type: 'RPC', id, error: 'NO_SUCH_METHOD' });
return;
}

Promise.resolve(() => method.apply(null, data.params))
Copy link
Copy Markdown
Owner

@developit developit Jan 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This creates a Promise with a value resolved to the function itself. See below:
screen shot 2018-01-11 at 10 01 02 am

.then( result => { ctx.postMessage({ type: 'RPC', id, result }); })
.catch( error => { ctx.postMessage({ type: 'RPC', id, error }); });
return;
}

let callback = callbacks[id];
if (callback==null) throw Error(`Unknown callback ${id}`);
delete callbacks[id];
data.error
? callback.reject(Error(data.error))
: callback.resolve(data.result);
});
}
setup(worker, worker.rpcMethods, callbacks);
Expand Down