@yiin/reactive-proxy-state 1.0.39 → 1.0.41

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;
@@ -2392,6 +2421,7 @@ function resetProxyStats() {
 function evictDeep(value) {
   if (value == null || typeof value !== "object")
     return;
+  value = toRaw(value);
   if (!globalSeen.has(value))
     return;
   globalSeen.delete(value);
@@ -3047,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);
@@ -3056,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) {
@@ -3224,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);
@@ -3233,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;
@@ -3253,7 +3295,7 @@ function wrapMap(map, emit, path = []) {
             path: cachedPath,
             key,
             oldValue,
-            newValue: value2
+            newValue: value2 !== null && typeof value2 === "object" ? deepClone(value2) : value2
           };
           emit?.(event);
           if (!existed) {
@@ -3470,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];
@@ -3729,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;
@@ -3749,7 +3797,7 @@ function wrapArray(arr, emit, path = []) {
           action: "set",
           path: newPath,
           oldValue,
-          newValue: value
+          newValue: isObject2(value) ? deepClone(value) : value
         };
         emit?.(event);
         if (isObject2(oldValue) && oldValue !== value) {
@@ -3774,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;
@@ -3862,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;
@@ -3881,7 +3927,7 @@ function reactive(obj, emit, path = [], options) {
           action: "set",
           path: newPath,
           oldValue,
-          newValue: value
+          newValue: isObject3(value) ? deepClone(value) : value
         };
         emit?.(event);
         trigger(target, prop);

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;
@@ -2330,6 +2359,7 @@ function resetProxyStats() {
 function evictDeep(value) {
   if (value == null || typeof value !== "object")
     return;
+  value = toRaw(value);
   if (!globalSeen.has(value))
     return;
   globalSeen.delete(value);
@@ -2985,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);
@@ -2994,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) {
@@ -3162,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);
@@ -3171,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;
@@ -3191,7 +3233,7 @@ function wrapMap(map, emit, path = []) {
             path: cachedPath,
             key,
             oldValue,
-            newValue: value2
+            newValue: value2 !== null && typeof value2 === "object" ? deepClone(value2) : value2
           };
           emit?.(event);
           if (!existed) {
@@ -3408,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];
@@ -3667,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;
@@ -3687,7 +3735,7 @@ function wrapArray(arr, emit, path = []) {
           action: "set",
           path: newPath,
           oldValue,
-          newValue: value
+          newValue: isObject2(value) ? deepClone(value) : value
         };
         emit?.(event);
         if (isObject2(oldValue) && oldValue !== value) {
@@ -3712,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;
@@ -3800,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;
@@ -3819,7 +3865,7 @@ function reactive(obj, emit, path = [], options) {
           action: "set",
           path: newPath,
           oldValue,
-          newValue: value
+          newValue: isObject3(value) ? deepClone(value) : value
         };
         emit?.(event);
         trigger(target, prop);

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>;

package/package.json

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