Skip to content
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.

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

use currying in build-computed #82

Merged
merged 1 commit into from
Apr 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 19 additions & 9 deletions addon/-build-computed.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,27 @@ function buildCallback({ incomingCallback, createArgs }) {
return newCallback;
}

export default function({ args, collapseKeys, getValue, flattenKeys }) {
let { keys, callback: incomingCallback } = parseComputedArgs(args);
export default function({ collapseKeys, getValue, flattenKeys }) {
return function(...args) {
let { keys, callback: incomingCallback } = parseComputedArgs(args);

let collapsedKeys = collapseKeys(keys);
let collapsedKeys = collapseKeys(keys);

function createArgs(context) {
let bundledKeys = collapsedKeys.map(key => ({ context, key }));
return bundledKeys.map(getValue);
}
function createArgs(context) {
let bundledKeys = collapsedKeys.map(key => ({ context, key }));
return bundledKeys.map(getValue);
}

let newCallback = buildCallback({ incomingCallback, createArgs });
let newCallback = buildCallback({ incomingCallback, createArgs });

return computed(...flattenKeys(keys), newCallback);
return computed(...flattenKeys(keys), newCallback);
}
}

export function buildCurriedComputed(computed) {
return function(callback) {
return function() {
return computed(...arguments, callback).readOnly();
};
};
}
4 changes: 1 addition & 3 deletions addon/computed-unsafe.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ import flattenKeys from './flatten-keys-unsafe';

const collapseKeys = keys => keys;

export default function(...args) {
return buildComputed({ args, collapseKeys, getValue, flattenKeys });
}
export default buildComputed({ collapseKeys, getValue, flattenKeys });
4 changes: 1 addition & 3 deletions addon/computed.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ import collapseKeys from './collapse-keys';
import getValue from './get-value';
import flattenKeys from './flatten-keys';

export default function(...args) {
return buildComputed({ args, collapseKeys, getValue, flattenKeys });
}
export default buildComputed({ collapseKeys, getValue, flattenKeys });
7 changes: 2 additions & 5 deletions addon/curried-computed.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import { buildCurriedComputed } from './-build-computed';
import computed from './computed';

export default function(callback) {
return function() {
return computed(...arguments, callback).readOnly();
};
}
export default buildCurriedComputed(computed);