Skip to content
This repository has been archived by the owner on Dec 19, 2017. It is now read-only.

FIXED: util.cascade alters source callback array #93

Merged
merged 3 commits into from
Sep 3, 2016
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
12 changes: 10 additions & 2 deletions dist/ko-component-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -1403,6 +1403,8 @@ return /******/ (function(modules) { // webpackBootstrap

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }

function cascade(callbacks) {
for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
args[_key - 1] = arguments[_key];
Expand All @@ -1412,10 +1414,16 @@ return /******/ (function(modules) { // webpackBootstrap
if (callbacks.length === 0) {
return resolve(true);
}
var cb = callbacks.shift();

var _callbacks = _toArray(callbacks);

var cb = _callbacks[0];

var restCallbacks = _callbacks.slice(1);

var recursiveResolve = function recursiveResolve() {
var shouldUpdate = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
return shouldUpdate ? cascade.apply(undefined, [callbacks].concat(args)).then(resolve) : resolve(false);
return shouldUpdate ? cascade.apply(undefined, [restCallbacks].concat(args)).then(resolve) : resolve(false);
};

if (cb.length === args.length + 1) {
Expand Down
2 changes: 1 addition & 1 deletion dist/ko-component-router.min.js

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ var _knockout2 = _interopRequireDefault(_knockout);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }

function cascade(callbacks) {
for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
args[_key - 1] = arguments[_key];
Expand All @@ -34,10 +36,16 @@ function cascade(callbacks) {
if (callbacks.length === 0) {
return resolve(true);
}
var cb = callbacks.shift();

var _callbacks = _toArray(callbacks);

var cb = _callbacks[0];

var restCallbacks = _callbacks.slice(1);

var recursiveResolve = function recursiveResolve() {
var shouldUpdate = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
return shouldUpdate ? cascade.apply(undefined, [callbacks].concat(args)).then(resolve) : resolve(false);
return shouldUpdate ? cascade.apply(undefined, [restCallbacks].concat(args)).then(resolve) : resolve(false);
};

if (cb.length === args.length + 1) {
Expand Down
4 changes: 2 additions & 2 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function cascade(callbacks, ...args) {
if (callbacks.length === 0) {
return resolve(true)
}
const cb = callbacks.shift()
const [cb, ...restCallbacks] = callbacks
const recursiveResolve = (shouldUpdate = true) => shouldUpdate
? cascade(callbacks, ...args).then(resolve)
? cascade(restCallbacks, ...args).then(resolve)
: resolve(false)

if (cb.length === args.length + 1) {
Expand Down
41 changes: 40 additions & 1 deletion test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import './src'
ko.options.deferUpdates = true

test('ko-component-router', async (t) => { // eslint-disable-line
const NUM_TESTS_PER_SUITE = 72
const NUM_TESTS_PER_SUITE = 76
const NUM_CONFIGS = 4
const NUM_TESTS = NUM_TESTS_PER_SUITE * NUM_CONFIGS + 4
t.plan(NUM_TESTS)
Expand Down Expand Up @@ -97,6 +97,13 @@ async function runTests(t, config) {
'route-pipeline'
],

'/route-pipeline-twice': [
(ctx) => {
ctx.state.stateUpdated = true
},
'route-pipeline-twice'
],

'/meta/:id': [(ctx) => ctx.route.component = 'meta'],

// wildcard segment
Expand Down Expand Up @@ -564,6 +571,38 @@ async function runTests(t, config) {
ko.components.unregister('route-pipeline')
})

// route pipeline twice
await step((done) => {
let callNum = 0
ko.components.register('route-pipeline-twice', {
template: '<div></div>',
viewModel: class {
constructor(ctx) {
t.equal(ctx.state().stateUpdated, true, `Callback updates state on each dispatch (dispatch # ${++callNum})`)
}
}
})
router.update('/route-pipeline-twice', { stateUpdated: false }, false)
const killMe = router.route.subscribe(() => {
killMe.dispose()
t.equal(router.route().component, 'route-pipeline-twice')
router.update('/about')
done()
})
})
await step((done) => {
router.update('/route-pipeline-twice', { stateUpdated: false }, false)
const killMe = router.route.subscribe(() => {
killMe.dispose()
t.equal(router.route().component, 'route-pipeline-twice')
router.update('/about')
done()
})
})
await step(() => {
ko.components.unregister('route-pipeline-twice')
})

// route pipeline meta programability
await step(() => {
ko.components.register('meta', {
Expand Down