Refactor

README.md

@@ -69,6 +69,7 @@ An object which provides
 - `reset` - a function to reset the form state to its initial state
 - `cancelSubmit` (() => void) - function to cancel the current form submission
 - `submitAsync` - async version of submit and resolves with the submission result
+- `set` - ((name, value) => void) - a function to set the value for any given field
 - `subscribe` ((stateListener) => () => void) - a state listener with the current state of the form (see below for [stateListener](#state-listener))
 - `__service` - the base service (xstate interpreter), made available for library authors to creating wrappers for frameworks
 - `validate` ((field, value?) => void) - function to validate given field

src/index.ts

@@ -28,7 +28,7 @@ export type Actions<T = any, D = any> = {
   cancelSubmit: () => void;
   kill: (id: string) => void;
   submitAsync: () => Promise<D>;
-  clearError: (id: string) => void;
+  // clearError: (id: string) => void;
   set: <N extends keyof T>(name: N, value: T[N]) => void;
   validate: <N extends keyof T>(name: N, value?: T[N]) => void;
   spawn: (id: string, value: unknown, validator: Validator) => void;
@@ -64,9 +64,9 @@ export const createForm = <
     service.send('submit');
   };
 
-  const clearError: Actions['clearError'] = (id) => {
-    service.send({ id, type: 'clear_error' });
-  };
+  // const clearError: Actions['clearError'] = (id) => {
+  //   service.send({ id, type: 'clear_error' });
+  // };
 
   const cancelSubmit: Actions['cancelSubmit'] = () => {
     service.send('cancel');
@@ -81,7 +81,7 @@ export const createForm = <
   };
 
   const set: Actions<T>['set'] = (id, value) => {
-    service.send({ id: id as string, value, type: 'change' });
+    service.send({ id: id as string, value, type: 'set' });
   };
 
   const validate: Actions<T>['validate'] = (id, value) => {
@@ -117,7 +117,7 @@ export const createForm = <
     reset,
     submit,
     validate,
-    clearError,
+    // clearError,
     submitAsync,
     cancelSubmit,
     __service: service,

src/machine/index.ts

@@ -19,11 +19,11 @@ export type Ctx<T extends object = any, D = any, E = any, FE = any> = {
 
 export type Events =
   | { type: 'reset' }
-  | { type: 'change'; id: string; value: unknown }
+  | { type: 'set'; id: string; value: unknown }
   | { type: 'spawn'; id: string; value: unknown; validator: Validator }
   | { type: 'kill'; id: string }
   | { type: 'validate'; id: string; value?: any }
-  | { type: 'clear_error'; id: string }
+  // | { type: 'clear_error'; id: string }
   | { type: 'submit' | 'cancel' }
 
   // actor events
@@ -97,23 +97,23 @@ export const config = <T extends object>(
           ],
         },
 
-        clear_error: [
-          {
-            cond: (_, { id }) => !!id,
-            actions: [
-              'removeActorError',
-              send((_) => ({ type: 'set', name: 'error', value: null }), {
-                to: (_, { id }) => id,
-              }),
-            ],
-          },
-          {
-            target: 'idle',
-            actions: 'clearError',
-          },
-        ],
-
-        change: {
+        // clear_error: [
+        //   {
+        //     cond: (_, { id }) => !!id,
+        //     actions: [
+        //       'removeActorError',
+        //       send((_) => ({ type: 'set', name: 'error', value: null }), {
+        //         to: (_, { id }) => id,
+        //       }),
+        //     ],
+        //   },
+        //   {
+        //     target: 'idle',
+        //     actions: 'clearError',
+        //   },
+        // ],
+
+        set: {
           actions: [
             'setValue',
             'setInitialState',
@@ -279,6 +279,13 @@ export const config = <T extends object>(
           },
         }),
 
+        maybeSetValue: assign({
+          values: ({ values }, { id, value }: any) => {
+            set(values, id, value === undefined ? get(values, id) : value);
+            return values;
+          },
+        }),
+
         setActorError: assign({
           errors: ({ errors }, { id, error }: any) => {
             set(errors, id, error);

src/machine/types.ts

@@ -15,17 +15,17 @@ export type FlattenedSchema<T = any> = {
   [K in keyof T]: Validator<T, T[K]>;
 };
 
-export type Infer<T> = T extends Schema<infer R>
-  ? {
-      [K in keyof R]: T[K] extends Array<infer U>
-        ? Infer<U>[]
-        : R[K] extends Validator<R, R[K]>
-        ? ReturnType<R[K]> extends Promise<infer N>
-          ? N
-          : ReturnType<R[K]>
-        : R[K];
-    }
-  : never;
+// export type Infer<T> = T extends Schema<infer R>
+//   ? {
+//       [K in keyof R]: T[K] extends Array<infer U>
+//         ? Infer<U>[]
+//         : R[K] extends Validator<R, R[K]>
+//         ? ReturnType<R[K]> extends Promise<infer N>
+//           ? N
+//           : ReturnType<R[K]>
+//         : R[K];
+//     }
+//   : never;
 
 export type SyncValidator<V = any, Vs = any> = (value: V, values: Vs) => V;