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

package/dist/reactivity.global.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
   **/
@@ -13,7 +13,7 @@ var VueReactivity = (function(exports) {
 	* \/\*#\_\_PURE\_\_\*\/
 	* So that they can be tree-shaken if necessary.
 	*/
-	/* @__NO_SIDE_EFFECTS__ */
+	/*@__NO_SIDE_EFFECTS__*/
 	function makeMap(str) {
 		const map = Object.create(null);
 		for (const key of str.split(",")) map[key] = 1;
@@ -47,20 +47,12 @@ var VueReactivity = (function(exports) {
 			return cache[str] || (cache[str] = fn(str));
 		});
 	};
-	const camelizeRE = /-(\w)/g;
-	const camelizeReplacer = (_, c) => c ? c.toUpperCase() : "";
-	cacheStringFunction((str) => str.replace(camelizeRE, camelizeReplacer));
-	const hyphenateRE = /\B([A-Z])/g;
-	cacheStringFunction((str) => str.replace(hyphenateRE, "-$1").toLowerCase());
 	/**
 	* @private
 	*/
 	const capitalize = cacheStringFunction((str) => {
 		return str.charAt(0).toUpperCase() + str.slice(1);
 	});
-	cacheStringFunction((str) => {
-		return str ? `on${capitalize(str)}` : ``;
-	});
 	const hasChanged = (value, oldValue) => !Object.is(value, oldValue);
 	const def = (obj, key, value, writable = false) => {
 		Object.defineProperty(obj, key, {
@@ -112,25 +104,16 @@ var VueReactivity = (function(exports) {
 	}
 	//#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;
@@ -204,8 +187,10 @@ var VueReactivity = (function(exports) {
 			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;
@@ -257,13 +242,23 @@ var VueReactivity = (function(exports) {
 		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;
@@ -274,13 +269,13 @@ var VueReactivity = (function(exports) {
 			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
 				};
@@ -295,15 +290,12 @@ var VueReactivity = (function(exports) {
 			}
 			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;
 					}
@@ -315,7 +307,7 @@ var VueReactivity = (function(exports) {
 				}
 				dirty = false;
 			}
-			return dirty;
+			return dirty && !!sub.flags;
 		} while (true);
 	}
 	function shallowPropagate(link) {
@@ -350,9 +342,42 @@ var VueReactivity = (function(exports) {
 		}
 		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) {
+			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) {
+			triggerEventInfos.push({
+				target,
+				type: "set",
+				key,
+				newValue,
+				oldValue
+			});
+			propagate(subs);
+			shallowPropagate(subs);
+			if (!batchDepth) flush();
+			triggerEventInfos.pop();
+		}
+	}
 	const targetMap = /* @__PURE__ */ new WeakMap();
 	const ITERATE_KEY = Symbol("Object iterate");
 	const MAP_KEY_ITERATE_KEY = Symbol("Map keys iterate");
@@ -433,9 +458,7 @@ var VueReactivity = (function(exports) {
 							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));
 				}
 			}
 		}
@@ -450,13 +473,17 @@ var VueReactivity = (function(exports) {
 	/**
 	* 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
@@ -632,8 +659,8 @@ var VueReactivity = (function(exports) {
 	}
 	//#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);
@@ -688,17 +715,19 @@ var VueReactivity = (function(exports) {
 					oldValue = /* @__PURE__ */ toRaw(oldValue);
 					value = /* @__PURE__ */ toRaw(value);
 				}
-				if (!isArrayWithIntegerKey && /* @__PURE__ */ isRef(oldValue) && !/* @__PURE__ */ isRef(value)) if (isOldValueReadonly) {
-					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) {
+						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);
 			}
@@ -734,10 +763,10 @@ var VueReactivity = (function(exports) {
 			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;
@@ -888,10 +917,10 @@ var VueReactivity = (function(exports) {
 			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)) {
@@ -916,10 +945,7 @@ var VueReactivity = (function(exports) {
 			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);
@@ -954,7 +980,7 @@ var VueReactivity = (function(exports) {
 	* @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);
 	}
@@ -987,7 +1013,7 @@ var VueReactivity = (function(exports) {
 	* @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);
 	}
@@ -1021,7 +1047,7 @@ var VueReactivity = (function(exports) {
 	* @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);
 	}
@@ -1031,10 +1057,11 @@ var VueReactivity = (function(exports) {
 			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;
@@ -1057,7 +1084,7 @@ var VueReactivity = (function(exports) {
 	* @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"]);
@@ -1073,11 +1100,11 @@ var VueReactivity = (function(exports) {
 	* @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"]);
 	}
@@ -1088,7 +1115,7 @@ var VueReactivity = (function(exports) {
 	* @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;
 	}
@@ -1115,7 +1142,7 @@ var VueReactivity = (function(exports) {
 	* @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;
@@ -1164,15 +1191,15 @@ var VueReactivity = (function(exports) {
 	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);
 	}
@@ -1187,7 +1214,7 @@ var VueReactivity = (function(exports) {
 		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;
@@ -1200,7 +1227,7 @@ var VueReactivity = (function(exports) {
 		}
 		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);
 			}
@@ -1211,7 +1238,7 @@ var VueReactivity = (function(exports) {
 			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;
@@ -1230,7 +1257,7 @@ var VueReactivity = (function(exports) {
 			}
 		}
 		update() {
-			this.flags &= ~ReactiveFlags$1.Dirty;
+			this.flags &= -17;
 			return hasChanged(this._oldValue, this._oldValue = this._rawValue);
 		}
 	};
@@ -1340,7 +1367,7 @@ var VueReactivity = (function(exports) {
 		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));
@@ -1375,7 +1402,7 @@ var VueReactivity = (function(exports) {
 	* @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);
@@ -1426,7 +1453,7 @@ var VueReactivity = (function(exports) {
 			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);
@@ -1475,9 +1502,11 @@ var VueReactivity = (function(exports) {
 			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) {
@@ -1498,10 +1527,12 @@ var VueReactivity = (function(exports) {
 		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;
 		}
 	};
@@ -1732,11 +1763,13 @@ var VueReactivity = (function(exports) {
 		*/
 		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;
 		}
 		/**
@@ -1744,8 +1777,8 @@ var VueReactivity = (function(exports) {
 		* 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;
@@ -1755,18 +1788,18 @@ var VueReactivity = (function(exports) {
 			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) {
 				onTrack(activeSub, {
 					target: this,
@@ -1797,7 +1830,7 @@ var VueReactivity = (function(exports) {
 		}
 	};
 	setupOnTrigger(ComputedRefImpl);
-	/* @__NO_SIDE_EFFECTS__ */
+	/*@__NO_SIDE_EFFECTS__*/
 	function computed(getterOrOptions, debugOptions, isSSR = false) {
 		let getter;
 		let setter;
@@ -1891,25 +1924,26 @@ var VueReactivity = (function(exports) {
 					else if (isFunction(s)) return call ? call(s, 2) : s();
 					else 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;
 				warnInvalidSource(source, onWarn);
 			}
@@ -1927,8 +1961,9 @@ var VueReactivity = (function(exports) {
 			if (once && cb) {
 				const _cb = cb;
 				cb = (...args) => {
-					_cb(...args);
+					const res = _cb(...args);
 					this.stop();
+					return res;
 				};
 			}
 			this.cb = cb;
@@ -1942,7 +1977,7 @@ var VueReactivity = (function(exports) {
 			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;
@@ -1995,6 +2030,7 @@ var VueReactivity = (function(exports) {
 	}
 	//#endregion
 	exports.ARRAY_ITERATE_KEY = ARRAY_ITERATE_KEY;
+	exports.Dep = Dep;
 	exports.EffectFlags = EffectFlags;
 	exports.EffectScope = EffectScope;
 	exports.ITERATE_KEY = ITERATE_KEY;
@@ -2005,11 +2041,18 @@ var VueReactivity = (function(exports) {
 	exports.TriggerOpTypes = TriggerOpTypes;
 	exports.WatchErrorCodes = WatchErrorCodes;
 	exports.WatcherEffect = WatcherEffect;
+	Object.defineProperty(exports, "activeSub", {
+		enumerable: true,
+		get: function() {
+			return activeSub;
+		}
+	});
 	exports.computed = computed;
 	exports.customRef = customRef;
 	exports.effect = effect;
 	exports.effectScope = effectScope;
 	exports.enableTracking = enableTracking;
+	exports.endBatch = endBatch;
 	exports.getCurrentScope = getCurrentScope;
 	exports.getCurrentWatcher = getCurrentWatcher;
 	exports.isProxy = isProxy;
@@ -2034,6 +2077,7 @@ var VueReactivity = (function(exports) {
 	exports.shallowReadArray = shallowReadArray;
 	exports.shallowReadonly = shallowReadonly;
 	exports.shallowRef = shallowRef;
+	exports.startBatch = startBatch;
 	exports.stop = stop;
 	exports.toRaw = toRaw;
 	exports.toReactive = toReactive;
@@ -2042,8 +2086,10 @@ var VueReactivity = (function(exports) {
 	exports.toRefs = toRefs;
 	exports.toValue = toValue;
 	exports.track = track;
+	exports.trackDep = trackDep;
 	exports.traverse = traverse;
 	exports.trigger = trigger;
+	exports.triggerDep = triggerDep;
 	exports.triggerRef = triggerRef;
 	exports.unref = unref;
 	exports.watch = watch;