@vue/reactivity 3.6.0-rc.13 → 3.6.0-rc.15

package/dist/reactivity.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/reactivity v3.6.0-rc.13
+  * @vue/reactivity v3.6.0-rc.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -41,16 +41,24 @@ var VueReactivity = (function(exports) {
 	};
 	const isPlainObject = (val) => toTypeString(val) === "[object Object]";
 	const isIntegerKey = (key) => isString(key) && key !== "NaN" && key[0] !== "-" && "" + parseInt(key, 10) === key;
+	const STRING_CACHE_MAX_SIZE = 1e4;
 	const cacheStringFunction = (fn) => {
-		const cache = Object.create(null);
+		let cache = Object.create(null);
+		let size = 0;
 		return ((str) => {
-			return cache[str] || (cache[str] = fn(str));
+			const hit = cache[str];
+			if (hit !== void 0) return hit;
+			if (++size > STRING_CACHE_MAX_SIZE) {
+				cache = Object.create(null);
+				size = 1;
+			}
+			return cache[str] = fn(str);
 		});
 	};
 	/**
 	* @private
 	*/
-	const capitalize = cacheStringFunction((str) => {
+	const capitalize = /*@__PURE__*/ cacheStringFunction((str) => {
 		return str.charAt(0).toUpperCase() + str.slice(1);
 	});
 	const hasChanged = (value, oldValue) => !Object.is(value, oldValue);
@@ -63,41 +71,6 @@ var VueReactivity = (function(exports) {
 		});
 	};
 	//#endregion
-	//#region packages/reactivity/src/debug.ts
-	const triggerEventInfos = [];
-	function onTrack(sub, debugInfo) {
-		if (sub.onTrack) sub.onTrack(extend({ effect: sub }, debugInfo));
-	}
-	function onTrigger(sub) {
-		if (sub.onTrigger) {
-			const debugInfo = triggerEventInfos[triggerEventInfos.length - 1];
-			sub.onTrigger(extend({ effect: sub }, debugInfo));
-		}
-	}
-	function setupOnTrigger(target) {
-		Object.defineProperty(target.prototype, "onTrigger", {
-			get() {
-				return this._onTrigger;
-			},
-			set(val) {
-				if (val && !this._onTrigger) setupFlagsHandler(this);
-				this._onTrigger = val;
-			}
-		});
-	}
-	function setupFlagsHandler(target) {
-		target._flags = target.flags;
-		Object.defineProperty(target, "flags", {
-			get() {
-				return target._flags;
-			},
-			set(value) {
-				if (!(target._flags & 48) && !!(value & 48)) onTrigger(this);
-				target._flags = value;
-			}
-		});
-	}
-	//#endregion
 	//#region packages/reactivity/src/warning.ts
 	function warn(msg, ...args) {
 		console.warn(`[Vue warn] ${msg}`, ...args);
@@ -107,13 +80,7 @@ var VueReactivity = (function(exports) {
 	const notifyBuffer = [];
 	let batchDepth = 0;
 	let activeSub = void 0;
-	let runDepth = 0;
-	function incRunDepth() {
-		++runDepth;
-	}
-	function decRunDepth() {
-		--runDepth;
-	}
+	const CHECKING = 512;
 	let globalVersion = 0;
 	let notifyIndex = 0;
 	let notifyBufferLength = 0;
@@ -162,6 +129,7 @@ var VueReactivity = (function(exports) {
 		const nextDep = link.nextDep;
 		const nextSub = link.nextSub;
 		const prevSub = link.prevSub;
+		link.prevDep = link.nextDep = link.prevSub = link.nextSub = void 0;
 		if (nextDep !== void 0) nextDep.prevDep = prevDep;
 		else sub.depsTail = prevDep;
 		if (prevDep !== void 0) prevDep.nextDep = nextDep;
@@ -169,7 +137,7 @@ var VueReactivity = (function(exports) {
 		if (nextSub !== void 0) nextSub.prevSub = prevSub;
 		else dep.subsTail = prevSub;
 		if (prevSub !== void 0) prevSub.nextSub = nextSub;
-		else if ((dep.subs = nextSub) === void 0) {
+		else if ((dep.subs = nextSub) === void 0 && dep.flags & 1) {
 			let toRemove = dep.deps;
 			if (toRemove !== void 0) {
 				do
@@ -187,14 +155,12 @@ var VueReactivity = (function(exports) {
 			const sub = link.sub;
 			let flags = sub.flags;
 			if (flags & 3) {
-				if (!(flags & 60)) {
-					sub.flags = flags | 32;
-					if (runDepth) sub.flags |= 8;
-				} else if (!(flags & 12)) flags = 0;
+				if (!(flags & 44)) sub.flags = flags | 32;
+				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;
-					flags &= 1;
+					flags = sub === activeSub || activeSub === void 0 ? 0 : flags & 1;
 				} else flags = 0;
 				if (flags & 2) notifyBuffer[notifyBufferLength++] = sub;
 				if (flags & 1) {
@@ -230,7 +196,7 @@ var VueReactivity = (function(exports) {
 	function startTracking(sub) {
 		++globalVersion;
 		sub.depsTail = void 0;
-		sub.flags = sub.flags & -57 | 4;
+		sub.flags = sub.flags & -569 | 4;
 		return setActiveSub(sub);
 	}
 	function endTracking(sub, prevSub) {
@@ -238,8 +204,11 @@ var VueReactivity = (function(exports) {
 		activeSub = prevSub;
 		const depsTail = sub.depsTail;
 		let toRemove = depsTail !== void 0 ? depsTail.nextDep : sub.deps;
-		while (toRemove !== void 0) toRemove = unlink(toRemove, sub);
-		sub.flags &= -5;
+		while (toRemove !== void 0) {
+			unlink(toRemove, sub);
+			toRemove = depsTail !== void 0 ? depsTail.nextDep : sub.deps;
+		}
+		if ((sub.flags &= -5) & 8) markRecursed(sub);
 	}
 	function flush() {
 		let hasError = false;
@@ -261,45 +230,67 @@ var VueReactivity = (function(exports) {
 		if (hasError) throw error;
 	}
 	function checkDirty(link, sub) {
+		try {
+			return walkDirty(link, sub);
+		} catch (err) {
+			markStale(sub);
+			throw err;
+		}
+	}
+	function walkDirty(link, sub) {
+		const root = sub;
 		let stack;
 		let checkDepth = 0;
+		let staleDepth = 0;
+		let staleFloor = 0;
 		top: do {
 			const dep = link.dep;
 			const depFlags = dep.flags;
 			let dirty = false;
 			if (sub.flags & 16) dirty = true;
 			else if ((depFlags & 17) === 17) {
-				const subs = dep.subs;
 				if (dep.update()) {
-					if (subs.nextSub !== void 0) shallowPropagate(subs);
+					const subs = dep.subs;
+					if (subs !== void 0 && (subs !== link || subs.nextSub !== void 0)) shallowPropagate(subs);
 					dirty = true;
 				}
 			} else if ((depFlags & 33) === 33) {
-				stack = {
-					value: link,
-					prev: stack
-				};
-				link = dep.deps;
-				sub = dep;
-				++checkDepth;
-				continue;
+				const depth = dep === root ? 0 : depFlags & CHECKING ? checkingDepth(dep, stack, checkDepth) : -1;
+				if (depth < 0) {
+					if (link.nextSub !== void 0 || link.prevSub !== void 0) dep.flags = depFlags | CHECKING;
+					stack = {
+						value: link,
+						prev: stack
+					};
+					link = dep.deps;
+					sub = dep;
+					++checkDepth;
+					continue;
+				}
+				if (depth < checkDepth) {
+					staleFloor = staleDepth && staleFloor < depth ? staleFloor : depth;
+					staleDepth = checkDepth;
+				}
 			}
 			if (!dirty && link.nextDep !== void 0) {
 				link = link.nextDep;
 				continue;
 			}
 			while (checkDepth) {
+				const stale = checkDepth === staleDepth;
+				if (stale && --staleDepth === staleFloor) staleDepth = 0;
 				--checkDepth;
 				link = stack.value;
 				stack = stack.prev;
 				if (dirty) {
-					const subs = sub.subs;
 					if (sub.update()) {
-						if (subs.nextSub !== void 0) shallowPropagate(subs);
+						const subs = sub.subs;
+						if (subs !== void 0 && (subs !== link || subs.nextSub !== void 0)) shallowPropagate(subs);
 						sub = link.sub;
 						continue;
 					}
-				} else sub.flags &= -33;
+				} else if (stale) sub.flags = sub.flags & -545 | 16;
+				else sub.flags &= -545;
 				sub = link.sub;
 				if (link.nextDep !== void 0) {
 					link = link.nextDep;
@@ -307,9 +298,21 @@ var VueReactivity = (function(exports) {
 				}
 				dirty = false;
 			}
-			return dirty && !!sub.flags;
+			return (dirty || !!(sub.flags & 16)) && !!sub.flags;
 		} while (true);
 	}
+	function checkingDepth(dep, stack, depth) {
+		for (; stack !== void 0; stack = stack.prev, --depth) if (stack.value.dep === dep) return depth;
+		return -1;
+	}
+	function markStale(sub) {
+		const nodes = [sub];
+		do {
+			sub = nodes.pop();
+			sub.flags = sub.flags & -33 | 16;
+			for (let link = sub.deps; link !== void 0; link = link.nextDep) if (link.dep.flags & 32) nodes.push(link.dep);
+		} while (nodes.length);
+	}
 	function shallowPropagate(link) {
 		do {
 			const sub = link.sub;
@@ -327,6 +330,71 @@ var VueReactivity = (function(exports) {
 		}
 		return false;
 	}
+	function markRecursed(sub) {
+		const nodes = [sub];
+		do {
+			sub = nodes.pop();
+			for (let link = sub.deps; link !== void 0; link = link.nextDep) {
+				const dep = link.dep;
+				if ((dep.flags & 40) === 32) {
+					dep.flags |= 8;
+					nodes.push(dep);
+				}
+			}
+		} while (nodes.length);
+	}
+	//#endregion
+	//#region packages/reactivity/src/debug.ts
+	const triggered = [];
+	function onTrack(sub, debugInfo) {
+		if (sub.onTrack) sub.onTrack(extend({ effect: sub }, debugInfo));
+	}
+	function onTrigger(sub, debugInfo) {
+		if (sub.onTrigger) sub.onTrigger(extend({ effect: sub }, debugInfo));
+	}
+	function startTrigger() {
+		triggered.push([]);
+	}
+	function endTrigger(debugInfo) {
+		const subs = triggered.pop();
+		if (subs.length) {
+			startBatch();
+			try {
+				for (let i = 0; i < subs.length; i++) {
+					const sub = subs[i];
+					if (sub.flags & 3) onTrigger(sub, debugInfo);
+				}
+			} finally {
+				endBatch();
+			}
+		}
+	}
+	function setupOnTrigger(target) {
+		Object.defineProperty(target.prototype, "onTrigger", {
+			get() {
+				return this._onTrigger;
+			},
+			set(val) {
+				if (val && !this._onTrigger) setupFlagsHandler(this);
+				this._onTrigger = val;
+			}
+		});
+	}
+	function setupFlagsHandler(target) {
+		target._flags = target.flags;
+		Object.defineProperty(target, "flags", {
+			get() {
+				return target._flags;
+			},
+			set(value) {
+				if (!(target._flags & 48) && !!(value & 48)) {
+					if (triggered.length) triggered[triggered.length - 1].push(this);
+					else onTrigger(this);
+				}
+				target._flags = value;
+			}
+		});
+	}
 	//#endregion
 	//#region packages/reactivity/src/dep.ts
 	var Dep = class {
@@ -365,17 +433,17 @@ var VueReactivity = (function(exports) {
 	function triggerDep(dep, target = dep, key = "value", newValue, oldValue) {
 		const subs = dep.subs;
 		if (subs !== void 0) {
-			triggerEventInfos.push({
+			startTrigger();
+			propagate(subs);
+			shallowPropagate(subs);
+			endTrigger({
 				target,
 				type: "set",
 				key,
 				newValue,
 				oldValue
 			});
-			propagate(subs);
-			shallowPropagate(subs);
 			if (!batchDepth) flush();
-			triggerEventInfos.pop();
 		}
 	}
 	const targetMap = /* @__PURE__ */ new WeakMap();
@@ -419,20 +487,12 @@ var VueReactivity = (function(exports) {
 		if (!depsMap) return;
 		const run = (dep) => {
 			if (dep !== void 0 && dep.subs !== void 0) {
-				triggerEventInfos.push({
-					target,
-					type,
-					key,
-					newValue,
-					oldValue,
-					oldTarget
-				});
 				propagate(dep.subs);
 				shallowPropagate(dep.subs);
-				triggerEventInfos.pop();
 			}
 		};
 		startBatch();
+		startTrigger();
 		if (type === "clear") depsMap.forEach(run);
 		else {
 			const targetIsArray = isArray(target);
@@ -462,6 +522,14 @@ var VueReactivity = (function(exports) {
 				}
 			}
 		}
+		endTrigger({
+			target,
+			type,
+			key,
+			newValue,
+			oldValue,
+			oldTarget
+		});
 		endBatch();
 	}
 	function getDepFromReactive(object, key) {
@@ -676,7 +744,7 @@ 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 builtInSymbols = /*@__PURE__*/ 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);
@@ -1260,16 +1328,16 @@ var VueReactivity = (function(exports) {
 				this._value = !useDirectValue && this._wrap ? this._wrap(newValue) : newValue;
 				const subs = this.subs;
 				if (subs !== void 0) {
-					triggerEventInfos.push({
+					startTrigger();
+					propagate(subs);
+					endTrigger({
 						target: this,
 						type: "set",
 						key: "value",
 						newValue,
 						oldValue
 					});
-					propagate(subs);
 					if (!batchDepth) flush();
-					triggerEventInfos.pop();
 				}
 			}
 		}
@@ -1306,8 +1374,10 @@ var VueReactivity = (function(exports) {
 	function triggerRef(ref) {
 		const dep = ref.dep;
 		if (dep !== void 0 && dep.subs !== void 0) {
+			startTrigger();
 			propagate(dep.subs);
 			shallowPropagate(dep.subs);
+			endTrigger();
 			if (!batchDepth) flush();
 		}
 	}
@@ -1506,6 +1576,10 @@ var VueReactivity = (function(exports) {
 		get active() {
 			return !(this.flags & 1024);
 		}
+		/** @internal */
+		get running() {
+			return !!(this.flags & 4);
+		}
 		pause() {
 			this.flags |= 256;
 		}
@@ -1519,11 +1593,9 @@ 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) {
@@ -1546,9 +1618,9 @@ var VueReactivity = (function(exports) {
 			if (flags & 16) return true;
 			if (flags & 32) {
 				if (checkDirty(this.deps, this)) {
-					this.flags = flags | 16;
+					if (this.active) this.flags |= 16;
 					return true;
-				} else this.flags = flags & -33;
+				} else this.flags &= -33;
 			}
 			return false;
 		}
@@ -1560,20 +1632,17 @@ var VueReactivity = (function(exports) {
 		if (options) {
 			const { onStop, scheduler } = options;
 			if (onStop) {
-				options.onStop = void 0;
 				const stop = e.stop.bind(e);
 				e.stop = () => {
 					stop();
 					onStop();
 				};
 			}
-			if (scheduler) {
-				options.scheduler = void 0;
-				e.notify = () => {
-					if (!(e.flags & 256)) scheduler();
-				};
-			}
-			extend(e, options);
+			if (scheduler) e.notify = () => {
+				if (!(e.flags & 1280)) scheduler();
+			};
+			e.onTrack = options.onTrack;
+			e.onTrigger = options.onTrigger;
 		}
 		try {
 			e.run();
@@ -1686,8 +1755,10 @@ var VueReactivity = (function(exports) {
 			const flags = this.flags;
 			if (flags & 256) {
 				this.flags = flags & -257;
-				for (let link = this.deps; link !== void 0; link = link.nextDep) {
-					const dep = link.dep;
+				const deps = [];
+				for (let link = this.deps; link !== void 0; link = link.nextDep) deps.push(link.dep);
+				for (let i = 0; i < deps.length; i++) {
+					const dep = deps[i];
 					if ("resume" in dep) dep.resume();
 				}
 			}
@@ -1716,8 +1787,10 @@ var VueReactivity = (function(exports) {
 			while (dep !== void 0) {
 				const node = dep.dep;
 				if ("stop" in node) {
-					dep = dep.nextDep;
+					const prev = dep.prevDep;
 					node.stop();
+					const next = prev !== void 0 ? prev.nextDep : this.deps;
+					dep = next === dep ? dep.nextDep : next;
 				} else dep = unlink(dep, this);
 			}
 			cleanup(this);
@@ -1758,11 +1831,14 @@ var VueReactivity = (function(exports) {
 	* @see {@link https://vuejs.org/api/reactivity-advanced.html#onscopedispose}
 	*/
 	function onScopeDispose(fn, failSilently = false) {
-		if (activeEffectScope !== void 0) activeEffectScope.cleanups[activeEffectScope.cleanupsLength++] = fn;
-		else if (!failSilently) warn("onScopeDispose() is called when there is no active effect scope to be associated with.");
+		if (activeEffectScope !== void 0) {
+			if (activeEffectScope.active) activeEffectScope.cleanups[activeEffectScope.cleanupsLength++] = fn;
+			else fn();
+		} else if (!failSilently) warn("onScopeDispose() is called when there is no active effect scope to be associated with.");
 	}
 	//#endregion
 	//#region packages/reactivity/src/computed.ts
+	const FAILED = 64;
 	/**
 	* @private exported by @vue/reactivity for Vue core use, but not exported from
 	* the main vue package
@@ -1811,12 +1887,24 @@ var VueReactivity = (function(exports) {
 		}
 		get value() {
 			const flags = this.flags;
-			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 & 32) this.flags = flags & -33;
+			try {
+				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 & 32) this.flags = flags & -33;
+			} catch (err) {
+				if (activeSub !== void 0) {
+					onTrack(activeSub, {
+						target: this,
+						type: "get",
+						key: "value"
+					});
+					link(this, activeSub);
+				} else if (activeEffectScope !== void 0) link(this, activeEffectScope);
+				throw err;
+			}
 			if (activeSub !== void 0) {
 				onTrack(activeSub, {
 					target: this,
@@ -1824,7 +1912,18 @@ var VueReactivity = (function(exports) {
 					key: "value"
 				});
 				link(this, activeSub);
-			} else if (activeEffectScope !== void 0) link(this, activeEffectScope);
+			} else if (activeEffectScope !== void 0) {
+				if (activeEffectScope.active) link(this, activeEffectScope);
+				else if (this.subs === void 0) {
+					let dep = this.deps;
+					if (dep !== void 0) {
+						do
+							dep = unlink(dep, this);
+						while (dep !== void 0);
+						this.flags |= 16;
+					}
+				}
+			}
 			return this._value;
 		}
 		set value(newValue) {
@@ -1836,11 +1935,15 @@ var VueReactivity = (function(exports) {
 			try {
 				const oldValue = this._value;
 				const newValue = this.fn(oldValue);
-				if (hasChanged(oldValue, newValue)) {
+				if (hasChanged(oldValue, newValue) || this.flags & FAILED) {
 					this._value = newValue;
+					this.flags &= -65;
 					return true;
 				}
 				return false;
+			} catch (err) {
+				this.flags |= FAILED;
+				throw err;
 			} finally {
 				endTracking(this, prevSub);
 			}
@@ -1861,6 +1964,7 @@ var VueReactivity = (function(exports) {
 			cRef.onTrack = debugOptions.onTrack;
 			cRef.onTrigger = debugOptions.onTrigger;
 		}
+		if (isSSR && activeEffectScope !== void 0) link(cRef, activeEffectScope);
 		return cRef;
 	}
 	//#endregion