fixed snapshot bug

src/index.ts

@@ -1,176 +1,177 @@
 /* eslint-disable */
-import { z, ZodType } from 'zod';
-import { proxy as vproxy } from 'valtio';
+import { z, ZodType } from 'zod'
+import { proxy as vproxy } from 'valtio'
 
 type ValtioProxy<T> = {
-  [P in keyof T]: T[P];
-};
+  [P in keyof T]: T[P]
+}
 
 type SchemaConfig = {
-  parseAsync?: boolean;
-  safeParse?: boolean;
-  errorHandler?: (error: unknown) => void;
-};
+  parseAsync?: boolean
+  safeParse?: boolean
+  errorHandler?: (error: unknown) => void
+}
 
 const defaultConfig = {
   parseAsync: false,
   safeParse: false,
-  errorHandler: (error: unknown) => console.error(error),
-};
+  errorHandler: (error: unknown) => console.error(error)
+}
 
 export const vzGlobalConfig = {
   safeParse: false,
-  errorHandler: (error: unknown) => console.error(error),
-};
+  errorHandler: (error: unknown) => console.error(error)
+}
 
 const isObject = (x: unknown): x is object =>
-  typeof x === 'object' && x !== null;
+  typeof x === 'object' && x !== null
 
-type MergedConfig = Required<SchemaConfig>;
+type MergedConfig = Required<SchemaConfig>
 
 type SchemaMeta = SchemaConfig & {
-  initialState: unknown;
-};
+  initialState: unknown
+}
 
-type PropType = string | number | symbol;
-const schemaMeta = new WeakMap<ZodType<any>, SchemaMeta>();
-const pathList = new WeakMap<{}, PropType[]>();
+type PropType = string | number | symbol
+const schemaMeta = new WeakMap<ZodType<any>, SchemaMeta>()
+const pathList = new WeakMap<{}, PropType[]>()
 
 type SchemaReturn<T extends ZodType<any>> = {
-  proxy: (initialState: any, config?: SchemaConfig) => ValtioProxy<z.infer<T>>;
-};
+  proxy: (initialState: any, config?: SchemaConfig) => ValtioProxy<z.infer<T>>
+}
 
 function updateObjectAtPath(object: any, newValue: any, path: PropType[]) {
-  let stack = [...path];
+  let stack = [...path]
 
   while (stack.length > 1) {
-    const key = stack.shift();
-    if (key === undefined) return;
+    const key = stack.shift()
+    if (key === undefined) return
     if (!object[key] || typeof object[key] !== 'object') {
-      object[key] = {};
+      object[key] = {}
     }
-    object = object[key];
+    object = object[key]
   }
 
-  const lastKey = stack.shift();
-  if (lastKey !== undefined) object[lastKey] = newValue;
+  const lastKey = stack.shift()
+  if (lastKey !== undefined) object[lastKey] = newValue
 }
 
 export const schema = <T extends ZodType<any>>(
-  zodSchema: T,
+  zodSchema: T
 ): SchemaReturn<T> => {
   const proxy = (
     initialState: z.infer<T>,
-    config: SchemaConfig = {},
+    config: SchemaConfig = {}
   ): ValtioProxy<z.infer<T>> => {
     if (!isObject(initialState)) {
-      throw new Error('object required');
+      throw new Error('object required')
     }
 
-    const mergedConfig: MergedConfig = { ...defaultConfig, ...config };
+    const mergedConfig: MergedConfig = { ...defaultConfig, ...config }
 
-    const parseAsync = mergedConfig.parseAsync;
-    const safeParse = mergedConfig.safeParse;
-    const errorHandler = mergedConfig.errorHandler;
+    const parseAsync = mergedConfig.parseAsync
+    const safeParse = mergedConfig.safeParse
+    const errorHandler = mergedConfig.errorHandler
 
     // before proxying, validate the initial state
     if (parseAsync) {
       zodSchema.parseAsync(initialState).catch((e) => {
-        throw e;
-      });
+        throw e
+      })
     } else {
-      zodSchema.parse(initialState);
+      zodSchema.parse(initialState)
     }
 
-    const valtioProxy = vproxy(initialState);
+    const valtioProxy = vproxy(initialState)
+
     const createProxy = (target: any, parentPath: PropType[] = []): any => {
       if (!schemaMeta.has(zodSchema)) {
         schemaMeta.set(zodSchema, {
           safeParse,
           parseAsync,
           errorHandler,
-          initialState,
-        });
+          initialState
+        })
       }
 
       Reflect.ownKeys(target).forEach((key) => {
         if (isObject(target[key])) {
-          const newPath = parentPath.concat(key);
-          pathList.set(target[key], newPath);
-          createProxy(target[key], newPath);
+          const newPath = parentPath.concat(key)
+          pathList.set(target[key], newPath)
+          createProxy(target[key], newPath)
         }
-      });
+      })
 
       return new Proxy(target, {
         get(target, prop, receiver) {
-          const value = Reflect.get(target, prop, receiver);
+          const value = Reflect.get(target, prop, receiver)
           return isObject(value)
             ? createProxy(value, parentPath.concat(prop))
-            : value;
+            : value
         },
         set(target, prop, value, receiver) {
           const originalObject = schemaMeta.get(zodSchema)!
-            .initialState as z.infer<T>;
+            .initialState as z.infer<T>
 
-          const objectToValidate = JSON.parse(JSON.stringify(originalObject));
-          const path = (pathList.get(target) || []).concat(prop);
+          const objectToValidate = JSON.parse(JSON.stringify(originalObject))
+          const path = (pathList.get(target) || []).concat(prop)
 
-          updateObjectAtPath(objectToValidate, value, path);
+          updateObjectAtPath(objectToValidate, value, path)
 
           const handleAsyncParse = async () => {
             try {
-              const parsedValue = await zodSchema.parseAsync(objectToValidate);
-              Reflect.set(target, prop, value, receiver);
-              return true;
+              const parsedValue = await zodSchema.parseAsync(objectToValidate)
+              updateObjectAtPath(valtioProxy, value, path)
+              return true
             } catch (error) {
-              errorHandler(error);
+              errorHandler(error)
               if (!safeParse) {
-                throw error;
+                throw error
               }
-              return false;
+              return false
             }
-          };
+          }
 
           const handleSyncParse = () => {
             try {
               if (safeParse) {
-                const result = zodSchema.safeParse(objectToValidate);
+                const result = zodSchema.safeParse(objectToValidate)
                 if (result.success) {
-                  Reflect.set(target, prop, value, receiver);
-                  return true;
+                  updateObjectAtPath(valtioProxy, value, path)
+                  return true
                 } else {
-                  errorHandler(result.error);
-                  return false;
+                  errorHandler(result.error)
+                  return false
                 }
               } else {
-                const parsedValue = zodSchema.parse(objectToValidate);
-                Reflect.set(target, prop, value, receiver);
-                return true;
+                const parsedValue = zodSchema.parse(objectToValidate)
+                updateObjectAtPath(valtioProxy, value, path)
+                return true
               }
             } catch (error) {
-              errorHandler(error);
+              errorHandler(error)
               if (!safeParse) {
-                throw error;
+                throw error
               }
-              return false;
+              return false
             }
-          };
+          }
 
           if (parseAsync) {
             handleAsyncParse().catch((error) => {
-              errorHandler(error);
+              errorHandler(error)
               if (!safeParse) {
-                throw error;
+                throw error
               }
-            });
-            return true;
+            })
+            return true
           } else {
-            return handleSyncParse();
+            return handleSyncParse()
           }
-        },
-      });
-    };
-    return createProxy(valtioProxy);
-  };
-  return { proxy };
-};
+        }
+      })
+    }
+    return createProxy(valtioProxy)
+  }
+  return { proxy }
+}