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

package/dist/reactivity.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/reactivity v3.6.0-rc.14
+  * @vue/reactivity v3.6.0-rc.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -8,41 +8,6 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 let _vue_shared = require("@vue/shared");
-//#region packages/reactivity/src/debug.ts
-const triggerEventInfos = [];
-function onTrack(sub, debugInfo) {
-	if (sub.onTrack) sub.onTrack((0, _vue_shared.extend)({ effect: sub }, debugInfo));
-}
-function onTrigger(sub) {
-	if (sub.onTrigger) {
-		const debugInfo = triggerEventInfos[triggerEventInfos.length - 1];
-		sub.onTrigger((0, _vue_shared.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);
@@ -52,13 +17,7 @@ function warn(msg, ...args) {
 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;
@@ -107,6 +66,7 @@ function unlink(link, sub = link.sub) {
 	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;
@@ -114,7 +74,7 @@ function unlink(link, sub = link.sub) {
 	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
@@ -132,14 +92,12 @@ function propagate(link) {
 		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) {
@@ -175,7 +133,7 @@ function propagate(link) {
 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) {
@@ -183,8 +141,11 @@ function endTracking(sub, prevSub) {
 	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;
@@ -206,45 +167,67 @@ function flush() {
 	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;
@@ -252,9 +235,21 @@ function checkDirty(link, sub) {
 			}
 			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;
@@ -272,6 +267,71 @@ function isValidLink(checkLink, sub) {
 	}
 	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((0, _vue_shared.extend)({ effect: sub }, debugInfo));
+}
+function onTrigger(sub, debugInfo) {
+	if (sub.onTrigger) sub.onTrigger((0, _vue_shared.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 {
@@ -310,17 +370,17 @@ function trackDep(dep, target = dep, key = "value") {
 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();
@@ -364,20 +424,12 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
 	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 = (0, _vue_shared.isArray)(target);
@@ -407,6 +459,14 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
 			}
 		}
 	}
+	endTrigger({
+		target,
+		type,
+		key,
+		newValue,
+		oldValue,
+		oldTarget
+	});
 	endBatch();
 }
 function getDepFromReactive(object, key) {
@@ -621,7 +681,7 @@ function noTracking(self, method, args = []) {
 //#endregion
 //#region packages/reactivity/src/baseHandlers.ts
 const isNonTrackableKeys = /*@__PURE__*/ (0, _vue_shared.makeMap)(`__proto__,__v_isRef,__isVue`);
-const builtInSymbols = new Set(/*@__PURE__*/ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(_vue_shared.isSymbol));
+const builtInSymbols = /*@__PURE__*/ new Set(/*@__PURE__*/ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(_vue_shared.isSymbol));
 function hasOwnProperty(key) {
 	if (!(0, _vue_shared.isSymbol)(key)) key = String(key);
 	const obj = /* @__PURE__ */ toRaw(this);
@@ -1205,16 +1265,16 @@ var RefImpl = class {
 			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();
 			}
 		}
 	}
@@ -1251,8 +1311,10 @@ var RefImpl = class {
 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();
 	}
 }
@@ -1451,6 +1513,10 @@ var ReactiveEffect = class {
 	get active() {
 		return !(this.flags & 1024);
 	}
+	/** @internal */
+	get running() {
+		return !!(this.flags & 4);
+	}
 	pause() {
 		this.flags |= 256;
 	}
@@ -1464,11 +1530,9 @@ 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) {
@@ -1491,9 +1555,9 @@ var ReactiveEffect = class {
 		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;
 	}
@@ -1505,20 +1569,17 @@ function effect(fn, options) {
 	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();
-			};
-		}
-		(0, _vue_shared.extend)(e, options);
+		if (scheduler) e.notify = () => {
+			if (!(e.flags & 1280)) scheduler();
+		};
+		e.onTrack = options.onTrack;
+		e.onTrigger = options.onTrigger;
 	}
 	try {
 		e.run();
@@ -1631,8 +1692,10 @@ var EffectScope = class {
 		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();
 			}
 		}
@@ -1661,8 +1724,10 @@ var EffectScope = class {
 		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);
@@ -1703,11 +1768,14 @@ function setCurrentScope(scope) {
 * @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
@@ -1756,12 +1824,24 @@ var ComputedRefImpl = class {
 	}
 	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,
@@ -1769,7 +1849,18 @@ var ComputedRefImpl = class {
 				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) {
@@ -1781,11 +1872,15 @@ var ComputedRefImpl = class {
 		try {
 			const oldValue = this._value;
 			const newValue = this.fn(oldValue);
-			if ((0, _vue_shared.hasChanged)(oldValue, newValue)) {
+			if ((0, _vue_shared.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);
 		}
@@ -1806,6 +1901,7 @@ function computed(getterOrOptions, debugOptions, isSSR = false) {
 		cRef.onTrack = debugOptions.onTrack;
 		cRef.onTrigger = debugOptions.onTrigger;
 	}
+	if (isSSR && activeEffectScope !== void 0) link(cRef, activeEffectScope);
 	return cRef;
 }
 //#endregion