@vue/reactivity 3.3.9 → 3.4.0-alpha.2

package/dist/reactivity.global.js

@@ -2,14 +2,12 @@ var VueReactivity = (function (exports) {
   'use strict';
 
   function makeMap(str, expectsLowerCase) {
-    const map = /* @__PURE__ */ Object.create(null);
-    const list = str.split(",");
-    for (let i = 0; i < list.length; i++) {
-      map[list[i]] = true;
-    }
-    return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];
+    const set = new Set(str.split(","));
+    return expectsLowerCase ? (val) => set.has(val.toLowerCase()) : (val) => set.has(val);
   }
 
+  const NOOP = () => {
+  };
   const extend = Object.assign;
   const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
   const hasOwn = (val, key) => hasOwnProperty$1.call(val, key);
@@ -148,117 +146,120 @@ var VueReactivity = (function (exports) {
     }
   }
 
-  const createDep = (effects) => {
-    const dep = new Set(effects);
-    dep.w = 0;
-    dep.n = 0;
-    return dep;
-  };
-  const wasTracked = (dep) => (dep.w & trackOpBit) > 0;
-  const newTracked = (dep) => (dep.n & trackOpBit) > 0;
-  const initDepMarkers = ({ deps }) => {
-    if (deps.length) {
-      for (let i = 0; i < deps.length; i++) {
-        deps[i].w |= trackOpBit;
-      }
-    }
-  };
-  const finalizeDepMarkers = (effect) => {
-    const { deps } = effect;
-    if (deps.length) {
-      let ptr = 0;
-      for (let i = 0; i < deps.length; i++) {
-        const dep = deps[i];
-        if (wasTracked(dep) && !newTracked(dep)) {
-          dep.delete(effect);
-        } else {
-          deps[ptr++] = dep;
-        }
-        dep.w &= ~trackOpBit;
-        dep.n &= ~trackOpBit;
-      }
-      deps.length = ptr;
-    }
-  };
-
-  const targetMap = /* @__PURE__ */ new WeakMap();
-  let effectTrackDepth = 0;
-  let trackOpBit = 1;
-  const maxMarkerBits = 30;
   let activeEffect;
-  const ITERATE_KEY = Symbol("iterate" );
-  const MAP_KEY_ITERATE_KEY = Symbol("Map key iterate" );
   class ReactiveEffect {
-    constructor(fn, scheduler = null, scope) {
+    constructor(fn, trigger, scheduler, scope) {
       this.fn = fn;
+      this.trigger = trigger;
       this.scheduler = scheduler;
       this.active = true;
       this.deps = [];
-      this.parent = void 0;
+      /**
+       * @internal
+       */
+      this._dirtyLevel = 3;
+      /**
+       * @internal
+       */
+      this._trackId = 0;
+      /**
+       * @internal
+       */
+      this._runnings = 0;
+      /**
+       * @internal
+       */
+      this._queryings = 0;
+      /**
+       * @internal
+       */
+      this._depsLength = 0;
       recordEffectScope(this, scope);
     }
+    get dirty() {
+      if (this._dirtyLevel === 1) {
+        this._dirtyLevel = 0;
+        this._queryings++;
+        pauseTracking();
+        for (const dep of this.deps) {
+          if (dep.computed) {
+            triggerComputed(dep.computed);
+            if (this._dirtyLevel >= 2) {
+              break;
+            }
+          }
+        }
+        resetTracking();
+        this._queryings--;
+      }
+      return this._dirtyLevel >= 2;
+    }
+    set dirty(v) {
+      this._dirtyLevel = v ? 3 : 0;
+    }
     run() {
+      this._dirtyLevel = 0;
       if (!this.active) {
         return this.fn();
       }
-      let parent = activeEffect;
       let lastShouldTrack = shouldTrack;
-      while (parent) {
-        if (parent === this) {
-          return;
-        }
-        parent = parent.parent;
-      }
+      let lastEffect = activeEffect;
       try {
-        this.parent = activeEffect;
-        activeEffect = this;
         shouldTrack = true;
-        trackOpBit = 1 << ++effectTrackDepth;
-        if (effectTrackDepth <= maxMarkerBits) {
-          initDepMarkers(this);
-        } else {
-          cleanupEffect(this);
-        }
+        activeEffect = this;
+        this._runnings++;
+        preCleanupEffect(this);
         return this.fn();
       } finally {
-        if (effectTrackDepth <= maxMarkerBits) {
-          finalizeDepMarkers(this);
-        }
-        trackOpBit = 1 << --effectTrackDepth;
-        activeEffect = this.parent;
+        postCleanupEffect(this);
+        this._runnings--;
+        activeEffect = lastEffect;
         shouldTrack = lastShouldTrack;
-        this.parent = void 0;
-        if (this.deferStop) {
-          this.stop();
-        }
       }
     }
     stop() {
-      if (activeEffect === this) {
-        this.deferStop = true;
-      } else if (this.active) {
-        cleanupEffect(this);
-        if (this.onStop) {
-          this.onStop();
-        }
+      var _a;
+      if (this.active) {
+        preCleanupEffect(this);
+        postCleanupEffect(this);
+        (_a = this.onStop) == null ? void 0 : _a.call(this);
         this.active = false;
       }
     }
   }
-  function cleanupEffect(effect2) {
-    const { deps } = effect2;
-    if (deps.length) {
-      for (let i = 0; i < deps.length; i++) {
-        deps[i].delete(effect2);
+  function triggerComputed(computed) {
+    return computed.value;
+  }
+  function preCleanupEffect(effect2) {
+    effect2._trackId++;
+    effect2._depsLength = 0;
+  }
+  function postCleanupEffect(effect2) {
+    if (effect2.deps && effect2.deps.length > effect2._depsLength) {
+      for (let i = effect2._depsLength; i < effect2.deps.length; i++) {
+        cleanupDepEffect(effect2.deps[i], effect2);
+      }
+      effect2.deps.length = effect2._depsLength;
+    }
+  }
+  function cleanupDepEffect(dep, effect2) {
+    const trackId = dep.get(effect2);
+    if (trackId !== void 0 && effect2._trackId !== trackId) {
+      dep.delete(effect2);
+      if (dep.size === 0) {
+        dep.cleanup();
       }
-      deps.length = 0;
     }
   }
   function effect(fn, options) {
     if (fn.effect instanceof ReactiveEffect) {
       fn = fn.effect.fn;
     }
-    const _effect = new ReactiveEffect(fn);
+    const _effect = new ReactiveEffect(fn, NOOP, () => {
+      if (_effect.dirty) {
+        _effect.run();
+      }
+    });
     if (options) {
       extend(_effect, options);
       if (options.scope)
@@ -275,6 +276,7 @@ var VueReactivity = (function (exports) {
     runner.effect.stop();
   }
   let shouldTrack = true;
+  let pauseScheduleStack = 0;
   const trackStack = [];
   function pauseTracking() {
     trackStack.push(shouldTrack);
@@ -288,6 +290,68 @@ var VueReactivity = (function (exports) {
     const last = trackStack.pop();
     shouldTrack = last === void 0 ? true : last;
   }
+  function pauseScheduling() {
+    pauseScheduleStack++;
+  }
+  function resetScheduling() {
+    pauseScheduleStack--;
+    while (!pauseScheduleStack && queueEffectSchedulers.length) {
+      queueEffectSchedulers.shift()();
+    }
+  }
+  function trackEffect(effect2, dep, debuggerEventExtraInfo) {
+    var _a;
+    if (dep.get(effect2) !== effect2._trackId) {
+      dep.set(effect2, effect2._trackId);
+      const oldDep = effect2.deps[effect2._depsLength];
+      if (oldDep !== dep) {
+        if (oldDep) {
+          cleanupDepEffect(oldDep, effect2);
+        }
+        effect2.deps[effect2._depsLength++] = dep;
+      } else {
+        effect2._depsLength++;
+      }
+      {
+        (_a = effect2.onTrack) == null ? void 0 : _a.call(effect2, extend({ effect: effect2 }, debuggerEventExtraInfo));
+      }
+    }
+  }
+  const queueEffectSchedulers = [];
+  function triggerEffects(dep, dirtyLevel, debuggerEventExtraInfo) {
+    var _a;
+    pauseScheduling();
+    for (const effect2 of dep.keys()) {
+      if (!effect2.allowRecurse && effect2._runnings) {
+        continue;
+      }
+      if (effect2._dirtyLevel < dirtyLevel && (!effect2._runnings || dirtyLevel !== 2)) {
+        const lastDirtyLevel = effect2._dirtyLevel;
+        effect2._dirtyLevel = dirtyLevel;
+        if (lastDirtyLevel === 0 && (!effect2._queryings || dirtyLevel !== 2)) {
+          {
+            (_a = effect2.onTrigger) == null ? void 0 : _a.call(effect2, extend({ effect: effect2 }, debuggerEventExtraInfo));
+          }
+          effect2.trigger();
+          if (effect2.scheduler) {
+            queueEffectSchedulers.push(effect2.scheduler);
+          }
+        }
+      }
+    }
+    resetScheduling();
+  }
+
+  const createDep = (cleanup, computed) => {
+    const dep = /* @__PURE__ */ new Map();
+    dep.cleanup = cleanup;
+    dep.computed = computed;
+    return dep;
+  };
+
+  const targetMap = /* @__PURE__ */ new WeakMap();
+  const ITERATE_KEY = Symbol("iterate" );
+  const MAP_KEY_ITERATE_KEY = Symbol("Map key iterate" );
   function track(target, type, key) {
     if (shouldTrack && activeEffect) {
       let depsMap = targetMap.get(target);
@@ -296,35 +360,17 @@ var VueReactivity = (function (exports) {
       }
       let dep = depsMap.get(key);
       if (!dep) {
-        depsMap.set(key, dep = createDep());
-      }
-      const eventInfo = { effect: activeEffect, target, type, key } ;
-      trackEffects(dep, eventInfo);
-    }
-  }
-  function trackEffects(dep, debuggerEventExtraInfo) {
-    let shouldTrack2 = false;
-    if (effectTrackDepth <= maxMarkerBits) {
-      if (!newTracked(dep)) {
-        dep.n |= trackOpBit;
-        shouldTrack2 = !wasTracked(dep);
-      }
-    } else {
-      shouldTrack2 = !dep.has(activeEffect);
-    }
-    if (shouldTrack2) {
-      dep.add(activeEffect);
-      activeEffect.deps.push(dep);
-      if (activeEffect.onTrack) {
-        activeEffect.onTrack(
-          extend(
-            {
-              effect: activeEffect
-            },
-            debuggerEventExtraInfo
-          )
-        );
+        depsMap.set(key, dep = createDep(() => depsMap.delete(key)));
       }
+      trackEffect(
+        activeEffect,
+        dep,
+        {
+          target,
+          type,
+          key
+        } 
+      );
     }
   }
   function trigger(target, type, key, newValue, oldValue, oldTarget) {
@@ -372,49 +418,24 @@ var VueReactivity = (function (exports) {
           break;
       }
     }
-    const eventInfo = { target, type, key, newValue, oldValue, oldTarget } ;
-    if (deps.length === 1) {
-      if (deps[0]) {
-        {
-          triggerEffects(deps[0], eventInfo);
-        }
-      }
-    } else {
-      const effects = [];
-      for (const dep of deps) {
-        if (dep) {
-          effects.push(...dep);
-        }
-      }
-      {
-        triggerEffects(createDep(effects), eventInfo);
-      }
-    }
-  }
-  function triggerEffects(dep, debuggerEventExtraInfo) {
-    const effects = isArray(dep) ? dep : [...dep];
-    for (const effect2 of effects) {
-      if (effect2.computed) {
-        triggerEffect(effect2, debuggerEventExtraInfo);
-      }
-    }
-    for (const effect2 of effects) {
-      if (!effect2.computed) {
-        triggerEffect(effect2, debuggerEventExtraInfo);
-      }
-    }
-  }
-  function triggerEffect(effect2, debuggerEventExtraInfo) {
-    if (effect2 !== activeEffect || effect2.allowRecurse) {
-      if (effect2.onTrigger) {
-        effect2.onTrigger(extend({ effect: effect2 }, debuggerEventExtraInfo));
-      }
-      if (effect2.scheduler) {
-        effect2.scheduler();
-      } else {
-        effect2.run();
+    pauseScheduling();
+    for (const dep of deps) {
+      if (dep) {
+        triggerEffects(
+          dep,
+          3,
+          {
+            target,
+            type,
+            key,
+            newValue,
+            oldValue,
+            oldTarget
+          } 
+        );
       }
     }
+    resetScheduling();
   }
   function getDepFromReactive(object, key) {
     var _a;
@@ -445,7 +466,9 @@ var VueReactivity = (function (exports) {
     ["push", "pop", "shift", "unshift", "splice"].forEach((key) => {
       instrumentations[key] = function(...args) {
         pauseTracking();
+        pauseScheduling();
         const res = toRaw(this)[key].apply(this, args);
+        resetScheduling();
         resetTracking();
         return res;
       };
@@ -984,30 +1007,94 @@ var VueReactivity = (function (exports) {
   const toReactive = (value) => isObject(value) ? reactive(value) : value;
   const toReadonly = (value) => isObject(value) ? readonly(value) : value;
 
+  class ComputedRefImpl {
+    constructor(getter, _setter, isReadonly, isSSR) {
+      this._setter = _setter;
+      this.dep = void 0;
+      this.__v_isRef = true;
+      this["__v_isReadonly"] = false;
+      this.effect = new ReactiveEffect(
+        () => getter(this._value),
+        () => triggerRefValue(this, 1)
+      );
+      this.effect.computed = this;
+      this.effect.active = this._cacheable = !isSSR;
+      this["__v_isReadonly"] = isReadonly;
+    }
+    get value() {
+      const self = toRaw(this);
+      trackRefValue(self);
+      if (!self._cacheable || self.effect.dirty) {
+        if (hasChanged(self._value, self._value = self.effect.run())) {
+          triggerRefValue(self, 2);
+        }
+      }
+      return self._value;
+    }
+    set value(newValue) {
+      this._setter(newValue);
+    }
+    // #region polyfill _dirty for backward compatibility third party code for Vue <= 3.3.x
+    get _dirty() {
+      return this.effect.dirty;
+    }
+    set _dirty(v) {
+      this.effect.dirty = v;
+    }
+    // #endregion
+  }
+  function computed(getterOrOptions, debugOptions, isSSR = false) {
+    let getter;
+    let setter;
+    const onlyGetter = isFunction(getterOrOptions);
+    if (onlyGetter) {
+      getter = getterOrOptions;
+      setter = () => {
+        console.warn("Write operation failed: computed value is readonly");
+      } ;
+    } else {
+      getter = getterOrOptions.get;
+      setter = getterOrOptions.set;
+    }
+    const cRef = new ComputedRefImpl(getter, setter, onlyGetter || !setter, isSSR);
+    if (debugOptions && !isSSR) {
+      cRef.effect.onTrack = debugOptions.onTrack;
+      cRef.effect.onTrigger = debugOptions.onTrigger;
+    }
+    return cRef;
+  }
+
   function trackRefValue(ref2) {
     if (shouldTrack && activeEffect) {
       ref2 = toRaw(ref2);
-      {
-        trackEffects(ref2.dep || (ref2.dep = createDep()), {
+      trackEffect(
+        activeEffect,
+        ref2.dep || (ref2.dep = createDep(
+          () => ref2.dep = void 0,
+          ref2 instanceof ComputedRefImpl ? ref2 : void 0
+        )),
+        {
           target: ref2,
           type: "get",
           key: "value"
-        });
-      }
+        } 
+      );
     }
   }
-  function triggerRefValue(ref2, newVal) {
+  function triggerRefValue(ref2, dirtyLevel = 3, newVal) {
     ref2 = toRaw(ref2);
     const dep = ref2.dep;
     if (dep) {
-      {
-        triggerEffects(dep, {
+      triggerEffects(
+        dep,
+        dirtyLevel,
+        {
           target: ref2,
           type: "set",
           key: "value",
           newValue: newVal
-        });
-      }
+        } 
+      );
     }
   }
   function isRef(r) {
@@ -1043,12 +1130,12 @@ var VueReactivity = (function (exports) {
       if (hasChanged(newVal, this._rawValue)) {
         this._rawValue = newVal;
         this._value = useDirectValue ? newVal : toReactive(newVal);
-        triggerRefValue(this, newVal);
+        triggerRefValue(this, 3, newVal);
       }
     }
   }
   function triggerRef(ref2) {
-    triggerRefValue(ref2, ref2.value );
+    triggerRefValue(ref2, 3, ref2.value );
   }
   function unref(ref2) {
     return isRef(ref2) ? ref2.value : ref2;
@@ -1146,127 +1233,7 @@ var VueReactivity = (function (exports) {
     return isRef(val) ? val : new ObjectRefImpl(source, key, defaultValue);
   }
 
-  class ComputedRefImpl {
-    constructor(getter, _setter, isReadonly, isSSR) {
-      this._setter = _setter;
-      this.dep = void 0;
-      this.__v_isRef = true;
-      this["__v_isReadonly"] = false;
-      this._dirty = true;
-      this.effect = new ReactiveEffect(getter, () => {
-        if (!this._dirty) {
-          this._dirty = true;
-          triggerRefValue(this);
-        }
-      });
-      this.effect.computed = this;
-      this.effect.active = this._cacheable = !isSSR;
-      this["__v_isReadonly"] = isReadonly;
-    }
-    get value() {
-      const self = toRaw(this);
-      trackRefValue(self);
-      if (self._dirty || !self._cacheable) {
-        self._dirty = false;
-        self._value = self.effect.run();
-      }
-      return self._value;
-    }
-    set value(newValue) {
-      this._setter(newValue);
-    }
-  }
-  function computed(getterOrOptions, debugOptions, isSSR = false) {
-    let getter;
-    let setter;
-    const onlyGetter = isFunction(getterOrOptions);
-    if (onlyGetter) {
-      getter = getterOrOptions;
-      setter = () => {
-        console.warn("Write operation failed: computed value is readonly");
-      } ;
-    } else {
-      getter = getterOrOptions.get;
-      setter = getterOrOptions.set;
-    }
-    const cRef = new ComputedRefImpl(getter, setter, onlyGetter || !setter, isSSR);
-    if (debugOptions && !isSSR) {
-      cRef.effect.onTrack = debugOptions.onTrack;
-      cRef.effect.onTrigger = debugOptions.onTrigger;
-    }
-    return cRef;
-  }
-
-  const tick = /* @__PURE__ */ Promise.resolve();
-  const queue = [];
-  let queued = false;
-  const scheduler = (fn) => {
-    queue.push(fn);
-    if (!queued) {
-      queued = true;
-      tick.then(flush);
-    }
-  };
-  const flush = () => {
-    for (let i = 0; i < queue.length; i++) {
-      queue[i]();
-    }
-    queue.length = 0;
-    queued = false;
-  };
-  class DeferredComputedRefImpl {
-    constructor(getter) {
-      this.dep = void 0;
-      this._dirty = true;
-      this.__v_isRef = true;
-      this["__v_isReadonly"] = true;
-      let compareTarget;
-      let hasCompareTarget = false;
-      let scheduled = false;
-      this.effect = new ReactiveEffect(getter, (computedTrigger) => {
-        if (this.dep) {
-          if (computedTrigger) {
-            compareTarget = this._value;
-            hasCompareTarget = true;
-          } else if (!scheduled) {
-            const valueToCompare = hasCompareTarget ? compareTarget : this._value;
-            scheduled = true;
-            hasCompareTarget = false;
-            scheduler(() => {
-              if (this.effect.active && this._get() !== valueToCompare) {
-                triggerRefValue(this);
-              }
-              scheduled = false;
-            });
-          }
-          for (const e of this.dep) {
-            if (e.computed instanceof DeferredComputedRefImpl) {
-              e.scheduler(
-                true
-                /* computedTrigger */
-              );
-            }
-          }
-        }
-        this._dirty = true;
-      });
-      this.effect.computed = this;
-    }
-    _get() {
-      if (this._dirty) {
-        this._dirty = false;
-        return this._value = this.effect.run();
-      }
-      return this._value;
-    }
-    get value() {
-      trackRefValue(this);
-      return toRaw(this)._get();
-    }
-  }
-  function deferredComputed(getter) {
-    return new DeferredComputedRefImpl(getter);
-  }
+  const deferredComputed = computed;
 
   exports.EffectScope = EffectScope;
   exports.ITERATE_KEY = ITERATE_KEY;
@@ -1285,11 +1252,13 @@ var VueReactivity = (function (exports) {
   exports.isShallow = isShallow;
   exports.markRaw = markRaw;
   exports.onScopeDispose = onScopeDispose;
+  exports.pauseScheduling = pauseScheduling;
   exports.pauseTracking = pauseTracking;
   exports.proxyRefs = proxyRefs;
   exports.reactive = reactive;
   exports.readonly = readonly;
   exports.ref = ref;
+  exports.resetScheduling = resetScheduling;
   exports.resetTracking = resetTracking;
   exports.shallowReactive = shallowReactive;
   exports.shallowReadonly = shallowReadonly;