@strictly/react-form 0.0.34 → 0.0.36

package/.out/util/Partial.d.ts

@@ -1,5 +1,5 @@
 import { type FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
-import { type ComponentProps, type ComponentType, type DependencyList, type ForwardRefExoticComponent, type PropsWithoutRef, type Ref, type RefAttributes } from 'react';
+import { type ComponentProps, type ComponentType, type DependencyList, type ForwardRefExoticComponent, type JSX, type PropsWithoutRef, type Ref, type RefAttributes } from 'react';
 export type RefOfProps<P, Fallback = unknown> = P extends RefAttributes<infer R> ? R : Fallback;
 export type PartialComponent<Component extends ComponentType<any>, CurriedProps, AdditionalProps = {}> = Exclude<keyof CurriedProps, keyof ComponentProps<Component>> extends never ? UnsafePartialComponent<Component, CurriedProps, AdditionalProps> : keyof CurriedProps extends (string | number) ? `unmatched prop: ${Exclude<keyof CurriedProps, keyof ComponentProps<Component>>}` : Exclude<keyof CurriedProps, keyof ComponentProps<Component>>;
 export type UnsafePartialComponent<Component extends ComponentType<any>, CurriedProps, AdditionalProps = {}, R = RefOfProps<ComponentProps<Component>>> = ForwardRefExoticComponent<PropsWithoutRef<RemainingComponentProps<Component, CurriedProps> & AdditionalProps> & {

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: es6
 CJS Build start
 ESM Build start
-ESM dist/index.js 60.01 KB
-ESM ⚡️ Build success in 127ms
-CJS dist/index.cjs 64.19 KB
-CJS ⚡️ Build success in 158ms
+CJS dist/index.cjs 64.40 KB
+CJS ⚡️ Build success in 140ms
+ESM dist/index.js 60.22 KB
+ESM ⚡️ Build success in 155ms
 DTS Build start
-DTS ⚡️ Build success in 6824ms
-DTS dist/index.d.cts 38.69 KB
-DTS dist/index.d.ts  38.69 KB
-Done in 8.27s.
+DTS ⚡️ Build success in 5375ms
+DTS dist/index.d.cts 39.00 KB
+DTS dist/index.d.ts  39.00 KB
+Done in 6.87s.

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

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

package/core/mobx/FormModel.ts

@@ -134,6 +134,10 @@ export type ContextOf<TypePathsToAdapters extends Partial<Readonly<Record<string
 
 export type FormMode = 'edit' | 'create'
 
+export type FormModelContextSource<ContextType, V, ValuePath extends string | number | symbol> = {
+  forPath(value: V, valuePath: ValuePath): ContextType,
+}
+
 export abstract class FormModel<
   T extends Type,
   ValueToTypePaths extends Readonly<Record<string, string>>,
@@ -169,6 +173,11 @@ export abstract class FormModel<
     readonly type: T,
     private readonly originalValue: ValueOfType<ReadonlyTypeOfType<T>>,
     protected readonly adapters: TypePathsToAdapters,
+    protected readonly contextSource: FormModelContextSource<
+      ContextType,
+      ValueOfType<ReadonlyTypeOfType<T>>,
+      keyof ValuePathsToAdapters
+    >,
     protected readonly mode: FormMode,
   ) {
     this.originalValues = flattenValuesOfType<ReadonlyTypeOfType<T>>(type, originalValue, this.listIndicesToKeys)
@@ -188,7 +197,7 @@ export abstract class FormModel<
         valuePath,
       ): AnnotatedFieldConversion<FieldOverride> | undefined => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const contextValue = this.toContext(originalValue, valuePath as keyof ValuePathsToAdapters)
+        const contextValue = contextSource.forPath(originalValue, valuePath as keyof ValuePathsToAdapters)
 
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const adapter = this.adapters[typePath as keyof TypePathsToAdapters]
@@ -214,11 +223,6 @@ export abstract class FormModel<
     }) as FlattenedFieldOverrides<ValuePathsToAdapters>
   }
 
-  protected abstract toContext(
-    value: ValueOfType<ReadonlyTypeOfType<T>>,
-    valuePath: keyof ValuePathsToAdapters,
-  ): ContextType
-
   get forceMutableFields() {
     switch (this.mode) {
       case 'create':
@@ -310,7 +314,7 @@ export abstract class FormModel<
     const accessor = this.getAccessorForValuePath(valuePath)
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const fieldTypeDef = this.flattenedTypeDefs[typePath as string]
-    const context = this.toContext(this.observableValue, valuePath)
+    const context = this.contextSource.forPath(this.observableValue, valuePath)
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const defaultValue = create(valuePath as string, context)
 
@@ -499,7 +503,7 @@ export abstract class FormModel<
         elementTypePath as string,
         // TODO what can we use for the value path here?
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        this.toContext(this.observableValue, valuePath as unknown as keyof ValuePathsToAdapters),
+        this.contextSource.forPath(this.observableValue, valuePath as unknown as keyof ValuePathsToAdapters),
       )
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const originalList: any[] = accessor.value
@@ -569,7 +573,7 @@ export abstract class FormModel<
     assertExists(revert, 'setting value not supported {}', valuePath)
 
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-    const conversion = revert(value, valuePath as any, this.toContext(this.observableValue, valuePath))
+    const conversion = revert(value, valuePath as any, this.contextSource.forPath(this.observableValue, valuePath))
     const accessor = this.getAccessorForValuePath(valuePath)
     return runInAction(() => {
       this.fieldOverrides[valuePath] = [value]
@@ -631,8 +635,9 @@ export abstract class FormModel<
       convert,
       create,
     } = adapter
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const context = this.toContext(this.observableValue, valuePath as unknown as keyof ValuePathsToAdapters)
+
+    const context = this.contextSource.forPath(this.observableValue, // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      valuePath as unknown as keyof ValuePathsToAdapters)
     const value = create(valuePath, context)
     const {
       value: displayValue,

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

@@ -7,6 +7,7 @@ import {
   nullType,
   numberType,
   object,
+  type ReadonlyTypeOfType,
   record,
   stringType,
   type Type,
@@ -24,7 +25,9 @@ import {
 } from 'core/mobx/fieldAdapterBuilder'
 import {
   type FlattenedTypePathsToAdaptersOf,
+  type FormMode,
   FormModel,
+  type FormModelContextSource,
   Validation,
   type ValuePathsToAdaptersOf,
 } from 'core/mobx/FormModel'
@@ -54,6 +57,19 @@ const originalIntegerToStringAdapter = adapterFromTwoWayConverter(
 
 const originalBooleanToBooleanAdapter = identityAdapter(false)
 
+class TestFormContextSource<V, ValuePath extends string | number | symbol> implements FormModelContextSource<
+  {},
+  V,
+  ValuePath
+> {
+  forPath(value: V, valuePath: ValuePath): {} {
+    return {
+      value,
+      valuePath,
+    }
+  }
+}
+
 class TestFormModel<
   T extends Type,
   ValueToTypePaths extends Readonly<Record<string, string>>,
@@ -62,14 +78,13 @@ class TestFormModel<
     {}
   >,
 > extends FormModel<T, ValueToTypePaths, TypePathsToAdapters, {}> {
-  override toContext(
-    value: ValueOfType<T>,
-    valuePath: keyof ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths>,
+  constructor(
+    type: T,
+    originalValue: ValueOfType<ReadonlyTypeOfType<T>>,
+    adapters: TypePathsToAdapters,
+    mode: FormMode,
   ) {
-    return {
-      value,
-      valuePath,
-    }
+    super(type, originalValue, adapters, new TestFormContextSource(), mode)
   }
 
   setFieldValueAndValidate<K extends keyof ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths>>(

package/dist/index.cjs

@@ -367,10 +367,11 @@ var Validation = /* @__PURE__ */ ((Validation2) => {
 var _validateAll_dec, _validateField_dec, _setFieldValue_dec, _valueChanged_dec, _dirty_dec, _accessors_dec, _knownFields_dec, _fields_dec, _value_dec, _validation_dec, _errorOverrides_dec, _fieldOverrides_dec, _observableValue_dec, _init, _observableValue, _fieldOverrides, _errorOverrides, _validation;
 _observableValue_dec = [import_mobx.observable.ref], _fieldOverrides_dec = [import_mobx.observable.shallow], _errorOverrides_dec = [import_mobx.observable.shallow], _validation_dec = [import_mobx.observable.shallow], _value_dec = [import_mobx.computed], _fields_dec = [import_mobx.computed], _knownFields_dec = [import_mobx.computed], _accessors_dec = [import_mobx.computed], _dirty_dec = [import_mobx.computed], _valueChanged_dec = [import_mobx.computed], _setFieldValue_dec = [import_mobx.action], _validateField_dec = [import_mobx.action], _validateAll_dec = [import_mobx.action];
 var FormModel = class {
-  constructor(type, originalValue, adapters, mode) {
+  constructor(type, originalValue, adapters, contextSource, mode) {
     this.type = type;
     this.originalValue = originalValue;
     this.adapters = adapters;
+    this.contextSource = contextSource;
     this.mode = mode;
     __runInitializers(_init, 5, this);
     __privateAdd(this, _observableValue, __runInitializers(_init, 8, this)), __runInitializers(_init, 11, this);
@@ -392,7 +393,7 @@ var FormModel = class {
       () => {
       },
       (_t, fieldValue, _setter, typePath, valuePath) => {
-        const contextValue = this.toContext(originalValue, valuePath);
+        const contextValue = contextSource.forPath(originalValue, valuePath);
         const adapter2 = this.adapters[typePath];
         if (adapter2 == null) {
           return;
@@ -486,7 +487,7 @@ var FormModel = class {
     const fieldOverride = this.fieldOverrides[valuePath];
     const accessor = this.getAccessorForValuePath(valuePath);
     const fieldTypeDef = this.flattenedTypeDefs[typePath];
-    const context = this.toContext(this.observableValue, valuePath);
+    const context = this.contextSource.forPath(this.observableValue, valuePath);
     const defaultValue = create(valuePath, context);
     const {
       value,
@@ -627,7 +628,7 @@ var FormModel = class {
       elementTypePath,
       // TODO what can we use for the value path here?
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      this.toContext(this.observableValue, valuePath)
+      this.contextSource.forPath(this.observableValue, valuePath)
     );
     const originalList = accessor.value;
     const newList = [
@@ -682,7 +683,7 @@ var FormModel = class {
   internalSetFieldValue(valuePath, value, validation) {
     const { revert } = this.getAdapterForValuePath(valuePath);
     (0, import_base2.assertExists)(revert, "setting value not supported {}", valuePath);
-    const conversion = revert(value, valuePath, this.toContext(this.observableValue, valuePath));
+    const conversion = revert(value, valuePath, this.contextSource.forPath(this.observableValue, valuePath));
     const accessor = this.getAccessorForValuePath(valuePath);
     return (0, import_mobx.runInAction)(() => {
       this.fieldOverrides[valuePath] = [value];
@@ -737,7 +738,11 @@ var FormModel = class {
       convert,
       create
     } = adapter2;
-    const context = this.toContext(this.observableValue, valuePath);
+    const context = this.contextSource.forPath(
+      this.observableValue,
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      valuePath
+    );
     const value = create(valuePath, context);
     const {
       value: displayValue

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { Maybe, ElementOfArray, StringConcatOf, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
 import { Type, ValueOfType, ReadonlyTypeOfType, FlattenedTypesOfType, ListTypeDef, FlattenedValuesOfType, Accessor, Validator, UnionTypeDef, ValueTypesOfDiscriminatedUnion, LiteralTypeDef } from '@strictly/define';
 import { ValueOf, SimplifyDeep, ReadonlyDeep, UnionToIntersection, StringKeyOf, Simplify } from 'type-fest';
-import { ComponentType, RefAttributes, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, Ref, DependencyList } from 'react';
+import { ComponentType, RefAttributes, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, Ref, DependencyList, JSX } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { CheckboxProps, PillProps, RadioProps, RadioGroupProps, TextInputProps, SelectProps } from '@mantine/core';
 import { Observer } from 'mobx-react';
@@ -132,10 +132,14 @@ type ContextOf<TypePathsToAdapters extends Partial<Readonly<Record<string, Field
     readonly [K in keyof TypePathsToAdapters]: TypePathsToAdapters[K] extends undefined ? undefined : unknown extends ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>> ? never : ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>>;
 }[keyof TypePathsToAdapters] | {}>;
 type FormMode = 'edit' | 'create';
+type FormModelContextSource<ContextType, V, ValuePath extends string | number | symbol> = {
+    forPath(value: V, valuePath: ValuePath): ContextType;
+};
 declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readonly<Record<string, string>>, TypePathsToAdapters extends FlattenedTypePathsToAdaptersOf<FlattenedValuesOfType<T, '*'>, ContextType>, ContextType = ContextOf<TypePathsToAdapters>, ValuePathsToAdapters extends ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths> = ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths>> {
     readonly type: T;
     private readonly originalValue;
     protected readonly adapters: TypePathsToAdapters;
+    protected readonly contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>;
     protected readonly mode: FormMode;
     private accessor observableValue;
     accessor fieldOverrides: FlattenedFieldOverrides<ValuePathsToAdapters>;
@@ -144,8 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private readonly flattenedTypeDefs;
     private readonly originalValues;
     private readonly listIndicesToKeys;
-    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, mode: FormMode);
-    protected abstract toContext(value: ValueOfType<ReadonlyTypeOfType<T>>, valuePath: keyof ValuePathsToAdapters): ContextType;
+    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>, mode: FormMode);
     get forceMutableFields(): boolean;
     get value(): ValueOfType<ReadonlyTypeOfType<T>>;
     get fields(): SimplifyDeep<FlattenedConvertedFieldsOf<ValuePathsToAdapters>>;
@@ -468,4 +471,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 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, peek, 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 FormModelContextSource, 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, peek, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Maybe, ElementOfArray, StringConcatOf, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
 import { Type, ValueOfType, ReadonlyTypeOfType, FlattenedTypesOfType, ListTypeDef, FlattenedValuesOfType, Accessor, Validator, UnionTypeDef, ValueTypesOfDiscriminatedUnion, LiteralTypeDef } from '@strictly/define';
 import { ValueOf, SimplifyDeep, ReadonlyDeep, UnionToIntersection, StringKeyOf, Simplify } from 'type-fest';
-import { ComponentType, RefAttributes, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, Ref, DependencyList } from 'react';
+import { ComponentType, RefAttributes, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, Ref, DependencyList, JSX } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { CheckboxProps, PillProps, RadioProps, RadioGroupProps, TextInputProps, SelectProps } from '@mantine/core';
 import { Observer } from 'mobx-react';
@@ -132,10 +132,14 @@ type ContextOf<TypePathsToAdapters extends Partial<Readonly<Record<string, Field
     readonly [K in keyof TypePathsToAdapters]: TypePathsToAdapters[K] extends undefined ? undefined : unknown extends ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>> ? never : ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>>;
 }[keyof TypePathsToAdapters] | {}>;
 type FormMode = 'edit' | 'create';
+type FormModelContextSource<ContextType, V, ValuePath extends string | number | symbol> = {
+    forPath(value: V, valuePath: ValuePath): ContextType;
+};
 declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readonly<Record<string, string>>, TypePathsToAdapters extends FlattenedTypePathsToAdaptersOf<FlattenedValuesOfType<T, '*'>, ContextType>, ContextType = ContextOf<TypePathsToAdapters>, ValuePathsToAdapters extends ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths> = ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths>> {
     readonly type: T;
     private readonly originalValue;
     protected readonly adapters: TypePathsToAdapters;
+    protected readonly contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>;
     protected readonly mode: FormMode;
     private accessor observableValue;
     accessor fieldOverrides: FlattenedFieldOverrides<ValuePathsToAdapters>;
@@ -144,8 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private readonly flattenedTypeDefs;
     private readonly originalValues;
     private readonly listIndicesToKeys;
-    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, mode: FormMode);
-    protected abstract toContext(value: ValueOfType<ReadonlyTypeOfType<T>>, valuePath: keyof ValuePathsToAdapters): ContextType;
+    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>, mode: FormMode);
     get forceMutableFields(): boolean;
     get value(): ValueOfType<ReadonlyTypeOfType<T>>;
     get fields(): SimplifyDeep<FlattenedConvertedFieldsOf<ValuePathsToAdapters>>;
@@ -468,4 +471,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 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, peek, 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 FormModelContextSource, 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, peek, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.js

@@ -337,10 +337,11 @@ var Validation = /* @__PURE__ */ ((Validation2) => {
 var _validateAll_dec, _validateField_dec, _setFieldValue_dec, _valueChanged_dec, _dirty_dec, _accessors_dec, _knownFields_dec, _fields_dec, _value_dec, _validation_dec, _errorOverrides_dec, _fieldOverrides_dec, _observableValue_dec, _init, _observableValue, _fieldOverrides, _errorOverrides, _validation;
 _observableValue_dec = [observable.ref], _fieldOverrides_dec = [observable.shallow], _errorOverrides_dec = [observable.shallow], _validation_dec = [observable.shallow], _value_dec = [computed], _fields_dec = [computed], _knownFields_dec = [computed], _accessors_dec = [computed], _dirty_dec = [computed], _valueChanged_dec = [computed], _setFieldValue_dec = [action], _validateField_dec = [action], _validateAll_dec = [action];
 var FormModel = class {
-  constructor(type, originalValue, adapters, mode) {
+  constructor(type, originalValue, adapters, contextSource, mode) {
     this.type = type;
     this.originalValue = originalValue;
     this.adapters = adapters;
+    this.contextSource = contextSource;
     this.mode = mode;
     __runInitializers(_init, 5, this);
     __privateAdd(this, _observableValue, __runInitializers(_init, 8, this)), __runInitializers(_init, 11, this);
@@ -362,7 +363,7 @@ var FormModel = class {
       () => {
       },
       (_t, fieldValue, _setter, typePath, valuePath) => {
-        const contextValue = this.toContext(originalValue, valuePath);
+        const contextValue = contextSource.forPath(originalValue, valuePath);
         const adapter2 = this.adapters[typePath];
         if (adapter2 == null) {
           return;
@@ -456,7 +457,7 @@ var FormModel = class {
     const fieldOverride = this.fieldOverrides[valuePath];
     const accessor = this.getAccessorForValuePath(valuePath);
     const fieldTypeDef = this.flattenedTypeDefs[typePath];
-    const context = this.toContext(this.observableValue, valuePath);
+    const context = this.contextSource.forPath(this.observableValue, valuePath);
     const defaultValue = create(valuePath, context);
     const {
       value,
@@ -597,7 +598,7 @@ var FormModel = class {
       elementTypePath,
       // TODO what can we use for the value path here?
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      this.toContext(this.observableValue, valuePath)
+      this.contextSource.forPath(this.observableValue, valuePath)
     );
     const originalList = accessor.value;
     const newList = [
@@ -652,7 +653,7 @@ var FormModel = class {
   internalSetFieldValue(valuePath, value, validation) {
     const { revert } = this.getAdapterForValuePath(valuePath);
     assertExists(revert, "setting value not supported {}", valuePath);
-    const conversion = revert(value, valuePath, this.toContext(this.observableValue, valuePath));
+    const conversion = revert(value, valuePath, this.contextSource.forPath(this.observableValue, valuePath));
     const accessor = this.getAccessorForValuePath(valuePath);
     return runInAction(() => {
       this.fieldOverrides[valuePath] = [value];
@@ -707,7 +708,11 @@ var FormModel = class {
       convert,
       create
     } = adapter2;
-    const context = this.toContext(this.observableValue, valuePath);
+    const context = this.contextSource.forPath(
+      this.observableValue,
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      valuePath
+    );
     const value = create(valuePath, context);
     const {
       value: displayValue

package/package.json

@@ -18,8 +18,8 @@
     "@strictly/support-vite": "*",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.0.1",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^4.3.3",
     "concurrently": "^9.1.2",
     "jsdom": "^25.0.1",
@@ -73,7 +73,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "exports": {
     ".": {
       "import": {

package/util/Partial.tsx

@@ -7,6 +7,7 @@ import {
   type ForwardedRef,
   forwardRef,
   type ForwardRefExoticComponent,
+  type JSX,
   type PropsWithoutRef,
   type Ref,
   type RefAttributes,