Skip to content

Set default lazy option to true in watch api #304

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

Closed
takumi-n wants to merge 1 commit into from
Closed

Set default lazy option to true in watch api #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/apis/watch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export function watch(
callback = null;
}

const opts = getWatcherOption(options);
const opts = getWatcherOption({ lazy: true, ...options });
const vm = getWatcherVM();

return createWatcher(vm, source, callback, opts);
Expand Down
16 changes: 8 additions & 8 deletions test/apis/state.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('api/ref', () => {
watch(a, () => {
dummy = a.value;
});
expect(dummy).toBe(1);
expect(dummy).toBeUndefined();
a.value = 2;
waitForUpdate(() => {
expect(dummy).toBe(2);
Expand All @@ -46,7 +46,7 @@ describe('api/ref', () => {
},
{ deep: true }
);
expect(dummy).toBe(1);
expect(dummy).toBeUndefined();
a.value.count = 2;
waitForUpdate(() => {
expect(dummy).toBe(2);
Expand Down Expand Up @@ -105,7 +105,7 @@ describe('api/toRefs', () => {
}
);
const stateAsRefs = toRefs(state);
expect(dummy).toBe(1);
expect(dummy).toBeUndefined();
expect(stateAsRefs.foo.value).toBe(1);
expect(stateAsRefs.bar.value).toBe(2);
state.foo++;
Expand Down Expand Up @@ -157,7 +157,7 @@ describe('unwrapping', () => {
},
{ deep: true, flush: 'sync' }
);
expect(dummy).toBe(0);
expect(dummy).toBeUndefined();
expect(obj.a).toBe(0);
expect(objWrapper.value.a).toBe(0);
obj.a++;
Expand Down Expand Up @@ -222,8 +222,8 @@ describe('unwrapping', () => {
},
{ deep: true, flush: 'sync' }
);
expect(dummy1).toBe(1);
expect(dummy2).toBe(1);
expect(dummy1).toBeUndefined();
expect(dummy2).toBeUndefined();
a.value++;
expect(dummy1).toBe(2);
expect(dummy2).toBe(2);
Expand Down Expand Up @@ -252,8 +252,8 @@ describe('unwrapping', () => {
},
{ deep: true, flush: 'sync' }
);
expect(dummy1).toBe(1);
expect(dummy2).toBe(1);
expect(dummy1).toBeUndefined();
expect(dummy2).toBeUndefined();
expect(obj.a).toBe(1);
expect(obj.b.c).toBe(1);
obj.a++;
Expand Down
69 changes: 33 additions & 36 deletions test/apis/watch.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ describe('api/watch', () => {
},
template: `<div>{{a}}</div>`,
}).$mount();
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(1, undefined, anyFn);
expect(spy).toBeCalledTimes(0);
vm.a = 2;
vm.a = 3;
expect(spy).toBeCalledTimes(1);
expect(spy).toBeCalledTimes(0);
waitForUpdate(() => {
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(3, 1, anyFn);
}).then(done);
});
Expand All @@ -46,12 +45,11 @@ describe('api/watch', () => {
},
template: `<div>{{a}}</div>`,
}).$mount();
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(1, undefined);
expect(spy).toBeCalledTimes(0);
vm.a = 2;
expect(spy).toBeCalledTimes(1);
expect(spy).toBeCalledTimes(0);
waitForUpdate(() => {
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(2, 1);
}).then(done);
});
Expand All @@ -68,12 +66,11 @@ describe('api/watch', () => {
},
template: `<div>{{a}}</div>`,
}).$mount();
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(1, undefined);
expect(spy).toBeCalledTimes(0);
vm.a = 2;
expect(spy).toBeCalledTimes(1);
expect(spy).toBeCalledTimes(0);
waitForUpdate(() => {
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(2, 1);
}).then(done);
});
Expand Down Expand Up @@ -196,12 +193,11 @@ describe('api/watch', () => {
return h('div', this.a);
},
}).$mount();
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(1, undefined);
expect(spy).toBeCalledTimes(0);
vm.a = 2;
waitForUpdate(() => {
expect(rerenderedText).toBe('2');
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(2, 1);
}).then(done);
});
Expand Down Expand Up @@ -286,9 +282,8 @@ describe('api/watch', () => {
count.value++;
},
});
expect(spy).toBeCalledTimes(2);
expect(spy).toHaveBeenNthCalledWith(1, 0, undefined);
expect(spy).toHaveBeenNthCalledWith(2, 1, 0);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenNthCalledWith(1, 1, 0);
});

it('should run in a expected order', done => {
Expand Down Expand Up @@ -321,7 +316,7 @@ describe('api/watch', () => {
},
template: `<div>{{x}}</div>`,
}).$mount();
expect(result).toEqual(['sync effect', 'sync callback', 'pre callback', 'post callback']);
expect(result).toEqual(['sync effect']);
result.length = 0;

waitForUpdate(() => {
Expand Down Expand Up @@ -419,21 +414,20 @@ describe('api/watch', () => {
},
template: `<div>{{obj1.a}} {{obj2.a}}</div>`,
}).$mount();
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith([1, 2], undefined);
expect(spy).toBeCalledTimes(0);
obj1.a = 2;
obj2.a = 3;

obj1.a = 3;
obj2.a = 4;
waitForUpdate(() => {
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith([3, 4], [1, 2]);
obj2.a = 5;
obj2.a = 6;
})
.then(() => {
expect(spy).toBeCalledTimes(3);
expect(spy).toBeCalledTimes(2);
expect(spy).toHaveBeenLastCalledWith([3, 6], [3, 4]);
})
.then(done);
Expand Down Expand Up @@ -553,10 +547,9 @@ describe('api/watch', () => {
it('should work', done => {
const obj = reactive({ a: 1 });
watch(() => obj.a, (n, o) => spy(n, o));
expect(spy).toHaveBeenLastCalledWith(1, undefined);
obj.a = 2;
waitForUpdate(() => {
expect(spy).toBeCalledTimes(2);
expect(spy).toBeCalledTimes(1);
expect(spy).toHaveBeenLastCalledWith(2, 1);
}).then(done);
});
Expand Down Expand Up @@ -634,7 +627,7 @@ describe('api/watch', () => {
.then(done);
});

it('run cleanup when watch stops', () => {
it('run cleanup when watch stops', done => {
const id = ref(1);
const spy = jest.fn();
const cleanup = jest.fn();
Expand All @@ -643,9 +636,16 @@ describe('api/watch', () => {
onCleanup(cleanup);
});

expect(spy).toHaveBeenCalledWith(1);
stop();
expect(cleanup).toHaveBeenCalled();
id.value = 2;

waitForUpdate(() => {
expect(spy).toHaveBeenLastCalledWith(2);
stop();
})
.then(() => {
expect(cleanup).toHaveBeenCalled();
})
.then(done);
});

it('should not collect reactive in onCleanup', done => {
Expand Down Expand Up @@ -675,19 +675,16 @@ describe('api/watch', () => {

it('work with callback ', done => {
const id = ref(1);
const promises = [];
let promise;
watch(id, (newVal, oldVal, onCleanup) => {
const val = getAsyncValue(newVal);
promises.push(val);
onCleanup(() => {
val.cancel();
});
promise = val;
});
id.value = 2;
waitForUpdate()
.thenWaitFor(async next => {
const values = await Promise.all(promises);
expect(values).toEqual(['canceled', 2]);
const value = await promise;
expect(value).toEqual(2);
next();
})
.then(done);
Expand Down