@strictly/react-form 0.0.6 → 0.0.8

package/dist/index.cjs

@@ -690,7 +690,10 @@ var FormModel = class {
 
 // core/mobx/hooks.ts
 var import_react = require("react");
-function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
+function useDefaultMobxFormHooks(presenter, value, {
+  onValidFieldSubmit,
+  onValidFormSubmit
+}) {
   const model = (0, import_react.useMemo)(function() {
     return presenter.createModel(value);
   }, [
@@ -710,14 +713,14 @@ function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
   const onFieldSubmit = (0, import_react.useCallback)(
     function(valuePath) {
       if (presenter.validateField(model, valuePath)) {
-        onValidSubmit?.(model, valuePath);
+        onValidFieldSubmit?.(model, valuePath);
       }
       return false;
     },
     [
       presenter,
       model,
-      onValidSubmit
+      onValidFieldSubmit
     ]
   );
   const onFieldBlur = (0, import_react.useCallback)(
@@ -733,11 +736,24 @@ function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
       model
     ]
   );
+  const onFormSubmit = (0, import_react.useCallback)(
+    function() {
+      if (presenter.validateAll(model)) {
+        onValidFormSubmit?.(model, model.value);
+      }
+    },
+    [
+      presenter,
+      model,
+      onValidFormSubmit
+    ]
+  );
   return {
     model,
     onFieldValueChange,
     onFieldSubmit,
-    onFieldBlur
+    onFieldBlur,
+    onFormSubmit
   };
 }
 
@@ -817,13 +833,35 @@ function mergeAdaptersWithValidators(adapters, validators) {
 }
 
 // core/mobx/sub_form_field_adapters.ts
-function subFormFieldAdapters(subAdapters, prefix) {
+var import_define3 = require("@strictly/define");
+function subFormFieldAdapters(subAdapters, parentTypePath, contextType) {
+  const dotCount = parentTypePath.split(".").length;
+  function getSubValuePathAndContext(valuePath, context) {
+    const parentValuePath = valuePath.split(".").slice(0, dotCount).join(".");
+    const subValuePath = valuePath.replace(parentValuePath, "$");
+    const subContext = (0, import_define3.flattenValuesOfType)(contextType, context)[parentValuePath];
+    return [
+      subValuePath,
+      subContext
+    ];
+  }
   return Object.entries(subAdapters).reduce((acc, [
-    subKey,
-    subValue
+    subTypePath,
+    subAdapter
   ]) => {
-    const key = subKey.replace("$", prefix);
-    acc[key] = subValue;
+    const typePath = subTypePath.replace("$", parentTypePath);
+    const adaptedAdapter = {
+      convert: (from, valuePath, context) => {
+        return subAdapter.convert(from, ...getSubValuePathAndContext(valuePath, context));
+      },
+      create: (valuePath, context) => {
+        return subAdapter.create(...getSubValuePathAndContext(valuePath, context));
+      },
+      revert: subAdapter.revert && ((from, valuePath, context) => {
+        return subAdapter.revert(from, ...getSubValuePathAndContext(valuePath, context));
+      })
+    };
+    acc[typePath] = adaptedAdapter;
     return acc;
   }, {});
 }
@@ -860,7 +898,7 @@ var IntegerToStringConverter = class {
 };
 
 // field_converters/nullable_to_boolean_converter.ts
-var import_define3 = require("@strictly/define");
+var import_define4 = require("@strictly/define");
 var NullableToBooleanConverter = class {
   constructor(typeDef, prototype, nullType, defaultToNull = true) {
     this.typeDef = typeDef;
@@ -878,7 +916,7 @@ var NullableToBooleanConverter = class {
   }
   revert(from) {
     if (from) {
-      const value = (0, import_define3.copy)(this.typeDef, this.prototype);
+      const value = (0, import_define4.copy)(this.typeDef, this.prototype);
       return {
         type: 0 /* Success */,
         value
@@ -896,7 +934,7 @@ var NullableToBooleanConverter = class {
 
 // field_converters/select_value_type_converter.ts
 var import_base5 = require("@strictly/base");
-var import_define4 = require("@strictly/define");
+var import_define5 = require("@strictly/define");
 var AbstractSelectValueTypeConverter = class {
   constructor(typeDef, values, defaultValueKey, noSuchValueError, required) {
     this.typeDef = typeDef;
@@ -914,7 +952,7 @@ var AbstractSelectValueTypeConverter = class {
         value: null
       };
     }
-    const value = prototype == null ? prototype : (0, import_define4.copy)(this.typeDef, prototype);
+    const value = prototype == null ? prototype : (0, import_define5.copy)(this.typeDef, prototype);
     return {
       type: 0 /* Success */,
       value
@@ -1007,13 +1045,13 @@ var TrimmingStringConverter = class {
 };
 
 // field_converters/validating_converter.ts
-var import_define5 = require("@strictly/define");
+var import_define6 = require("@strictly/define");
 function validatingConverter(validators = []) {
   return function(value, valuePath, context) {
     return validators.reduce(
       function(acc, validator) {
         if (acc.type === 0 /* Success */) {
-          const error = (0, import_define5.validate)(validator, value, valuePath, context);
+          const error = (0, import_define6.validate)(validator, value, valuePath, context);
           if (error != null) {
             return {
               type: 1 /* Failure */,
@@ -1037,7 +1075,7 @@ function DefaultErrorRenderer({
   error
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 }) {
-  return error;
+  return JSON.stringify(error);
 }
 
 // mantine/hooks.tsx
@@ -1268,15 +1306,19 @@ function createFieldsView(valuePath, FieldsView, observableProps) {
     observableProps.onFieldSubmit?.(toKey(subKey));
   }
   return (0, import_mobx_react2.observer)(function(props) {
-    const subFields = Object.entries(observableProps.fields).reduce((acc, [
-      fieldKey,
-      fieldValue
-    ]) => {
-      if (fieldKey.startsWith(valuePath)) {
-        acc[toSubKey(fieldKey)] = fieldValue;
-      }
-      return acc;
-    }, {});
+    const subFields = Object.entries(observableProps.fields).reduce(
+      (acc, [
+        fieldKey,
+        fieldValue
+      ]) => {
+        if (fieldKey.startsWith(valuePath)) {
+          acc[toSubKey(fieldKey)] = fieldValue;
+        }
+        return acc;
+      },
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      {}
+    );
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       FieldsView,
       {
@@ -1432,13 +1474,16 @@ function createTextInput(valuePath, TextInput) {
   const propSource = ({
     ErrorRenderer = DefaultErrorRenderer
   }) => {
+    const field = this.fields[valuePath];
+    if (field == null) {
+      throw new Error(`invalid field ${valuePath}`);
+    }
     const {
       readonly,
       required,
       value,
       error
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    } = this.fields[valuePath];
+    } = field;
     return {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       name: valuePath,
@@ -1674,7 +1719,7 @@ var MantineFormImpl = class {
 };
 
 // types/merge_validators.ts
-var import_define6 = require("@strictly/define");
+var import_define7 = require("@strictly/define");
 function mergeValidators(validators1, validators2) {
   const validators = {
     ...validators1,
@@ -1689,16 +1734,16 @@ function mergeValidators(validators1, validators2) {
       validators3[key] = {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         validate: function(value, valuePath, context) {
-          const error = (0, import_define6.validate)(validator1, value, valuePath, context);
+          const error = (0, import_define7.validate)(validator1, value, valuePath, context);
           if (error != null) {
             return error;
           }
-          return (0, import_define6.validate)(validator2, value, valuePath, context);
+          return (0, import_define7.validate)(validator2, value, valuePath, context);
         },
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         annotations: function(valuePath, context) {
-          const annotations1 = (0, import_define6.annotations)(validator1, valuePath, context);
-          const annotations22 = (0, import_define6.annotations)(validator2, valuePath, context);
+          const annotations1 = (0, import_define7.annotations)(validator1, valuePath, context);
+          const annotations22 = (0, import_define7.annotations)(validator2, valuePath, context);
           return {
             readonly: annotations1.readonly || annotations22.readonly,
             required: annotations1.required || annotations22.required

package/dist/index.d.cts

@@ -181,8 +181,12 @@ type FormFieldsOfPresenter<Presenter extends FormPresenter<any, any, any, any>>
 
 type ValueOfPresenter<P extends FormPresenter<any, any, any, any>> = P extends FormPresenter<infer T, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
 type ModelOfPresenter<P extends FormPresenter<any, any, any, any>> = ReturnType<P['createModel']>;
-declare function useDefaultMobxFormHooks<P extends FormPresenter<any, any, any, any>>(presenter: P, value: ValueOfPresenter<P>, onValidSubmit?: <Path extends ValuePathsOfPresenter<P>>(model: ModelOfPresenter<P>, valuePath: Path) => void): {
+declare function useDefaultMobxFormHooks<P extends FormPresenter<any, any, any, any>>(presenter: P, value: ValueOfPresenter<P>, { onValidFieldSubmit, onValidFormSubmit, }: {
+    onValidFieldSubmit?: <Path extends ValuePathsOfPresenter<P>>(model: ModelOfPresenter<P>, valuePath: Path) => void;
+    onValidFormSubmit?: (model: ModelOfPresenter<P>, value: ValueOfPresenter<P>) => void;
+}): {
     model: ModelOfPresenter<P>;
+    onFormSubmit?: (value: ValueOfPresenter<P>) => void;
 } & Omit<FieldsViewProps<ModelOfPresenter<P>['fields']>, 'fields'>;
 
 type MergedOfFieldAdaptersWithTwoWayConverter<FieldAdapters extends Readonly<Record<string, FieldAdapter>>, E, Context> = {
@@ -204,10 +208,11 @@ type MergedOfFieldAdaptersWithValidators<FieldAdapters extends Readonly<Record<K
 type MergedOfFieldAdapterWithValidator<A extends FieldAdapter, V extends Validator | undefined> = undefined extends V ? A : A extends FieldAdapter<infer From, infer To, infer E1, infer P1, infer C1> ? V extends Validator<From, infer E2, infer P2, infer C2> ? FieldAdapter<From, To, E1 | E2, P1 | P2, C1 | C2> : never : never;
 declare function mergeAdaptersWithValidators<FieldAdapters extends Readonly<Record<Key, FieldAdapter>>, Validators extends Readonly<Record<string, Validator>>, Key extends keyof Validators = keyof Validators>(adapters: FieldAdapters, validators: Validators): MergedOfFieldAdaptersWithValidators<FieldAdapters, Validators, Key>;
 
-type SubFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string> = {
-    [K in keyof SubAdapters as K extends StringConcatOf<'$', infer S> ? `${P}${S}` : never]: SubAdapters[K];
+type SubFormFieldAdapter<F extends FieldAdapter, ValuePath extends string, Context> = FieldAdapter<FromOfFieldAdapter<F>, ToOfFieldAdapter<F>, ErrorOfFieldAdapter<F>, ValuePathOfFieldAdapter<F> extends StringConcatOf<'$', infer ValuePathSuffix> ? `${ValuePath}${ValuePathSuffix}` : string, Context>;
+type SubFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, TypePath extends string, ValuePath extends string, Context> = {
+    [K in keyof SubAdapters as K extends StringConcatOf<'$', infer TypePathSuffix> ? `${TypePath}${TypePathSuffix}` : never]: SubFormFieldAdapter<SubAdapters[K], ValuePath, Context>;
 };
-declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string>(subAdapters: SubAdapters, prefix: P): SubFormFieldAdapters<SubAdapters, P>;
+declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, TypePath extends string, TypePathsToValuePaths extends Record<TypePath, string>, ContextType extends Type>(subAdapters: SubAdapters, parentTypePath: TypePath, contextType: ContextType): SubFormFieldAdapters<SubAdapters, TypePath, TypePathsToValuePaths[TypePath], ValueOfType<ContextType>>;
 
 declare class IntegerToStringConverter<E, ValuePath extends string, Context> implements TwoWayFieldConverter<number, string, E, ValuePath, Context> {
     private readonly isNanError;
@@ -217,14 +222,14 @@ declare class IntegerToStringConverter<E, ValuePath extends string, Context> imp
     revert(from: string): UnreliableFieldConversion<number, E>;
 }
 
-declare class NullableToBooleanConverter<T extends Type, E, ValuePath extends string, Context, NullType extends null | undefined> implements TwoWayFieldConverterWithValueFactory<ValueOfType<ReadonlyTypeOfType<T>> | NullType, boolean, E, ValuePath, Context> {
+declare class NullableToBooleanConverter<T extends Type, ValuePath extends string, Context, NullType extends null | undefined> implements TwoWayFieldConverterWithValueFactory<ValueOfType<ReadonlyTypeOfType<T>> | NullType, boolean, never, ValuePath, Context> {
     private readonly typeDef;
     private readonly prototype;
     private readonly nullType;
     readonly defaultValue: ValueOfType<ReadonlyTypeOfType<T>> | NullType;
     constructor(typeDef: T, prototype: ValueOfType<ReadonlyTypeOfType<T>>, nullType: NullType, defaultToNull?: boolean);
     convert(from: ValueOfType<ReadonlyTypeOfType<T>> | NullType): AnnotatedFieldConversion<boolean>;
-    revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, E>;
+    revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, never>;
     create(): ValueOfType<ReadonlyTypeOfType<T>> | NullType;
 }
 
@@ -268,7 +273,7 @@ type ErrorRendererProps<E> = {
     error: E;
 };
 type ErrorRenderer<E = any> = ComponentType<ErrorRendererProps<E>>;
-declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): any;
+declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): string;
 
 type ValueTypeOfField<F extends Field> = F extends Field<infer V> ? V : never;
 
@@ -318,8 +323,10 @@ type MantineForm<F extends Fields> = {
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
 };
-type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<ComponentType<P>, T, {
-    ErrorRenderer?: ErrorRenderer<E>;
+type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<ComponentType<P>, T, [
+    E
+] extends [never] ? {} : {
+    ErrorRenderer: ErrorRenderer<E>;
 }>;
 
 type SuppliedCheckboxProps = Pick<CheckboxProps, 'name' | 'checked' | 'disabled' | 'required' | 'error' | 'onChange' | 'onFocus' | 'onBlur' | 'onKeyUp'>;
@@ -383,21 +390,21 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
     constructor(fields: F);
-    textInput<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, TextInputProps>;
-    textInput<K extends keyof StringFieldsOfFields<F>, P extends SuppliedTextInputProps<any>>(valuePath: K, TextInput?: ComponentType<P>): MantineFieldComponent<SuppliedTextInputProps, P>;
+    textInput<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, TextInputProps, ErrorOfField<F[K]>>;
+    textInput<K extends keyof StringFieldsOfFields<F>, P extends SuppliedTextInputProps<any>>(valuePath: K, TextInput?: ComponentType<P>): MantineFieldComponent<SuppliedTextInputProps, P, ErrorOfField<F[K]>>;
     valueInput<K extends keyof AllFieldsOfFields<F>, P extends SuppliedValueInputProps<ValueTypeOfField<F[K]>, any>>(valuePath: K, ValueInput: ComponentType<P>): MantineFieldComponent<SuppliedValueInputProps<ValueTypeOfField<F[K]>>, P, ErrorOfField<F[K]>>;
     select<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, ComponentProps<typeof SimpleSelect>, ErrorOfField<F[K]>>;
-    checkbox<K extends keyof BooleanFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedCheckboxProps, CheckboxProps>;
+    checkbox<K extends keyof BooleanFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedCheckboxProps, CheckboxProps, ErrorOfField<F[K]>>;
     checkbox<K extends keyof BooleanFieldsOfFields<F>, P extends SuppliedCheckboxProps>(valuePath: K, Checkbox: ComponentType<P>): MantineFieldComponent<SuppliedCheckboxProps, P, ErrorOfField<F[K]>>;
-    radioGroup<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedRadioGroupProps, RadioGroupProps>;
-    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioGroupProps>(valuePath: K, RadioGroup: ComponentType<P>): MantineFieldComponent<SuppliedRadioGroupProps, P>;
+    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends RadioGroupProps = RadioGroupProps>(valuePath: K): MantineFieldComponent<SuppliedRadioGroupProps, P, ErrorOfField<F[K]>>;
+    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioGroupProps>(valuePath: K, RadioGroup: ComponentType<P>): MantineFieldComponent<SuppliedRadioGroupProps, P, ErrorOfField<F[K]>>;
     radio<K extends keyof StringFieldsOfFields<F>>(valuePath: K, value: ValueTypeOfField<F[K]>): MantineFieldComponent<SuppliedRadioProps, RadioProps, ErrorOfField<F[K]>>;
     radio<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioProps>(valuePath: K, value: ValueTypeOfField<F[K]>, Radio: ComponentType<P>): MantineFieldComponent<SuppliedRadioProps, P, ErrorOfField<F[K]>>;
     pill<K extends keyof AllFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedPillProps, PillProps, ErrorOfField<F[K]>>;
-    pill<K extends keyof AllFieldsOfFields<F>, P extends SuppliedPillProps>(valuePath: K, Pill: ComponentType<P>): MantineFieldComponent<SuppliedPillProps, P>;
-    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>>;
-    fieldsView<K extends keyof AllFieldsOfFields<F>, P extends FieldsViewProps<Fields> = FieldsViewProps<SubFormFields<F, K>>>(valuePath: K, FieldsView: ComponentType<P>): MantineFieldComponent<FieldsViewProps<P['fields']>, P>;
-    form<K extends keyof AllFieldsOfFields<F>, P extends FormProps<ValueTypeOfField<F[K]>> = FormProps<ValueTypeOfField<F[K]>>>(valuePath: K, Form: ComponentType<P>): MantineFieldComponent<FormProps<ValueTypeOfField<F[K]>>, P>;
+    pill<K extends keyof AllFieldsOfFields<F>, P extends SuppliedPillProps>(valuePath: K, Pill: ComponentType<P>): MantineFieldComponent<SuppliedPillProps, P, ErrorOfField<F[K]>>;
+    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>, never>;
+    fieldsView<K extends keyof AllFieldsOfFields<F>, P extends FieldsViewProps<Fields> = FieldsViewProps<SubFormFields<F, K>>>(valuePath: K, FieldsView: ComponentType<P>): MantineFieldComponent<FieldsViewProps<P['fields']>, P, never>;
+    form<K extends keyof AllFieldsOfFields<F>, P extends FormProps<ValueTypeOfField<F[K]>> = FormProps<ValueTypeOfField<F[K]>>>(valuePath: K, Form: ComponentType<P>): MantineFieldComponent<FormProps<ValueTypeOfField<F[K]>>, P, never>;
 }
 
 type MergedOfValidators<Validators1 extends Partial<Readonly<Record<Keys, Validator>>>, Validators2 extends Partial<Readonly<Record<Keys, Validator>>>, Keys extends string = Extract<keyof Validators1 | keyof Validators2, string>> = Simplify<{

package/dist/index.d.ts

@@ -181,8 +181,12 @@ type FormFieldsOfPresenter<Presenter extends FormPresenter<any, any, any, any>>
 
 type ValueOfPresenter<P extends FormPresenter<any, any, any, any>> = P extends FormPresenter<infer T, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
 type ModelOfPresenter<P extends FormPresenter<any, any, any, any>> = ReturnType<P['createModel']>;
-declare function useDefaultMobxFormHooks<P extends FormPresenter<any, any, any, any>>(presenter: P, value: ValueOfPresenter<P>, onValidSubmit?: <Path extends ValuePathsOfPresenter<P>>(model: ModelOfPresenter<P>, valuePath: Path) => void): {
+declare function useDefaultMobxFormHooks<P extends FormPresenter<any, any, any, any>>(presenter: P, value: ValueOfPresenter<P>, { onValidFieldSubmit, onValidFormSubmit, }: {
+    onValidFieldSubmit?: <Path extends ValuePathsOfPresenter<P>>(model: ModelOfPresenter<P>, valuePath: Path) => void;
+    onValidFormSubmit?: (model: ModelOfPresenter<P>, value: ValueOfPresenter<P>) => void;
+}): {
     model: ModelOfPresenter<P>;
+    onFormSubmit?: (value: ValueOfPresenter<P>) => void;
 } & Omit<FieldsViewProps<ModelOfPresenter<P>['fields']>, 'fields'>;
 
 type MergedOfFieldAdaptersWithTwoWayConverter<FieldAdapters extends Readonly<Record<string, FieldAdapter>>, E, Context> = {
@@ -204,10 +208,11 @@ type MergedOfFieldAdaptersWithValidators<FieldAdapters extends Readonly<Record<K
 type MergedOfFieldAdapterWithValidator<A extends FieldAdapter, V extends Validator | undefined> = undefined extends V ? A : A extends FieldAdapter<infer From, infer To, infer E1, infer P1, infer C1> ? V extends Validator<From, infer E2, infer P2, infer C2> ? FieldAdapter<From, To, E1 | E2, P1 | P2, C1 | C2> : never : never;
 declare function mergeAdaptersWithValidators<FieldAdapters extends Readonly<Record<Key, FieldAdapter>>, Validators extends Readonly<Record<string, Validator>>, Key extends keyof Validators = keyof Validators>(adapters: FieldAdapters, validators: Validators): MergedOfFieldAdaptersWithValidators<FieldAdapters, Validators, Key>;
 
-type SubFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string> = {
-    [K in keyof SubAdapters as K extends StringConcatOf<'$', infer S> ? `${P}${S}` : never]: SubAdapters[K];
+type SubFormFieldAdapter<F extends FieldAdapter, ValuePath extends string, Context> = FieldAdapter<FromOfFieldAdapter<F>, ToOfFieldAdapter<F>, ErrorOfFieldAdapter<F>, ValuePathOfFieldAdapter<F> extends StringConcatOf<'$', infer ValuePathSuffix> ? `${ValuePath}${ValuePathSuffix}` : string, Context>;
+type SubFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, TypePath extends string, ValuePath extends string, Context> = {
+    [K in keyof SubAdapters as K extends StringConcatOf<'$', infer TypePathSuffix> ? `${TypePath}${TypePathSuffix}` : never]: SubFormFieldAdapter<SubAdapters[K], ValuePath, Context>;
 };
-declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string>(subAdapters: SubAdapters, prefix: P): SubFormFieldAdapters<SubAdapters, P>;
+declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, TypePath extends string, TypePathsToValuePaths extends Record<TypePath, string>, ContextType extends Type>(subAdapters: SubAdapters, parentTypePath: TypePath, contextType: ContextType): SubFormFieldAdapters<SubAdapters, TypePath, TypePathsToValuePaths[TypePath], ValueOfType<ContextType>>;
 
 declare class IntegerToStringConverter<E, ValuePath extends string, Context> implements TwoWayFieldConverter<number, string, E, ValuePath, Context> {
     private readonly isNanError;
@@ -217,14 +222,14 @@ declare class IntegerToStringConverter<E, ValuePath extends string, Context> imp
     revert(from: string): UnreliableFieldConversion<number, E>;
 }
 
-declare class NullableToBooleanConverter<T extends Type, E, ValuePath extends string, Context, NullType extends null | undefined> implements TwoWayFieldConverterWithValueFactory<ValueOfType<ReadonlyTypeOfType<T>> | NullType, boolean, E, ValuePath, Context> {
+declare class NullableToBooleanConverter<T extends Type, ValuePath extends string, Context, NullType extends null | undefined> implements TwoWayFieldConverterWithValueFactory<ValueOfType<ReadonlyTypeOfType<T>> | NullType, boolean, never, ValuePath, Context> {
     private readonly typeDef;
     private readonly prototype;
     private readonly nullType;
     readonly defaultValue: ValueOfType<ReadonlyTypeOfType<T>> | NullType;
     constructor(typeDef: T, prototype: ValueOfType<ReadonlyTypeOfType<T>>, nullType: NullType, defaultToNull?: boolean);
     convert(from: ValueOfType<ReadonlyTypeOfType<T>> | NullType): AnnotatedFieldConversion<boolean>;
-    revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, E>;
+    revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, never>;
     create(): ValueOfType<ReadonlyTypeOfType<T>> | NullType;
 }
 
@@ -268,7 +273,7 @@ type ErrorRendererProps<E> = {
     error: E;
 };
 type ErrorRenderer<E = any> = ComponentType<ErrorRendererProps<E>>;
-declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): any;
+declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): string;
 
 type ValueTypeOfField<F extends Field> = F extends Field<infer V> ? V : never;
 
@@ -318,8 +323,10 @@ type MantineForm<F extends Fields> = {
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
 };
-type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<ComponentType<P>, T, {
-    ErrorRenderer?: ErrorRenderer<E>;
+type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<ComponentType<P>, T, [
+    E
+] extends [never] ? {} : {
+    ErrorRenderer: ErrorRenderer<E>;
 }>;
 
 type SuppliedCheckboxProps = Pick<CheckboxProps, 'name' | 'checked' | 'disabled' | 'required' | 'error' | 'onChange' | 'onFocus' | 'onBlur' | 'onKeyUp'>;
@@ -383,21 +390,21 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
     constructor(fields: F);
-    textInput<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, TextInputProps>;
-    textInput<K extends keyof StringFieldsOfFields<F>, P extends SuppliedTextInputProps<any>>(valuePath: K, TextInput?: ComponentType<P>): MantineFieldComponent<SuppliedTextInputProps, P>;
+    textInput<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, TextInputProps, ErrorOfField<F[K]>>;
+    textInput<K extends keyof StringFieldsOfFields<F>, P extends SuppliedTextInputProps<any>>(valuePath: K, TextInput?: ComponentType<P>): MantineFieldComponent<SuppliedTextInputProps, P, ErrorOfField<F[K]>>;
     valueInput<K extends keyof AllFieldsOfFields<F>, P extends SuppliedValueInputProps<ValueTypeOfField<F[K]>, any>>(valuePath: K, ValueInput: ComponentType<P>): MantineFieldComponent<SuppliedValueInputProps<ValueTypeOfField<F[K]>>, P, ErrorOfField<F[K]>>;
     select<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedTextInputProps, ComponentProps<typeof SimpleSelect>, ErrorOfField<F[K]>>;
-    checkbox<K extends keyof BooleanFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedCheckboxProps, CheckboxProps>;
+    checkbox<K extends keyof BooleanFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedCheckboxProps, CheckboxProps, ErrorOfField<F[K]>>;
     checkbox<K extends keyof BooleanFieldsOfFields<F>, P extends SuppliedCheckboxProps>(valuePath: K, Checkbox: ComponentType<P>): MantineFieldComponent<SuppliedCheckboxProps, P, ErrorOfField<F[K]>>;
-    radioGroup<K extends keyof StringFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedRadioGroupProps, RadioGroupProps>;
-    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioGroupProps>(valuePath: K, RadioGroup: ComponentType<P>): MantineFieldComponent<SuppliedRadioGroupProps, P>;
+    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends RadioGroupProps = RadioGroupProps>(valuePath: K): MantineFieldComponent<SuppliedRadioGroupProps, P, ErrorOfField<F[K]>>;
+    radioGroup<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioGroupProps>(valuePath: K, RadioGroup: ComponentType<P>): MantineFieldComponent<SuppliedRadioGroupProps, P, ErrorOfField<F[K]>>;
     radio<K extends keyof StringFieldsOfFields<F>>(valuePath: K, value: ValueTypeOfField<F[K]>): MantineFieldComponent<SuppliedRadioProps, RadioProps, ErrorOfField<F[K]>>;
     radio<K extends keyof StringFieldsOfFields<F>, P extends SuppliedRadioProps>(valuePath: K, value: ValueTypeOfField<F[K]>, Radio: ComponentType<P>): MantineFieldComponent<SuppliedRadioProps, P, ErrorOfField<F[K]>>;
     pill<K extends keyof AllFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedPillProps, PillProps, ErrorOfField<F[K]>>;
-    pill<K extends keyof AllFieldsOfFields<F>, P extends SuppliedPillProps>(valuePath: K, Pill: ComponentType<P>): MantineFieldComponent<SuppliedPillProps, P>;
-    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>>;
-    fieldsView<K extends keyof AllFieldsOfFields<F>, P extends FieldsViewProps<Fields> = FieldsViewProps<SubFormFields<F, K>>>(valuePath: K, FieldsView: ComponentType<P>): MantineFieldComponent<FieldsViewProps<P['fields']>, P>;
-    form<K extends keyof AllFieldsOfFields<F>, P extends FormProps<ValueTypeOfField<F[K]>> = FormProps<ValueTypeOfField<F[K]>>>(valuePath: K, Form: ComponentType<P>): MantineFieldComponent<FormProps<ValueTypeOfField<F[K]>>, P>;
+    pill<K extends keyof AllFieldsOfFields<F>, P extends SuppliedPillProps>(valuePath: K, Pill: ComponentType<P>): MantineFieldComponent<SuppliedPillProps, P, ErrorOfField<F[K]>>;
+    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>, never>;
+    fieldsView<K extends keyof AllFieldsOfFields<F>, P extends FieldsViewProps<Fields> = FieldsViewProps<SubFormFields<F, K>>>(valuePath: K, FieldsView: ComponentType<P>): MantineFieldComponent<FieldsViewProps<P['fields']>, P, never>;
+    form<K extends keyof AllFieldsOfFields<F>, P extends FormProps<ValueTypeOfField<F[K]>> = FormProps<ValueTypeOfField<F[K]>>>(valuePath: K, Form: ComponentType<P>): MantineFieldComponent<FormProps<ValueTypeOfField<F[K]>>, P, never>;
 }
 
 type MergedOfValidators<Validators1 extends Partial<Readonly<Record<Keys, Validator>>>, Validators2 extends Partial<Readonly<Record<Keys, Validator>>>, Keys extends string = Extract<keyof Validators1 | keyof Validators2, string>> = Simplify<{

package/dist/index.js

@@ -660,7 +660,10 @@ import {
   useCallback,
   useMemo
 } from "react";
-function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
+function useDefaultMobxFormHooks(presenter, value, {
+  onValidFieldSubmit,
+  onValidFormSubmit
+}) {
   const model = useMemo(function() {
     return presenter.createModel(value);
   }, [
@@ -680,14 +683,14 @@ function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
   const onFieldSubmit = useCallback(
     function(valuePath) {
       if (presenter.validateField(model, valuePath)) {
-        onValidSubmit?.(model, valuePath);
+        onValidFieldSubmit?.(model, valuePath);
       }
       return false;
     },
     [
       presenter,
       model,
-      onValidSubmit
+      onValidFieldSubmit
     ]
   );
   const onFieldBlur = useCallback(
@@ -703,11 +706,24 @@ function useDefaultMobxFormHooks(presenter, value, onValidSubmit) {
       model
     ]
   );
+  const onFormSubmit = useCallback(
+    function() {
+      if (presenter.validateAll(model)) {
+        onValidFormSubmit?.(model, model.value);
+      }
+    },
+    [
+      presenter,
+      model,
+      onValidFormSubmit
+    ]
+  );
   return {
     model,
     onFieldValueChange,
     onFieldSubmit,
-    onFieldBlur
+    onFieldBlur,
+    onFormSubmit
   };
 }
 
@@ -790,13 +806,37 @@ function mergeAdaptersWithValidators(adapters, validators) {
 }
 
 // core/mobx/sub_form_field_adapters.ts
-function subFormFieldAdapters(subAdapters, prefix) {
+import {
+  flattenValuesOfType as flattenValuesOfType2
+} from "@strictly/define";
+function subFormFieldAdapters(subAdapters, parentTypePath, contextType) {
+  const dotCount = parentTypePath.split(".").length;
+  function getSubValuePathAndContext(valuePath, context) {
+    const parentValuePath = valuePath.split(".").slice(0, dotCount).join(".");
+    const subValuePath = valuePath.replace(parentValuePath, "$");
+    const subContext = flattenValuesOfType2(contextType, context)[parentValuePath];
+    return [
+      subValuePath,
+      subContext
+    ];
+  }
   return Object.entries(subAdapters).reduce((acc, [
-    subKey,
-    subValue
+    subTypePath,
+    subAdapter
   ]) => {
-    const key = subKey.replace("$", prefix);
-    acc[key] = subValue;
+    const typePath = subTypePath.replace("$", parentTypePath);
+    const adaptedAdapter = {
+      convert: (from, valuePath, context) => {
+        return subAdapter.convert(from, ...getSubValuePathAndContext(valuePath, context));
+      },
+      create: (valuePath, context) => {
+        return subAdapter.create(...getSubValuePathAndContext(valuePath, context));
+      },
+      revert: subAdapter.revert && ((from, valuePath, context) => {
+        return subAdapter.revert(from, ...getSubValuePathAndContext(valuePath, context));
+      })
+    };
+    acc[typePath] = adaptedAdapter;
     return acc;
   }, {});
 }
@@ -1018,7 +1058,7 @@ function DefaultErrorRenderer({
   error
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 }) {
-  return error;
+  return JSON.stringify(error);
 }
 
 // mantine/hooks.tsx
@@ -1266,15 +1306,19 @@ function createFieldsView(valuePath, FieldsView, observableProps) {
     observableProps.onFieldSubmit?.(toKey(subKey));
   }
   return observer2(function(props) {
-    const subFields = Object.entries(observableProps.fields).reduce((acc, [
-      fieldKey,
-      fieldValue
-    ]) => {
-      if (fieldKey.startsWith(valuePath)) {
-        acc[toSubKey(fieldKey)] = fieldValue;
-      }
-      return acc;
-    }, {});
+    const subFields = Object.entries(observableProps.fields).reduce(
+      (acc, [
+        fieldKey,
+        fieldValue
+      ]) => {
+        if (fieldKey.startsWith(valuePath)) {
+          acc[toSubKey(fieldKey)] = fieldValue;
+        }
+        return acc;
+      },
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      {}
+    );
     return /* @__PURE__ */ jsx3(
       FieldsView,
       {
@@ -1432,13 +1476,16 @@ function createTextInput(valuePath, TextInput) {
   const propSource = ({
     ErrorRenderer = DefaultErrorRenderer
   }) => {
+    const field = this.fields[valuePath];
+    if (field == null) {
+      throw new Error(`invalid field ${valuePath}`);
+    }
     const {
       readonly,
       required,
       value,
       error
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    } = this.fields[valuePath];
+    } = field;
     return {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       name: valuePath,

package/field_converters/nullable_to_boolean_converter.ts

@@ -13,14 +13,13 @@ import {
 
 export class NullableToBooleanConverter<
   T extends Type,
-  E,
   ValuePath extends string,
   Context,
   NullType extends null | undefined,
 > implements TwoWayFieldConverterWithValueFactory<
   ValueOfType<ReadonlyTypeOfType<T>> | NullType,
   boolean,
-  E,
+  never,
   ValuePath,
   Context
 > {
@@ -43,7 +42,7 @@ export class NullableToBooleanConverter<
     }
   }
 
-  revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, E> {
+  revert(from: boolean): UnreliableFieldConversion<ValueOfType<ReadonlyTypeOfType<T>> | NullType, never> {
     if (from) {
       const value: ValueOfType<T> = copy(this.typeDef, this.prototype)
       return {

package/mantine/create_checkbox.tsx

@@ -78,9 +78,10 @@ export function createCheckbox<
       onKeyUp,
     }
   }
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   return createUnsafePartialObserverComponent(
     Checkbox,
     propSource,
     ['ErrorRenderer'],
-  )
+  ) as MantineFieldComponent<SuppliedCheckboxProps, Props, ErrorOfField<F[K]>>
 }