@fairys/valtio-form-basic 1.0.4 → 1.0.5

package/esm/common/instance/index.js

@@ -2,13 +2,12 @@ import { createContext, useContext, useRef } from "react";
 import { proxy, ref as external_valtio_ref, snapshot, unstable_getInternalStates, useSnapshot } from "valtio";
 import async_validator from "async-validator";
 import { copy } from "fast-copy";
-import { formatePath, get, isObject, removeValueByPaths, set } from "../utils/index.js";
+import { formatePath, get, removeValueByPaths, set } from "../utils/index.js";
 class FairysValtioFormInstance {
     onValuesChange;
     isValtioProxy = (value)=>{
-        const { refSet } = unstable_getInternalStates();
-        const canProxyDefault = (x)=>isObject(x) && !refSet.has(x) && (Array.isArray(x) || !(Symbol.iterator in x)) && !(x instanceof WeakMap) && !(x instanceof WeakSet) && !(x instanceof Error) && !(x instanceof Number) && !(x instanceof Date) && !(x instanceof String) && !(x instanceof RegExp) && !(x instanceof ArrayBuffer) && !(x instanceof Promise);
-        return canProxyDefault(value);
+        const { proxyStateMap } = unstable_getInternalStates();
+        return proxyStateMap.has(value);
     };
     state = proxy({});
     errorState = proxy({});
@@ -20,10 +19,8 @@ class FairysValtioFormInstance {
         const isValtioProxy = this.isValtioProxy(formData);
         if (isValtioProxy) if ('deepCopy' === initFormDataType) this.updated(copy(snapshot(formData)), false);
         else this.state = formData;
-        else {
-            if ('deepCopy' === initFormDataType) this.updated(copy(formData || {}), false);
-            this.updated(formData || {}, false);
-        }
+        else if ('deepCopy' === initFormDataType) this.updated(copy(formData || {}), false);
+        else this.updated(formData || {}, false);
     };
     updated = (state, isValidate = true)=>{
         const keys = Object.keys(state);

package/lib/common/instance/index.js

@@ -51,9 +51,8 @@ const index_js_namespaceObject = require("../utils/index.js");
 class FairysValtioFormInstance {
     onValuesChange;
     isValtioProxy = (value)=>{
-        const { refSet } = (0, external_valtio_namespaceObject.unstable_getInternalStates)();
-        const canProxyDefault = (x)=>(0, index_js_namespaceObject.isObject)(x) && !refSet.has(x) && (Array.isArray(x) || !(Symbol.iterator in x)) && !(x instanceof WeakMap) && !(x instanceof WeakSet) && !(x instanceof Error) && !(x instanceof Number) && !(x instanceof Date) && !(x instanceof String) && !(x instanceof RegExp) && !(x instanceof ArrayBuffer) && !(x instanceof Promise);
-        return canProxyDefault(value);
+        const { proxyStateMap } = (0, external_valtio_namespaceObject.unstable_getInternalStates)();
+        return proxyStateMap.has(value);
     };
     state = (0, external_valtio_namespaceObject.proxy)({});
     errorState = (0, external_valtio_namespaceObject.proxy)({});
@@ -65,10 +64,8 @@ class FairysValtioFormInstance {
         const isValtioProxy = this.isValtioProxy(formData);
         if (isValtioProxy) if ('deepCopy' === initFormDataType) this.updated((0, external_fast_copy_namespaceObject.copy)((0, external_valtio_namespaceObject.snapshot)(formData)), false);
         else this.state = formData;
-        else {
-            if ('deepCopy' === initFormDataType) this.updated((0, external_fast_copy_namespaceObject.copy)(formData || {}), false);
-            this.updated(formData || {}, false);
-        }
+        else if ('deepCopy' === initFormDataType) this.updated((0, external_fast_copy_namespaceObject.copy)(formData || {}), false);
+        else this.updated(formData || {}, false);
     };
     updated = (state, isValidate = true)=>{
         const keys = Object.keys(state);

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "使用 valtio 实现的表单基础库, 使其更加便捷，同时支持`PC`、`H5`、`Taro`，同时也更加灵活。",
   "homepage": "https://github.com/autumn-fairy-tales/valtio-form-basic",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/common/instance/index.ts

@@ -20,21 +20,8 @@ export class FairysValtioFormInstance<T extends MObject<T> = Record<string, any>
    * @returns 是否为代理对象
    */
   isValtioProxy = (value: any) => {
-    const { refSet } = unstable_getInternalStates();
-    const canProxyDefault = (x: unknown): boolean =>
-      isObject(x) &&
-      !refSet.has(x) &&
-      (Array.isArray(x) || !(Symbol.iterator in x)) &&
-      !(x instanceof WeakMap) &&
-      !(x instanceof WeakSet) &&
-      !(x instanceof Error) &&
-      !(x instanceof Number) &&
-      !(x instanceof Date) &&
-      !(x instanceof String) &&
-      !(x instanceof RegExp) &&
-      !(x instanceof ArrayBuffer) &&
-      !(x instanceof Promise);
-    return canProxyDefault(value);
+    const { proxyStateMap } = unstable_getInternalStates();
+    return proxyStateMap.has(value);
   };
 
   /**状态*/
@@ -58,18 +45,15 @@ export class FairysValtioFormInstance<T extends MObject<T> = Record<string, any>
     const isValtioProxy = this.isValtioProxy(formData);
     if (isValtioProxy) {
       if (initFormDataType === 'deepCopy') {
-        // this.state = proxy(copy(snapshot(formData)) as T);
         this.updated(copy(snapshot(formData)) as T, false);
       } else {
         this.state = formData as T;
-        // this.updated(formData as T, false);
       }
     } else {
       if (initFormDataType === 'deepCopy') {
         // this.state = proxy(copy(formData || {}) as T);
         this.updated(copy(formData || {}) as T, false);
-      }
-      {
+      } else {
         // this.state = proxy((formData || {}) as T);
         this.updated((formData || {}) as T, false);
       }