@strictly/react-form 0.0.3 → 0.0.5

package/.out/types/specs/list_fields_of_fields.tests.d.ts

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

package/.out/types/specs/list_fields_of_fields.tests.js

@@ -0,0 +1,12 @@
+describe('ListFieldsOfFields', () => {
+    it('matches the expected type of an empty set of fields', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+    it('matches the expected type of a set of fields containing a single list', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+    it('matches the expected type of a set of fields containing a multiple fields, including a list', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+});
+export {};

package/.out/types/specs/sub_form_fields.tests.d.ts

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

package/.out/types/specs/sub_form_fields.tests.js

@@ -0,0 +1,12 @@
+describe('SubFormFields', () => {
+    it('works on single field', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+    it('works on more two fields', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+    it('works on subfields', () => {
+        expectTypeOf().toEqualTypeOf();
+    });
+});
+export {};

package/.out/types/sub_form_fields.d.ts

@@ -0,0 +1,7 @@
+import { type StringConcatOf } from '@strictly/base';
+import { type Fields } from './field';
+export type SubFormFields<F extends Fields, P extends keyof F> = P extends string ? {
+    [K in keyof F as K extends StringConcatOf<`${P}.`, infer S> ? `$.${S}` : never]: F[K];
+} & {
+    $: F[P];
+} : never;

package/.out/types/sub_form_fields.js

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

package/.storybook/main.ts

@@ -1,10 +1,12 @@
 /* eslint-env node */
 import { type StorybookConfig } from '@storybook/react-vite'
+import { createRequire } from 'module'
 import {
   dirname,
   join,
-} from 'path'
+} from 'node:path'
 
+const require = createRequire(import.meta.url)
 /**
  * This function is used to resolve the absolute path of a package.
  * It is needed in projects that use Yarn PnP or are set up within a monorepo.

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: esnext
 CJS Build start
 ESM Build start
-CJS dist/index.cjs 44.90 KB
-CJS ⚡️ Build success in 113ms
-ESM dist/index.js 41.31 KB
-ESM ⚡️ Build success in 115ms
+ESM dist/index.js 43.08 KB
+ESM ⚡️ Build success in 117ms
+CJS dist/index.cjs 46.78 KB
+CJS ⚡️ Build success in 117ms
 DTS Build start
-DTS ⚡️ Build success in 9820ms
-DTS dist/index.d.cts 34.05 KB
-DTS dist/index.d.ts  34.05 KB
-Done in 10.94s.
+DTS ⚡️ Build success in 9983ms
+DTS dist/index.d.cts 34.96 KB
+DTS dist/index.d.ts  34.96 KB
+Done in 11.02s.

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

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

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.11s.
+Done in 0.12s.

package/core/mobx/field_adapter_builder.ts

@@ -6,7 +6,6 @@ import {
   annotatedIdentityConverter,
   unreliableIdentityConverter,
 } from 'field_converters/identity_converter'
-import { listConverter } from 'field_converters/list_converter'
 import { MaybeIdentityConverter } from 'field_converters/maybe_identity_converter'
 import { prototypingFieldValueFactory } from 'field_value_factories/prototyping_field_value_factory'
 import {
@@ -266,12 +265,12 @@ export function identityAdapter<
 
 export function listAdapter<
   E,
-  K extends string,
   ValuePath extends string,
   Context,
 >() {
-  return new FieldAdapterBuilder<readonly E[], readonly K[], never, ValuePath, Context>(
-    listConverter<E, K, ValuePath, Context>(),
+  return new FieldAdapterBuilder<readonly E[], readonly E[], never, ValuePath, Context>(
+    annotatedIdentityConverter<readonly E[], ValuePath, Context>(false),
     prototypingFieldValueFactory<readonly E[], ValuePath, Context>([]),
+    unreliableIdentityConverter<readonly E[], ValuePath, Context>(),
   )
 }

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

@@ -0,0 +1,59 @@
+import { type FieldAdapter } from 'core/mobx/field_adapter'
+import {
+  subFormFieldAdapters,
+} from 'core/mobx/sub_form_field_adapters'
+import { mockDeep } from 'vitest-mock-extended'
+
+describe('subFormFieldAdapters', () => {
+  const fieldAdapter1: FieldAdapter<string, boolean> = mockDeep()
+  const fieldAdapter2: FieldAdapter<number, boolean> = mockDeep()
+
+  describe('empty value', () => {
+    const adapters = subFormFieldAdapters({}, '$.a')
+
+    it('equals expected type', () => {
+      expectTypeOf(adapters).toEqualTypeOf<{}>()
+    })
+
+    it('equals expected value', () => {
+      expect(adapters).toEqual({})
+    })
+  })
+
+  describe('single adapter', () => {
+    const adapters = subFormFieldAdapters({
+      $: fieldAdapter1,
+    }, '$.a')
+
+    it('equals expected type', () => {
+      expectTypeOf(adapters).toEqualTypeOf<{
+        '$.a': FieldAdapter<string, boolean>,
+      }>()
+    })
+
+    it('equals expected value', () => {
+      expect(adapters).toEqual({ '$.a': fieldAdapter1 })
+    })
+  })
+
+  describe('multiple adapters', () => {
+    const adapters = subFormFieldAdapters({
+      '$.x': fieldAdapter1,
+      '$.y': fieldAdapter2,
+    }, '$.a')
+
+    it('equals expected type', () => {
+      expectTypeOf(adapters).toEqualTypeOf<{
+        '$.a.x': FieldAdapter<string, boolean>,
+        '$.a.y': FieldAdapter<number, boolean>,
+      }>()
+    })
+
+    it('equals expected value', () => {
+      expect(adapters).toEqual({
+        '$.a.x': fieldAdapter1,
+        '$.a.y': fieldAdapter2,
+      })
+    })
+  })
+})

package/core/mobx/sub_form_field_adapters.ts

@@ -0,0 +1,21 @@
+import { type StringConcatOf } from '@strictly/base'
+import { type FieldAdapter } from './field_adapter'
+
+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]
+}
+
+export function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string>(
+  subAdapters: SubAdapters,
+  prefix: P,
+): SubFormFieldAdapters<SubAdapters, P> {
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return Object.entries(subAdapters).reduce<Record<string, FieldAdapter>>((acc, [
+    subKey,
+    subValue,
+  ]) => {
+    const key = subKey.replace('$', prefix)
+    acc[key] = subValue
+    return acc
+  }, {}) as SubFormFieldAdapters<SubAdapters, P>
+}

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
   mergeFieldAdaptersWithTwoWayConverter: () => mergeFieldAdaptersWithTwoWayConverter,
   mergeValidators: () => mergeValidators,
   prototypingFieldValueFactory: () => prototypingFieldValueFactory,
+  subFormFieldAdapters: () => subFormFieldAdapters,
   useMantineForm: () => useMantineForm,
   usePartialComponent: () => usePartialComponent,
   usePartialObserverComponent: () => usePartialObserverComponent,
@@ -138,20 +139,6 @@ function unreliableIdentityConverter() {
   };
 }
 
-// field_converters/list_converter.ts
-function listConverter() {
-  return function(from, valuePath) {
-    const value = from.map(function(_v, i) {
-      return `${valuePath}.${i}`;
-    });
-    return {
-      value,
-      required: false,
-      readonly: false
-    };
-  };
-}
-
 // field_converters/maybe_identity_converter.ts
 var MaybeIdentityConverter = class {
   constructor(converter, isFrom) {
@@ -240,8 +227,9 @@ function identityAdapter(prototype, required) {
 }
 function listAdapter() {
   return new FieldAdapterBuilder(
-    listConverter(),
-    prototypingFieldValueFactory([])
+    annotatedIdentityConverter(false),
+    prototypingFieldValueFactory([]),
+    unreliableIdentityConverter()
   );
 }
 
@@ -774,6 +762,18 @@ function mergeAdaptersWithValidators(adapters, validators) {
   );
 }
 
+// core/mobx/sub_form_field_adapters.ts
+function subFormFieldAdapters(subAdapters, prefix) {
+  return Object.entries(subAdapters).reduce((acc, [
+    subKey,
+    subValue
+  ]) => {
+    const key = subKey.replace("$", prefix);
+    acc[key] = subValue;
+    return acc;
+  }, {});
+}
+
 // field_converters/integer_to_string_converter.ts
 var IntegerToStringConverter = class {
   constructor(isNanError, base = 10) {
@@ -1197,17 +1197,20 @@ function createList(valuePath, List) {
   const propSource = () => {
     const values = [...this.fields[valuePath].value];
     return {
-      values
+      values,
+      listPath: valuePath
     };
   };
   return createUnsafePartialObserverComponent(List, propSource);
 }
 function DefaultList({
   values,
+  listPath,
   children
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children: values.map(function(value, index) {
-    return children(value, index);
+    const valuePath = `${listPath}.${index}`;
+    return children(valuePath, value, index);
   }) });
 }
 
@@ -1282,8 +1285,53 @@ function createRadioGroup(valuePath, RadioGroup) {
   return createUnsafePartialObserverComponent(RadioGroup, propSource, ["ErrorRenderer"]);
 }
 
-// mantine/create_text_input.tsx
+// mantine/create_sub_form.tsx
+var import_mobx_react2 = require("mobx-react");
 var import_jsx_runtime5 = require("react/jsx-runtime");
+function createSubForm(valuePath, SubForm, observableProps) {
+  function toKey(subKey) {
+    return subKey.replace("$", valuePath);
+  }
+  function toSubKey(key) {
+    return key.replace(valuePath, "$");
+  }
+  function onFieldValueChange(subKey, value) {
+    observableProps.onFieldValueChange(toKey(subKey), value);
+  }
+  function onFieldBlur(subKey) {
+    observableProps.onFieldBlur?.(toKey(subKey));
+  }
+  function onFieldFocus(subKey) {
+    observableProps.onFieldFocus?.(toKey(subKey));
+  }
+  function onFieldSubmit(subKey) {
+    observableProps.onFieldSubmit?.(toKey(subKey));
+  }
+  return (0, import_mobx_react2.observer)(function() {
+    const subFields = Object.entries(observableProps.fields).reduce((acc, [
+      fieldKey,
+      fieldValue
+    ]) => {
+      if (fieldKey.startsWith(valuePath)) {
+        acc[toSubKey(fieldKey)] = fieldValue;
+      }
+      return acc;
+    }, {});
+    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+      SubForm,
+      {
+        fields: subFields,
+        onFieldBlur,
+        onFieldFocus,
+        onFieldSubmit,
+        onFieldValueChange
+      }
+    );
+  });
+}
+
+// mantine/create_text_input.tsx
+var import_jsx_runtime6 = require("react/jsx-runtime");
 function createTextInput(valuePath, TextInput) {
   const onChange = (e) => {
     this.onFieldValueChange?.(valuePath, e.target.value);
@@ -1317,7 +1365,7 @@ function createTextInput(valuePath, TextInput) {
       value,
       disabled: readonly,
       required,
-      error: error && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(ErrorRenderer, { error }),
+      error: error && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ErrorRenderer, { error }),
       onChange,
       onFocus,
       onBlur,
@@ -1332,7 +1380,7 @@ function createTextInput(valuePath, TextInput) {
 }
 
 // mantine/create_value_input.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_jsx_runtime7 = require("react/jsx-runtime");
 function createValueInput(valuePath, ValueInput) {
   const onChange = (value) => {
     this.onFieldValueChange?.(valuePath, value);
@@ -1366,7 +1414,7 @@ function createValueInput(valuePath, ValueInput) {
       value,
       disabled: readonly,
       required,
-      error: error && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ErrorRenderer, { error }),
+      error: error && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ErrorRenderer, { error }),
       onChange,
       onFocus,
       onBlur,
@@ -1381,9 +1429,9 @@ function createValueInput(valuePath, ValueInput) {
 }
 
 // mantine/hooks.tsx
-var import_jsx_runtime7 = require("react/jsx-runtime");
+var import_jsx_runtime8 = require("react/jsx-runtime");
 function SimpleSelect(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_core.Select, { ...props });
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_core.Select, { ...props });
 }
 function useMantineForm({
   onFieldValueChange,
@@ -1456,6 +1504,9 @@ var MantineFormImpl = class {
   listCache = new import_base6.Cache(
     createList.bind(this)
   );
+  subFormCache = new import_base6.Cache(
+    createSubForm.bind(this)
+  );
   @import_mobx2.observable.ref
   accessor fields;
   onFieldValueChange;
@@ -1521,6 +1572,16 @@ var MantineFormImpl = class {
       DefaultList
     );
   }
+  // TODO have the returned component take any non-overlapping props as props
+  subForm(valuePath, SubForm) {
+    return this.subFormCache.retrieveOrCreate(
+      valuePath,
+      // strip props from component since we lose information in the cache
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      SubForm,
+      this
+    );
+  }
 };
 
 // types/merge_validators.ts
@@ -1587,6 +1648,7 @@ function mergeValidators(validators1, validators2) {
   mergeFieldAdaptersWithTwoWayConverter,
   mergeValidators,
   prototypingFieldValueFactory,
+  subFormFieldAdapters,
   useMantineForm,
   usePartialComponent,
   usePartialObserverComponent,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Maybe, ElementOfArray, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
+import { Maybe, ElementOfArray, StringConcatOf, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
 import { Type, ValueOfType, ReadonlyTypeOfType, FlattenedTypesOfType, ListTypeDef, FlattenedValuesOfType, MobxValueOfType, Accessor, Validator, UnionTypeDef, ValueTypesOfDiscriminatedUnion, LiteralTypeDef } from '@strictly/define';
 import { ValueOf, SimplifyDeep, ReadonlyDeep, StringKeyOf, Simplify } from 'type-fest';
 import { ComponentType, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, DependencyList } from 'react';
@@ -68,7 +68,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 listAdapter<E, K extends string, ValuePath extends string, Context>(): FieldAdapterBuilder<readonly E[], readonly K[], 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> = {
     readonly [K in keyof FlattenedValues]: FieldAdapter<FlattenedValues[K], any, any, TypePathsToValuePaths[K], Context>;
@@ -168,6 +168,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];
+};
+declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string>(subAdapters: SubAdapters, prefix: P): SubFormFieldAdapters<SubAdapters, P>;
+
 /**
  * Used to extract the supported value paths from a presenter
  */
@@ -279,6 +284,12 @@ type StringFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends string | undefined | null ? K : never]: F[K];
 };
 
+type SubFormFields<F extends Fields, P extends keyof F> = P extends string ? {
+    [K in keyof F as K extends StringConcatOf<`${P}.`, infer S> ? `$.${S}` : never]: F[K];
+} & {
+    $: F[P];
+} : never;
+
 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>>;
 type UnsafePartialComponent<Component extends ComponentType<any>, CurriedProps, AdditionalProps = {}> = ForwardRefExoticComponent<PropsWithoutRef<RemainingComponentProps<Component, CurriedProps> & AdditionalProps>>;
 declare function createSimplePartialComponent<Component extends ComponentType<any>, CurriedProps extends Partial<ComponentProps<Component>>>(Component: Component, curriedProps: CurriedProps): PartialComponent<Component, CurriedProps>;
@@ -307,11 +318,12 @@ type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<Component
 
 type SuppliedCheckboxProps = Pick<CheckboxProps, 'name' | 'checked' | 'disabled' | 'required' | 'error' | 'onChange' | 'onFocus' | 'onBlur' | 'onKeyUp'>;
 
-type SuppliedListProps<Value = any> = {
+type SuppliedListProps<Value = any, ListPath extends string = string> = {
     values: readonly Value[];
+    listPath: ListPath;
 };
-declare function DefaultList<Value>({ values, children, }: SuppliedListProps<Value> & {
-    children: (value: Value, index: number) => React.ReactNode;
+declare function DefaultList<Value, ListPath extends string>({ values, listPath, children, }: SuppliedListProps<Value, ListPath> & {
+    children: (valuePath: `${ListPath}.${number}`, value: Value, index: number) => React.ReactNode;
 }): react_jsx_runtime.JSX.Element;
 
 type SuppliedPillProps = Pick<PillProps, 'children' | 'disabled'>;
@@ -357,8 +369,9 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     private readonly radioCache;
     private readonly pillCache;
     private readonly listCache;
+    private readonly subFormCache;
     accessor fields: F;
-    onFieldValueChange: (<K extends keyof F>(this: void, key: K, value: F[K]['value']) => void) | undefined;
+    onFieldValueChange: <K extends keyof F>(this: void, key: K, value: F[K]['value']) => void;
     onFieldFocus: ((this: void, key: keyof F) => void) | undefined;
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
@@ -375,7 +388,8 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     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<ElementOfArray<F[K]>>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]>>>>;
+    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>>;
+    subForm<K extends keyof AllFieldsOfFields<F>, S extends SubFormFields<F, K>>(valuePath: K, SubForm: ComponentType<FormProps<S>>): ComponentType;
 }
 
 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<{
@@ -384,4 +398,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 EditorProps, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, 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, useMantineForm, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, type EditorProps, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, 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, useMantineForm, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Maybe, ElementOfArray, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
+import { Maybe, ElementOfArray, StringConcatOf, StringKeyOf as StringKeyOf$1, ExhaustiveArrayOfUnion, FriendlyExhaustiveArrayOfUnion } from '@strictly/base';
 import { Type, ValueOfType, ReadonlyTypeOfType, FlattenedTypesOfType, ListTypeDef, FlattenedValuesOfType, MobxValueOfType, Accessor, Validator, UnionTypeDef, ValueTypesOfDiscriminatedUnion, LiteralTypeDef } from '@strictly/define';
 import { ValueOf, SimplifyDeep, ReadonlyDeep, StringKeyOf, Simplify } from 'type-fest';
 import { ComponentType, ComponentProps, ForwardRefExoticComponent, PropsWithoutRef, DependencyList } from 'react';
@@ -68,7 +68,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 listAdapter<E, K extends string, ValuePath extends string, Context>(): FieldAdapterBuilder<readonly E[], readonly K[], 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> = {
     readonly [K in keyof FlattenedValues]: FieldAdapter<FlattenedValues[K], any, any, TypePathsToValuePaths[K], Context>;
@@ -168,6 +168,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];
+};
+declare function subFormFieldAdapters<SubAdapters extends Record<string, FieldAdapter>, P extends string>(subAdapters: SubAdapters, prefix: P): SubFormFieldAdapters<SubAdapters, P>;
+
 /**
  * Used to extract the supported value paths from a presenter
  */
@@ -279,6 +284,12 @@ type StringFieldsOfFields<F extends Fields> = {
     [K in keyof F as ValueTypeOfField<F[K]> extends string | undefined | null ? K : never]: F[K];
 };
 
+type SubFormFields<F extends Fields, P extends keyof F> = P extends string ? {
+    [K in keyof F as K extends StringConcatOf<`${P}.`, infer S> ? `$.${S}` : never]: F[K];
+} & {
+    $: F[P];
+} : never;
+
 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>>;
 type UnsafePartialComponent<Component extends ComponentType<any>, CurriedProps, AdditionalProps = {}> = ForwardRefExoticComponent<PropsWithoutRef<RemainingComponentProps<Component, CurriedProps> & AdditionalProps>>;
 declare function createSimplePartialComponent<Component extends ComponentType<any>, CurriedProps extends Partial<ComponentProps<Component>>>(Component: Component, curriedProps: CurriedProps): PartialComponent<Component, CurriedProps>;
@@ -307,11 +318,12 @@ type MantineFieldComponent<T, P = T, E = any> = UnsafePartialComponent<Component
 
 type SuppliedCheckboxProps = Pick<CheckboxProps, 'name' | 'checked' | 'disabled' | 'required' | 'error' | 'onChange' | 'onFocus' | 'onBlur' | 'onKeyUp'>;
 
-type SuppliedListProps<Value = any> = {
+type SuppliedListProps<Value = any, ListPath extends string = string> = {
     values: readonly Value[];
+    listPath: ListPath;
 };
-declare function DefaultList<Value>({ values, children, }: SuppliedListProps<Value> & {
-    children: (value: Value, index: number) => React.ReactNode;
+declare function DefaultList<Value, ListPath extends string>({ values, listPath, children, }: SuppliedListProps<Value, ListPath> & {
+    children: (valuePath: `${ListPath}.${number}`, value: Value, index: number) => React.ReactNode;
 }): react_jsx_runtime.JSX.Element;
 
 type SuppliedPillProps = Pick<PillProps, 'children' | 'disabled'>;
@@ -357,8 +369,9 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     private readonly radioCache;
     private readonly pillCache;
     private readonly listCache;
+    private readonly subFormCache;
     accessor fields: F;
-    onFieldValueChange: (<K extends keyof F>(this: void, key: K, value: F[K]['value']) => void) | undefined;
+    onFieldValueChange: <K extends keyof F>(this: void, key: K, value: F[K]['value']) => void;
     onFieldFocus: ((this: void, key: keyof F) => void) | undefined;
     onFieldBlur: ((this: void, key: keyof F) => void) | undefined;
     onFieldSubmit: ((this: void, key: keyof F) => boolean | void) | undefined;
@@ -375,7 +388,8 @@ declare class MantineFormImpl<F extends Fields> implements MantineForm<F> {
     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<ElementOfArray<F[K]>>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]>>>>;
+    list<K extends keyof ListFieldsOfFields<F>>(valuePath: K): MantineFieldComponent<SuppliedListProps<`${K}.${number}`>, ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>>;
+    subForm<K extends keyof AllFieldsOfFields<F>, S extends SubFormFields<F, K>>(valuePath: K, SubForm: ComponentType<FormProps<S>>): ComponentType;
 }
 
 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<{
@@ -384,4 +398,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 EditorProps, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, 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, useMantineForm, usePartialComponent, usePartialObserverComponent, validatingConverter };
+export { AbstractSelectValueTypeConverter, type AnnotatedFieldConversion, type AnnotatedFieldConverter, type Annotation, DefaultErrorRenderer, type EditorProps, type ErrorOfField, type ErrorOfFieldAdapter, type ErrorRenderer, type ErrorRendererProps, type Field, type FieldAdapter, type FieldAdaptersOfValues, type FieldValueFactory, type Fields, 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, useMantineForm, usePartialComponent, usePartialObserverComponent, validatingConverter };