@yiin/reactive-proxy-state 1.0.38 → 1.0.40

package/dist/index.cjs

@@ -2362,6 +2362,35 @@ __export(exports_src, {
 module.exports = __toCommonJS(exports_src);
 
 // src/utils.ts
+function toRaw(observed) {
+  let value = observed;
+  while (value && value["__v_raw" /* RAW */]) {
+    value = value["__v_raw" /* RAW */];
+  }
+  return value;
+}
+function unwrapForStore(value) {
+  if (value["__v_isReactive" /* IS_REACTIVE */])
+    return toRaw(value);
+  if (Array.isArray(value)) {
+    for (let i = 0;i < value.length; i++) {
+      const child = value[i];
+      if (child != null && typeof child === "object" && child["__v_isReactive" /* IS_REACTIVE */]) {
+        value[i] = toRaw(child);
+      }
+    }
+  } else if (!(value instanceof Map) && !(value instanceof Set) && !(value instanceof Date)) {
+    for (const key in value) {
+      if (!Object.prototype.hasOwnProperty.call(value, key))
+        continue;
+      const child = value[key];
+      if (child != null && typeof child === "object" && child["__v_isReactive" /* IS_REACTIVE */]) {
+        value[key] = toRaw(child);
+      }
+    }
+  }
+  return value;
+}
 var deepEqualCache = new WeakMap;
 var MAX_CACHE_SIZE = 1000;
 var pathCache = new WeakMap;
@@ -2389,6 +2418,41 @@ function resetProxyStats() {
   proxyStats.objects = 0;
   proxyStats.staleEvicted = 0;
 }
+function evictDeep(value) {
+  if (value == null || typeof value !== "object")
+    return;
+  value = toRaw(value);
+  if (!globalSeen.has(value))
+    return;
+  globalSeen.delete(value);
+  wrapperCache.delete(value);
+  proxyStats.staleEvicted++;
+  if (Array.isArray(value)) {
+    for (let i = 0;i < value.length; i++) {
+      if (value[i] != null && typeof value[i] === "object") {
+        evictDeep(value[i]);
+      }
+    }
+  } else if (value instanceof Map) {
+    for (const v of value.values()) {
+      if (v != null && typeof v === "object")
+        evictDeep(v);
+    }
+  } else if (value instanceof Set) {
+    for (const v of value) {
+      if (v != null && typeof v === "object")
+        evictDeep(v);
+    }
+  } else {
+    const keys = Object.keys(value);
+    for (let i = 0;i < keys.length; i++) {
+      const child = value[keys[i]];
+      if (child != null && typeof child === "object") {
+        evictDeep(child);
+      }
+    }
+  }
+}
 function cleanupPathCache(root) {
   const cache = pathCache.get(root);
   if (cache && pathCacheSize.get(root) > MAX_CACHE_SIZE) {
@@ -3013,6 +3077,10 @@ function wrapSet(set, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(set, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (prop === Symbol.iterator || prop === "entries" || prop === "values" || prop === "keys" || prop === "forEach") {
         track(target, Symbol.iterator);
@@ -3022,6 +3090,8 @@ function wrapSet(set, emit, path = []) {
       }
       if (prop === "add") {
         methodCache[prop] = function(value2) {
+          if (value2 != null && typeof value2 === "object")
+            value2 = unwrapForStore(value2);
           const existed = target.has(value2);
           const oldSize = target.size;
           if (!existed) {
@@ -3190,6 +3260,10 @@ function wrapMap(map, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(map, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (prop === Symbol.iterator || prop === "entries" || prop === "values" || prop === "keys" || prop === "forEach") {
         track(target, Symbol.iterator);
@@ -3199,6 +3273,8 @@ function wrapMap(map, emit, path = []) {
       }
       if (prop === "set") {
         methodCache[prop] = function(key, value2) {
+          if (value2 != null && typeof value2 === "object")
+            value2 = unwrapForStore(value2);
           const existed = target.has(key);
           const oldValue = target.get(key);
           const oldSize = target.size;
@@ -3436,6 +3512,10 @@ function wrapArray(arr, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(arr, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (methodCache[prop]) {
         return methodCache[prop];
@@ -3480,6 +3560,8 @@ function wrapArray(arr, emit, path = []) {
               oldValue
             };
             emit?.(event);
+            if (isObject2(oldValue))
+              evictDeep(oldValue);
             trigger(target, Symbol.iterator);
             if (oldLength !== newLength) {
               trigger(target, "length");
@@ -3503,6 +3585,8 @@ function wrapArray(arr, emit, path = []) {
               oldValue
             };
             emit?.(event);
+            if (isObject2(oldValue))
+              evictDeep(oldValue);
             trigger(target, Symbol.iterator);
             if (oldLength !== newLength) {
               trigger(target, "length");
@@ -3552,6 +3636,10 @@ function wrapArray(arr, emit, path = []) {
                 oldValues: deletedItems.length > 0 ? deletedItems : undefined
               };
               emit?.(event);
+              for (let i = 0;i < deletedItems.length; i++) {
+                if (isObject2(deletedItems[i]))
+                  evictDeep(deletedItems[i]);
+              }
               trigger(target, Symbol.iterator);
               if (oldLength !== newLength) {
                 trigger(target, "length");
@@ -3687,6 +3775,8 @@ function wrapArray(arr, emit, path = []) {
       return value;
     },
     set(target, prop, value, receiver) {
+      if (isObject2(value))
+        value = unwrapForStore(value);
       const oldValue = target[prop];
       if (oldValue === value)
         return true;
@@ -3710,6 +3800,9 @@ function wrapArray(arr, emit, path = []) {
           newValue: value
         };
         emit?.(event);
+        if (isObject2(oldValue) && oldValue !== value) {
+          evictDeep(oldValue);
+        }
         trigger(target, prop);
       }
       return result;
@@ -3729,10 +3822,6 @@ function isObject3(v) {
 function isReactive(value) {
   return !!(value && value["__v_isReactive" /* IS_REACTIVE */]);
 }
-function toRaw(observed) {
-  const raw = observed && observed["__v_raw" /* RAW */];
-  return raw ? toRaw(raw) : observed;
-}
 function createAsyncEmit(emit) {
   const queue = [];
   let flushScheduled = false;
@@ -3817,6 +3906,8 @@ function reactive(obj, emit, path = [], options) {
       return wrapValue(value, newPath);
     },
     set(target, prop, value, receiver) {
+      if (isObject3(value))
+        value = unwrapForStore(value);
       const oldValue = target[prop];
       if (oldValue === value)
         return true;
@@ -3841,9 +3932,7 @@ function reactive(obj, emit, path = [], options) {
         emit?.(event);
         trigger(target, prop);
         if (isObject3(oldValue) && oldValue !== value) {
-          globalSeen.delete(oldValue);
-          wrapperCache.delete(oldValue);
-          proxyStats.staleEvicted++;
+          evictDeep(oldValue);
         }
       }
       return result;
@@ -3868,9 +3957,7 @@ function reactive(obj, emit, path = [], options) {
         emit?.(event);
         trigger(target, prop);
         if (isObject3(oldValue)) {
-          globalSeen.delete(oldValue);
-          wrapperCache.delete(oldValue);
-          proxyStats.staleEvicted++;
+          evictDeep(oldValue);
         }
       }
       return result;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './types';
-export { deepClone, deepEqual, getProxyStats, resetProxyStats } from './utils';
+export { deepClone, deepEqual, getProxyStats, resetProxyStats, toRaw } from './utils';
 export * from './state';
 export * from './reactive';
 export * from './watch';

package/dist/index.js

@@ -2300,6 +2300,35 @@ var require_reactivity_cjs = __commonJS((exports) => {
   exports.watch = watch2;
 });
 // src/utils.ts
+function toRaw(observed) {
+  let value = observed;
+  while (value && value["__v_raw" /* RAW */]) {
+    value = value["__v_raw" /* RAW */];
+  }
+  return value;
+}
+function unwrapForStore(value) {
+  if (value["__v_isReactive" /* IS_REACTIVE */])
+    return toRaw(value);
+  if (Array.isArray(value)) {
+    for (let i = 0;i < value.length; i++) {
+      const child = value[i];
+      if (child != null && typeof child === "object" && child["__v_isReactive" /* IS_REACTIVE */]) {
+        value[i] = toRaw(child);
+      }
+    }
+  } else if (!(value instanceof Map) && !(value instanceof Set) && !(value instanceof Date)) {
+    for (const key in value) {
+      if (!Object.prototype.hasOwnProperty.call(value, key))
+        continue;
+      const child = value[key];
+      if (child != null && typeof child === "object" && child["__v_isReactive" /* IS_REACTIVE */]) {
+        value[key] = toRaw(child);
+      }
+    }
+  }
+  return value;
+}
 var deepEqualCache = new WeakMap;
 var MAX_CACHE_SIZE = 1000;
 var pathCache = new WeakMap;
@@ -2327,6 +2356,41 @@ function resetProxyStats() {
   proxyStats.objects = 0;
   proxyStats.staleEvicted = 0;
 }
+function evictDeep(value) {
+  if (value == null || typeof value !== "object")
+    return;
+  value = toRaw(value);
+  if (!globalSeen.has(value))
+    return;
+  globalSeen.delete(value);
+  wrapperCache.delete(value);
+  proxyStats.staleEvicted++;
+  if (Array.isArray(value)) {
+    for (let i = 0;i < value.length; i++) {
+      if (value[i] != null && typeof value[i] === "object") {
+        evictDeep(value[i]);
+      }
+    }
+  } else if (value instanceof Map) {
+    for (const v of value.values()) {
+      if (v != null && typeof v === "object")
+        evictDeep(v);
+    }
+  } else if (value instanceof Set) {
+    for (const v of value) {
+      if (v != null && typeof v === "object")
+        evictDeep(v);
+    }
+  } else {
+    const keys = Object.keys(value);
+    for (let i = 0;i < keys.length; i++) {
+      const child = value[keys[i]];
+      if (child != null && typeof child === "object") {
+        evictDeep(child);
+      }
+    }
+  }
+}
 function cleanupPathCache(root) {
   const cache = pathCache.get(root);
   if (cache && pathCacheSize.get(root) > MAX_CACHE_SIZE) {
@@ -2951,6 +3015,10 @@ function wrapSet(set, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(set, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (prop === Symbol.iterator || prop === "entries" || prop === "values" || prop === "keys" || prop === "forEach") {
         track(target, Symbol.iterator);
@@ -2960,6 +3028,8 @@ function wrapSet(set, emit, path = []) {
       }
       if (prop === "add") {
         methodCache[prop] = function(value2) {
+          if (value2 != null && typeof value2 === "object")
+            value2 = unwrapForStore(value2);
           const existed = target.has(value2);
           const oldSize = target.size;
           if (!existed) {
@@ -3128,6 +3198,10 @@ function wrapMap(map, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(map, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (prop === Symbol.iterator || prop === "entries" || prop === "values" || prop === "keys" || prop === "forEach") {
         track(target, Symbol.iterator);
@@ -3137,6 +3211,8 @@ function wrapMap(map, emit, path = []) {
       }
       if (prop === "set") {
         methodCache[prop] = function(key, value2) {
+          if (value2 != null && typeof value2 === "object")
+            value2 = unwrapForStore(value2);
           const existed = target.has(key);
           const oldValue = target.get(key);
           const oldSize = target.size;
@@ -3374,6 +3450,10 @@ function wrapArray(arr, emit, path = []) {
   const methodCache = {};
   const proxy = new Proxy(arr, {
     get(target, prop, receiver) {
+      if (prop === "__v_raw" /* RAW */)
+        return target;
+      if (prop === "__v_isReactive" /* IS_REACTIVE */)
+        return true;
       track(target, prop);
       if (methodCache[prop]) {
         return methodCache[prop];
@@ -3418,6 +3498,8 @@ function wrapArray(arr, emit, path = []) {
               oldValue
             };
             emit?.(event);
+            if (isObject2(oldValue))
+              evictDeep(oldValue);
             trigger(target, Symbol.iterator);
             if (oldLength !== newLength) {
               trigger(target, "length");
@@ -3441,6 +3523,8 @@ function wrapArray(arr, emit, path = []) {
               oldValue
             };
             emit?.(event);
+            if (isObject2(oldValue))
+              evictDeep(oldValue);
             trigger(target, Symbol.iterator);
             if (oldLength !== newLength) {
               trigger(target, "length");
@@ -3490,6 +3574,10 @@ function wrapArray(arr, emit, path = []) {
                 oldValues: deletedItems.length > 0 ? deletedItems : undefined
               };
               emit?.(event);
+              for (let i = 0;i < deletedItems.length; i++) {
+                if (isObject2(deletedItems[i]))
+                  evictDeep(deletedItems[i]);
+              }
               trigger(target, Symbol.iterator);
               if (oldLength !== newLength) {
                 trigger(target, "length");
@@ -3625,6 +3713,8 @@ function wrapArray(arr, emit, path = []) {
       return value;
     },
     set(target, prop, value, receiver) {
+      if (isObject2(value))
+        value = unwrapForStore(value);
       const oldValue = target[prop];
       if (oldValue === value)
         return true;
@@ -3648,6 +3738,9 @@ function wrapArray(arr, emit, path = []) {
           newValue: value
         };
         emit?.(event);
+        if (isObject2(oldValue) && oldValue !== value) {
+          evictDeep(oldValue);
+        }
         trigger(target, prop);
       }
       return result;
@@ -3667,10 +3760,6 @@ function isObject3(v) {
 function isReactive(value) {
   return !!(value && value["__v_isReactive" /* IS_REACTIVE */]);
 }
-function toRaw(observed) {
-  const raw = observed && observed["__v_raw" /* RAW */];
-  return raw ? toRaw(raw) : observed;
-}
 function createAsyncEmit(emit) {
   const queue = [];
   let flushScheduled = false;
@@ -3755,6 +3844,8 @@ function reactive(obj, emit, path = [], options) {
       return wrapValue(value, newPath);
     },
     set(target, prop, value, receiver) {
+      if (isObject3(value))
+        value = unwrapForStore(value);
       const oldValue = target[prop];
       if (oldValue === value)
         return true;
@@ -3779,9 +3870,7 @@ function reactive(obj, emit, path = [], options) {
         emit?.(event);
         trigger(target, prop);
         if (isObject3(oldValue) && oldValue !== value) {
-          globalSeen.delete(oldValue);
-          wrapperCache.delete(oldValue);
-          proxyStats.staleEvicted++;
+          evictDeep(oldValue);
         }
       }
       return result;
@@ -3806,9 +3895,7 @@ function reactive(obj, emit, path = [], options) {
         emit?.(event);
         trigger(target, prop);
         if (isObject3(oldValue)) {
-          globalSeen.delete(oldValue);
-          wrapperCache.delete(oldValue);
-          proxyStats.staleEvicted++;
+          evictDeep(oldValue);
         }
       }
       return result;

package/dist/reactive.d.ts

@@ -3,11 +3,6 @@ import { EmitFunction, Path, ReactiveOptions } from "./types";
  * Checks if an object is a reactive proxy
  */
 export declare function isReactive(value: any): boolean;
-/**
- * Returns the raw, original object underlying a reactive proxy.
- * If the input is not a proxy, returns the input itself.
- */
-export declare function toRaw<T>(observed: T): T;
 /**
  * Create a reactive proxy for an object
  */

package/dist/utils.d.ts

@@ -1,3 +1,13 @@
+/**
+ * Returns the raw, original object underlying a reactive proxy.
+ * If the input is not a proxy, returns the input itself.
+ */
+export declare function toRaw<T>(observed: T): T;
+/**
+ * Strip proxy refs from spread results before storing in raw state.
+ * Prevents unbounded proxy nesting from `{ ...reactiveProxy }` patterns.
+ */
+export declare function unwrapForStore(value: any): any;
 export declare const pathCache: WeakMap<object, Map<string, any>>;
 export declare const pathConcatCache: Map<string, any[]>;
 export declare const globalSeen: WeakMap<any, any>;
@@ -22,6 +32,12 @@ export declare function getProxyStats(): {
     staleEvicted: number;
 };
 export declare function resetProxyStats(): void;
+/**
+ * Recursively evict an object and all its nested children from proxy caches.
+ * This allows GC to collect the entire old object tree when a property is
+ * replaced, not just the top-level value.
+ */
+export declare function evictDeep(value: any): void;
 export declare function deepEqual(a: any, b: any, seen?: WeakMap<any, any>): boolean;
 export declare function getFromPathCache(root: object, pathKey: string): any | undefined;
 export declare function setInPathCache(root: object, pathKey: string, value: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yiin/reactive-proxy-state",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "author": "Yiin <stanislovas@yiin.lt>",
   "repository": {
     "type": "git",