@vue/reactivity 3.6.0-beta.9 → 3.6.0-rc.10

package/dist/reactivity.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/reactivity v3.6.0-beta.9
+  * @vue/reactivity v3.6.0-rc.10
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -48,25 +48,16 @@ function warn(msg, ...args) {
 }
 //#endregion
 //#region packages/reactivity/src/system.ts
-const ReactiveFlags$1 = {
-	"None": 0,
-	"0": "None",
-	"Mutable": 1,
-	"1": "Mutable",
-	"Watching": 2,
-	"2": "Watching",
-	"RecursedCheck": 4,
-	"4": "RecursedCheck",
-	"Recursed": 8,
-	"8": "Recursed",
-	"Dirty": 16,
-	"16": "Dirty",
-	"Pending": 32,
-	"32": "Pending"
-};
 const notifyBuffer = [];
 let batchDepth = 0;
 let activeSub = void 0;
+let runDepth = 0;
+function incRunDepth() {
+	++runDepth;
+}
+function decRunDepth() {
+	--runDepth;
+}
 let globalVersion = 0;
 let notifyIndex = 0;
 let notifyBufferLength = 0;
@@ -140,8 +131,10 @@ function propagate(link) {
 		const sub = link.sub;
 		let flags = sub.flags;
 		if (flags & 3) {
-			if (!(flags & 60)) sub.flags = flags | 32;
-			else if (!(flags & 12)) flags = 0;
+			if (!(flags & 60)) {
+				sub.flags = flags | 32;
+				if (runDepth) sub.flags |= 8;
+			} else if (!(flags & 12)) flags = 0;
 			else if (!(flags & 4)) sub.flags = flags & -9 | 32;
 			else if (!(flags & 48) && isValidLink(link, sub)) {
 				sub.flags = flags | 40;
@@ -193,13 +186,23 @@ function endTracking(sub, prevSub) {
 	sub.flags &= -5;
 }
 function flush() {
+	let hasError = false;
+	let error;
 	while (notifyIndex < notifyBufferLength) {
 		const effect = notifyBuffer[notifyIndex];
 		notifyBuffer[notifyIndex++] = void 0;
-		effect.notify();
+		try {
+			effect.notify();
+		} catch (err) {
+			if (!hasError) {
+				hasError = true;
+				error = err;
+			}
+		}
 	}
 	notifyIndex = 0;
 	notifyBufferLength = 0;
+	if (hasError) throw error;
 }
 function checkDirty(link, sub) {
 	let stack;
@@ -210,13 +213,13 @@ function checkDirty(link, sub) {
 		let dirty = false;
 		if (sub.flags & 16) dirty = true;
 		else if ((depFlags & 17) === 17) {
+			const subs = dep.subs;
 			if (dep.update()) {
-				const subs = dep.subs;
 				if (subs.nextSub !== void 0) shallowPropagate(subs);
 				dirty = true;
 			}
 		} else if ((depFlags & 33) === 33) {
-			if (link.nextSub !== void 0 || link.prevSub !== void 0) stack = {
+			stack = {
 				value: link,
 				prev: stack
 			};
@@ -231,15 +234,12 @@ function checkDirty(link, sub) {
 		}
 		while (checkDepth) {
 			--checkDepth;
-			const firstSub = sub.subs;
-			const hasMultipleSubs = firstSub.nextSub !== void 0;
-			if (hasMultipleSubs) {
-				link = stack.value;
-				stack = stack.prev;
-			} else link = firstSub;
+			link = stack.value;
+			stack = stack.prev;
 			if (dirty) {
+				const subs = sub.subs;
 				if (sub.update()) {
-					if (hasMultipleSubs) shallowPropagate(firstSub);
+					if (subs.nextSub !== void 0) shallowPropagate(subs);
 					sub = link.sub;
 					continue;
 				}
@@ -251,7 +251,7 @@ function checkDirty(link, sub) {
 			}
 			dirty = false;
 		}
-		return dirty;
+		return dirty && !!sub.flags;
 	} while (true);
 }
 function shallowPropagate(link) {
@@ -286,9 +286,42 @@ var Dep = class {
 	}
 	set subs(value) {
 		this._subs = value;
-		if (value === void 0) this.map.delete(this.key);
+		if (value === void 0 && this.map) this.map.delete(this.key);
 	}
 };
+/**
+* Tracks a dep its owner keys on its own, outside `targetMap`.
+* @internal
+*/
+function trackDep(dep, target = dep, key = "value") {
+	if (activeSub !== void 0) {
+		if (!!(process.env.NODE_ENV !== "production")) onTrack(activeSub, {
+			target,
+			type: "get",
+			key
+		});
+		link(dep, activeSub);
+	}
+}
+/**
+* @internal
+*/
+function triggerDep(dep, target = dep, key = "value", newValue, oldValue) {
+	const subs = dep.subs;
+	if (subs !== void 0) {
+		if (!!(process.env.NODE_ENV !== "production")) triggerEventInfos.push({
+			target,
+			type: "set",
+			key,
+			newValue,
+			oldValue
+		});
+		propagate(subs);
+		shallowPropagate(subs);
+		if (!batchDepth) flush();
+		if (!!(process.env.NODE_ENV !== "production")) triggerEventInfos.pop();
+	}
+}
 const targetMap = /* @__PURE__ */ new WeakMap();
 const ITERATE_KEY = Symbol(!!(process.env.NODE_ENV !== "production") ? "Object iterate" : "");
 const MAP_KEY_ITERATE_KEY = Symbol(!!(process.env.NODE_ENV !== "production") ? "Map keys iterate" : "");
@@ -369,9 +402,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
 						if (isMap(target)) run(depsMap.get(MAP_KEY_ITERATE_KEY));
 					}
 					break;
-				case "set":
-					if (isMap(target)) run(depsMap.get(ITERATE_KEY));
-					break;
+				case "set": if (isMap(target)) run(depsMap.get(ITERATE_KEY));
 			}
 		}
 	}
@@ -386,13 +417,17 @@ function getDepFromReactive(object, key) {
 /**
 * Track array iteration and return:
 * - if input is reactive: a cloned raw array with reactive values
-* - if input is non-reactive or shallowReactive: the original raw array
+* - if input is readonly: a cloned raw array with readonly values, preserving
+*   reactivity
+* - if input is raw or shallow: the original raw array
 */
 function reactiveReadArray(array) {
 	const raw = /* @__PURE__ */ toRaw(array);
 	if (raw === array) return raw;
 	track(raw, "iterate", ARRAY_ITERATE_KEY);
-	return /* @__PURE__ */ isShallow(array) ? raw : raw.map(toReactive);
+	if (/* @__PURE__ */ isShallow(array)) return raw;
+	if (!/* @__PURE__ */ isReadonly(array)) return raw.map(toReactive);
+	return /* @__PURE__ */ isReactive(array) ? raw.map((item) => toReadonly(toReactive(item))) : raw.map(toReadonly);
 }
 /**
 * Track array iteration and return raw array
@@ -568,8 +603,8 @@ function noTracking(self, method, args = []) {
 }
 //#endregion
 //#region packages/reactivity/src/baseHandlers.ts
-const isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`);
-const builtInSymbols = new Set(/* @__PURE__ */ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(isSymbol));
+const isNonTrackableKeys = /*@__PURE__*/ makeMap(`__proto__,__v_isRef,__isVue`);
+const builtInSymbols = new Set(/*@__PURE__*/ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(isSymbol));
 function hasOwnProperty(key) {
 	if (!isSymbol(key)) key = String(key);
 	const obj = /* @__PURE__ */ toRaw(this);
@@ -624,17 +659,19 @@ var MutableReactiveHandler = class extends BaseReactiveHandler {
 				oldValue = /* @__PURE__ */ toRaw(oldValue);
 				value = /* @__PURE__ */ toRaw(value);
 			}
-			if (!isArrayWithIntegerKey && /* @__PURE__ */ isRef(oldValue) && !/* @__PURE__ */ isRef(value)) if (isOldValueReadonly) {
-				if (!!(process.env.NODE_ENV !== "production")) warn(`Set operation on key "${String(key)}" failed: target is readonly.`, target[key]);
-				return true;
-			} else {
-				oldValue.value = value;
-				return true;
+			if (!isArrayWithIntegerKey && /* @__PURE__ */ isRef(oldValue) && !/* @__PURE__ */ isRef(value)) {
+				if (isOldValueReadonly) {
+					if (!!(process.env.NODE_ENV !== "production")) warn(`Set operation on key "${String(key)}" failed: target is readonly.`, target[key]);
+					return true;
+				} else {
+					oldValue.value = value;
+					return true;
+				}
 			}
 		}
 		const hadKey = isArrayWithIntegerKey ? Number(key) < target.length : hasOwn(target, key);
 		const result = Reflect.set(target, key, value, /* @__PURE__ */ isRef(target) ? target : receiver);
-		if (target === /* @__PURE__ */ toRaw(receiver)) {
+		if (target === /* @__PURE__ */ toRaw(receiver) && result) {
 			if (!hadKey) trigger(target, "add", key, value);
 			else if (hasChanged(value, oldValue)) trigger(target, "set", key, value, oldValue);
 		}
@@ -670,10 +707,10 @@ var ReadonlyReactiveHandler = class extends BaseReactiveHandler {
 		return true;
 	}
 };
-const mutableHandlers = /* @__PURE__ */ new MutableReactiveHandler();
-const readonlyHandlers = /* @__PURE__ */ new ReadonlyReactiveHandler();
-const shallowReactiveHandlers = /* @__PURE__ */ new MutableReactiveHandler(true);
-const shallowReadonlyHandlers = /* @__PURE__ */ new ReadonlyReactiveHandler(true);
+const mutableHandlers = /*@__PURE__*/ new MutableReactiveHandler();
+const readonlyHandlers = /*@__PURE__*/ new ReadonlyReactiveHandler();
+const shallowReactiveHandlers = /*@__PURE__*/ new MutableReactiveHandler(true);
+const shallowReadonlyHandlers = /*@__PURE__*/ new ReadonlyReactiveHandler(true);
 //#endregion
 //#region packages/reactivity/src/collectionHandlers.ts
 const toShallow = (value) => value;
@@ -824,10 +861,10 @@ function createInstrumentationGetter(isReadonly, shallow) {
 		return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
 	};
 }
-const mutableCollectionHandlers = { get: /* @__PURE__ */ createInstrumentationGetter(false, false) };
-const shallowCollectionHandlers = { get: /* @__PURE__ */ createInstrumentationGetter(false, true) };
-const readonlyCollectionHandlers = { get: /* @__PURE__ */ createInstrumentationGetter(true, false) };
-const shallowReadonlyCollectionHandlers = { get: /* @__PURE__ */ createInstrumentationGetter(true, true) };
+const mutableCollectionHandlers = { get: /*@__PURE__*/ createInstrumentationGetter(false, false) };
+const shallowCollectionHandlers = { get: /*@__PURE__*/ createInstrumentationGetter(false, true) };
+const readonlyCollectionHandlers = { get: /*@__PURE__*/ createInstrumentationGetter(true, false) };
+const shallowReadonlyCollectionHandlers = { get: /*@__PURE__*/ createInstrumentationGetter(true, true) };
 function checkIdentityKeys(target, has, key) {
 	const rawKey = /* @__PURE__ */ toRaw(key);
 	if (rawKey !== key && has.call(target, rawKey)) {
@@ -852,10 +889,7 @@ function targetTypeMap(rawType) {
 		default: return 0;
 	}
 }
-function getTargetType(value) {
-	return value["__v_skip"] || !Object.isExtensible(value) ? 0 : targetTypeMap(toRawType(value));
-}
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function reactive(target) {
 	if (/* @__PURE__ */ isReadonly(target)) return target;
 	return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);
@@ -890,7 +924,7 @@ function reactive(target) {
 * @param target - The source object.
 * @see {@link https://vuejs.org/api/reactivity-advanced.html#shallowreactive}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function shallowReactive(target) {
 	return createReactiveObject(target, false, shallowReactiveHandlers, shallowCollectionHandlers, shallowReactiveMap);
 }
@@ -923,7 +957,7 @@ function shallowReactive(target) {
 * @param target - The source object.
 * @see {@link https://vuejs.org/api/reactivity-core.html#readonly}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function readonly(target) {
 	return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);
 }
@@ -957,7 +991,7 @@ function readonly(target) {
 * @param target - The source object.
 * @see {@link https://vuejs.org/api/reactivity-advanced.html#shallowreadonly}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function shallowReadonly(target) {
 	return createReactiveObject(target, true, shallowReadonlyHandlers, shallowReadonlyCollectionHandlers, shallowReadonlyMap);
 }
@@ -967,10 +1001,11 @@ function createReactiveObject(target, isReadonly, baseHandlers, collectionHandle
 		return target;
 	}
 	if (target["__v_raw"] && !(isReadonly && target["__v_isReactive"])) return target;
-	const targetType = getTargetType(target);
-	if (targetType === 0) return target;
+	if (target["__v_skip"] || !Object.isExtensible(target)) return target;
 	const existingProxy = proxyMap.get(target);
 	if (existingProxy) return existingProxy;
+	const targetType = targetTypeMap(toRawType(target));
+	if (targetType === 0) return target;
 	const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);
 	proxyMap.set(target, proxy);
 	return proxy;
@@ -993,7 +1028,7 @@ function createReactiveObject(target, isReadonly, baseHandlers, collectionHandle
 * @param value - The value to check.
 * @see {@link https://vuejs.org/api/reactivity-utilities.html#isreactive}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function isReactive(value) {
 	if (/* @__PURE__ */ isReadonly(value)) return /* @__PURE__ */ isReactive(value["__v_raw"]);
 	return !!(value && value["__v_isReactive"]);
@@ -1009,11 +1044,11 @@ function isReactive(value) {
 * @param value - The value to check.
 * @see {@link https://vuejs.org/api/reactivity-utilities.html#isreadonly}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function isReadonly(value) {
 	return !!(value && value["__v_isReadonly"]);
 }
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function isShallow(value) {
 	return !!(value && value["__v_isShallow"]);
 }
@@ -1024,7 +1059,7 @@ function isShallow(value) {
 * @param value - The value to check.
 * @see {@link https://vuejs.org/api/reactivity-utilities.html#isproxy}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function isProxy(value) {
 	return value ? !!value["__v_raw"] : false;
 }
@@ -1051,7 +1086,7 @@ function isProxy(value) {
 * @param observed - The object for which the "raw" value is requested.
 * @see {@link https://vuejs.org/api/reactivity-advanced.html#toraw}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function toRaw(observed) {
 	const raw = observed && observed["__v_raw"];
 	return raw ? /* @__PURE__ */ toRaw(raw) : observed;
@@ -1100,15 +1135,15 @@ const toReactive = (value) => isObject(value) ? /* @__PURE__ */ reactive(value)
 const toReadonly = (value) => isObject(value) ? /* @__PURE__ */ readonly(value) : value;
 //#endregion
 //#region packages/reactivity/src/ref.ts
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function isRef(r) {
 	return r ? r["__v_isRef"] === true : false;
 }
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function ref(value) {
 	return createRef(value, toReactive);
 }
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function shallowRef(value) {
 	return createRef(value);
 }
@@ -1123,7 +1158,7 @@ var RefImpl = class {
 	constructor(value, wrap) {
 		this.subs = void 0;
 		this.subsTail = void 0;
-		this.flags = ReactiveFlags$1.Mutable;
+		this.flags = 1;
 		this.__v_isRef = true;
 		this.__v_isShallow = false;
 		this._oldValue = this._rawValue = wrap ? /* @__PURE__ */ toRaw(value) : value;
@@ -1136,7 +1171,7 @@ var RefImpl = class {
 	}
 	get value() {
 		trackRef(this);
-		if (this.flags & ReactiveFlags$1.Dirty && this.update()) {
+		if (this.flags & 16 && this.update()) {
 			const subs = this.subs;
 			if (subs !== void 0) shallowPropagate(subs);
 		}
@@ -1147,7 +1182,7 @@ var RefImpl = class {
 		const useDirectValue = this["__v_isShallow"] || /* @__PURE__ */ isShallow(newValue) || /* @__PURE__ */ isReadonly(newValue);
 		newValue = useDirectValue ? newValue : /* @__PURE__ */ toRaw(newValue);
 		if (hasChanged(newValue, oldValue)) {
-			this.flags |= ReactiveFlags$1.Dirty;
+			this.flags |= 16;
 			this._rawValue = newValue;
 			this._value = !useDirectValue && this._wrap ? this._wrap(newValue) : newValue;
 			const subs = this.subs;
@@ -1166,7 +1201,7 @@ var RefImpl = class {
 		}
 	}
 	update() {
-		this.flags &= ~ReactiveFlags$1.Dirty;
+		this.flags &= -17;
 		return hasChanged(this._oldValue, this._oldValue = this._rawValue);
 	}
 };
@@ -1276,7 +1311,7 @@ var CustomRefImpl = class {
 	constructor(factory) {
 		this.subs = void 0;
 		this.subsTail = void 0;
-		this.flags = ReactiveFlags$1.None;
+		this.flags = 0;
 		this["__v_isRef"] = true;
 		this._value = void 0;
 		const { get, set } = factory(() => trackRef(this), () => triggerRef(this));
@@ -1311,7 +1346,7 @@ function customRef(factory) {
 * @param object - Reactive object to be made into an object of linked refs.
 * @see {@link https://vuejs.org/api/reactivity-utilities.html#torefs}
 */
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function toRefs(object) {
 	const ret = isArray(object) ? new Array(object.length) : {};
 	for (const key in object) ret[key] = propertyToRef(object, key);
@@ -1362,7 +1397,7 @@ var GetterRefImpl = class {
 		return this._value = this._getter();
 	}
 };
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function toRef(source, key, defaultValue) {
 	if (/* @__PURE__ */ isRef(source)) return source;
 	else if (isFunction(source)) return new GetterRefImpl(source);
@@ -1411,9 +1446,11 @@ var ReactiveEffect = class {
 		if (!this.active) return this.fn();
 		cleanup(this);
 		const prevSub = startTracking(this);
+		incRunDepth();
 		try {
 			return this.fn();
 		} finally {
+			decRunDepth();
 			endTracking(this, prevSub);
 			const flags = this.flags;
 			if ((flags & 136) === 136) {
@@ -1434,10 +1471,12 @@ var ReactiveEffect = class {
 	get dirty() {
 		const flags = this.flags;
 		if (flags & 16) return true;
-		if (flags & 32) if (checkDirty(this.deps, this)) {
-			this.flags = flags | 16;
-			return true;
-		} else this.flags = flags & -33;
+		if (flags & 32) {
+			if (checkDirty(this.deps, this)) {
+				this.flags = flags | 16;
+				return true;
+			} else this.flags = flags & -33;
+		}
 		return false;
 	}
 };
@@ -1668,11 +1707,13 @@ var ComputedRefImpl = class {
 	*/
 	get _dirty() {
 		const flags = this.flags;
-		if (flags & ReactiveFlags$1.Dirty) return true;
-		if (flags & ReactiveFlags$1.Pending) if (checkDirty(this.deps, this)) {
-			this.flags = flags | ReactiveFlags$1.Dirty;
-			return true;
-		} else this.flags = flags & ~ReactiveFlags$1.Pending;
+		if (flags & 16) return true;
+		if (flags & 32) {
+			if (checkDirty(this.deps, this)) {
+				this.flags = flags | 16;
+				return true;
+			} else this.flags = flags & -33;
+		}
 		return false;
 	}
 	/**
@@ -1680,8 +1721,8 @@ var ComputedRefImpl = class {
 	* for backwards compat
 	*/
 	set _dirty(v) {
-		if (v) this.flags |= ReactiveFlags$1.Dirty;
-		else this.flags &= ~(ReactiveFlags$1.Dirty | ReactiveFlags$1.Pending);
+		if (v) this.flags |= 16;
+		else this.flags &= -49;
 	}
 	constructor(fn, setter) {
 		this.fn = fn;
@@ -1691,18 +1732,18 @@ var ComputedRefImpl = class {
 		this.subsTail = void 0;
 		this.deps = void 0;
 		this.depsTail = void 0;
-		this.flags = ReactiveFlags$1.Mutable | ReactiveFlags$1.Dirty;
+		this.flags = 17;
 		this.__v_isRef = true;
 		this["__v_isReadonly"] = !setter;
 	}
 	get value() {
 		const flags = this.flags;
-		if (flags & ReactiveFlags$1.Dirty || flags & ReactiveFlags$1.Pending && checkDirty(this.deps, this)) {
+		if (flags & 16 || flags & 32 && checkDirty(this.deps, this)) {
 			if (this.update()) {
 				const subs = this.subs;
 				if (subs !== void 0) shallowPropagate(subs);
 			}
-		} else if (flags & ReactiveFlags$1.Pending) this.flags = flags & ~ReactiveFlags$1.Pending;
+		} else if (flags & 32) this.flags = flags & -33;
 		if (activeSub !== void 0) {
 			if (!!(process.env.NODE_ENV !== "production")) onTrack(activeSub, {
 				target: this,
@@ -1733,7 +1774,7 @@ var ComputedRefImpl = class {
 	}
 };
 if (!!(process.env.NODE_ENV !== "production")) setupOnTrigger(ComputedRefImpl);
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function computed(getterOrOptions, debugOptions, isSSR = false) {
 	let getter;
 	let setter;
@@ -1827,25 +1868,26 @@ var WatcherEffect = class extends ReactiveEffect {
 				else if (isFunction(s)) return call ? call(s, 2) : s();
 				else process.env.NODE_ENV !== "production" && warnInvalidSource(s, onWarn);
 			});
-		} else if (isFunction(source)) if (cb) getter = call ? () => call(source, 2) : source;
-		else getter = () => {
-			if (this.cleanupsLength) {
-				const prevSub = setActiveSub();
+		} else if (isFunction(source)) {
+			if (cb) getter = call ? () => call(source, 2) : source;
+			else getter = () => {
+				if (this.cleanupsLength) {
+					const prevSub = setActiveSub();
+					try {
+						cleanup(this);
+					} finally {
+						setActiveSub(prevSub);
+					}
+				}
+				const currentEffect = activeWatcher;
+				activeWatcher = this;
 				try {
-					cleanup(this);
+					return call ? call(source, 3, [this.boundCleanup]) : source(this.boundCleanup);
 				} finally {
-					setActiveSub(prevSub);
+					activeWatcher = currentEffect;
 				}
-			}
-			const currentEffect = activeWatcher;
-			activeWatcher = this;
-			try {
-				return call ? call(source, 3, [this.boundCleanup]) : source(this.boundCleanup);
-			} finally {
-				activeWatcher = currentEffect;
-			}
-		};
-		else {
+			};
+		} else {
 			getter = NOOP;
 			process.env.NODE_ENV !== "production" && warnInvalidSource(source, onWarn);
 		}
@@ -1863,8 +1905,9 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (once && cb) {
 			const _cb = cb;
 			cb = (...args) => {
-				_cb(...args);
+				const res = _cb(...args);
 				this.stop();
+				return res;
 			};
 		}
 		this.cb = cb;
@@ -1880,7 +1923,7 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (!this.cb) return;
 		const { immediate, deep, call } = this.options;
 		if (initialRun && !immediate) return;
-		if (deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
+		if (initialRun || deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
 			cleanup(this);
 			const currentWatcher = activeWatcher;
 			activeWatcher = this;
@@ -1932,4 +1975,4 @@ function traverse(value, depth = Infinity, seen) {
 	return value;
 }
 //#endregion
-export { ARRAY_ITERATE_KEY, EffectFlags, EffectScope, ITERATE_KEY, MAP_KEY_ITERATE_KEY, ReactiveEffect, ReactiveFlags, TrackOpTypes, TriggerOpTypes, WatchErrorCodes, WatcherEffect, computed, customRef, effect, effectScope, enableTracking, getCurrentScope, getCurrentWatcher, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onEffectCleanup, onScopeDispose, onWatcherCleanup, pauseTracking, proxyRefs, reactive, reactiveReadArray, readonly, ref, resetTracking, setActiveSub, setCurrentScope, shallowReactive, shallowReadArray, shallowReadonly, shallowRef, stop, toRaw, toReactive, toReadonly, toRef, toRefs, toValue, track, traverse, trigger, triggerRef, unref, watch };
+export { ARRAY_ITERATE_KEY, Dep, EffectFlags, EffectScope, ITERATE_KEY, MAP_KEY_ITERATE_KEY, ReactiveEffect, ReactiveFlags, TrackOpTypes, TriggerOpTypes, WatchErrorCodes, WatcherEffect, activeSub, computed, customRef, effect, effectScope, enableTracking, endBatch, getCurrentScope, getCurrentWatcher, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onEffectCleanup, onScopeDispose, onWatcherCleanup, pauseTracking, proxyRefs, reactive, reactiveReadArray, readonly, ref, resetTracking, setActiveSub, setCurrentScope, shallowReactive, shallowReadArray, shallowReadonly, shallowRef, startBatch, stop, toRaw, toReactive, toReadonly, toRef, toRefs, toValue, track, trackDep, traverse, trigger, triggerDep, triggerRef, unref, watch };