@strictly/react-form 0.0.21 → 0.0.23

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: es6
 CJS Build start
 ESM Build start
-CJS dist/index.cjs 60.71 KB
-CJS ⚡️ Build success in 127ms
 ESM dist/index.js 56.70 KB
-ESM ⚡️ Build success in 127ms
+ESM ⚡️ Build success in 139ms
+CJS dist/index.cjs 60.71 KB
+CJS ⚡️ Build success in 141ms
 DTS Build start
-DTS ⚡️ Build success in 9799ms
-DTS dist/index.d.cts 38.50 KB
-DTS dist/index.d.ts  38.50 KB
-Done in 10.96s.
+DTS ⚡️ Build success in 31420ms
+DTS dist/index.d.cts 37.20 KB
+DTS dist/index.d.ts  37.20 KB
+Done in 32.57s.

package/core/mobx/hooks.tsx

@@ -5,14 +5,10 @@ import {
 import {
   useCallback,
 } from 'react'
+import type { ValueTypeOfField } from 'types/value_type_of_field'
 import {
   type FormModel,
 } from './form_model'
-import {
-  type FormFieldsOfModel,
-  type ToValueOfModelValuePath,
-  type ValuePathsOfModel,
-} from './types'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any>
@@ -22,14 +18,14 @@ type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends Form
 export function useDefaultMobxFormHooks<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   M extends FormModel<any, any, any, any, any>,
-  F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>,
+  F extends M['fields'] = M['fields'],
 >(
   model: M,
   {
     onValidFieldSubmit,
     onValidFormSubmit,
   }: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void,
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void,
     onValidFormSubmit?: (value: ValueOfModel<M>) => void,
   } = {},
 ): {
@@ -40,9 +36,9 @@ export function useDefaultMobxFormHooks<
   onFieldSubmit?(this: void, key: keyof F): boolean | void,
 } {
   const onFieldValueChange = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (
+    function<Path extends keyof F> (
       path: Path,
-      value: ToValueOfModelValuePath<M, Path>,
+      value: ValueTypeOfField<F[Path]>,
     ) {
       // clear any validation
       model.setFieldValue<Path>(path, value, null)
@@ -51,7 +47,7 @@ export function useDefaultMobxFormHooks<
   )
 
   const onFieldSubmit = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (valuePath: Path) {
+    function<Path extends keyof F> (valuePath: Path) {
       if (model.validateField(valuePath)) {
         onValidFieldSubmit?.(valuePath)
       }
@@ -64,7 +60,7 @@ export function useDefaultMobxFormHooks<
   )
 
   const onFieldBlur = useCallback(
-    function<Path extends ValuePathsOfModel<M>> (path: Path) {
+    function<Path extends keyof F> (path: Path) {
       // work around potential loss of focus prior to state potentially invalidating change triggering
       // (e.g. changing a discriminator)
       // TODO debounce?

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

@@ -93,7 +93,7 @@ describe('all', function () {
     resetMockAdapter(originalBooleanToBooleanAdapter, booleanToBooleanAdapter)
   })
 
-  describe('FlattenedTypePathsToConvertersOf', function () {
+  describe('FlattenedTypePathsToAdaptersOf', function () {
     type ConvenientFieldAdapter<
       From,
       Context,
@@ -1066,8 +1066,8 @@ describe('all', function () {
             'x',
             true,
           )).narrow,
-          '$.x:a': identityAdapter(0).narrow,
-          '$.y:b': identityAdapter(false).narrow,
+          '$:x.a': identityAdapter(0).narrow,
+          '$:y.b': identityAdapter(false).narrow,
         } as const
 
         describe('isValuePathActive', function () {
@@ -1091,11 +1091,11 @@ describe('all', function () {
                 true,
               ],
               [
-                '$.x:a',
+                '$:x.a',
                 true,
               ],
               [
-                '$.y:b',
+                '$:y.b',
                 false,
               ],
             ] as const)('value path %s is active %s', function (path, expected) {
@@ -1124,11 +1124,11 @@ describe('all', function () {
                 true,
               ],
               [
-                '$.x:a',
+                '$:x.a',
                 false,
               ],
               [
-                '$.y:b',
+                '$:y.b',
                 true,
               ],
             ] as const)('value path %s is active %s', function (path, expected) {

package/dist/index.d.cts

@@ -159,27 +159,9 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     validateAll(validation?: Validation): boolean;
 }
 
-/**
- * Used to extract the supported value paths from a model
- */
-type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;
-
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
-declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void;
+declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends M['fields'] = M['fields']>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void;
     onValidFormSubmit?: (value: ValueOfModel<M>) => void;
 }): {
     onFormSubmit: () => void;
@@ -456,4 +438,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 FormFieldsOfModel, 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, type ToValueOfModelValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsOfModel, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, 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 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, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/dist/index.d.ts

@@ -159,27 +159,9 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     validateAll(validation?: Validation): boolean;
 }
 
-/**
- * Used to extract the supported value paths from a model
- */
-type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;
-
 type ValueOfModel<M extends FormModel<any, any, any, any, any>> = M extends FormModel<infer T, any, any, any, any> ? ValueOfType<ReadonlyTypeOfType<T>> : never;
-declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends FormFieldsOfModel<M> = FormFieldsOfModel<M>>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
-    onValidFieldSubmit?: <Path extends ValuePathsOfModel<M>>(valuePath: Path) => void;
+declare function useDefaultMobxFormHooks<M extends FormModel<any, any, any, any, any>, F extends M['fields'] = M['fields']>(model: M, { onValidFieldSubmit, onValidFormSubmit, }?: {
+    onValidFieldSubmit?: <Path extends keyof F>(valuePath: Path) => void;
     onValidFormSubmit?: (value: ValueOfModel<M>) => void;
 }): {
     onFormSubmit: () => void;
@@ -456,4 +438,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 FormFieldsOfModel, 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, type ToValueOfModelValuePath, TrimmingStringConverter, type TwoWayFieldConverter, type TwoWayFieldConverterWithValueFactory, type UnreliableFieldConversion, UnreliableFieldConversionType, type UnreliableFieldConverter, type UnsafePartialComponent, Validation, type ValuePathOfFieldAdapter, type ValuePathsOfModel, type ValuePathsToAdaptersOf, adapter, adapterFromPrototype, adapterFromTwoWayConverter, createPartialComponent, createPartialObserverComponent, createSimplePartialComponent, createUnsafePartialObserverComponent, identityAdapter, listAdapter, mergeAdaptersWithValidators, mergeFieldAdaptersWithTwoWayConverter, mergeValidators, 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 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, prototypingFieldValueFactory, subFormFieldAdapters, trimmingStringAdapter, useDefaultMobxFormHooks, useMantineFormFields, usePartialComponent, usePartialObserverComponent, validatingConverter };

package/index.ts

@@ -8,7 +8,6 @@ export * from './core/mobx/hooks'
 export * from './core/mobx/merge_field_adapters_with_two_way_converter'
 export * from './core/mobx/merge_field_adapters_with_validators'
 export * from './core/mobx/sub_form_field_adapters'
-export * from './core/mobx/types'
 export * from './core/props'
 export * from './field_converters/integer_to_string_converter'
 export * from './field_converters/nullable_to_boolean_converter'

package/package.json

@@ -1,5 +1,10 @@
 {
   "author": "Chris <chris.glover@gmail.com> (@madmaw)",
+  "dependencies": {
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "type-fest": "^4.27.0"
+  },
   "description": "Types and utilities for creating React forms",
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^7.25.9",
@@ -17,8 +22,6 @@
     "@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",
     "@vitejs/plugin-react": "^4.3.3",
     "concurrently": "^9.1.2",
     "jsdom": "^25.0.1",
@@ -36,15 +39,14 @@
   "license": "MIT",
   "name": "@strictly/react-form",
   "peerDependencies": {
-    "@mantine/core": "^7.13.4",
-    "@mantine/hooks": "^7.13.4",
+    "@mantine/core": "^7.0.0",
+    "@mantine/hooks": "^7.0.0",
     "@strictly/base": "*",
     "@strictly/define": "*",
-    "mobx": "^6.13.5",
+    "mobx": "^6.0.0",
     "mobx-react": "^9.1.1",
-    "react": "^19.0.0 || ^18.3.1",
-    "react-dom": "^19.0.0 || ^18.3.1",
-    "type-fest": "^4.27.0"
+    "react": "^19.0.0 || ^18.0.0",
+    "react-dom": "^19.0.0 || ^18.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -70,7 +72,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "exports": {
     ".": {
       "import": {

package/.out/core/mobx/types.d.ts

@@ -1,19 +0,0 @@
-import { type ToOfFieldAdapter } from './field_adapter';
-import { type FlattenedConvertedFieldsOf, type FormModel } from './form_model';
-/**
- * Used to extract the supported value paths from a model
- */
-export type ValuePathsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? keyof ValuePathsToAdapters : never;
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-export type ToValueOfModelValuePath<Model extends FormModel<any, any, any, any, any>, K extends ValuePathsOfModel<Model>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? ToOfFieldAdapter<ValuePathsToAdapters[K]> : never;
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-export type FormFieldsOfModel<Model extends FormModel<any, any, any, any, any>> = Model extends FormModel<infer _1, infer _2, infer _3, infer _4, infer ValuePathsToAdapters> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters> : never;

package/.out/core/mobx/types.js

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

package/core/mobx/types.ts

@@ -1,57 +0,0 @@
-// TODO rename/split-out this file
-import { type ToOfFieldAdapter } from './field_adapter'
-import {
-  type FlattenedConvertedFieldsOf,
-  type FormModel,
-} from './form_model'
-
-/**
- * Used to extract the supported value paths from a model
- */
-export type ValuePathsOfModel<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Model extends FormModel<any, any, any, any, any>,
-> = Model extends FormModel<
-  infer _1,
-  infer _2,
-  infer _3,
-  infer _4,
-  infer ValuePathsToAdapters
-> ? keyof ValuePathsToAdapters
-  : never
-
-/**
- * Used to extract the render type (so the value that is passed to the view) of a given value path
- * from a model
- */
-export type ToValueOfModelValuePath<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Model extends FormModel<any, any, any, any, any>,
-  K extends ValuePathsOfModel<Model>,
-> = Model extends FormModel<
-  infer _1,
-  infer _2,
-  infer _3,
-  infer _4,
-  infer ValuePathsToAdapters
-> ? ToOfFieldAdapter<ValuePathsToAdapters[K]>
-  : never
-
-/**
- * Extracts the form fields from a form model. The recommended way is to
- * define the form fields explicitly and use that type to enforce the types
- * of your converters, but generating the FormFields from your model
- * is less typing, albeit at the cost of potentially getting type errors
- * reported a long way away from the source
- */
-export type FormFieldsOfModel<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Model extends FormModel<any, any, any, any, any>,
-> = Model extends FormModel<
-  infer _1,
-  infer _2,
-  infer _3,
-  infer _4,
-  infer ValuePathsToAdapters
-> ? FlattenedConvertedFieldsOf<ValuePathsToAdapters>
-  : never