@vue/reactivity 3.4.30 → 3.4.32

package/dist/reactivity.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/reactivity v3.4.30
+* @vue/reactivity v3.4.32
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -124,7 +124,7 @@ class ReactiveEffect {
     /**
      * @internal
      */
-    this._dirtyLevel = 5;
+    this._dirtyLevel = 4;
     /**
      * @internal
      */
@@ -144,20 +144,14 @@ class ReactiveEffect {
     recordEffectScope(this, scope);
   }
   get dirty() {
-    if (this._dirtyLevel === 2)
-      return false;
-    if (this._dirtyLevel === 3 || this._dirtyLevel === 4) {
+    if (this._dirtyLevel === 2 || this._dirtyLevel === 3) {
       this._dirtyLevel = 1;
       pauseTracking();
       for (let i = 0; i < this._depsLength; i++) {
         const dep = this.deps[i];
         if (dep.computed) {
-          if (dep.computed.effect._dirtyLevel === 2) {
-            resetTracking();
-            return true;
-          }
           triggerComputed(dep.computed);
-          if (this._dirtyLevel >= 5) {
+          if (this._dirtyLevel >= 4) {
             break;
           }
         }
@@ -167,10 +161,10 @@ class ReactiveEffect {
       }
       resetTracking();
     }
-    return this._dirtyLevel >= 5;
+    return this._dirtyLevel >= 4;
   }
   set dirty(v) {
-    this._dirtyLevel = v ? 5 : 0;
+    this._dirtyLevel = v ? 4 : 0;
   }
   run() {
     this._dirtyLevel = 0;
@@ -296,17 +290,8 @@ function triggerEffects(dep, dirtyLevel, debuggerEventExtraInfo) {
   pauseScheduling();
   for (const effect2 of dep.keys()) {
     let tracking;
-    if (!dep.computed && effect2.computed) {
-      if (effect2._runnings > 0 && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
-        effect2._dirtyLevel = 2;
-        continue;
-      }
-    }
     if (effect2._dirtyLevel < dirtyLevel && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
       effect2._shouldSchedule || (effect2._shouldSchedule = effect2._dirtyLevel === 0);
-      if (effect2.computed && effect2._dirtyLevel === 2) {
-        effect2._shouldSchedule = true;
-      }
       effect2._dirtyLevel = dirtyLevel;
     }
     if (effect2._shouldSchedule && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
@@ -314,7 +299,7 @@ function triggerEffects(dep, dirtyLevel, debuggerEventExtraInfo) {
         (_a = effect2.onTrigger) == null ? void 0 : _a.call(effect2, shared.extend({ effect: effect2 }, debuggerEventExtraInfo));
       }
       effect2.trigger();
-      if ((!effect2._runnings || effect2.allowRecurse) && effect2._dirtyLevel !== 3) {
+      if ((!effect2._runnings || effect2.allowRecurse) && effect2._dirtyLevel !== 2) {
         effect2._shouldSchedule = false;
         if (effect2.scheduler) {
           queueEffectSchedulers.push(effect2.scheduler);
@@ -406,7 +391,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
     if (dep) {
       triggerEffects(
         dep,
-        5,
+        4,
         {
           target,
           type,
@@ -602,18 +587,18 @@ const shallowReadonlyHandlers = /* @__PURE__ */ new ReadonlyReactiveHandler(true
 
 const toShallow = (value) => value;
 const getProto = (v) => Reflect.getPrototypeOf(v);
-function get(target, key, isReadonly = false, isShallow = false) {
+function get(target, key, isReadonly2 = false, isShallow2 = false) {
   target = target["__v_raw"];
   const rawTarget = toRaw(target);
   const rawKey = toRaw(key);
-  if (!isReadonly) {
+  if (!isReadonly2) {
     if (shared.hasChanged(key, rawKey)) {
       track(rawTarget, "get", key);
     }
     track(rawTarget, "get", rawKey);
   }
   const { has: has2 } = getProto(rawTarget);
-  const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
+  const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
   if (has2.call(rawTarget, key)) {
     return wrap(target.get(key));
   } else if (has2.call(rawTarget, rawKey)) {
@@ -622,11 +607,11 @@ function get(target, key, isReadonly = false, isShallow = false) {
     target.get(key);
   }
 }
-function has(key, isReadonly = false) {
+function has(key, isReadonly2 = false) {
   const target = this["__v_raw"];
   const rawTarget = toRaw(target);
   const rawKey = toRaw(key);
-  if (!isReadonly) {
+  if (!isReadonly2) {
     if (shared.hasChanged(key, rawKey)) {
       track(rawTarget, "has", key);
     }
@@ -634,13 +619,15 @@ function has(key, isReadonly = false) {
   }
   return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);
 }
-function size(target, isReadonly = false) {
+function size(target, isReadonly2 = false) {
   target = target["__v_raw"];
-  !isReadonly && track(toRaw(target), "iterate", ITERATE_KEY);
+  !isReadonly2 && track(toRaw(target), "iterate", ITERATE_KEY);
   return Reflect.get(target, "size", target);
 }
-function add(value) {
-  value = toRaw(value);
+function add(value, _isShallow = false) {
+  if (!_isShallow && !isShallow(value) && !isReadonly(value)) {
+    value = toRaw(value);
+  }
   const target = toRaw(this);
   const proto = getProto(target);
   const hadKey = proto.has.call(target, value);
@@ -650,8 +637,10 @@ function add(value) {
   }
   return this;
 }
-function set(key, value) {
-  value = toRaw(value);
+function set(key, value, _isShallow = false) {
+  if (!_isShallow && !isShallow(value) && !isReadonly(value)) {
+    value = toRaw(value);
+  }
   const target = toRaw(this);
   const { has: has2, get: get2 } = getProto(target);
   let hadKey = has2.call(target, key);
@@ -697,19 +686,19 @@ function clear() {
   }
   return result;
 }
-function createForEach(isReadonly, isShallow) {
+function createForEach(isReadonly2, isShallow2) {
   return function forEach(callback, thisArg) {
     const observed = this;
     const target = observed["__v_raw"];
     const rawTarget = toRaw(target);
-    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-    !isReadonly && track(rawTarget, "iterate", ITERATE_KEY);
+    const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
+    !isReadonly2 && track(rawTarget, "iterate", ITERATE_KEY);
     return target.forEach((value, key) => {
       return callback.call(thisArg, wrap(value), wrap(key), observed);
     });
   };
 }
-function createIterableMethod(method, isReadonly, isShallow) {
+function createIterableMethod(method, isReadonly2, isShallow2) {
   return function(...args) {
     const target = this["__v_raw"];
     const rawTarget = toRaw(target);
@@ -717,8 +706,8 @@ function createIterableMethod(method, isReadonly, isShallow) {
     const isPair = method === "entries" || method === Symbol.iterator && targetIsMap;
     const isKeyOnly = method === "keys" && targetIsMap;
     const innerIterator = target[method](...args);
-    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-    !isReadonly && track(
+    const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
+    !isReadonly2 && track(
       rawTarget,
       "iterate",
       isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY
@@ -774,8 +763,12 @@ function createInstrumentations() {
       return size(this);
     },
     has,
-    add,
-    set,
+    add(value) {
+      return add.call(this, value, true);
+    },
+    set(key, value) {
+      return set.call(this, key, value, true);
+    },
     delete: deleteEntry,
     clear,
     forEach: createForEach(false, true)
@@ -841,13 +834,13 @@ const [
   shallowInstrumentations,
   shallowReadonlyInstrumentations
 ] = /* @__PURE__ */ createInstrumentations();
-function createInstrumentationGetter(isReadonly, shallow) {
-  const instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;
+function createInstrumentationGetter(isReadonly2, shallow) {
+  const instrumentations = shallow ? isReadonly2 ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly2 ? readonlyInstrumentations : mutableInstrumentations;
   return (target, key, receiver) => {
     if (key === "__v_isReactive") {
-      return !isReadonly;
+      return !isReadonly2;
     } else if (key === "__v_isReadonly") {
-      return isReadonly;
+      return isReadonly2;
     } else if (key === "__v_raw") {
       return target;
     }
@@ -1009,7 +1002,7 @@ class ComputedRefImpl {
       () => getter(this._value),
       () => triggerRefValue(
         this,
-        this.effect._dirtyLevel === 3 ? 3 : 4
+        this.effect._dirtyLevel === 2 ? 2 : 3
       )
     );
     this.effect.computed = this;
@@ -1018,11 +1011,8 @@ class ComputedRefImpl {
   }
   get value() {
     const self = toRaw(this);
-    const lastDirtyLevel = self.effect._dirtyLevel;
     if ((!self._cacheable || self.effect.dirty) && shared.hasChanged(self._value, self._value = self.effect.run())) {
-      if (lastDirtyLevel !== 3) {
-        triggerRefValue(self, 5);
-      }
+      triggerRefValue(self, 4);
     }
     trackRefValue(self);
     if (self.effect._dirtyLevel >= 2) {
@@ -1031,7 +1021,7 @@ class ComputedRefImpl {
 
 getter: `, this.getter);
       }
-      triggerRefValue(self, 3);
+      triggerRefValue(self, 2);
     }
     return self._value;
   }
@@ -1086,7 +1076,7 @@ function trackRefValue(ref2) {
     );
   }
 }
-function triggerRefValue(ref2, dirtyLevel = 5, newVal, oldVal) {
+function triggerRefValue(ref2, dirtyLevel = 4, newVal, oldVal) {
   ref2 = toRaw(ref2);
   const dep = ref2.dep;
   if (dep) {
@@ -1137,12 +1127,12 @@ class RefImpl {
       const oldVal = this._rawValue;
       this._rawValue = newVal;
       this._value = useDirectValue ? newVal : toReactive(newVal);
-      triggerRefValue(this, 5, newVal, oldVal);
+      triggerRefValue(this, 4, newVal, oldVal);
     }
   }
 }
 function triggerRef(ref2) {
-  triggerRefValue(ref2, 5, ref2.value );
+  triggerRefValue(ref2, 4, ref2.value );
 }
 function unref(ref2) {
   return isRef(ref2) ? ref2.value : ref2;

package/dist/reactivity.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/reactivity v3.4.30
+* @vue/reactivity v3.4.32
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -114,7 +114,7 @@ class ReactiveEffect {
     /**
      * @internal
      */
-    this._dirtyLevel = 5;
+    this._dirtyLevel = 4;
     /**
      * @internal
      */
@@ -134,20 +134,14 @@ class ReactiveEffect {
     recordEffectScope(this, scope);
   }
   get dirty() {
-    if (this._dirtyLevel === 2)
-      return false;
-    if (this._dirtyLevel === 3 || this._dirtyLevel === 4) {
+    if (this._dirtyLevel === 2 || this._dirtyLevel === 3) {
       this._dirtyLevel = 1;
       pauseTracking();
       for (let i = 0; i < this._depsLength; i++) {
         const dep = this.deps[i];
         if (dep.computed) {
-          if (dep.computed.effect._dirtyLevel === 2) {
-            resetTracking();
-            return true;
-          }
           triggerComputed(dep.computed);
-          if (this._dirtyLevel >= 5) {
+          if (this._dirtyLevel >= 4) {
             break;
           }
         }
@@ -157,10 +151,10 @@ class ReactiveEffect {
       }
       resetTracking();
     }
-    return this._dirtyLevel >= 5;
+    return this._dirtyLevel >= 4;
   }
   set dirty(v) {
-    this._dirtyLevel = v ? 5 : 0;
+    this._dirtyLevel = v ? 4 : 0;
   }
   run() {
     this._dirtyLevel = 0;
@@ -281,22 +275,13 @@ function triggerEffects(dep, dirtyLevel, debuggerEventExtraInfo) {
   pauseScheduling();
   for (const effect2 of dep.keys()) {
     let tracking;
-    if (!dep.computed && effect2.computed) {
-      if (effect2._runnings > 0 && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
-        effect2._dirtyLevel = 2;
-        continue;
-      }
-    }
     if (effect2._dirtyLevel < dirtyLevel && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
       effect2._shouldSchedule || (effect2._shouldSchedule = effect2._dirtyLevel === 0);
-      if (effect2.computed && effect2._dirtyLevel === 2) {
-        effect2._shouldSchedule = true;
-      }
       effect2._dirtyLevel = dirtyLevel;
     }
     if (effect2._shouldSchedule && (tracking != null ? tracking : tracking = dep.get(effect2) === effect2._trackId)) {
       effect2.trigger();
-      if ((!effect2._runnings || effect2.allowRecurse) && effect2._dirtyLevel !== 3) {
+      if ((!effect2._runnings || effect2.allowRecurse) && effect2._dirtyLevel !== 2) {
         effect2._shouldSchedule = false;
         if (effect2.scheduler) {
           queueEffectSchedulers.push(effect2.scheduler);
@@ -382,7 +367,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) {
     if (dep) {
       triggerEffects(
         dep,
-        5);
+        4);
     }
   }
   resetScheduling();
@@ -557,18 +542,18 @@ const shallowReadonlyHandlers = /* @__PURE__ */ new ReadonlyReactiveHandler(true
 
 const toShallow = (value) => value;
 const getProto = (v) => Reflect.getPrototypeOf(v);
-function get(target, key, isReadonly = false, isShallow = false) {
+function get(target, key, isReadonly2 = false, isShallow2 = false) {
   target = target["__v_raw"];
   const rawTarget = toRaw(target);
   const rawKey = toRaw(key);
-  if (!isReadonly) {
+  if (!isReadonly2) {
     if (shared.hasChanged(key, rawKey)) {
       track(rawTarget, "get", key);
     }
     track(rawTarget, "get", rawKey);
   }
   const { has: has2 } = getProto(rawTarget);
-  const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
+  const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
   if (has2.call(rawTarget, key)) {
     return wrap(target.get(key));
   } else if (has2.call(rawTarget, rawKey)) {
@@ -577,11 +562,11 @@ function get(target, key, isReadonly = false, isShallow = false) {
     target.get(key);
   }
 }
-function has(key, isReadonly = false) {
+function has(key, isReadonly2 = false) {
   const target = this["__v_raw"];
   const rawTarget = toRaw(target);
   const rawKey = toRaw(key);
-  if (!isReadonly) {
+  if (!isReadonly2) {
     if (shared.hasChanged(key, rawKey)) {
       track(rawTarget, "has", key);
     }
@@ -589,13 +574,15 @@ function has(key, isReadonly = false) {
   }
   return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);
 }
-function size(target, isReadonly = false) {
+function size(target, isReadonly2 = false) {
   target = target["__v_raw"];
-  !isReadonly && track(toRaw(target), "iterate", ITERATE_KEY);
+  !isReadonly2 && track(toRaw(target), "iterate", ITERATE_KEY);
   return Reflect.get(target, "size", target);
 }
-function add(value) {
-  value = toRaw(value);
+function add(value, _isShallow = false) {
+  if (!_isShallow && !isShallow(value) && !isReadonly(value)) {
+    value = toRaw(value);
+  }
   const target = toRaw(this);
   const proto = getProto(target);
   const hadKey = proto.has.call(target, value);
@@ -605,8 +592,10 @@ function add(value) {
   }
   return this;
 }
-function set(key, value) {
-  value = toRaw(value);
+function set(key, value, _isShallow = false) {
+  if (!_isShallow && !isShallow(value) && !isReadonly(value)) {
+    value = toRaw(value);
+  }
   const target = toRaw(this);
   const { has: has2, get: get2 } = getProto(target);
   let hadKey = has2.call(target, key);
@@ -647,19 +636,19 @@ function clear() {
   }
   return result;
 }
-function createForEach(isReadonly, isShallow) {
+function createForEach(isReadonly2, isShallow2) {
   return function forEach(callback, thisArg) {
     const observed = this;
     const target = observed["__v_raw"];
     const rawTarget = toRaw(target);
-    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-    !isReadonly && track(rawTarget, "iterate", ITERATE_KEY);
+    const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
+    !isReadonly2 && track(rawTarget, "iterate", ITERATE_KEY);
     return target.forEach((value, key) => {
       return callback.call(thisArg, wrap(value), wrap(key), observed);
     });
   };
 }
-function createIterableMethod(method, isReadonly, isShallow) {
+function createIterableMethod(method, isReadonly2, isShallow2) {
   return function(...args) {
     const target = this["__v_raw"];
     const rawTarget = toRaw(target);
@@ -667,8 +656,8 @@ function createIterableMethod(method, isReadonly, isShallow) {
     const isPair = method === "entries" || method === Symbol.iterator && targetIsMap;
     const isKeyOnly = method === "keys" && targetIsMap;
     const innerIterator = target[method](...args);
-    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-    !isReadonly && track(
+    const wrap = isShallow2 ? toShallow : isReadonly2 ? toReadonly : toReactive;
+    !isReadonly2 && track(
       rawTarget,
       "iterate",
       isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY
@@ -717,8 +706,12 @@ function createInstrumentations() {
       return size(this);
     },
     has,
-    add,
-    set,
+    add(value) {
+      return add.call(this, value, true);
+    },
+    set(key, value) {
+      return set.call(this, key, value, true);
+    },
     delete: deleteEntry,
     clear,
     forEach: createForEach(false, true)
@@ -784,13 +777,13 @@ const [
   shallowInstrumentations,
   shallowReadonlyInstrumentations
 ] = /* @__PURE__ */ createInstrumentations();
-function createInstrumentationGetter(isReadonly, shallow) {
-  const instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;
+function createInstrumentationGetter(isReadonly2, shallow) {
+  const instrumentations = shallow ? isReadonly2 ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly2 ? readonlyInstrumentations : mutableInstrumentations;
   return (target, key, receiver) => {
     if (key === "__v_isReactive") {
-      return !isReadonly;
+      return !isReadonly2;
     } else if (key === "__v_isReadonly") {
-      return isReadonly;
+      return isReadonly2;
     } else if (key === "__v_raw") {
       return target;
     }
@@ -935,7 +928,7 @@ class ComputedRefImpl {
       () => getter(this._value),
       () => triggerRefValue(
         this,
-        this.effect._dirtyLevel === 3 ? 3 : 4
+        this.effect._dirtyLevel === 2 ? 2 : 3
       )
     );
     this.effect.computed = this;
@@ -944,15 +937,12 @@ class ComputedRefImpl {
   }
   get value() {
     const self = toRaw(this);
-    const lastDirtyLevel = self.effect._dirtyLevel;
     if ((!self._cacheable || self.effect.dirty) && shared.hasChanged(self._value, self._value = self.effect.run())) {
-      if (lastDirtyLevel !== 3) {
-        triggerRefValue(self, 5);
-      }
+      triggerRefValue(self, 4);
     }
     trackRefValue(self);
     if (self.effect._dirtyLevel >= 2) {
-      triggerRefValue(self, 3);
+      triggerRefValue(self, 2);
     }
     return self._value;
   }
@@ -995,7 +985,7 @@ function trackRefValue(ref2) {
       ));
   }
 }
-function triggerRefValue(ref2, dirtyLevel = 5, newVal, oldVal) {
+function triggerRefValue(ref2, dirtyLevel = 4, newVal, oldVal) {
   ref2 = toRaw(ref2);
   const dep = ref2.dep;
   if (dep) {
@@ -1038,12 +1028,12 @@ class RefImpl {
       this._rawValue;
       this._rawValue = newVal;
       this._value = useDirectValue ? newVal : toReactive(newVal);
-      triggerRefValue(this, 5);
+      triggerRefValue(this, 4);
     }
   }
 }
 function triggerRef(ref2) {
-  triggerRefValue(ref2, 5);
+  triggerRefValue(ref2, 4);
 }
 function unref(ref2) {
   return isRef(ref2) ? ref2.value : ref2;

package/dist/reactivity.d.ts

@@ -507,7 +507,7 @@ export type MaybeRefOrGetter<T = any> = MaybeRef<T> | (() => T);
  * @param ref - Ref or plain value to be converted into the plain value.
  * @see {@link https://vuejs.org/api/reactivity-utilities.html#unref}
  */
-export declare function unref<T>(ref: MaybeRef<T> | ComputedRef<T>): T;
+export declare function unref<T>(ref: MaybeRef<T> | ComputedRef<T> | ShallowRef<T>): T;
 /**
  * Normalizes values / refs / getters to values.
  * This is similar to {@link unref()}, except that it also normalizes getters.
@@ -524,7 +524,7 @@ export declare function unref<T>(ref: MaybeRef<T> | ComputedRef<T>): T;
  * @param source - A getter, an existing ref, or a non-function value.
  * @see {@link https://vuejs.org/api/reactivity-utilities.html#tovalue}
  */
-export declare function toValue<T>(source: MaybeRefOrGetter<T> | ComputedRef<T>): T;
+export declare function toValue<T>(source: MaybeRefOrGetter<T> | ComputedRef<T> | ShallowRef<T>): T;
 /**
  * Returns a reactive proxy for the given object.
  *