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

package/dist/reactivity.cjs.prod.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
   **/
@@ -12,13 +12,7 @@ let _vue_shared = require("@vue/shared");
 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;
@@ -67,6 +61,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;
@@ -74,7 +69,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
@@ -92,14 +87,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) {
@@ -135,15 +128,18 @@ 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) {
 	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;
@@ -165,45 +161,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;
@@ -211,9 +229,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;
@@ -231,6 +261,19 @@ 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/dep.ts
 var Dep = class {
@@ -551,7 +594,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);
@@ -1348,6 +1391,10 @@ var ReactiveEffect = class {
 	get active() {
 		return !(this.flags & 1024);
 	}
+	/** @internal */
+	get running() {
+		return !!(this.flags & 4);
+	}
 	pause() {
 		this.flags |= 256;
 	}
@@ -1361,11 +1408,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) {
@@ -1388,9 +1433,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;
 	}
@@ -1401,20 +1446,15 @@ 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();
+		};
 	}
 	try {
 		e.run();
@@ -1525,8 +1565,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();
 			}
 		}
@@ -1555,8 +1597,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);
@@ -1597,10 +1641,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;
+	if (activeEffectScope !== void 0) {
+		if (activeEffectScope.active) activeEffectScope.cleanups[activeEffectScope.cleanupsLength++] = fn;
+		else fn();
+	}
 }
 //#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
@@ -1649,14 +1697,31 @@ 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) link(this, activeSub);
+			else if (activeEffectScope !== void 0) link(this, activeEffectScope);
+			throw err;
+		}
 		if (activeSub !== void 0) 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) {
@@ -1667,11 +1732,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);
 		}
@@ -1686,7 +1755,9 @@ function computed(getterOrOptions, debugOptions, isSSR = false) {
 		getter = getterOrOptions.get;
 		setter = getterOrOptions.set;
 	}
-	return new ComputedRefImpl(getter, setter);
+	const cRef = new ComputedRefImpl(getter, setter);
+	if (isSSR && activeEffectScope !== void 0) link(cRef, activeEffectScope);
+	return cRef;
 }
 //#endregion
 //#region packages/reactivity/src/constants.ts