@volverjs/form-vue 1.0.0-beta.21 → 1.0.0-beta.23

package/src/index.ts

@@ -6,14 +6,16 @@ import {
     type Plugin,
 } from 'vue'
 import type { AnyZodObject } from 'zod'
-import { defineFormField } from './VvFormField'
 import { defineForm } from './VvForm'
+import { defineFormField } from './VvFormField'
+import { defineFormFieldsGroup } from './VvFormFieldsGroup'
 import { defineFormWrapper } from './VvFormWrapper'
 import { defineFormTemplate } from './VvFormTemplate'
 import type {
     InjectedFormData,
     InjectedFormWrapperData,
     InjectedFormFieldData,
+    InjectedFormFieldsGroupData,
     FormComposableOptions,
     FormPluginOptions,
     FormTemplateItem,
@@ -23,7 +25,7 @@ import type {
     FormTemplate,
 } from './types'
 
-function _formFactory<Schema extends FormSchema>(schema: Schema,	options: FormComposableOptions<Schema> = {}) {
+function _formFactory<Schema extends FormSchema>(schema: Schema, options: FormComposableOptions<Schema> = {}) {
     // create injection keys
     const formInjectionKey = Symbol('formInjectionKey') as InjectionKey<InjectedFormData<Schema>>
     const formWrapperInjectionKey = Symbol('formWrapperInjectionKey') as InjectionKey<
@@ -32,6 +34,9 @@ function _formFactory<Schema extends FormSchema>(schema: Schema,	options: FormCo
     const formFieldInjectionKey = Symbol('formFieldInjectionKey') as InjectionKey<
         InjectedFormFieldData<Schema>
     >
+    const formFieldsGroupInjectionKey = Symbol('formFieldsGroupInjectionKey') as InjectionKey<
+        InjectedFormFieldsGroupData<Schema>
+    >
 
     // create components
     const VvFormWrapper = defineFormWrapper(
@@ -44,6 +49,11 @@ function _formFactory<Schema extends FormSchema>(schema: Schema,	options: FormCo
         formFieldInjectionKey,
         options,
     )
+    const VvFormFieldsGroup = defineFormFieldsGroup(
+        formInjectionKey,
+        formWrapperInjectionKey,
+        formFieldsGroupInjectionKey,
+    )
     const VvFormTemplate = defineFormTemplate(formInjectionKey, VvFormField)
     const {
         clear,
@@ -77,6 +87,7 @@ function _formFactory<Schema extends FormSchema>(schema: Schema,	options: FormCo
         validate,
         VvForm,
         VvFormField,
+        VvFormFieldsGroup,
         VvFormTemplate,
         VvFormWrapper,
     }

package/src/types.ts

@@ -1,12 +1,18 @@
 import type { Component, DeepReadonly, Ref, RendererElement, RendererNode, VNode, WatchStopHandle } from 'vue'
-import type { TypeOf, z } from 'zod'
+import type { z, AnyZodObject, ZodEffects, ZodOptional, ZodTypeAny } from 'zod'
 import type { IgnoredUpdater } from '@vueuse/core'
 import type { FormFieldType, FormStatus } from './enums'
 
-export type FormSchema =
-    | z.AnyZodObject
-    | z.ZodEffects<z.AnyZodObject>
-    | z.ZodEffects<z.ZodEffects<z.AnyZodObject>>
+type Depth = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] // Adjust the depth limit as needed
+
+type DecrementDepth<D extends Depth[number]> = Depth[D]
+
+export type EffectType<T extends ZodTypeAny, D extends Depth[number] = 10> =
+    D extends 0
+        ? T
+        : T | ZodOptional<T> | ZodEffects<EffectType<T, DecrementDepth<D>>>
+
+export type FormSchema = EffectType<AnyZodObject>
 
 export type FormFieldComponentOptions = {
     lazyLoad?: boolean
@@ -66,10 +72,15 @@ export type InjectedFormWrapperData<Schema extends FormSchema> = {
 }
 
 export type InjectedFormFieldData<Schema extends FormSchema> = {
-    name: Ref<string>
+    name: Readonly<Ref<Path<z.infer<Schema>>>>
     errors: Readonly<Ref<DeepReadonly<z.inferFormattedError<Schema>>>>
 }
 
+export type InjectedFormFieldsGroupData<Schema extends FormSchema> = {
+    names: DeepReadonly<Ref<Path<z.infer<Schema>>[]>>
+    errors: Readonly<Ref<DeepReadonly<Record<string, z.inferFormattedError<Schema>> | undefined>>>
+}
+
 export type Primitive =
     | null
     | undefined

package/src/utils.ts

@@ -11,15 +11,11 @@ import {
     ZodRecord,
     ZodArray,
 } from 'zod'
-import type { FormSchema } from './types'
+import type { EffectType, FormSchema } from './types'
 
 export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema, original: Partial<z.infer<Schema>> & Record<string, unknown> = {}): Partial<z.infer<Schema>> {
     const getSchemaInnerType = <Type extends ZodTypeAny>(
-        schema:
-            | Type
-            | ZodEffects<Type>
-            | ZodEffects<ZodEffects<Type>>
-            | ZodOptional<Type>,
+        schema: EffectType<Type>,
     ) => {
         let toReturn = schema
         while (toReturn instanceof ZodEffects) {
@@ -48,9 +44,9 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
     }
     const innerType = getSchemaInnerType<AnyZodObject>(schema)
     const unknownKeys
-		= innerType instanceof ZodObject
-		    ? innerType._def.unknownKeys === 'passthrough'
-		    : false
+        = innerType instanceof ZodObject
+            ? innerType._def.unknownKeys === 'passthrough'
+            : false
     return {
         ...(unknownKeys ? original : {}),
         ...Object.fromEntries(
@@ -94,7 +90,7 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
                                         (element && typeof element === 'object'
                                             ? element
                                             : undefined) as Partial<
-											typeof arrayType
+                                                typeof arrayType
                                         >,
                                     ),
                                 ),
@@ -105,7 +101,7 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
                         const valueType = getSchemaInnerType(innerType._def.valueType)
                         if (valueType instanceof ZodObject) {
                             return [key, Object.keys(originalValue).reduce((acc: Record<string, unknown>, recordKey: string) => {
-                                acc[recordKey] = defaultObjectBySchema(valueType, originalValue[recordKey])
+                                acc[recordKey] = defaultObjectBySchema(valueType, (originalValue as Record<string, unknown>)[recordKey] as Partial<any> & Record<string, unknown>)
                                 return acc
                             }, {})]
                         }
@@ -117,7 +113,7 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
                                 innerType,
                                 originalValue
                                 && typeof originalValue === 'object'
-                                    ? originalValue
+                                    ? (originalValue as Partial<z.infer<Schema>> & Record<string, unknown>)
                                     : defaultValue,
                             ),
                         ]