@vue/reactivity 3.6.0-rc.5 → 3.6.0-rc.7

package/dist/reactivity.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/reactivity v3.6.0-rc.5
+  * @vue/reactivity v3.6.0-rc.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -376,9 +376,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
 						if ((0, _vue_shared.isMap)(target)) run(depsMap.get(MAP_KEY_ITERATE_KEY));
 					}
 					break;
-				case "set":
-					if ((0, _vue_shared.isMap)(target)) run(depsMap.get(ITERATE_KEY));
-					break;
+				case "set": if ((0, _vue_shared.isMap)(target)) run(depsMap.get(ITERATE_KEY));
 			}
 		}
 	}
@@ -575,8 +573,8 @@ 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 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));
 function hasOwnProperty(key) {
 	if (!(0, _vue_shared.isSymbol)(key)) key = String(key);
 	const obj = /* @__PURE__ */ toRaw(this);
@@ -631,12 +629,14 @@ var MutableReactiveHandler = class extends BaseReactiveHandler {
 				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 : (0, _vue_shared.hasOwn)(target, key);
@@ -677,10 +677,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;
@@ -831,10 +831,10 @@ function createInstrumentationGetter(isReadonly, shallow) {
 		return Reflect.get((0, _vue_shared.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)) {
@@ -859,7 +859,7 @@ function targetTypeMap(rawType) {
 		default: return 0;
 	}
 }
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function reactive(target) {
 	if (/* @__PURE__ */ isReadonly(target)) return target;
 	return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);
@@ -894,7 +894,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);
 }
@@ -927,7 +927,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);
 }
@@ -961,7 +961,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);
 }
@@ -998,7 +998,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"]);
@@ -1014,11 +1014,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"]);
 }
@@ -1029,7 +1029,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;
 }
@@ -1056,7 +1056,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;
@@ -1105,15 +1105,15 @@ const toReactive = (value) => (0, _vue_shared.isObject)(value) ? /* @__PURE__ */
 const toReadonly = (value) => (0, _vue_shared.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);
 }
@@ -1316,7 +1316,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 = (0, _vue_shared.isArray)(object) ? new Array(object.length) : {};
 	for (const key in object) ret[key] = propertyToRef(object, key);
@@ -1367,7 +1367,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 ((0, _vue_shared.isFunction)(source)) return new GetterRefImpl(source);
@@ -1441,10 +1441,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;
 	}
 };
@@ -1676,10 +1678,12 @@ 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 & ReactiveFlags$1.Pending) {
+			if (checkDirty(this.deps, this)) {
+				this.flags = flags | ReactiveFlags$1.Dirty;
+				return true;
+			} else this.flags = flags & ~ReactiveFlags$1.Pending;
+		}
 		return false;
 	}
 	/**
@@ -1740,7 +1744,7 @@ var ComputedRefImpl = class {
 	}
 };
 setupOnTrigger(ComputedRefImpl);
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function computed(getterOrOptions, debugOptions, isSSR = false) {
 	let getter;
 	let setter;
@@ -1834,25 +1838,26 @@ var WatcherEffect = class extends ReactiveEffect {
 				else if ((0, _vue_shared.isFunction)(s)) return call ? call(s, 2) : s();
 				else warnInvalidSource(s, onWarn);
 			});
-		} else if ((0, _vue_shared.isFunction)(source)) if (cb) getter = call ? () => call(source, 2) : source;
-		else getter = () => {
-			if (this.cleanupsLength) {
-				const prevSub = setActiveSub();
+		} else if ((0, _vue_shared.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 = _vue_shared.NOOP;
 			warnInvalidSource(source, onWarn);
 		}

package/dist/reactivity.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/reactivity v3.6.0-rc.5
+  * @vue/reactivity v3.6.0-rc.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -321,9 +321,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
 						if ((0, _vue_shared.isMap)(target)) run(depsMap.get(MAP_KEY_ITERATE_KEY));
 					}
 					break;
-				case "set":
-					if ((0, _vue_shared.isMap)(target)) run(depsMap.get(ITERATE_KEY));
-					break;
+				case "set": if ((0, _vue_shared.isMap)(target)) run(depsMap.get(ITERATE_KEY));
 			}
 		}
 	}
@@ -520,8 +518,8 @@ 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 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));
 function hasOwnProperty(key) {
 	if (!(0, _vue_shared.isSymbol)(key)) key = String(key);
 	const obj = /* @__PURE__ */ toRaw(this);
@@ -576,10 +574,12 @@ var MutableReactiveHandler = class extends BaseReactiveHandler {
 				oldValue = /* @__PURE__ */ toRaw(oldValue);
 				value = /* @__PURE__ */ toRaw(value);
 			}
-			if (!isArrayWithIntegerKey && /* @__PURE__ */ isRef(oldValue) && !/* @__PURE__ */ isRef(value)) if (isOldValueReadonly) return true;
-			else {
-				oldValue.value = value;
-				return true;
+			if (!isArrayWithIntegerKey && /* @__PURE__ */ isRef(oldValue) && !/* @__PURE__ */ isRef(value)) {
+				if (isOldValueReadonly) return true;
+				else {
+					oldValue.value = value;
+					return true;
+				}
 			}
 		}
 		const hadKey = isArrayWithIntegerKey ? Number(key) < target.length : (0, _vue_shared.hasOwn)(target, key);
@@ -618,10 +618,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;
@@ -768,10 +768,10 @@ function createInstrumentationGetter(isReadonly, shallow) {
 		return Reflect.get((0, _vue_shared.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) };
 //#endregion
 //#region packages/reactivity/src/reactive.ts
 const reactiveMap = /* @__PURE__ */ new WeakMap();
@@ -789,7 +789,7 @@ function targetTypeMap(rawType) {
 		default: return 0;
 	}
 }
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function reactive(target) {
 	if (/* @__PURE__ */ isReadonly(target)) return target;
 	return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);
@@ -824,7 +824,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);
 }
@@ -857,7 +857,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);
 }
@@ -891,7 +891,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);
 }
@@ -925,7 +925,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"]);
@@ -941,11 +941,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"]);
 }
@@ -956,7 +956,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;
 }
@@ -983,7 +983,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;
@@ -1032,15 +1032,15 @@ const toReactive = (value) => (0, _vue_shared.isObject)(value) ? /* @__PURE__ */
 const toReadonly = (value) => (0, _vue_shared.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);
 }
@@ -1228,7 +1228,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 = (0, _vue_shared.isArray)(object) ? new Array(object.length) : {};
 	for (const key in object) ret[key] = propertyToRef(object, key);
@@ -1279,7 +1279,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 ((0, _vue_shared.isFunction)(source)) return new GetterRefImpl(source);
@@ -1353,10 +1353,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;
 	}
 };
@@ -1584,10 +1586,12 @@ 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 & ReactiveFlags$1.Pending) {
+			if (checkDirty(this.deps, this)) {
+				this.flags = flags | ReactiveFlags$1.Dirty;
+				return true;
+			} else this.flags = flags & ~ReactiveFlags$1.Pending;
+		}
 		return false;
 	}
 	/**
@@ -1640,7 +1644,7 @@ var ComputedRefImpl = class {
 		}
 	}
 };
-/* @__NO_SIDE_EFFECTS__ */
+/*@__NO_SIDE_EFFECTS__*/
 function computed(getterOrOptions, debugOptions, isSSR = false) {
 	let getter;
 	let setter;
@@ -1728,25 +1732,26 @@ var WatcherEffect = class extends ReactiveEffect {
 				else if (/* @__PURE__ */ isReactive(s)) return reactiveGetter(s, deep);
 				else if ((0, _vue_shared.isFunction)(s)) return call ? call(s, 2) : s();
 			});
-		} else if ((0, _vue_shared.isFunction)(source)) if (cb) getter = call ? () => call(source, 2) : source;
-		else getter = () => {
-			if (this.cleanupsLength) {
-				const prevSub = setActiveSub();
+		} else if ((0, _vue_shared.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 getter = _vue_shared.NOOP;
+			};
+		} else getter = _vue_shared.NOOP;
 		if (cb && deep) {
 			const baseGetter = getter;
 			const depth = deep === true ? Infinity : deep;