@saas-ui/forms 2.0.0-next.17 → 2.0.0-next.18

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @saas-ui/forms
 
+## 2.0.0-next.18
+
+### Patch Changes
+
+- 01ac442f: Fixed modal form handler type inference
+
 ## 2.0.0-next.17
 
 ### Patch Changes

package/dist/ajv/index.d.ts

@@ -1,4 +1,4 @@
-import { FieldResolver, CreateFormProps, FieldValues, WithFields, FormProps } from '@saas-ui/forms';
+import { FieldResolver, CreateFormProps, WithFields, FormProps } from '@saas-ui/forms';
 import { ajvResolver } from '@hookform/resolvers/ajv';
 export { ajvResolver } from '@hookform/resolvers/ajv';
 import { JTDDataType } from 'ajv/dist/jtd';
@@ -12,9 +12,10 @@ interface CreateAjvFormProps<FieldDefs> extends CreateFormProps<FieldDefs> {
     schemaOptions?: ResolverArgs[1];
     resolverOptions?: ResolverArgs[2];
 }
-type ParseJsonSchema<T> = T extends JTDDataType<any> ? T : never;
-type AjvFormType<FieldDefs, ExtraProps = object, JsonSchema extends Record<string, any> = Record<string, any>> = (<TFieldValues extends FieldValues = FieldValues, // placeholder
-TContext extends object = object, TSchema extends JsonSchema = JsonSchema>(props: WithFields<FormProps<ParseJsonSchema<TSchema>, TContext, TSchema>, FieldDefs> & {
+type ParseJsonSchema<T> = T extends {
+    type: 'object';
+} ? JTDDataType<T> extends infer R ? R extends object ? R : never : never : never;
+type AjvFormType<FieldDefs, ExtraProps = object, JsonSchema extends Record<string, any> = Record<string, any>> = (<TSchema extends JsonSchema = JsonSchema, TFieldValues extends ParseJsonSchema<TSchema> = ParseJsonSchema<TSchema>, TContext extends object = object>(props: WithFields<FormProps<TSchema, TFieldValues, TContext>, FieldDefs> & {
     ref?: React.ForwardedRef<HTMLFormElement>;
 } & ExtraProps) => React.ReactElement) & {
     displayName?: string;

package/dist/ajv/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ajv/src/ajv-resolver.ts","../../ajv/src/create-ajv-form.ts","../../ajv/src/index.ts"],"names":[],"mappings":";AAAA,SAAS,mBAAmB;AAC5B,SAAS,2BAA0C;AAM5C,IAAM,mBAAmB,CAAC,WAAoC;AACnE,SAAO,oBAAoB,OAAO,UAAU;AAC9C;;;ACTA;AAAA,EACE;AAAA,OAKK;AAuCA,SAAS,cACd,SACA;AACA,SAAO,WAAW;AAAA,IAChB,UAAU,CAAC,WACT,YAAY,QAAQ,mCAAS,eAAe,mCAAS,eAAe;AAAA,IACtE,eAAe;AAAA,IACf,GAAG;AAAA,EACL,CAAC;AACH;;;AC/CO,IAAM,OAAO,cAAc","sourcesContent":["import { ajvResolver } from '@hookform/resolvers/ajv'\nimport { objectFieldResolver, FieldResolver } from '@saas-ui/forms'\n\nimport { JSONSchemaType } from 'ajv'\n\nexport { ajvResolver }\n\nexport const ajvFieldResolver = (schema: JSONSchemaType<unknown>) => {\n  return objectFieldResolver(schema.properties)\n}\n","import {\n  createForm,\n  CreateFormProps,\n  FieldValues,\n  FormProps,\n  WithFields,\n} from '@saas-ui/forms'\nimport { ajvFieldResolver, ajvResolver } from './ajv-resolver'\nimport { JTDDataType } from 'ajv/dist/jtd'\ntype ResolverArgs = Parameters<typeof ajvResolver>\n\nexport interface CreateAjvFormProps<FieldDefs>\n  extends CreateFormProps<FieldDefs> {\n  schemaOptions?: ResolverArgs[1]\n  resolverOptions?: ResolverArgs[2]\n}\n\ntype ParseJsonSchema<T> = T extends JTDDataType<any> ? T : never\n\nexport type AjvFormType<\n  FieldDefs,\n  ExtraProps = object,\n  JsonSchema extends Record<string, any> = Record<string, any>\n> = (<\n  TFieldValues extends FieldValues = FieldValues, // placeholder\n  TContext extends object = object,\n  TSchema extends JsonSchema = JsonSchema\n>(\n  props: WithFields<\n    FormProps<ParseJsonSchema<TSchema>, TContext, TSchema>,\n    FieldDefs\n  > & {\n    ref?: React.ForwardedRef<HTMLFormElement>\n  } & ExtraProps\n) => React.ReactElement) & {\n  displayName?: string\n  id?: string\n}\n\n/**\n * Create a Form component with AJV validation that accepts JSON Type Definition schema\n *\n * @see Docs https://saas-ui.dev/docs/components/forms/form\n * @see https://ajv.js.org/json-type-definition.html\n */\nexport function createAjvForm<FieldDefs>(\n  options?: CreateAjvFormProps<FieldDefs>\n) {\n  return createForm({\n    resolver: (schema: any) =>\n      ajvResolver(schema, options?.schemaOptions, options?.resolverOptions),\n    fieldResolver: ajvFieldResolver,\n    ...options,\n  }) as AjvFormType<FieldDefs>\n}\n","export * from './ajv-resolver'\nexport { createAjvForm } from './create-ajv-form'\nexport type { CreateAjvFormProps } from './create-ajv-form'\nexport type { JTDDataType, JTDSchemaType } from 'ajv/dist/jtd'\n\nimport { createAjvForm } from './create-ajv-form'\n\nexport const Form = createAjvForm()\n"]}
+{"version":3,"sources":["../../ajv/src/ajv-resolver.ts","../../ajv/src/create-ajv-form.ts","../../ajv/src/index.ts"],"names":[],"mappings":";AAAA,SAAS,mBAAmB;AAC5B,SAAS,2BAA0C;AAM5C,IAAM,mBAAmB,CAAC,WAAoC;AACnE,SAAO,oBAAoB,OAAO,UAAU;AAC9C;;;ACTA;AAAA,EACE;AAAA,OAKK;AA0CA,SAAS,cACd,SACA;AACA,SAAO,WAAW;AAAA,IAChB,UAAU,CAAC,WACT,YAAY,QAAQ,mCAAS,eAAe,mCAAS,eAAe;AAAA,IACtE,eAAe;AAAA,IACf,GAAG;AAAA,EACL,CAAC;AACH;;;AClDO,IAAM,OAAO,cAAc","sourcesContent":["import { ajvResolver } from '@hookform/resolvers/ajv'\nimport { objectFieldResolver, FieldResolver } from '@saas-ui/forms'\n\nimport { JSONSchemaType } from 'ajv'\n\nexport { ajvResolver }\n\nexport const ajvFieldResolver = (schema: JSONSchemaType<unknown>) => {\n  return objectFieldResolver(schema.properties)\n}\n","import {\n  createForm,\n  CreateFormProps,\n  FieldValues,\n  FormProps,\n  WithFields,\n} from '@saas-ui/forms'\nimport { ajvFieldResolver, ajvResolver } from './ajv-resolver'\nimport { JTDDataType } from 'ajv/dist/jtd'\ntype ResolverArgs = Parameters<typeof ajvResolver>\n\nexport interface CreateAjvFormProps<FieldDefs>\n  extends CreateFormProps<FieldDefs> {\n  schemaOptions?: ResolverArgs[1]\n  resolverOptions?: ResolverArgs[2]\n}\n\ntype ParseJsonSchema<T> = T extends { type: 'object' }\n  ? JTDDataType<T> extends infer R\n    ? R extends object\n      ? R\n      : never\n    : never\n  : never\n\nexport type AjvFormType<\n  FieldDefs,\n  ExtraProps = object,\n  JsonSchema extends Record<string, any> = Record<string, any>\n> = (<\n  TSchema extends JsonSchema = JsonSchema,\n  TFieldValues extends ParseJsonSchema<TSchema> = ParseJsonSchema<TSchema>,\n  TContext extends object = object\n>(\n  props: WithFields<FormProps<TSchema, TFieldValues, TContext>, FieldDefs> & {\n    ref?: React.ForwardedRef<HTMLFormElement>\n  } & ExtraProps\n) => React.ReactElement) & {\n  displayName?: string\n  id?: string\n}\n\n/**\n * Create a Form component with AJV validation that accepts JSON Type Definition schema\n *\n * @see Docs https://saas-ui.dev/docs/components/forms/form\n * @see https://ajv.js.org/json-type-definition.html\n */\nexport function createAjvForm<FieldDefs>(\n  options?: CreateAjvFormProps<FieldDefs>\n) {\n  return createForm({\n    resolver: (schema: any) =>\n      ajvResolver(schema, options?.schemaOptions, options?.resolverOptions),\n    fieldResolver: ajvFieldResolver,\n    ...options,\n  }) as AjvFormType<FieldDefs>\n}\n","export * from './ajv-resolver'\nexport { createAjvForm } from './create-ajv-form'\nexport type { CreateAjvFormProps } from './create-ajv-form'\nexport type { JTDDataType, JTDSchemaType } from 'ajv/dist/jtd'\n\nimport { createAjvForm } from './create-ajv-form'\n\nexport const Form = createAjvForm()\n"]}

package/dist/ajv/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ajv/src/ajv-resolver.ts","../../ajv/src/create-ajv-form.ts","../../ajv/src/index.ts"],"names":[],"mappings":";AAAA,SAAS,mBAAmB;AAC5B,SAAS,2BAA0C;AAM5C,IAAM,mBAAmB,CAAC,WAAoC;AACnE,SAAO,oBAAoB,OAAO,UAAU;AAC9C;;;ACTA;AAAA,EACE;AAAA,OAKK;AAuCA,SAAS,cACd,SACA;AACA,SAAO,WAAW;AAAA,IAChB,UAAU,CAAC,WACT,YAAY,QAAQ,mCAAS,eAAe,mCAAS,eAAe;AAAA,IACtE,eAAe;AAAA,IACf,GAAG;AAAA,EACL,CAAC;AACH;;;AC/CO,IAAM,OAAO,cAAc","sourcesContent":["import { ajvResolver } from '@hookform/resolvers/ajv'\nimport { objectFieldResolver, FieldResolver } from '@saas-ui/forms'\n\nimport { JSONSchemaType } from 'ajv'\n\nexport { ajvResolver }\n\nexport const ajvFieldResolver = (schema: JSONSchemaType<unknown>) => {\n  return objectFieldResolver(schema.properties)\n}\n","import {\n  createForm,\n  CreateFormProps,\n  FieldValues,\n  FormProps,\n  WithFields,\n} from '@saas-ui/forms'\nimport { ajvFieldResolver, ajvResolver } from './ajv-resolver'\nimport { JTDDataType } from 'ajv/dist/jtd'\ntype ResolverArgs = Parameters<typeof ajvResolver>\n\nexport interface CreateAjvFormProps<FieldDefs>\n  extends CreateFormProps<FieldDefs> {\n  schemaOptions?: ResolverArgs[1]\n  resolverOptions?: ResolverArgs[2]\n}\n\ntype ParseJsonSchema<T> = T extends JTDDataType<any> ? T : never\n\nexport type AjvFormType<\n  FieldDefs,\n  ExtraProps = object,\n  JsonSchema extends Record<string, any> = Record<string, any>\n> = (<\n  TFieldValues extends FieldValues = FieldValues, // placeholder\n  TContext extends object = object,\n  TSchema extends JsonSchema = JsonSchema\n>(\n  props: WithFields<\n    FormProps<ParseJsonSchema<TSchema>, TContext, TSchema>,\n    FieldDefs\n  > & {\n    ref?: React.ForwardedRef<HTMLFormElement>\n  } & ExtraProps\n) => React.ReactElement) & {\n  displayName?: string\n  id?: string\n}\n\n/**\n * Create a Form component with AJV validation that accepts JSON Type Definition schema\n *\n * @see Docs https://saas-ui.dev/docs/components/forms/form\n * @see https://ajv.js.org/json-type-definition.html\n */\nexport function createAjvForm<FieldDefs>(\n  options?: CreateAjvFormProps<FieldDefs>\n) {\n  return createForm({\n    resolver: (schema: any) =>\n      ajvResolver(schema, options?.schemaOptions, options?.resolverOptions),\n    fieldResolver: ajvFieldResolver,\n    ...options,\n  }) as AjvFormType<FieldDefs>\n}\n","export * from './ajv-resolver'\nexport { createAjvForm } from './create-ajv-form'\nexport type { CreateAjvFormProps } from './create-ajv-form'\nexport type { JTDDataType, JTDSchemaType } from 'ajv/dist/jtd'\n\nimport { createAjvForm } from './create-ajv-form'\n\nexport const Form = createAjvForm()\n"]}
+{"version":3,"sources":["../../ajv/src/ajv-resolver.ts","../../ajv/src/create-ajv-form.ts","../../ajv/src/index.ts"],"names":[],"mappings":";AAAA,SAAS,mBAAmB;AAC5B,SAAS,2BAA0C;AAM5C,IAAM,mBAAmB,CAAC,WAAoC;AACnE,SAAO,oBAAoB,OAAO,UAAU;AAC9C;;;ACTA;AAAA,EACE;AAAA,OAKK;AA0CA,SAAS,cACd,SACA;AACA,SAAO,WAAW;AAAA,IAChB,UAAU,CAAC,WACT,YAAY,QAAQ,mCAAS,eAAe,mCAAS,eAAe;AAAA,IACtE,eAAe;AAAA,IACf,GAAG;AAAA,EACL,CAAC;AACH;;;AClDO,IAAM,OAAO,cAAc","sourcesContent":["import { ajvResolver } from '@hookform/resolvers/ajv'\nimport { objectFieldResolver, FieldResolver } from '@saas-ui/forms'\n\nimport { JSONSchemaType } from 'ajv'\n\nexport { ajvResolver }\n\nexport const ajvFieldResolver = (schema: JSONSchemaType<unknown>) => {\n  return objectFieldResolver(schema.properties)\n}\n","import {\n  createForm,\n  CreateFormProps,\n  FieldValues,\n  FormProps,\n  WithFields,\n} from '@saas-ui/forms'\nimport { ajvFieldResolver, ajvResolver } from './ajv-resolver'\nimport { JTDDataType } from 'ajv/dist/jtd'\ntype ResolverArgs = Parameters<typeof ajvResolver>\n\nexport interface CreateAjvFormProps<FieldDefs>\n  extends CreateFormProps<FieldDefs> {\n  schemaOptions?: ResolverArgs[1]\n  resolverOptions?: ResolverArgs[2]\n}\n\ntype ParseJsonSchema<T> = T extends { type: 'object' }\n  ? JTDDataType<T> extends infer R\n    ? R extends object\n      ? R\n      : never\n    : never\n  : never\n\nexport type AjvFormType<\n  FieldDefs,\n  ExtraProps = object,\n  JsonSchema extends Record<string, any> = Record<string, any>\n> = (<\n  TSchema extends JsonSchema = JsonSchema,\n  TFieldValues extends ParseJsonSchema<TSchema> = ParseJsonSchema<TSchema>,\n  TContext extends object = object\n>(\n  props: WithFields<FormProps<TSchema, TFieldValues, TContext>, FieldDefs> & {\n    ref?: React.ForwardedRef<HTMLFormElement>\n  } & ExtraProps\n) => React.ReactElement) & {\n  displayName?: string\n  id?: string\n}\n\n/**\n * Create a Form component with AJV validation that accepts JSON Type Definition schema\n *\n * @see Docs https://saas-ui.dev/docs/components/forms/form\n * @see https://ajv.js.org/json-type-definition.html\n */\nexport function createAjvForm<FieldDefs>(\n  options?: CreateAjvFormProps<FieldDefs>\n) {\n  return createForm({\n    resolver: (schema: any) =>\n      ajvResolver(schema, options?.schemaOptions, options?.resolverOptions),\n    fieldResolver: ajvFieldResolver,\n    ...options,\n  }) as AjvFormType<FieldDefs>\n}\n","export * from './ajv-resolver'\nexport { createAjvForm } from './create-ajv-form'\nexport type { CreateAjvFormProps } from './create-ajv-form'\nexport type { JTDDataType, JTDSchemaType } from 'ajv/dist/jtd'\n\nimport { createAjvForm } from './create-ajv-form'\n\nexport const Form = createAjvForm()\n"]}

package/dist/index.d.ts

@@ -256,7 +256,7 @@ type DefaultFieldOverrides = {
 type FieldOverrides<FieldDefs, TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     [K in FieldPathWithArray<TFieldValues, TName>]?: Omit<MergeFieldProps<FieldDefs extends never ? DefaultFields : ShallowMerge<DefaultFields, FieldDefs>, TFieldValues>, 'name'>;
 };
-type WithFields<TFormProps extends FormProps<any, any, any, any>, FieldDefs, ExtraOverrides = object> = TFormProps extends FormProps<infer TFieldValues, infer TContext> ? Omit<TFormProps, 'children' | 'fields'> & {
+type WithFields<TFormProps extends FormProps<any, any, any, any>, FieldDefs, ExtraOverrides = object> = TFormProps extends FormProps<infer TSchema, infer TFieldValues, infer TContext> ? Omit<TFormProps, 'children' | 'fields'> & {
     children?: FormChildren<FieldDefs, TFieldValues, TContext>;
     fields?: FieldOverrides<FieldDefs, TFieldValues> & {
         submit?: SubmitButtonProps;
@@ -522,7 +522,7 @@ interface FormRenderContext<TFieldValues extends FieldValues = FieldValues, TCon
     ArrayField: React$1.FC<ArrayFieldProps<TFieldValues> & React$1.RefAttributes<UseArrayFieldReturn>>;
     ObjectField: React$1.FC<ObjectFieldProps<TFieldValues>>;
 }
-interface FormOptions<TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TSchema = unknown, TFieldTypes = FieldProps<TFieldValues>> {
+interface FormOptions<TSchema = unknown, TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TFieldTypes = FieldProps<TFieldValues>> {
     /**
      * The form schema.
      */
@@ -556,7 +556,7 @@ interface FormOptions<TFieldValues extends FieldValues = FieldValues, TContext e
      */
     fields?: DefaultFieldOverrides;
 }
-interface FormProps<TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TSchema = unknown, TFieldTypes = FieldProps<TFieldValues>> extends UseFormProps<TFieldValues, TContext>, Omit<HTMLChakraProps<'form'>, 'children' | 'onChange' | 'onSubmit' | 'onError'>, FormOptions<TFieldValues, TContext, TSchema, TFieldTypes> {
+interface FormProps<TSchema = unknown, TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TFieldTypes = FieldProps<TFieldValues>> extends UseFormProps<TFieldValues, TContext>, Omit<HTMLChakraProps<'form'>, 'children' | 'onChange' | 'onSubmit' | 'onError'>, FormOptions<TSchema, TFieldValues, TContext, TFieldTypes> {
 }
 /**
  * The wrapper component provides context, state, and focus management.
@@ -564,7 +564,7 @@ interface FormProps<TFieldValues extends FieldValues = FieldValues, TContext ext
  * @see Docs https://saas-ui.dev/docs/components/forms/form
  */
 declare const Form$1: FormComponent;
-type FormComponent = (<TFieldValues extends FieldValues, TContext extends object = object, TSchema = unknown, TFieldTypes = FieldProps<TFieldValues>>(props: FormProps<TFieldValues, TContext, TSchema, TFieldTypes> & {
+type FormComponent = (<TSchema = unknown, TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TFieldTypes = FieldProps<TFieldValues>>(props: FormProps<TSchema, TFieldValues, TContext, TFieldTypes> & {
     ref?: React$1.ForwardedRef<HTMLFormElement>;
 }) => React$1.ReactElement) & {
     displayName?: string;
@@ -593,7 +593,7 @@ interface StepFormRenderContext<TFieldValues extends FieldValues = FieldValues,
     ArrayField: React$1.FC<ArrayFieldProps<TFieldValues> & React$1.RefAttributes<UseArrayFieldReturn>>;
     ObjectField: React$1.FC<ObjectFieldProps<TFieldValues>>;
 }
-interface UseStepFormProps<TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TFieldTypes = FieldProps<TFieldValues>> extends Omit<UseStepperProps, 'onChange'>, Omit<FormProps<TFieldValues, TContext, any, TFieldTypes>, 'children'> {
+interface UseStepFormProps<TFieldValues extends FieldValues = FieldValues, TContext extends object = object, TFieldTypes = FieldProps<TFieldValues>> extends Omit<UseStepperProps, 'onChange'>, Omit<FormProps<any, TFieldValues, TContext, TFieldTypes>, 'children'> {
     children: MaybeRenderProp<StepFormRenderContext<TFieldValues, TContext, TFieldTypes>>;
 }
 interface UseStepFormReturn<TFieldValues extends FieldValues = FieldValues> extends UseStepperReturn {
@@ -619,7 +619,7 @@ interface CreateFormProps<FieldDefs> {
     fieldResolver?: GetFieldResolver;
     fields?: FieldDefs extends Record<string, React__default.FC<any>> ? FieldDefs : never;
 }
-type FormType<FieldDefs, ExtraProps = object, ExtraOverrides = object> = (<TFieldValues extends FieldValues, TContext extends object = object, TSchema = unknown>(props: WithFields<FormProps<TFieldValues, TContext, TSchema>, FieldDefs, ExtraOverrides> & {
+type FormType<FieldDefs, ExtraProps = object, ExtraOverrides = object> = (<TSchema = unknown, TFieldValues extends FieldValues = FieldValues, TContext extends object = object>(props: WithFields<FormProps<TSchema, TFieldValues, TContext>, FieldDefs, ExtraOverrides> & {
     ref?: React__default.ForwardedRef<HTMLFormElement>;
 } & ExtraProps) => React__default.ReactElement) & {
     displayName?: string;