@volverjs/form-vue 1.0.0-beta.20 → 1.0.0-beta.22

package/dist/types.d.ts

@@ -1,8 +1,11 @@
 import { Component, DeepReadonly, Ref, RendererElement, RendererNode, VNode, WatchStopHandle } from 'vue';
-import { z } from 'zod';
+import { z, AnyZodObject, ZodEffects, ZodOptional, ZodTypeAny } from 'zod';
 import { IgnoredUpdater } from '@vueuse/core';
 import { 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];
+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;
     sideEffects?: (type: `${FormFieldType}`) => Promise<void> | void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@volverjs/form-vue",
   "type": "module",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.22",
   "description": "Vue 3 Forms with @volverjs/ui-vue",
   "author": "8 Wave S.r.l.",
   "license": "MIT",
@@ -57,23 +57,23 @@
     "zod": "^3.23.*"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.7.3",
+    "@antfu/eslint-config": "^3.8.0",
     "@nabla/vite-plugin-eslint": "^2.0.4",
-    "@playwright/experimental-ct-vue": "1.48.0",
+    "@playwright/experimental-ct-vue": "1.48.2",
     "@testing-library/vue": "^8.1.0",
     "@vitejs/plugin-vue": "^5.1.4",
-    "@volverjs/style": "0.1.13",
+    "@volverjs/style": "0.1.14",
     "@vue/compiler-sfc": "^3.5.12",
     "@vue/runtime-core": "^3.5.12",
     "@vue/test-utils": "^2.4.6",
     "copy": "^0.3.2",
-    "eslint": "^9.12.0",
+    "eslint": "^9.13.0",
     "happy-dom": "^15.7.4",
     "typescript": "^5.6.3",
-    "vite": "^5.4.9",
-    "vite-plugin-dts": "^4.2.4",
+    "vite": "^5.4.10",
+    "vite-plugin-dts": "^4.3.0",
     "vite-plugin-externalize-deps": "^0.8.0",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.4"
   },
   "scripts": {
     "lint": "eslint .",

package/src/VvFormTemplate.ts

@@ -12,7 +12,7 @@ import {
     unref,
 } from 'vue'
 import type { FormSchema, InjectedFormData, FormTemplate, RenderFunctionOutput } from './types'
-import type { inferFormattedError, TypeOf, z } from 'zod'
+import type { inferFormattedError, TypeOf } from 'zod'
 import type { FormStatus } from './enums'
 
 export function defineFormTemplate<Schema extends FormSchema>(formProvideKey: InjectionKey<InjectedFormData<Schema>>, VvFormField: Component) {

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 { z, type AnyZodObject, type ZodEffects, type ZodOptional, type 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

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,
                             ),
                         ]