Factorized errors function.

Author: ciscoheat

src/lib/client/clientValidation.ts

@@ -18,9 +18,9 @@ import {
   traversePathsAsync
 } from '../traversal.js';
 import type { FormOptions, SuperForm, TaintOption } from './index.js';
-import { errorShape, mapErrors } from '../errors.js';
+import { errorShape, mapErrors, clearErrors } from '../errors.js';
 import type { FormPathType } from '../stringPath.js';
-import { clearErrors, clone } from '../utils.js';
+import { clone } from '../utils.js';
 import { get } from 'svelte/store';
 
 export type ValidateOptions<V> = Partial<{

src/lib/client/index.ts

@@ -29,7 +29,7 @@ import {
   isInvalidPath
 } from '../traversal.js';
 import { fieldProxy } from './proxies.js';
-import { clearErrors, clone } from '../utils.js';
+import { clone } from '../utils.js';
 import {
   splitPath,
   type FormPath,
@@ -48,7 +48,7 @@ import {
   type SuperFormEvents,
   type SuperFormEventList
 } from './formEnhance.js';
-import { flattenErrors } from '../errors.js';
+import { clearErrors, flattenErrors } from '../errors.js';
 import { clientValidation, validateForm } from './clientValidation.js';
 
 export {

src/lib/errors.ts

@@ -9,6 +9,8 @@ import type {
 } from 'zod';
 import { mergePath } from './stringPath.js';
 import { unwrapZodType } from './schemaEntity.js';
+import type { Writable } from 'svelte/store';
+import { setPaths, traversePaths } from './traversal.js';
 
 /**
  * A tree structure where the existence of a node means that its not a leaf.
@@ -122,3 +124,31 @@ function _flattenErrors(
       }
     });
 }
+
+export function clearErrors<T extends AnyZodObject>(
+  Errors: Writable<ValidationErrors<T>>,
+  options: {
+    undefinePath: string[] | null;
+    clearFormLevelErrors: boolean;
+  }
+) {
+  Errors.update(($errors) => {
+    traversePaths($errors, (pathData) => {
+      if (
+        pathData.path.length == 1 &&
+        pathData.path[0] == '_errors' &&
+        !options.clearFormLevelErrors
+      ) {
+        return;
+      }
+      if (Array.isArray(pathData.value)) {
+        return pathData.set(undefined);
+      }
+    });
+
+    if (options.undefinePath)
+      setPaths($errors, [options.undefinePath], undefined);
+
+    return $errors;
+  });
+}

src/lib/index.ts

@@ -55,16 +55,6 @@ type IntersectArray<T extends readonly unknown[]> = T extends [
 type IntersectUnion<T extends ZodUnion<ZodUnionOptions>> =
   T extends ZodUnion<infer O> ? IntersectArray<O> : never;
 
-/*
-const schema = z
-  .object({ id: z.number() })
-  .or(z.object({ name: z.string() }));
-
-type U = typeof schema; //ZodUnion<[AnyZodObject, AnyZodObject]>
-
-type P = IntersectUnion<U>;
-*/
-
 type SuperStructArray<T extends AnyZodObject, Data, ArrayData = unknown> = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [Property in keyof RawShape<T>]?: T extends any
@@ -137,7 +127,7 @@ export type TaintedFields<T extends AnyZodObject> = SuperStructArray<
 
 export type ValidationErrors<T extends AnyZodObject> = {
   _errors?: string[];
-} & SuperStructArray<T, string[], {_errors?: string[]}>;
+} & SuperStructArray<T, string[], { _errors?: string[] }>;
 
 export type InputConstraint = Partial<{
   pattern: string; // RegExp

src/lib/utils.ts

@@ -1,40 +1,8 @@
 import { parse, stringify } from 'devalue';
-import type { Writable } from 'svelte/store';
-import type { AnyZodObject } from 'zod';
-import type { ValidationErrors } from './index.js';
-import { setPaths, traversePaths } from './traversal.js';
 
 export function clone<T>(data: T): T {
   if ('structuredClone' in globalThis) {
     return structuredClone(data);
   }
   return parse(stringify(data));
 }
-
-export function clearErrors<T extends AnyZodObject>(
-  Errors: Writable<ValidationErrors<T>>,
-  options: {
-    undefinePath: string[] | null;
-    clearFormLevelErrors: boolean;
-  }
-) {
-  Errors.update(($errors) => {
-    traversePaths($errors, (pathData) => {
-      if (
-        pathData.path.length == 1 &&
-        pathData.path[0] == '_errors' &&
-        !options.clearFormLevelErrors
-      ) {
-        return;
-      }
-      if (Array.isArray(pathData.value)) {
-        return pathData.set(undefined);
-      }
-    });
-
-    if (options.undefinePath)
-      setPaths($errors, [options.undefinePath], undefined);
-
-    return $errors;
-  });
-}