@vue/runtime-dom 3.2.29 → 3.2.30

package/dist/runtime-dom.global.js

@@ -201,13 +201,15 @@ var VueRuntimeDOM = (function (exports) {
    * @private
    */
   const toDisplayString = (val) => {
-      return val == null
-          ? ''
-          : isArray(val) ||
-              (isObject(val) &&
-                  (val.toString === objectToString || !isFunction(val.toString)))
-              ? JSON.stringify(val, replacer, 2)
-              : String(val);
+      return isString(val)
+          ? val
+          : val == null
+              ? ''
+              : isArray(val) ||
+                  (isObject(val) &&
+                      (val.toString === objectToString || !isFunction(val.toString)))
+                  ? JSON.stringify(val, replacer, 2)
+                  : String(val);
   };
   const replacer = (_key, val) => {
       // can't use isRef here since @vue/shared has no deps
@@ -281,6 +283,7 @@ var VueRuntimeDOM = (function (exports) {
       'onVnodeBeforeMount,onVnodeMounted,' +
       'onVnodeBeforeUpdate,onVnodeUpdated,' +
       'onVnodeBeforeUnmount,onVnodeUnmounted');
+  const isBuiltInDirective = /*#__PURE__*/ makeMap('bind,cloak,else-if,else,for,html,if,model,on,once,pre,show,slot,text,memo');
   const cacheStringFunction = (fn) => {
       const cache = Object.create(null);
       return ((str) => {
@@ -346,7 +349,6 @@ var VueRuntimeDOM = (function (exports) {
   }
 
   let activeEffectScope;
-  const effectScopeStack = [];
   class EffectScope {
       constructor(detached = false) {
           this.active = true;
@@ -361,11 +363,11 @@ var VueRuntimeDOM = (function (exports) {
       run(fn) {
           if (this.active) {
               try {
-                  this.on();
+                  activeEffectScope = this;
                   return fn();
               }
               finally {
-                  this.off();
+                  activeEffectScope = this.parent;
               }
           }
           else {
@@ -373,23 +375,24 @@ var VueRuntimeDOM = (function (exports) {
           }
       }
       on() {
-          if (this.active) {
-              effectScopeStack.push(this);
-              activeEffectScope = this;
-          }
+          activeEffectScope = this;
       }
       off() {
-          if (this.active) {
-              effectScopeStack.pop();
-              activeEffectScope = effectScopeStack[effectScopeStack.length - 1];
-          }
+          activeEffectScope = this.parent;
       }
       stop(fromParent) {
           if (this.active) {
-              this.effects.forEach(e => e.stop());
-              this.cleanups.forEach(cleanup => cleanup());
+              let i, l;
+              for (i = 0, l = this.effects.length; i < l; i++) {
+                  this.effects[i].stop();
+              }
+              for (i = 0, l = this.cleanups.length; i < l; i++) {
+                  this.cleanups[i]();
+              }
               if (this.scopes) {
-                  this.scopes.forEach(e => e.stop(true));
+                  for (i = 0, l = this.scopes.length; i < l; i++) {
+                      this.scopes[i].stop(true);
+                  }
               }
               // nested scope, dereference from parent to avoid memory leaks
               if (this.parent && !fromParent) {
@@ -407,8 +410,7 @@ var VueRuntimeDOM = (function (exports) {
   function effectScope(detached) {
       return new EffectScope(detached);
   }
-  function recordEffectScope(effect, scope) {
-      scope = scope || activeEffectScope;
+  function recordEffectScope(effect, scope = activeEffectScope) {
       if (scope && scope.active) {
           scope.effects.push(effect);
       }
@@ -471,7 +473,6 @@ var VueRuntimeDOM = (function (exports) {
    * When recursion depth is greater, fall back to using a full cleanup.
    */
   const maxMarkerBits = 30;
-  const effectStack = [];
   let activeEffect;
   const ITERATE_KEY = Symbol('iterate' );
   const MAP_KEY_ITERATE_KEY = Symbol('Map key iterate' );
@@ -481,35 +482,42 @@ var VueRuntimeDOM = (function (exports) {
           this.scheduler = scheduler;
           this.active = true;
           this.deps = [];
+          this.parent = undefined;
           recordEffectScope(this, scope);
       }
       run() {
           if (!this.active) {
               return this.fn();
           }
-          if (!effectStack.length || !effectStack.includes(this)) {
-              try {
-                  effectStack.push((activeEffect = this));
-                  enableTracking();
-                  trackOpBit = 1 << ++effectTrackDepth;
-                  if (effectTrackDepth <= maxMarkerBits) {
-                      initDepMarkers(this);
-                  }
-                  else {
-                      cleanupEffect(this);
-                  }
-                  return this.fn();
+          let parent = activeEffect;
+          let lastShouldTrack = shouldTrack;
+          while (parent) {
+              if (parent === this) {
+                  return;
               }
-              finally {
-                  if (effectTrackDepth <= maxMarkerBits) {
-                      finalizeDepMarkers(this);
-                  }
-                  trackOpBit = 1 << --effectTrackDepth;
-                  resetTracking();
-                  effectStack.pop();
-                  const n = effectStack.length;
-                  activeEffect = n > 0 ? effectStack[n - 1] : undefined;
+              parent = parent.parent;
+          }
+          try {
+              this.parent = activeEffect;
+              activeEffect = this;
+              shouldTrack = true;
+              trackOpBit = 1 << ++effectTrackDepth;
+              if (effectTrackDepth <= maxMarkerBits) {
+                  initDepMarkers(this);
               }
+              else {
+                  cleanupEffect(this);
+              }
+              return this.fn();
+          }
+          finally {
+              if (effectTrackDepth <= maxMarkerBits) {
+                  finalizeDepMarkers(this);
+              }
+              trackOpBit = 1 << --effectTrackDepth;
+              activeEffect = this.parent;
+              shouldTrack = lastShouldTrack;
+              this.parent = undefined;
           }
       }
       stop() {
@@ -557,32 +565,24 @@ var VueRuntimeDOM = (function (exports) {
       trackStack.push(shouldTrack);
       shouldTrack = false;
   }
-  function enableTracking() {
-      trackStack.push(shouldTrack);
-      shouldTrack = true;
-  }
   function resetTracking() {
       const last = trackStack.pop();
       shouldTrack = last === undefined ? true : last;
   }
   function track(target, type, key) {
-      if (!isTracking()) {
-          return;
-      }
-      let depsMap = targetMap.get(target);
-      if (!depsMap) {
-          targetMap.set(target, (depsMap = new Map()));
-      }
-      let dep = depsMap.get(key);
-      if (!dep) {
-          depsMap.set(key, (dep = createDep()));
+      if (shouldTrack && activeEffect) {
+          let depsMap = targetMap.get(target);
+          if (!depsMap) {
+              targetMap.set(target, (depsMap = new Map()));
+          }
+          let dep = depsMap.get(key);
+          if (!dep) {
+              depsMap.set(key, (dep = createDep()));
+          }
+          const eventInfo = { effect: activeEffect, target, type, key }
+              ;
+          trackEffects(dep, eventInfo);
       }
-      const eventInfo = { effect: activeEffect, target, type, key }
-          ;
-      trackEffects(dep, eventInfo);
-  }
-  function isTracking() {
-      return shouldTrack && activeEffect !== undefined;
   }
   function trackEffects(dep, debuggerEventExtraInfo) {
       let shouldTrack = false;
@@ -1267,13 +1267,10 @@ var VueRuntimeDOM = (function (exports) {
   const toReadonly = (value) => isObject(value) ? readonly(value) : value;
 
   function trackRefValue(ref) {
-      if (isTracking()) {
+      if (shouldTrack && activeEffect) {
           ref = toRaw(ref);
-          if (!ref.dep) {
-              ref.dep = createDep();
-          }
           {
-              trackEffects(ref.dep, {
+              trackEffects(ref.dep || (ref.dep = createDep()), {
                   target: ref,
                   type: "get" /* GET */,
                   key: 'value'
@@ -1295,7 +1292,7 @@ var VueRuntimeDOM = (function (exports) {
       }
   }
   function isRef(r) {
-      return Boolean(r && r.__v_isRef === true);
+      return !!(r && r.__v_isRef === true);
   }
   function ref(value) {
       return createRef(value, false);
@@ -5107,7 +5104,6 @@ var VueRuntimeDOM = (function (exports) {
     [bar, this.y]
   ])
   */
-  const isBuiltInDirective = /*#__PURE__*/ makeMap('bind,cloak,else-if,else,for,html,if,model,on,once,pre,show,slot,text,memo');
   function validateDirectiveName(name) {
       if (isBuiltInDirective(name)) {
           warn$1('Do not use built-in directive ids as custom directive id: ' + name);
@@ -9028,7 +9024,7 @@ var VueRuntimeDOM = (function (exports) {
   }
 
   // Core API ------------------------------------------------------------------
-  const version = "3.2.29";
+  const version = "3.2.30";
   /**
    * SSR utils for \@vue/server-renderer. Only exposed in cjs builds.
    * @internal