@strictly/react-form 0.0.4 → 0.0.5

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: esnext
 CJS Build start
 ESM Build start
-CJS dist/index.cjs 46.90 KB
-CJS ⚡️ Build success in 104ms
-ESM dist/index.js 43.20 KB
-ESM ⚡️ Build success in 106ms
+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 9810ms
-DTS dist/index.d.cts 34.83 KB
-DTS dist/index.d.ts  34.83 KB
-Done in 10.96s.
+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.63s.
+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/dist/index.cjs

@@ -139,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) {
@@ -241,8 +227,9 @@ function identityAdapter(prototype, required) {
 }
 function listAdapter() {
   return new FieldAdapterBuilder(
-    listConverter(),
-    prototypingFieldValueFactory([])
+    annotatedIdentityConverter(false),
+    prototypingFieldValueFactory([]),
+    unreliableIdentityConverter()
   );
 }
 
@@ -1210,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);
   }) });
 }
 

package/dist/index.d.cts

@@ -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>;
@@ -318,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'>;
@@ -387,7 +388,7 @@ 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<`${K}.${number}`>, ComponentProps<typeof DefaultList<`${K}.${number}`>>>;
+    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;
 }
 

package/dist/index.d.ts

@@ -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>;
@@ -318,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'>;
@@ -387,7 +388,7 @@ 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<`${K}.${number}`>, ComponentProps<typeof DefaultList<`${K}.${number}`>>>;
+    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;
 }
 

package/dist/index.js

@@ -87,20 +87,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) {
@@ -189,8 +175,9 @@ function identityAdapter(prototype, required) {
 }
 function listAdapter() {
   return new FieldAdapterBuilder(
-    listConverter(),
-    prototypingFieldValueFactory([])
+    annotatedIdentityConverter(false),
+    prototypingFieldValueFactory([]),
+    unreliableIdentityConverter()
   );
 }
 
@@ -1206,17 +1193,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__ */ jsx3(Fragment, { children: values.map(function(value, index) {
-    return children(value, index);
+    const valuePath = `${listPath}.${index}`;
+    return children(valuePath, value, index);
   }) });
 }
 

package/mantine/create_list.tsx

@@ -10,8 +10,9 @@ import {
 } from './types'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type SuppliedListProps<Value = any> = {
+export type SuppliedListProps<Value = any, ListPath extends string = string> = {
   values: readonly Value[],
+  listPath: ListPath,
 }
 
 export function createList<
@@ -19,6 +20,7 @@ export function createList<
   K extends keyof ListFieldsOfFields<F>,
   Props extends SuppliedListProps<ElementOfArray<ValueTypeOfField<F[K]>>> & {
     children: (
+      valuePath: `${K}.${number}`,
       value: ElementOfArray<ValueTypeOfField<F[K]>>,
       index: number,
     ) => React.ReactNode,
@@ -32,6 +34,7 @@ export function createList<
     const values = [...this.fields[valuePath].value]
     return {
       values,
+      listPath: valuePath,
     }
   }
   return createUnsafePartialObserverComponent(List, propSource)
@@ -39,16 +42,19 @@ export function createList<
 
 export function DefaultList<
   Value,
+  ListPath extends string,
 >({
   values,
+  listPath,
   children,
-}: SuppliedListProps<Value> & {
-  children: (value: Value, index: number) => React.ReactNode,
+}: SuppliedListProps<Value, ListPath> & {
+  children: (valuePath: `${ListPath}.${number}`, value: Value, index: number) => React.ReactNode,
 }) {
   return (
     <>
       {values.map(function (value, index) {
-        return children(value, index)
+        const valuePath: `${ListPath}.${number}` = `${listPath}.${index}`
+        return children(valuePath, value, index)
       })}
     </>
   )

package/mantine/hooks.tsx

@@ -13,6 +13,7 @@ import {
 } from '@mantine/core'
 import {
   Cache,
+  type ElementOfArray,
 } from '@strictly/base'
 import { type FormProps } from 'core/props'
 import {
@@ -362,7 +363,7 @@ class MantineFormImpl<
     K extends keyof ListFieldsOfFields<F>,
   >(valuePath: K): MantineFieldComponent<
     SuppliedListProps<`${K}.${number}`>,
-    ComponentProps<typeof DefaultList<`${K}.${number}`>>
+    ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>
   > {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     return this.listCache.retrieveOrCreate(
@@ -370,7 +371,7 @@ class MantineFormImpl<
       DefaultList,
     ) as MantineFieldComponent<
       SuppliedListProps<`${K}.${number}`>,
-      ComponentProps<typeof DefaultList<`${K}.${number}`>>,
+      ComponentProps<typeof DefaultList<ElementOfArray<F[K]['value']>, K>>,
       ErrorOfField<F[K]>
     >
   }

package/mantine/specs/__snapshots__/list_hooks.tests.tsx.snap

@@ -38,29 +38,77 @@ exports[`mantine list hooks > renders Populated 1`] = `
         class="m_b183c0a2 mantine-Code-root"
         dir="ltr"
       >
-        ValuePath: 
-        $.4
+        <span>
+          ValuePath: 
+          $.0
+        </span>
+        <br />
+        <span>
+          Value: 
+          A
+        </span>
+        <br />
+        <span>
+          Index: 
+          0
+        </span>
       </code>
       <code
         class="m_b183c0a2 mantine-Code-root"
         dir="ltr"
       >
-        ValuePath: 
-        $.6
+        <span>
+          ValuePath: 
+          $.1
+        </span>
+        <br />
+        <span>
+          Value: 
+          B
+        </span>
+        <br />
+        <span>
+          Index: 
+          1
+        </span>
       </code>
       <code
         class="m_b183c0a2 mantine-Code-root"
         dir="ltr"
       >
-        ValuePath: 
-        $.19
+        <span>
+          ValuePath: 
+          $.2
+        </span>
+        <br />
+        <span>
+          Value: 
+          C
+        </span>
+        <br />
+        <span>
+          Index: 
+          2
+        </span>
       </code>
       <code
         class="m_b183c0a2 mantine-Code-root"
         dir="ltr"
       >
-        ValuePath: 
-        $.0
+        <span>
+          ValuePath: 
+          $.3
+        </span>
+        <br />
+        <span>
+          Value: 
+          D
+        </span>
+        <br />
+        <span>
+          Index: 
+          3
+        </span>
       </code>
     </div>
   </div>

package/mantine/specs/list_hooks.stories.tsx

@@ -26,10 +26,20 @@ function Component(props: FormProps<{
     >
       <Stack>
         <List>
-          {function (valuePath: ListPath) {
+          {function (valuePath: ListPath, value: string, index: number) {
             return (
               <Code key={valuePath}>
-                ValuePath: {valuePath}
+                <span>
+                  ValuePath: {valuePath}
+                </span>
+                <br />
+                <span>
+                  Value: {value}
+                </span>
+                <br />
+                <span>
+                  Index: {index}
+                </span>
               </Code>
             )
           }}
@@ -72,10 +82,10 @@ export const Populated: Story = {
         readonly: false,
         required: false,
         value: [
-          '$.4',
-          '$.6',
-          '$.19',
-          '$.0',
+          'A',
+          'B',
+          'C',
+          'D',
         ],
       },
     },

package/package.json

@@ -69,7 +69,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "exports": {
     ".": {
       "import": {

package/.out/field_converters/list_converter.d.ts

@@ -1,2 +0,0 @@
-import { type AnnotatedFieldConverter } from 'types/field_converters';
-export declare function listConverter<E, K extends string, ValuePath extends string, Context>(): AnnotatedFieldConverter<readonly E[], K[], ValuePath, Context>;

package/.out/field_converters/list_converter.js

@@ -1,13 +0,0 @@
-export function listConverter() {
-    return function (from, valuePath) {
-        const value = from.map(function (_v, i) {
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            return `${valuePath}.${i}`;
-        });
-        return {
-            value,
-            required: false,
-            readonly: false,
-        };
-    };
-}

package/field_converters/list_converter.ts

@@ -1,20 +0,0 @@
-import { type AnnotatedFieldConverter } from 'types/field_converters'
-
-export function listConverter<
-  E,
-  K extends string,
-  ValuePath extends string,
-  Context,
->(): AnnotatedFieldConverter<readonly E[], K[], ValuePath, Context> {
-  return function (from: readonly E[], valuePath: ValuePath) {
-    const value = from.map(function (_v, i) {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return `${valuePath as string}.${i}` as K
-    })
-    return {
-      value,
-      required: false,
-      readonly: false,
-    }
-  }
-}