@strictly/react-form 0.0.8 → 0.0.9

package/.out/types/specs/{error_type_of_field.tests.js → error_of_field.tests.js}

@@ -1,4 +1,4 @@
-describe('ErrorTypeOfField', function () {
+describe('ErrorOfField', function () {
     it('equals expected type', function () {
         const e = Symbol();
         expectTypeOf().toEqualTypeOf();

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: esnext
 CJS Build start
 ESM Build start
-CJS dist/index.cjs 50.73 KB
-CJS ⚡️ Build success in 112ms
-ESM dist/index.js 46.84 KB
-ESM ⚡️ Build success in 113ms
+CJS dist/index.cjs 51.55 KB
+CJS ⚡️ Build success in 120ms
+ESM dist/index.js 47.61 KB
+ESM ⚡️ Build success in 121ms
 DTS Build start
-DTS ⚡️ Build success in 9662ms
-DTS dist/index.d.cts 36.94 KB
-DTS dist/index.d.ts  36.94 KB
-Done in 10.73s.
+DTS ⚡️ Build success in 10031ms
+DTS dist/index.d.cts 37.40 KB
+DTS dist/index.d.ts  37.40 KB
+Done in 11.07s.

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

@@ -1,3 +1,3 @@
 yarn run v1.22.22
 $ tsc
-Done in 7.38s.
+Done in 7.61s.

package/.turbo/turbo-release$colon$exports.log

@@ -1,3 +1,3 @@
 yarn run v1.22.22
 $ json -f package.json -f package.exports.json --merge > package.release.json
-Done in 0.13s.
+Done in 0.12s.

package/core/mobx/field_adapter_builder.ts

@@ -7,12 +7,14 @@ import {
   unreliableIdentityConverter,
 } from 'field_converters/identity_converter'
 import { MaybeIdentityConverter } from 'field_converters/maybe_identity_converter'
+import { TrimmingStringConverter } from 'field_converters/trimming_string_converter'
 import { prototypingFieldValueFactory } from 'field_value_factories/prototyping_field_value_factory'
 import {
   type AnnotatedFieldConverter,
   type FieldValueFactory,
   type TwoWayFieldConverter,
   type TwoWayFieldConverterWithValueFactory,
+  UnreliableFieldConversionType,
   type UnreliableFieldConverter,
 } from 'types/field_converters'
 import { type FieldAdapter } from './field_adapter'
@@ -82,6 +84,65 @@ class FieldAdapterBuilder<
     )
   }
 
+  nullable(): FieldAdapterBuilder<
+    From | null,
+    To | null,
+    E,
+    ValuePath,
+    Context
+  > {
+    return this.or(null)
+  }
+
+  optional(): FieldAdapterBuilder<
+    From | undefined,
+    To | undefined,
+    E,
+    ValuePath,
+    Context
+  > {
+    return this.or(undefined)
+  }
+
+  private or<V>(proto: V): FieldAdapterBuilder<
+    From | V,
+    To | V,
+    E,
+    ValuePath,
+    Context
+  > {
+    function isFrom(v: From | V): v is From {
+      return v !== proto
+    }
+    function isTo(v: To | V): v is To {
+      return v !== proto
+    }
+    return new FieldAdapterBuilder<
+      From | V,
+      To | V,
+      E,
+      ValuePath,
+      Context
+    >(
+      (v, valuePath, context) =>
+        isFrom(v)
+          ? this.convert(v, valuePath, context)
+          : {
+            value: v,
+            readonly: false,
+            required: false,
+          },
+      this.create,
+      (v, valuePath, context) =>
+        isTo(v) && this.revert
+          ? this.revert(v, valuePath, context)
+          : {
+            type: UnreliableFieldConversionType.Success,
+            value: proto,
+          },
+    )
+  }
+
   withIdentity(isFrom: (from: To | From) => from is From): FieldAdapterBuilder<
     From,
     To | From,
@@ -263,6 +324,16 @@ export function identityAdapter<
   )
 }
 
+export function trimmingStringAdapter<
+  ValuePath extends string,
+  Context,
+>() {
+  return adapterFromTwoWayConverter<string, string, never, ValuePath, Context>(
+    new TrimmingStringConverter<ValuePath, Context>(),
+    prototypingFieldValueFactory<string, ValuePath, Context>(''),
+  )
+}
+
 export function listAdapter<
   E,
   ValuePath extends string,

package/core/mobx/hooks.ts

@@ -31,10 +31,10 @@ export function useDefaultMobxFormHooks<P extends FormPresenter<any, any, any, a
   }: {
     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,
+  onFormSubmit?: () => void,
 } & Omit<FieldsViewProps<ModelOfPresenter<P>['fields']>, 'fields'> {
   const model = useMemo(function () {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions

package/dist/index.cjs

@@ -45,6 +45,7 @@ __export(index_exports, {
   mergeValidators: () => mergeValidators,
   prototypingFieldValueFactory: () => prototypingFieldValueFactory,
   subFormFieldAdapters: () => subFormFieldAdapters,
+  trimmingStringAdapter: () => trimmingStringAdapter,
   useDefaultMobxFormHooks: () => useDefaultMobxFormHooks,
   useMantineFormFields: () => useMantineFormFields,
   usePartialComponent: () => usePartialComponent,
@@ -105,18 +106,18 @@ function chainAnnotatedFieldConverter(from, to) {
   return function(value, valuePath, context) {
     const {
       required: intermediateRequired,
-      readonly: intermediateDisabled,
+      readonly: intermediateReadonly,
       value: intermediateValue
     } = from(value, valuePath, context);
     const {
       required: finalRequired,
-      readonly: finalDisabled,
+      readonly: finalReadonly,
       value: finalValue
     } = to(intermediateValue, valuePath, context);
     return {
       value: finalValue,
       required: intermediateRequired || finalRequired,
-      readonly: intermediateDisabled || finalDisabled
+      readonly: intermediateReadonly || finalReadonly
     };
   };
 }
@@ -155,6 +156,25 @@ var MaybeIdentityConverter = class {
   }
 };
 
+// field_converters/trimming_string_converter.ts
+var TrimmingStringConverter = class {
+  constructor() {
+  }
+  convert(to) {
+    return {
+      value: to.trim(),
+      required: false,
+      readonly: false
+    };
+  }
+  revert(from) {
+    return {
+      type: 0 /* Success */,
+      value: from.trim()
+    };
+  }
+};
+
 // field_value_factories/prototyping_field_value_factory.ts
 function prototypingFieldValueFactory(prototype) {
   return function() {
@@ -189,6 +209,32 @@ var FieldAdapterBuilder = class _FieldAdapterBuilder {
       reverter
     );
   }
+  nullable() {
+    return this.or(null);
+  }
+  optional() {
+    return this.or(void 0);
+  }
+  or(proto) {
+    function isFrom(v) {
+      return v !== proto;
+    }
+    function isTo(v) {
+      return v !== proto;
+    }
+    return new _FieldAdapterBuilder(
+      (v, valuePath, context) => isFrom(v) ? this.convert(v, valuePath, context) : {
+        value: v,
+        readonly: false,
+        required: false
+      },
+      this.create,
+      (v, valuePath, context) => isTo(v) && this.revert ? this.revert(v, valuePath, context) : {
+        type: 0 /* Success */,
+        value: proto
+      }
+    );
+  }
   withIdentity(isFrom) {
     const identityConverter = new MaybeIdentityConverter({
       convert: this.convert,
@@ -226,6 +272,12 @@ function identityAdapter(prototype, required) {
     unreliableIdentityConverter()
   );
 }
+function trimmingStringAdapter() {
+  return adapterFromTwoWayConverter(
+    new TrimmingStringConverter(),
+    prototypingFieldValueFactory("")
+  );
+}
 function listAdapter() {
   return new FieldAdapterBuilder(
     annotatedIdentityConverter(false),
@@ -693,7 +745,7 @@ var import_react = require("react");
 function useDefaultMobxFormHooks(presenter, value, {
   onValidFieldSubmit,
   onValidFormSubmit
-}) {
+} = {}) {
   const model = (0, import_react.useMemo)(function() {
     return presenter.createModel(value);
   }, [
@@ -1025,25 +1077,6 @@ var SelectStringConverter = class extends AbstractSelectValueTypeConverter {
   }
 };
 
-// field_converters/trimming_string_converter.ts
-var TrimmingStringConverter = class {
-  constructor() {
-  }
-  convert(to) {
-    return {
-      value: to.trim(),
-      required: false,
-      readonly: false
-    };
-  }
-  revert(from) {
-    return {
-      type: 0 /* Success */,
-      value: from.trim()
-    };
-  }
-};
-
 // field_converters/validating_converter.ts
 var import_define6 = require("@strictly/define");
 function validatingConverter(validators = []) {
@@ -1783,6 +1816,7 @@ function mergeValidators(validators1, validators2) {
   mergeValidators,
   prototypingFieldValueFactory,
   subFormFieldAdapters,
+  trimmingStringAdapter,
   useDefaultMobxFormHooks,
   useMantineFormFields,
   usePartialComponent,

package/dist/index.d.cts

@@ -58,6 +58,9 @@ declare class FieldAdapterBuilder<From, To, E, ValuePath extends string, Context
     constructor(convert: AnnotatedFieldConverter<From, To, ValuePath, Context>, create: FieldValueFactory<From, ValuePath, Context>, revert?: UnreliableFieldConverter<To, From, E, ValuePath, Context> | undefined);
     chain<To2, E2 = E>(converter: AnnotatedFieldConverter<To, To2, ValuePath, Context>, reverter?: UnreliableFieldConverter<To2, To, E2, ValuePath, Context>): FieldAdapterBuilder<From, To2, E | E2, ValuePath, Context>;
     withReverter(reverter: UnreliableFieldConverter<To, From, E, ValuePath, Context>): FieldAdapterBuilder<From, To, E, ValuePath, Context>;
+    nullable(): FieldAdapterBuilder<From | null, To | null, E, ValuePath, Context>;
+    optional(): FieldAdapterBuilder<From | undefined, To | undefined, E, ValuePath, Context>;
+    private or;
     withIdentity(isFrom: (from: To | From) => from is From): FieldAdapterBuilder<From, To | From, E, ValuePath, Context>;
     get narrow(): FieldAdapter<From, To, E, ValuePath, Context>;
 }
@@ -68,6 +71,7 @@ declare function adapterFromTwoWayConverter<From, To, E, ValuePath extends strin
 declare function adapterFromPrototype<From, To, ValuePath extends string, Context>(converter: AnnotatedFieldConverter<From, To, ValuePath, Context>, prototype: From): FieldAdapterBuilder<From, To, never, ValuePath, Context>;
 declare function adapterFromPrototype<From, To, E, ValuePath extends string, Context>(converter: TwoWayFieldConverter<From, To, E, ValuePath, Context>, prototype: From): FieldAdapterBuilder<From, To, E, ValuePath, Context>;
 declare function identityAdapter<V, ValuePath extends string, Context>(prototype: V, required?: boolean): FieldAdapterBuilder<V, V, never, ValuePath, Context>;
+declare function trimmingStringAdapter<ValuePath extends string, Context>(): FieldAdapterBuilder<string, string, never, ValuePath, Context>;
 declare function listAdapter<E, ValuePath extends string, Context>(): FieldAdapterBuilder<readonly E[], readonly E[], never, ValuePath, Context>;
 
 type FieldAdaptersOfValues<FlattenedValues extends Readonly<Record<string, any>>, TypePathsToValuePaths extends Readonly<Record<keyof FlattenedValues, string>> = Readonly<Record<keyof FlattenedValues, any>>, Context = any> = {
@@ -181,12 +185,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>, { onValidFieldSubmit, onValidFormSubmit, }: {
+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;
+    onFormSubmit?: () => void;
 } & Omit<FieldsViewProps<ModelOfPresenter<P>['fields']>, 'fields'>;
 
 type MergedOfFieldAdaptersWithTwoWayConverter<FieldAdapters extends Readonly<Record<string, FieldAdapter>>, E, Context> = {
@@ -269,11 +273,14 @@ declare function validatingConverter<V, E, ValuePath extends string, Context>(va
 
 declare function prototypingFieldValueFactory<V, ValuePath extends string, Context>(prototype: V): FieldValueFactory<V, ValuePath, Context>;
 
-type ErrorRendererProps<E> = {
+type ErrorOfField<F extends Field> = F extends Field<infer _V, infer E> ? E : never;
+
+type InternalErrorRendererProps<E> = {
     error: E;
 };
-type ErrorRenderer<E = any> = ComponentType<ErrorRendererProps<E>>;
-declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): string;
+type ErrorRendererProps<F extends Fields, K extends keyof Fields> = InternalErrorRendererProps<ErrorOfField<F[K]>>;
+type ErrorRenderer<E = any> = ComponentType<InternalErrorRendererProps<E>>;
+declare function DefaultErrorRenderer({ error, }: InternalErrorRendererProps<any>): string;
 
 type ValueTypeOfField<F extends Field> = F extends Field<infer V> ? V : never;
 
@@ -285,8 +292,6 @@ type BooleanFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends boolean ? K : never]: F[K];
 };
 
-type ErrorOfField<F extends Field> = F extends Field<infer _V, infer E> ? E : never;
-
 type ListFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends readonly any[] ? K : never]: F[K];
 };
@@ -413,4 +418,4 @@ type MergedOfValidators<Validators1 extends Partial<Readonly<Record<Keys, Valida
 type MergedOfValidator<Validator1 extends Validator, Validator2 extends Validator> = Validator1 extends Validator<infer V, infer E1, infer P, infer C> ? Validator2 extends Validator<V, infer E2, P, C> ? Validator<V, E1 | E2, P, C> : never : never;
 declare function mergeValidators<Validators1 extends Partial<Readonly<Record<Keys, Validator>>>, Validators2 extends Partial<Readonly<Record<Keys, Validator>>>, Keys extends string = Extract<keyof Validators1 | keyof Validators2, string>>(validators1: Validators1, validators2: Validators2): MergedOfValidators<Validators1, Validators2, Keys>;
 
-export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, 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 FormFieldsOfPresenter, FormModel, FormPresenter, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfPresenterValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, type ValuePathOfFieldAdapter, type ValuePathsOfPresenter, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, 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 FormFieldsOfPresenter, FormModel, FormPresenter, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfPresenterValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, type ValuePathOfFieldAdapter, type ValuePathsOfPresenter, 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

@@ -58,6 +58,9 @@ declare class FieldAdapterBuilder<From, To, E, ValuePath extends string, Context
     constructor(convert: AnnotatedFieldConverter<From, To, ValuePath, Context>, create: FieldValueFactory<From, ValuePath, Context>, revert?: UnreliableFieldConverter<To, From, E, ValuePath, Context> | undefined);
     chain<To2, E2 = E>(converter: AnnotatedFieldConverter<To, To2, ValuePath, Context>, reverter?: UnreliableFieldConverter<To2, To, E2, ValuePath, Context>): FieldAdapterBuilder<From, To2, E | E2, ValuePath, Context>;
     withReverter(reverter: UnreliableFieldConverter<To, From, E, ValuePath, Context>): FieldAdapterBuilder<From, To, E, ValuePath, Context>;
+    nullable(): FieldAdapterBuilder<From | null, To | null, E, ValuePath, Context>;
+    optional(): FieldAdapterBuilder<From | undefined, To | undefined, E, ValuePath, Context>;
+    private or;
     withIdentity(isFrom: (from: To | From) => from is From): FieldAdapterBuilder<From, To | From, E, ValuePath, Context>;
     get narrow(): FieldAdapter<From, To, E, ValuePath, Context>;
 }
@@ -68,6 +71,7 @@ declare function adapterFromTwoWayConverter<From, To, E, ValuePath extends strin
 declare function adapterFromPrototype<From, To, ValuePath extends string, Context>(converter: AnnotatedFieldConverter<From, To, ValuePath, Context>, prototype: From): FieldAdapterBuilder<From, To, never, ValuePath, Context>;
 declare function adapterFromPrototype<From, To, E, ValuePath extends string, Context>(converter: TwoWayFieldConverter<From, To, E, ValuePath, Context>, prototype: From): FieldAdapterBuilder<From, To, E, ValuePath, Context>;
 declare function identityAdapter<V, ValuePath extends string, Context>(prototype: V, required?: boolean): FieldAdapterBuilder<V, V, never, ValuePath, Context>;
+declare function trimmingStringAdapter<ValuePath extends string, Context>(): FieldAdapterBuilder<string, string, never, ValuePath, Context>;
 declare function listAdapter<E, ValuePath extends string, Context>(): FieldAdapterBuilder<readonly E[], readonly E[], never, ValuePath, Context>;
 
 type FieldAdaptersOfValues<FlattenedValues extends Readonly<Record<string, any>>, TypePathsToValuePaths extends Readonly<Record<keyof FlattenedValues, string>> = Readonly<Record<keyof FlattenedValues, any>>, Context = any> = {
@@ -181,12 +185,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>, { onValidFieldSubmit, onValidFormSubmit, }: {
+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;
+    onFormSubmit?: () => void;
 } & Omit<FieldsViewProps<ModelOfPresenter<P>['fields']>, 'fields'>;
 
 type MergedOfFieldAdaptersWithTwoWayConverter<FieldAdapters extends Readonly<Record<string, FieldAdapter>>, E, Context> = {
@@ -269,11 +273,14 @@ declare function validatingConverter<V, E, ValuePath extends string, Context>(va
 
 declare function prototypingFieldValueFactory<V, ValuePath extends string, Context>(prototype: V): FieldValueFactory<V, ValuePath, Context>;
 
-type ErrorRendererProps<E> = {
+type ErrorOfField<F extends Field> = F extends Field<infer _V, infer E> ? E : never;
+
+type InternalErrorRendererProps<E> = {
     error: E;
 };
-type ErrorRenderer<E = any> = ComponentType<ErrorRendererProps<E>>;
-declare function DefaultErrorRenderer({ error, }: ErrorRendererProps<any>): string;
+type ErrorRendererProps<F extends Fields, K extends keyof Fields> = InternalErrorRendererProps<ErrorOfField<F[K]>>;
+type ErrorRenderer<E = any> = ComponentType<InternalErrorRendererProps<E>>;
+declare function DefaultErrorRenderer({ error, }: InternalErrorRendererProps<any>): string;
 
 type ValueTypeOfField<F extends Field> = F extends Field<infer V> ? V : never;
 
@@ -285,8 +292,6 @@ type BooleanFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends boolean ? K : never]: F[K];
 };
 
-type ErrorOfField<F extends Field> = F extends Field<infer _V, infer E> ? E : never;
-
 type ListFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends readonly any[] ? K : never]: F[K];
 };
@@ -413,4 +418,4 @@ type MergedOfValidators<Validators1 extends Partial<Readonly<Record<Keys, Valida
 type MergedOfValidator<Validator1 extends Validator, Validator2 extends Validator> = Validator1 extends Validator<infer V, infer E1, infer P, infer C> ? Validator2 extends Validator<V, infer E2, P, C> ? Validator<V, E1 | E2, P, C> : never : never;
 declare function mergeValidators<Validators1 extends Partial<Readonly<Record<Keys, Validator>>>, Validators2 extends Partial<Readonly<Record<Keys, Validator>>>, Keys extends string = Extract<keyof Validators1 | keyof Validators2, string>>(validators1: Validators1, validators2: Validators2): MergedOfValidators<Validators1, Validators2, Keys>;
 
-export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, 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 FormFieldsOfPresenter, FormModel, FormPresenter, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfPresenterValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, type ValuePathOfFieldAdapter, type ValuePathsOfPresenter, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, prototypingFieldValueFactory, subFormFieldAdapters, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, 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 FormFieldsOfPresenter, FormModel, FormPresenter, type FormProps, type FromOfFieldAdapter, IntegerToStringConverter, type MergedOfFieldAdaptersWithTwoWayConverter, type MergedOfFieldAdaptersWithValidators, type MergedOfValidator, type MergedOfValidators, NullableToBooleanConverter, type PartialComponent, SelectDiscriminatedUnionConverter, SelectLiteralConverter, SelectStringConverter, type ToOfFieldAdapter, type ToValueOfPresenterValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, type ValuePathOfFieldAdapter, type ValuePathsOfPresenter, 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

@@ -52,18 +52,18 @@ function chainAnnotatedFieldConverter(from, to) {
   return function(value, valuePath, context) {
     const {
       required: intermediateRequired,
-      readonly: intermediateDisabled,
+      readonly: intermediateReadonly,
       value: intermediateValue
     } = from(value, valuePath, context);
     const {
       required: finalRequired,
-      readonly: finalDisabled,
+      readonly: finalReadonly,
       value: finalValue
     } = to(intermediateValue, valuePath, context);
     return {
       value: finalValue,
       required: intermediateRequired || finalRequired,
-      readonly: intermediateDisabled || finalDisabled
+      readonly: intermediateReadonly || finalReadonly
     };
   };
 }
@@ -102,6 +102,25 @@ var MaybeIdentityConverter = class {
   }
 };
 
+// field_converters/trimming_string_converter.ts
+var TrimmingStringConverter = class {
+  constructor() {
+  }
+  convert(to) {
+    return {
+      value: to.trim(),
+      required: false,
+      readonly: false
+    };
+  }
+  revert(from) {
+    return {
+      type: 0 /* Success */,
+      value: from.trim()
+    };
+  }
+};
+
 // field_value_factories/prototyping_field_value_factory.ts
 function prototypingFieldValueFactory(prototype) {
   return function() {
@@ -136,6 +155,32 @@ var FieldAdapterBuilder = class _FieldAdapterBuilder {
       reverter
     );
   }
+  nullable() {
+    return this.or(null);
+  }
+  optional() {
+    return this.or(void 0);
+  }
+  or(proto) {
+    function isFrom(v) {
+      return v !== proto;
+    }
+    function isTo(v) {
+      return v !== proto;
+    }
+    return new _FieldAdapterBuilder(
+      (v, valuePath, context) => isFrom(v) ? this.convert(v, valuePath, context) : {
+        value: v,
+        readonly: false,
+        required: false
+      },
+      this.create,
+      (v, valuePath, context) => isTo(v) && this.revert ? this.revert(v, valuePath, context) : {
+        type: 0 /* Success */,
+        value: proto
+      }
+    );
+  }
   withIdentity(isFrom) {
     const identityConverter = new MaybeIdentityConverter({
       convert: this.convert,
@@ -173,6 +218,12 @@ function identityAdapter(prototype, required) {
     unreliableIdentityConverter()
   );
 }
+function trimmingStringAdapter() {
+  return adapterFromTwoWayConverter(
+    new TrimmingStringConverter(),
+    prototypingFieldValueFactory("")
+  );
+}
 function listAdapter() {
   return new FieldAdapterBuilder(
     annotatedIdentityConverter(false),
@@ -663,7 +714,7 @@ import {
 function useDefaultMobxFormHooks(presenter, value, {
   onValidFieldSubmit,
   onValidFormSubmit
-}) {
+} = {}) {
   const model = useMemo(function() {
     return presenter.createModel(value);
   }, [
@@ -1006,25 +1057,6 @@ var SelectStringConverter = class extends AbstractSelectValueTypeConverter {
   }
 };
 
-// field_converters/trimming_string_converter.ts
-var TrimmingStringConverter = class {
-  constructor() {
-  }
-  convert(to) {
-    return {
-      value: to.trim(),
-      required: false,
-      readonly: false
-    };
-  }
-  revert(from) {
-    return {
-      type: 0 /* Success */,
-      value: from.trim()
-    };
-  }
-};
-
 // field_converters/validating_converter.ts
 import {
   validate as validate2
@@ -1787,6 +1819,7 @@ export {
   mergeValidators,
   prototypingFieldValueFactory,
   subFormFieldAdapters,
+  trimmingStringAdapter,
   useDefaultMobxFormHooks,
   useMantineFormFields,
   usePartialComponent,

package/field_converters/chain_field_converter.ts

@@ -71,18 +71,18 @@ export function chainAnnotatedFieldConverter<
   return function (value: From, valuePath: ValuePath, context: Context): AnnotatedFieldConversion {
     const {
       required: intermediateRequired,
-      readonly: intermediateDisabled,
+      readonly: intermediateReadonly,
       value: intermediateValue,
     } = from(value, valuePath, context)
     const {
       required: finalRequired,
-      readonly: finalDisabled,
+      readonly: finalReadonly,
       value: finalValue,
     } = to(intermediateValue, valuePath, context)
     return {
       value: finalValue,
       required: intermediateRequired || finalRequired,
-      readonly: intermediateDisabled || finalDisabled,
+      readonly: intermediateReadonly || finalReadonly,
     }
   }
 }

package/mantine/error_renderer.ts

@@ -1,15 +1,24 @@
 import { type ComponentType } from 'react'
+import { type ErrorOfField } from 'types/error_of_field'
+import { type Fields } from 'types/field'
 
-export type ErrorRendererProps<E> = {
+type InternalErrorRendererProps<E> = {
   error: E,
 }
 
+export type ErrorRendererProps<
+  F extends Fields,
+  K extends keyof Fields,
+> = InternalErrorRendererProps<
+  ErrorOfField<F[K]>
+>
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ErrorRenderer<E = any> = ComponentType<ErrorRendererProps<E>>
+export type ErrorRenderer<E = any> = ComponentType<InternalErrorRendererProps<E>>
 
 export function DefaultErrorRenderer({
   error,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-}: ErrorRendererProps<any>) {
+}: InternalErrorRendererProps<any>) {
   return JSON.stringify(error)
 }

package/package.json

@@ -70,7 +70,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "exports": {
     ".": {
       "import": {

package/types/specs/{error_type_of_field.tests.ts → error_of_field.tests.ts}

@@ -1,7 +1,7 @@
 import { type ErrorOfField } from 'types/error_of_field'
 import { type Field } from 'types/field'
 
-describe('ErrorTypeOfField', function () {
+describe('ErrorOfField', function () {
   it('equals expected type', function () {
     const e = Symbol()
     type E = typeof e