@strictly/react-form 0.0.22 → 0.0.24

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: es6
 CJS Build start
 ESM Build start
-ESM dist/index.js 56.70 KB
-ESM ⚡️ Build success in 124ms
-CJS dist/index.cjs 60.71 KB
-CJS ⚡️ Build success in 127ms
+CJS dist/index.cjs 60.74 KB
+CJS ⚡️ Build success in 148ms
+ESM dist/index.js 56.72 KB
+ESM ⚡️ Build success in 148ms
 DTS Build start
-DTS ⚡️ Build success in 10452ms
-DTS dist/index.d.cts 38.50 KB
-DTS dist/index.d.ts  38.50 KB
-Done in 11.53s.
+DTS ⚡️ Build success in 31697ms
+DTS dist/index.d.cts 37.27 KB
+DTS dist/index.d.ts  37.27 KB
+Done in 32.89s.

package/.turbo/turbo-check-types.log

@@ -1,3 +1,3 @@
 yarn run v1.22.22
 $ tsc -b
-Done in 0.40s.
+Done in 0.41s.

package/core/mobx/form_model.ts

@@ -89,6 +89,7 @@ type FlattenedFieldOverrides<
 }
 
 export enum Validation {
+  None = 0,
   Changed = 1,
   Always = 2,
 }
@@ -211,7 +212,7 @@ export abstract class FormModel<
       case 'edit':
         return false
       default:
-        return this.mode satisfies never
+        throw new UnreachableError(this.mode)
     }
   }
 
@@ -310,12 +311,11 @@ export abstract class FormModel<
       valuePath as string,
       context,
     )
-    // const error = this.errors[valuePath]
     let error: unknown = undefined
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value
-    const validation = this.validation[valuePath]
+    const validation = this.validation[valuePath] ?? Validation.None
     switch (validation) {
-      case undefined:
+      case Validation.None:
         // skip validation
         break
       case Validation.Changed:
@@ -393,7 +393,7 @@ export abstract class FormModel<
   setFieldValue<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
     value: ToOfFieldAdapter<ValuePathsToAdapters[K]>,
-    validation: Validation | undefined | null = this.validation[valuePath],
+    validation?: Validation,
   ): boolean {
     return this.internalSetFieldValue(valuePath, value, validation)
   }
@@ -563,7 +563,7 @@ export abstract class FormModel<
   private internalSetFieldValue<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
     value: ToOfFieldAdapter<ValuePathsToAdapters[K]>,
-    validation: Validation | undefined | null,
+    validation: Validation | undefined,
   ): boolean {
     const { revert } = this.getAdapterForValuePath(valuePath)
 
@@ -576,8 +576,6 @@ export abstract class FormModel<
       this.fieldOverrides[valuePath] = [value]
       if (validation != null) {
         this.validation[valuePath] = validation
-      } else {
-        delete this.validation[valuePath]
       }
       switch (conversion.type) {
         case UnreliableFieldConversionType.Failure:
@@ -644,12 +642,13 @@ export abstract class FormModel<
     return keys.has(valuePath as string)
   }
 
+  getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation {
+    return this.validation[valuePath] ?? Validation.None
+  }
+
   validateField<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
-    validation: Validation = Math.max(
-      this.mode === 'create' ? Validation.Always : Validation.Changed,
-      this.validation[valuePath] ?? Validation.Changed,
-    ),
+    validation: Validation = Validation.Always,
   ): boolean {
     runInAction(() => {
       this.validation[valuePath] = validation
@@ -657,7 +656,7 @@ export abstract class FormModel<
     return this.fields[valuePath].error == null
   }
 
-  validateAll(validation: Validation = this.mode === 'create' ? Validation.Always : Validation.Changed): boolean {
+  validateAll(validation: Validation = Validation.Always): boolean {
     const accessors = toArray(this.accessors)
 
     runInAction(() => {

package/core/mobx/hooks.tsx

@@ -5,14 +5,11 @@ import {
 import {
   useCallback,
 } from 'react'
+import type { ValueTypeOfField } from 'types/value_type_of_field'
 import {
   type FormModel,
+  Validation,
 } from './form_model'
-import {
-  type FormFieldsOfModel,
-  type ToValueOfModelValuePath,
-  type ValuePathsOfModel,
-} from './types'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any>
@@ -22,14 +19,14 @@ type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends Form
 export function useDefaultMobxFormHooks<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   M extends FormModel<any, any, any, any, any>,
-  F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>,
+  F extends M['fields'] = M['fields'],
 >(
   model: M,
   {
     onValidFieldSubmit,
     onValidFormSubmit,
   }: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void,
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void,
     onValidFormSubmit?: (value: ValueOfModel<M>) => void,
   } = {},
 ): {
@@ -40,18 +37,18 @@ export function useDefaultMobxFormHooks<
   onFieldSubmit?(this: void, key: keyof F): boolean | void,
 } {
   const onFieldValueChange = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (
+    function<Path extends keyof F> (
       path: Path,
-      value: ToValueOfModelValuePath<M, Path>,
+      value: ValueTypeOfField<F[Path]>,
     ) {
-      // clear any validation
-      model.setFieldValue<Path>(path, value, null)
+      // clear validation once there are no errors for the field
+      model.setFieldValue<Path>(path, value)
     },
     [model],
   )
 
   const onFieldSubmit = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (valuePath: Path) {
+    function<Path extends keyof F> (valuePath: Path) {
       if (model.validateField(valuePath)) {
         onValidFieldSubmit?.(valuePath)
       }
@@ -64,13 +61,14 @@ export function useDefaultMobxFormHooks<
   )
 
   const onFieldBlur = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (path: Path) {
+    function<Path extends keyof F> (path: Path) {
       // work around potential loss of focus prior to state potentially invalidating change triggering
       // (e.g. changing a discriminator)
       // TODO debounce?
       setTimeout(function () {
         if (model.isValuePathActive(path)) {
-          model.validateField(path)
+          // further workaround to make sure we don't downgrade the existing validation
+          model.validateField(path, Math.max(Validation.Changed, model.getValidation(path)))
         }
       }, 100)
     },

package/core/mobx/specs/form_model.tests.ts

@@ -93,7 +93,7 @@ describe('all', function () {
     resetMockAdapter(originalBooleanToBooleanAdapter, booleanToBooleanAdapter)
   })
 
-  describe('FlattenedTypePathsToConvertersOf', function () {
+  describe('FlattenedTypePathsToAdaptersOf', function () {
     type ConvenientFieldAdapter<
       From,
       Context,
@@ -1066,8 +1066,8 @@ describe('all', function () {
             'x',
             true,
           )).narrow,
-          '$.x:a': identityAdapter(0).narrow,
-          '$.y:b': identityAdapter(false).narrow,
+          '$:x.a': identityAdapter(0).narrow,
+          '$:y.b': identityAdapter(false).narrow,
         } as const
 
         describe('isValuePathActive', function () {
@@ -1091,11 +1091,11 @@ describe('all', function () {
                 true,
               ],
               [
-                '$.x:a',
+                '$:x.a',
                 true,
               ],
               [
-                '$.y:b',
+                '$:y.b',
                 false,
               ],
             ] as const)('value path %s is active %s', function (path, expected) {
@@ -1124,11 +1124,11 @@ describe('all', function () {
                 true,
               ],
               [
-                '$.x:a',
+                '$:x.a',
                 false,
               ],
               [
-                '$.y:b',
+                '$:y.b',
                 true,
               ],
             ] as const)('value path %s is active %s', function (path, expected) {
@@ -1267,8 +1267,8 @@ describe('all', function () {
           expect(model.fields['$.n'].readonly).toBeTruthy()
         })
 
-        it('validates successfully with clean, but invalid data', () => {
-          expect(model.validateAll()).toBeTruthy()
+        it('fails validation with invalid, clean data', () => {
+          expect(model.validateAll()).toBeFalsy()
         })
 
         it('fails validation with invalid, dirty data', () => {

package/dist/index.cjs

@@ -358,6 +358,7 @@ var import_base2 = require("@strictly/base");
 var import_define = require("@strictly/define");
 var import_mobx = require("mobx");
 var Validation = /* @__PURE__ */ ((Validation2) => {
+  Validation2[Validation2["None"] = 0] = "None";
   Validation2[Validation2["Changed"] = 1] = "Changed";
   Validation2[Validation2["Always"] = 2] = "Always";
   return Validation2;
@@ -412,7 +413,7 @@ var FormModel = class {
       case "edit":
         return false;
       default:
-        return this.mode;
+        throw new import_base2.UnreachableError(this.mode);
     }
   }
   get fields() {
@@ -463,6 +464,7 @@ var FormModel = class {
     return this.synthesizeFieldByPaths(valuePath, typePath);
   }
   synthesizeFieldByPaths(valuePath, typePath) {
+    var _a;
     const adapter2 = this.adapters[typePath];
     if (adapter2 == null) {
       return;
@@ -492,9 +494,9 @@ var FormModel = class {
     );
     let error = void 0;
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value;
-    const validation = this.validation[valuePath];
+    const validation = (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
     switch (validation) {
-      case void 0:
+      case 0 /* None */:
         break;
       case 1 /* Changed */:
         if (revert != null) {
@@ -555,7 +557,7 @@ var FormModel = class {
   typePath(valuePath) {
     return (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
   }
-  setFieldValue(valuePath, value, validation = this.validation[valuePath]) {
+  setFieldValue(valuePath, value, validation) {
     return this.internalSetFieldValue(valuePath, value, validation);
   }
   addListItem(valuePath, elementValue = null, index) {
@@ -699,8 +701,6 @@ var FormModel = class {
       this.fieldOverrides[valuePath] = [value];
       if (validation != null) {
         this.validation[valuePath] = validation;
-      } else {
-        delete this.validation[valuePath];
       }
       switch (conversion.type) {
         case 1 /* Failure */:
@@ -757,16 +757,17 @@ var FormModel = class {
     const keys = new Set(Object.keys(values));
     return keys.has(valuePath);
   }
-  validateField(valuePath, validation = Math.max(
-    this.mode === "create" ? 2 /* Always */ : 1 /* Changed */,
-    ((_a) => (_a = this.validation[valuePath]) != null ? _a : 1 /* Changed */)()
-  )) {
+  getValidation(valuePath) {
+    var _a;
+    return (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
+  }
+  validateField(valuePath, validation = 2 /* Always */) {
     (0, import_mobx.runInAction)(() => {
       this.validation[valuePath] = validation;
     });
     return this.fields[valuePath].error == null;
   }
-  validateAll(validation = this.mode === "create" ? 2 /* Always */ : 1 /* Changed */) {
+  validateAll(validation = 2 /* Always */) {
     const accessors = (0, import_base2.toArray)(this.accessors);
     (0, import_mobx.runInAction)(() => {
       accessors.forEach(([valuePath]) => {
@@ -801,7 +802,7 @@ function useDefaultMobxFormHooks(model, {
 } = {}) {
   const onFieldValueChange = (0, import_react.useCallback)(
     function(path, value) {
-      model.setFieldValue(path, value, null);
+      model.setFieldValue(path, value);
     },
     [model]
   );
@@ -821,7 +822,7 @@ function useDefaultMobxFormHooks(model, {
     function(path) {
       setTimeout(function() {
         if (model.isValuePathActive(path)) {
-          model.validateField(path);
+          model.validateField(path, Math.max(1 /* Changed */, model.getValidation(path)));
         }
       }, 100);
     },

package/dist/index.d.cts

@@ -113,6 +113,7 @@ type FlattenedFieldOverrides<ValuePathsToAdapters extends Readonly<Record<string
     -readonly [K in keyof ValuePathsToAdapters]?: FieldOverride<ToOfFieldAdapter<ValuePathsToAdapters[K]>>;
 };
 declare enum Validation {
+    None = 0,
     Changed = 1,
     Always = 2
 }
@@ -147,7 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private maybeGetAdapterForValuePath;
     private getAdapterForValuePath;
     typePath<K extends keyof ValueToTypePaths>(valuePath: K): ValueToTypePaths[K];
-    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation | undefined | null): boolean;
+    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation): boolean;
     addListItem<K extends keyof FlattenedListTypesOfType<T>>(valuePath: K, elementValue?: Maybe<ElementOfArray<FlattenedValuesOfType<T>[K]>>, index?: number): void;
     removeListItem<K extends keyof FlattenedListTypesOfType<T>>(...elementValuePaths: readonly `${K}.${number}`[]): void;
     private internalSetFieldValue;
@@ -155,31 +156,14 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     clearFieldValue<K extends StringKeyOf<ValuePathsToAdapters>>(valuePath: K): void;
     clearAll(value: ValueOfType<T>): void;
     isValuePathActive<K extends keyof ValuePathsToAdapters>(valuePath: K): boolean;
+    getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation;
     validateField<K extends keyof ValuePathsToAdapters>(valuePath: K, validation?: Validation): boolean;
     validateAll(validation?: Validation): boolean;
 }
 
-/**
- * Used to extract the supported value paths from a model
- */
-type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;
-
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
-declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void;
+declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends M['fields'] = M['fields']>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void;
     onValidFormSubmit?: (value: ValueOfModel<M>) => void;
 }): {
     onFormSubmit: () => void;
@@ -456,4 +440,4 @@ declare function mergeValidators<Validators1 extends Partial<Readonly<Record<Key
 
 declare function Empty(): null;
 
-export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, type ContextOf, type ContextOfFieldAdapter, DefaultErrorRenderer, Empty, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, type FieldsViewProps, type FlattenedAdaptersOfFields, type FlattenedConvertedFieldsOf, type FlattenedTypePathsToAdaptersOf, type FormFieldsOfFieldAdapters, type FormFieldsOfModel, type FormMode, FormModel, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, type RefOfProps, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfModelValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsOfModel, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, type ContextOf, type ContextOfFieldAdapter, DefaultErrorRenderer, Empty, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, type FieldsViewProps, type FlattenedAdaptersOfFields, type FlattenedConvertedFieldsOf, type FlattenedTypePathsToAdaptersOf, type FormFieldsOfFieldAdapters, type FormMode, FormModel, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, type RefOfProps, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.d.ts

@@ -113,6 +113,7 @@ type FlattenedFieldOverrides<ValuePathsToAdapters extends Readonly<Record<string
     -readonly [K in keyof ValuePathsToAdapters]?: FieldOverride<ToOfFieldAdapter<ValuePathsToAdapters[K]>>;
 };
 declare enum Validation {
+    None = 0,
     Changed = 1,
     Always = 2
 }
@@ -147,7 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private maybeGetAdapterForValuePath;
     private getAdapterForValuePath;
     typePath<K extends keyof ValueToTypePaths>(valuePath: K): ValueToTypePaths[K];
-    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation | undefined | null): boolean;
+    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation): boolean;
     addListItem<K extends keyof FlattenedListTypesOfType<T>>(valuePath: K, elementValue?: Maybe<ElementOfArray<FlattenedValuesOfType<T>[K]>>, index?: number): void;
     removeListItem<K extends keyof FlattenedListTypesOfType<T>>(...elementValuePaths: readonly `${K}.${number}`[]): void;
     private internalSetFieldValue;
@@ -155,31 +156,14 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     clearFieldValue<K extends StringKeyOf<ValuePathsToAdapters>>(valuePath: K): void;
     clearAll(value: ValueOfType<T>): void;
     isValuePathActive<K extends keyof ValuePathsToAdapters>(valuePath: K): boolean;
+    getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation;
     validateField<K extends keyof ValuePathsToAdapters>(valuePath: K, validation?: Validation): boolean;
     validateAll(validation?: Validation): boolean;
 }
 
-/**
- * Used to extract the supported value paths from a model
- */
-type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;
-
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
-declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void;
+declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends M['fields'] = M['fields']>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void;
     onValidFormSubmit?: (value: ValueOfModel<M>) => void;
 }): {
     onFormSubmit: () => void;
@@ -456,4 +440,4 @@ declare function mergeValidators<Validators1 extends Partial<Readonly<Record<Key
 
 declare function Empty(): null;
 
-export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, type ContextOf, type ContextOfFieldAdapter, DefaultErrorRenderer, Empty, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, type FieldsViewProps, type FlattenedAdaptersOfFields, type FlattenedConvertedFieldsOf, type FlattenedTypePathsToAdaptersOf, type FormFieldsOfFieldAdapters, type FormFieldsOfModel, type FormMode, FormModel, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, type RefOfProps, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfModelValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsOfModel, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, type ContextOf, type ContextOfFieldAdapter, DefaultErrorRenderer, Empty, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, type FieldsViewProps, type FlattenedAdaptersOfFields, type FlattenedConvertedFieldsOf, type FlattenedTypePathsToAdaptersOf, type FormFieldsOfFieldAdapters, type FormMode, FormModel, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, type RefOfProps, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.js

@@ -327,6 +327,7 @@ import {
   runInAction
 } from "mobx";
 var Validation = /* @__PURE__ */ ((Validation2) => {
+  Validation2[Validation2["None"] = 0] = "None";
   Validation2[Validation2["Changed"] = 1] = "Changed";
   Validation2[Validation2["Always"] = 2] = "Always";
   return Validation2;
@@ -381,7 +382,7 @@ var FormModel = class {
       case "edit":
         return false;
       default:
-        return this.mode;
+        throw new UnreachableError2(this.mode);
     }
   }
   get fields() {
@@ -432,6 +433,7 @@ var FormModel = class {
     return this.synthesizeFieldByPaths(valuePath, typePath);
   }
   synthesizeFieldByPaths(valuePath, typePath) {
+    var _a;
     const adapter2 = this.adapters[typePath];
     if (adapter2 == null) {
       return;
@@ -461,9 +463,9 @@ var FormModel = class {
     );
     let error = void 0;
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value;
-    const validation = this.validation[valuePath];
+    const validation = (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
     switch (validation) {
-      case void 0:
+      case 0 /* None */:
         break;
       case 1 /* Changed */:
         if (revert != null) {
@@ -524,7 +526,7 @@ var FormModel = class {
   typePath(valuePath) {
     return valuePathToTypePath(this.type, valuePath, true);
   }
-  setFieldValue(valuePath, value, validation = this.validation[valuePath]) {
+  setFieldValue(valuePath, value, validation) {
     return this.internalSetFieldValue(valuePath, value, validation);
   }
   addListItem(valuePath, elementValue = null, index) {
@@ -668,8 +670,6 @@ var FormModel = class {
       this.fieldOverrides[valuePath] = [value];
       if (validation != null) {
         this.validation[valuePath] = validation;
-      } else {
-        delete this.validation[valuePath];
       }
       switch (conversion.type) {
         case 1 /* Failure */:
@@ -726,16 +726,17 @@ var FormModel = class {
     const keys = new Set(Object.keys(values));
     return keys.has(valuePath);
   }
-  validateField(valuePath, validation = Math.max(
-    this.mode === "create" ? 2 /* Always */ : 1 /* Changed */,
-    ((_a) => (_a = this.validation[valuePath]) != null ? _a : 1 /* Changed */)()
-  )) {
+  getValidation(valuePath) {
+    var _a;
+    return (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
+  }
+  validateField(valuePath, validation = 2 /* Always */) {
     runInAction(() => {
       this.validation[valuePath] = validation;
     });
     return this.fields[valuePath].error == null;
   }
-  validateAll(validation = this.mode === "create" ? 2 /* Always */ : 1 /* Changed */) {
+  validateAll(validation = 2 /* Always */) {
     const accessors = toArray(this.accessors);
     runInAction(() => {
       accessors.forEach(([valuePath]) => {
@@ -772,7 +773,7 @@ function useDefaultMobxFormHooks(model, {
 } = {}) {
   const onFieldValueChange = useCallback(
     function(path, value) {
-      model.setFieldValue(path, value, null);
+      model.setFieldValue(path, value);
     },
     [model]
   );
@@ -792,7 +793,7 @@ function useDefaultMobxFormHooks(model, {
     function(path) {
       setTimeout(function() {
         if (model.isValuePathActive(path)) {
-          model.validateField(path);
+          model.validateField(path, Math.max(1 /* Changed */, model.getValidation(path)));
         }
       }, 100);
     },

package/index.ts

@@ -8,7 +8,6 @@ export * from './core/mobx/hooks'
 export * from './core/mobx/merge_field_adapters_with_two_way_converter'
 export * from './core/mobx/merge_field_adapters_with_validators'
 export * from './core/mobx/sub_form_field_adapters'
-export * from './core/mobx/types'
 export * from './core/props'
 export * from './field_converters/integer_to_string_converter'
 export * from './field_converters/nullable_to_boolean_converter'

package/package.json

@@ -72,7 +72,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "exports": {
     ".": {
       "import": {

package/.out/core/mobx/types.d.ts

@@ -1,19 +0,0 @@
-import { type ToOfFieldAdapter } from './field_adapter';
-import { type FlattenedConvertedFieldsOf, type FormModel } from './form_model';
-/**
- * Used to extract the supported value paths from a model
- */
-export type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-export type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-export type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;

package/.out/core/mobx/types.js

@@ -1 +0,0 @@
-export {};