@formisch/qwik 0.3.1 → 0.5.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as v from "valibot";
 import { JSXOutput, NoSerialize, PropsOf, QRL, ReadonlySignal } from "@qwik.dev/core";
-import * as _qwik_dev_core_internal3 from "@qwik.dev/core/internal";
+import * as _qwik_dev_core_internal1 from "@qwik.dev/core/internal";
 
 //#region ../../packages/core/dist/index.qwik.d.ts
 //#region src/types/schema.d.ts
@@ -24,19 +24,25 @@ interface InternalBaseStore {
   schema: NoSerialize<Schema>;
   elements: FieldElement[];
   errors: Signal<[string, ...string[]] | null>;
+  isTouched: Signal<boolean>;
+  isDirty: Signal<boolean>;
 }
 interface InternalArrayStore extends InternalBaseStore {
   kind: "array";
   children: InternalFieldStore[];
+  initialInput: Signal<true | null | undefined>;
+  startInput: Signal<true | null | undefined>;
+  input: Signal<true | null | undefined>;
   initialItems: Signal<string[]>;
   startItems: Signal<string[]>;
   items: Signal<string[]>;
-  isTouched: Signal<boolean>;
-  isDirty: Signal<boolean>;
 }
 interface InternalObjectStore extends InternalBaseStore {
   kind: "object";
   children: Record<string, InternalFieldStore>;
+  initialInput: Signal<true | null | undefined>;
+  startInput: Signal<true | null | undefined>;
+  input: Signal<true | null | undefined>;
 }
 interface InternalValueStore extends InternalBaseStore {
   kind: "value";
@@ -169,21 +175,129 @@ type ValidArrayPath<TValue, TPath extends RequiredPath> = TPath extends LazyArra
 */
 //#endregion
 //#region ../../packages/methods/dist/index.qwik.d.ts
-declare function focus(config: any): void;
-declare function getAllErrors(form: any): null;
-declare function getErrors(form: any, config: any): any;
-declare function getInput(form: any, config: any): unknown;
-declare function handleSubmit(form: any, handler: any): (event: any) => Promise<void>;
-declare function insert(form: any, config: any): void;
-declare function move(form: any, config: any): void;
-declare function remove(form: any, config: any): void;
-declare function replace(form: any, config: any): void;
-declare function reset(form: any, config: any): void;
-declare function setErrors(form: any, config: any): void;
-declare function setInput(form: any, config: any): void;
-declare function submit(form: any): void;
-declare function swap(form: any, config: any): void;
-declare function validate(form: any, config: any): Promise<v.SafeParseResult<Schema>>;
+//#region src/focus/focus.d.ts
+interface FocusFieldConfig<TSchema extends Schema, TFieldPath extends RequiredPath> {
+  readonly form: BaseFormStore<TSchema>;
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+}
+declare function focus<TSchema extends Schema, TFieldPath extends RequiredPath>(config: FocusFieldConfig<TSchema, TFieldPath>): void;
+//#endregion
+//#region src/getAllErrors/getAllErrors.d.ts
+declare function getAllErrors(form: BaseFormStore): [string, ...string[]] | null;
+//#endregion
+//#region src/getErrors/getErrors.d.ts
+interface GetFormErrorsConfig {
+  readonly path?: undefined;
+}
+interface GetFieldErrorsConfig<TSchema extends Schema, TFieldPath extends RequiredPath> {
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+}
+declare function getErrors<TSchema extends Schema>(form: BaseFormStore<TSchema>): [string, ...string[]] | null;
+declare function getErrors<TSchema extends Schema, TFieldPath extends RequiredPath | undefined = undefined>(form: BaseFormStore<TSchema>, config: TFieldPath extends RequiredPath ? GetFieldErrorsConfig<TSchema, TFieldPath> : GetFormErrorsConfig): [string, ...string[]] | null;
+//#endregion
+//#region src/getInput/getInput.d.ts
+interface GetFormInputConfig {
+  readonly path?: undefined;
+}
+interface GetFieldInputConfig<TSchema extends Schema, TFieldPath extends RequiredPath> {
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+}
+declare function getInput<TSchema extends Schema>(form: BaseFormStore<TSchema>): PartialValues<v.InferInput<TSchema>>;
+declare function getInput<TSchema extends Schema, TFieldPath extends RequiredPath | undefined = undefined>(form: BaseFormStore<TSchema>, config: TFieldPath extends RequiredPath ? GetFieldInputConfig<TSchema, TFieldPath> : GetFormInputConfig): PartialValues<TFieldPath extends RequiredPath ? PathValue<v.InferInput<TSchema>, TFieldPath> : v.InferInput<TSchema>>;
+//#endregion
+//#region src/handleSubmit/handleSubmit.d.ts
+declare function handleSubmit<TSchema extends Schema>(form: BaseFormStore<TSchema>, handler: SubmitHandler<TSchema>): (event: SubmitEvent) => void;
+//#endregion
+//#region src/insert/insert.d.ts
+interface InsertConfig<TSchema extends Schema, TFieldArrayPath extends RequiredPath> {
+  readonly path: ValidArrayPath<v.InferInput<TSchema>, TFieldArrayPath>;
+  readonly at?: number | undefined;
+  readonly initialInput?: DeepPartial<PathValue<v.InferInput<TSchema>, [...TFieldArrayPath, number]>> | undefined;
+}
+declare function insert<TSchema extends Schema, TFieldArrayPath extends RequiredPath>(form: BaseFormStore<TSchema>, config: InsertConfig<TSchema, TFieldArrayPath>): void;
+//#endregion
+//#region src/move/move.d.ts
+interface MoveConfig<TSchema extends Schema, TFieldArrayPath extends RequiredPath> {
+  readonly path: ValidArrayPath<v.InferInput<TSchema>, TFieldArrayPath>;
+  readonly from: number;
+  readonly to: number;
+}
+declare function move<TSchema extends Schema, TFieldArrayPath extends RequiredPath>(form: BaseFormStore<TSchema>, config: MoveConfig<TSchema, TFieldArrayPath>): void;
+//#endregion
+//#region src/remove/remove.d.ts
+interface RemoveConfig<TSchema extends Schema, TFieldArrayPath extends RequiredPath> {
+  readonly path: ValidArrayPath<v.InferInput<TSchema>, TFieldArrayPath>;
+  readonly at: number;
+}
+declare function remove<TSchema extends Schema, TFieldArrayPath extends RequiredPath>(form: BaseFormStore<TSchema>, config: RemoveConfig<TSchema, TFieldArrayPath>): void;
+//#endregion
+//#region src/replace/replace.d.ts
+interface ReplaceConfig<TSchema extends Schema, TFieldArrayPath extends RequiredPath> {
+  readonly path: ValidArrayPath<v.InferInput<TSchema>, TFieldArrayPath>;
+  readonly at: number;
+  readonly initialInput?: DeepPartial<PathValue<v.InferInput<TSchema>, [...TFieldArrayPath, number]>> | undefined;
+}
+declare function replace<TSchema extends Schema, TFieldArrayPath extends RequiredPath>(form: BaseFormStore<TSchema>, config: ReplaceConfig<TSchema, TFieldArrayPath>): void;
+//#endregion
+//#region src/reset/reset.d.ts
+interface ResetBaseConfig {
+  readonly keepInput?: boolean | undefined;
+  readonly keepTouched?: boolean | undefined;
+  readonly keepErrors?: boolean | undefined;
+}
+interface ResetFormConfig<TSchema extends Schema> extends ResetBaseConfig {
+  readonly path?: undefined;
+  readonly initialInput?: DeepPartial<v.InferInput<TSchema>> | undefined;
+  readonly keepSubmitCount?: boolean | undefined;
+  readonly keepSubmitted?: boolean | undefined;
+}
+interface ResetFieldConfig<TSchema extends Schema, TFieldPath extends RequiredPath> extends ResetBaseConfig {
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+  readonly initialInput?: DeepPartial<PathValue<v.InferInput<TSchema>, TFieldPath>>;
+}
+declare function reset(form: BaseFormStore): void;
+declare function reset<TSchema extends Schema, TFieldPath extends RequiredPath | undefined = undefined>(form: BaseFormStore<TSchema>, config: TFieldPath extends RequiredPath ? ResetFieldConfig<TSchema, TFieldPath> : ResetFormConfig<TSchema>): void;
+//#endregion
+//#region src/setErrors/setErrors.d.ts
+interface SetFormErrorsConfig {
+  readonly path?: undefined;
+  readonly errors: [string, ...string[]] | null;
+}
+interface SetFieldErrorsConfig<TSchema extends Schema, TFieldPath extends RequiredPath> {
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+  readonly errors: [string, ...string[]] | null;
+}
+declare function setErrors<TSchema extends Schema, TFieldPath extends RequiredPath | undefined = undefined>(form: BaseFormStore<TSchema>, config: TFieldPath extends RequiredPath ? SetFieldErrorsConfig<TSchema, TFieldPath> : SetFormErrorsConfig): void;
+//#endregion
+//#region src/setInput/setInput.d.ts
+interface SetFormInputConfig<TSchema extends Schema> {
+  readonly path?: undefined;
+  readonly input: v.InferInput<TSchema>;
+}
+interface SetFieldInputConfig<TSchema extends Schema, TFieldPath extends RequiredPath> {
+  readonly path: ValidPath<v.InferInput<TSchema>, TFieldPath>;
+  readonly input: PathValue<v.InferInput<TSchema>, TFieldPath>;
+}
+declare function setInput<TSchema extends Schema>(form: BaseFormStore<TSchema>, config: SetFormInputConfig<TSchema>): void;
+declare function setInput<TSchema extends Schema, TFieldPath extends RequiredPath | undefined = undefined>(form: BaseFormStore<TSchema>, config: TFieldPath extends RequiredPath ? SetFieldInputConfig<TSchema, TFieldPath> : SetFormInputConfig<TSchema>): void;
+//#endregion
+//#region src/submit/submit.d.ts
+declare function submit(form: BaseFormStore): void;
+//#endregion
+//#region src/swap/swap.d.ts
+interface SwapConfig<TSchema extends Schema, TFieldArrayPath extends RequiredPath> {
+  readonly path: ValidArrayPath<v.InferInput<TSchema>, TFieldArrayPath>;
+  readonly at: number;
+  readonly and: number;
+}
+declare function swap<TSchema extends Schema, TFieldArrayPath extends RequiredPath>(form: BaseFormStore<TSchema>, config: SwapConfig<TSchema, TFieldArrayPath>): void;
+//#endregion
+//#region src/validate/validate.d.ts
+interface ValidateFormConfig {
+  readonly shouldFocus?: boolean | undefined;
+}
+declare function validate<TSchema extends Schema>(form: BaseFormStore<TSchema>, config?: ValidateFormConfig): Promise<v.SafeParseResult<TSchema>>;
+//#endregion
 //#endregion
 //#region src/types/field.d.ts
 /**
@@ -245,7 +359,7 @@ interface FieldProps<TSchema extends Schema = Schema, TFieldPath extends Require
 /**
  * Headless form field that provides reactive properties and state.
  */
-declare const Field: <TSchema extends Schema, TFieldPath extends RequiredPath>(props: _qwik_dev_core_internal3.PublicProps<FieldProps<TSchema, TFieldPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal3.DevJSX) => JSXOutput;
+declare const Field: <TSchema extends Schema, TFieldPath extends RequiredPath>(props: _qwik_dev_core_internal1.PublicProps<FieldProps<TSchema, TFieldPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal1.DevJSX) => JSXOutput;
 //#endregion
 //#region src/components/FieldArray/FieldArray.d.ts
 /**
@@ -259,14 +373,14 @@ interface FieldArrayProps<TSchema extends Schema = Schema, TFieldArrayPath exten
 /**
  * Headless field array that provides reactive properties and state.
  */
-declare const FieldArray: <TSchema extends Schema, TFieldArrayPath extends RequiredPath>(props: _qwik_dev_core_internal3.PublicProps<FieldArrayProps<TSchema, TFieldArrayPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal3.DevJSX) => JSXOutput;
+declare const FieldArray: <TSchema extends Schema, TFieldArrayPath extends RequiredPath>(props: _qwik_dev_core_internal1.PublicProps<FieldArrayProps<TSchema, TFieldArrayPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal1.DevJSX) => JSXOutput;
 //#endregion
 //#region src/components/Form/Form.d.ts
 type FormProps<TSchema extends Schema = Schema> = Omit<PropsOf<'form'>, 'onSubmit$' | 'noValidate'> & {
   of: FormStore<TSchema>;
   onSubmit$: QRL<SubmitHandler<TSchema>>;
 };
-declare const Form: <TSchema extends Schema>(props: _qwik_dev_core_internal3.PublicProps<FormProps<TSchema>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal3.DevJSX) => JSXOutput;
+declare const Form: <TSchema extends Schema>(props: _qwik_dev_core_internal1.PublicProps<FormProps<TSchema>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal1.DevJSX) => JSXOutput;
 //#endregion
 //#region src/hooks/useField/useField.d.ts
 interface UseFieldConfig<TSchema extends Schema = Schema, TFieldPath extends RequiredPath = RequiredPath> {
@@ -284,4 +398,4 @@ declare function useFieldArray<TSchema extends Schema, TFieldArrayPath extends R
 declare function useFormQrl<TSchema extends Schema>(configQrl: QRL<FormConfig<TSchema>>): FormStore<TSchema>;
 declare const useForm$: <TSchema extends Schema>(qrl: FormConfig<TSchema>) => FormStore<TSchema>;
 //#endregion
-export { Field, FieldArray, FieldArrayProps, FieldArrayStore, FieldElementProps, FieldProps, FieldStore, Form, FormProps, FormStore, type SubmitHandler, UseFieldArrayConfig, UseFieldConfig, focus, getAllErrors, getErrors, getInput, handleSubmit, insert, move, remove, replace, reset, setErrors, setInput, submit, swap, useField, useFieldArray, useForm$, useFormQrl, validate };
+export { type DeepPartial, Field, FieldArray, FieldArrayProps, FieldArrayStore, type FieldElement, FieldElementProps, FieldProps, FieldStore, FocusFieldConfig, Form, type FormConfig, FormProps, FormStore, GetFieldErrorsConfig, GetFieldInputConfig, GetFormErrorsConfig, GetFormInputConfig, InsertConfig, MoveConfig, type PartialValues, type PathValue, RemoveConfig, ReplaceConfig, type RequiredPath, ResetFieldConfig, ResetFormConfig, type Schema, SetFieldErrorsConfig, SetFieldInputConfig, SetFormErrorsConfig, SetFormInputConfig, type SubmitHandler, SwapConfig, UseFieldArrayConfig, UseFieldConfig, type ValidArrayPath, type ValidPath, ValidateFormConfig, type ValidationMode, focus, getAllErrors, getErrors, getInput, handleSubmit, insert, move, remove, replace, reset, setErrors, setInput, submit, swap, useField, useFieldArray, useForm$, useFormQrl, validate };

package/dist/index.qwik.js

@@ -14,16 +14,21 @@ function batch(fn) {
 * TODO: Add comment
 * TODO: Should this stay in /primitives or move to /utils?
 */
-function initializeFieldStore(internalFieldStore, schema, initialInput, path) {
+function initializeFieldStore(internalFieldStore, schema, initialInput, path, nullish = false) {
 	if (framework === "qwik" && schema.type === "lazy" || schema.type === "object_with_rest" || schema.type === "record" || schema.type === "tuple_with_rest" || schema.type === "promise") throw new Error(`"${schema.type}" schema is not supported`);
 	else if (schema.type === "lazy") initializeFieldStore(internalFieldStore, schema.getter(void 0), initialInput, path);
-	else if (schema.type === "exact_optional" || schema.type === "non_nullable" || schema.type === "non_nullish" || schema.type === "non_optional" || schema.type === "nullable" || schema.type === "nullish" || schema.type === "optional" || schema.type === "undefinedable") initializeFieldStore(internalFieldStore, schema.wrapped, initialInput ?? v.getDefault(schema), path);
+	else if (schema.type === "exact_optional" || schema.type === "nullable" || schema.type === "nullish" || schema.type === "optional" || schema.type === "undefinedable") initializeFieldStore(internalFieldStore, schema.wrapped, initialInput ?? v.getDefault(schema), path, true);
+	else if (schema.type === "non_nullable" || schema.type === "non_nullish" || schema.type === "non_optional") initializeFieldStore(internalFieldStore, schema.wrapped, initialInput, path);
 	else if (schema.type === "intersect" || schema.type === "union" || schema.type === "variant") for (const schemaOption of schema.options) initializeFieldStore(internalFieldStore, schemaOption, initialInput, path);
 	else {
 		internalFieldStore.schema = schema;
 		internalFieldStore.name = JSON.stringify(path);
-		internalFieldStore.elements = [];
+		const initialElements = [];
+		internalFieldStore.initialElements = initialElements;
+		internalFieldStore.elements = initialElements;
 		internalFieldStore.errors = createSignal(null);
+		internalFieldStore.isTouched = createSignal(false);
+		internalFieldStore.isDirty = createSignal(false);
 		if (schema.type === "array" || schema.type === "loose_tuple" || schema.type === "strict_tuple" || schema.type === "tuple") {
 			if (internalFieldStore.kind && internalFieldStore.kind !== "array") throw new Error(`Store initialized as "${internalFieldStore.kind}" cannot be reinitialized as "array"`);
 			internalFieldStore.kind = "array";
@@ -42,12 +47,14 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path) {
 					initializeFieldStore(internalFieldStore.children[index], schema.items[index], initialInput?.[index], path);
 					path.pop();
 				}
+				const arrayInput = nullish && initialInput == null ? initialInput : true;
+				internalFieldStore.initialInput = createSignal(arrayInput);
+				internalFieldStore.startInput = createSignal(arrayInput);
+				internalFieldStore.input = createSignal(arrayInput);
 				const initialItems = internalFieldStore.children.map(createId);
 				internalFieldStore.initialItems = createSignal(initialItems);
 				internalFieldStore.startItems = createSignal(initialItems);
 				internalFieldStore.items = createSignal(initialItems);
-				internalFieldStore.isTouched = createSignal(false);
-				internalFieldStore.isDirty = createSignal(false);
 			}
 		} else if (schema.type === "loose_object" || schema.type === "object" || schema.type === "strict_object") {
 			if (internalFieldStore.kind && internalFieldStore.kind !== "object") throw new Error(`Store initialized as "${internalFieldStore.kind}" cannot be reinitialized as "object"`);
@@ -60,6 +67,10 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path) {
 					initializeFieldStore(internalFieldStore.children[key], schema.entries[key], initialInput?.[key], path);
 					path.pop();
 				}
+				const objectInput = nullish && initialInput == null ? initialInput : true;
+				internalFieldStore.initialInput = createSignal(objectInput);
+				internalFieldStore.startInput = createSignal(objectInput);
+				internalFieldStore.input = createSignal(objectInput);
 			}
 		} else {
 			internalFieldStore.kind = "value";
@@ -67,8 +78,6 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path) {
 				internalFieldStore.initialInput = createSignal(initialInput);
 				internalFieldStore.startInput = createSignal(initialInput);
 				internalFieldStore.input = createSignal(initialInput);
-				internalFieldStore.isTouched = createSignal(false);
-				internalFieldStore.isDirty = createSignal(false);
 			}
 		}
 	}
@@ -85,10 +94,14 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path) {
 function copyItemState(fromInternalFieldStore, toInternalFieldStore) {
 	batch(() => {
 		untrack(() => {
+			toInternalFieldStore.elements = fromInternalFieldStore.elements;
+			toInternalFieldStore.errors.value = fromInternalFieldStore.errors.value;
+			toInternalFieldStore.startInput.value = fromInternalFieldStore.startInput.value;
+			toInternalFieldStore.input.value = fromInternalFieldStore.input.value;
+			toInternalFieldStore.isTouched.value = fromInternalFieldStore.isTouched.value;
+			toInternalFieldStore.isDirty.value = fromInternalFieldStore.isDirty.value;
 			if (fromInternalFieldStore.kind === "array" && toInternalFieldStore.kind === "array") {
 				const fromItems = fromInternalFieldStore.items.value;
-				toInternalFieldStore.isTouched.value = fromInternalFieldStore.isTouched.value;
-				toInternalFieldStore.isDirty.value = fromInternalFieldStore.isDirty.value;
 				toInternalFieldStore.startItems.value = fromInternalFieldStore.startItems.value;
 				toInternalFieldStore.items.value = fromItems;
 				let path;
@@ -103,12 +116,6 @@ function copyItemState(fromInternalFieldStore, toInternalFieldStore) {
 					copyItemState(fromInternalFieldStore.children[index], toInternalFieldStore.children[index]);
 				}
 			} else if (fromInternalFieldStore.kind === "object" && toInternalFieldStore.kind === "object") for (const key in fromInternalFieldStore.children) copyItemState(fromInternalFieldStore.children[key], toInternalFieldStore.children[key]);
-			else if (fromInternalFieldStore.kind === "value" && toInternalFieldStore.kind === "value") {
-				toInternalFieldStore.isTouched.value = fromInternalFieldStore.isTouched.value;
-				toInternalFieldStore.isDirty.value = fromInternalFieldStore.isDirty.value;
-				toInternalFieldStore.startInput.value = fromInternalFieldStore.startInput.value;
-				toInternalFieldStore.input.value = fromInternalFieldStore.input.value;
-			}
 		});
 	});
 }
@@ -123,11 +130,15 @@ function copyItemState(fromInternalFieldStore, toInternalFieldStore) {
 */
 function resetItemState(internalFieldStore, initialInput) {
 	batch(() => {
+		internalFieldStore.elements = [];
 		internalFieldStore.errors.value = null;
-		if (internalFieldStore.kind === "array") {
-			internalFieldStore.isTouched.value = false;
-			internalFieldStore.isDirty.value = false;
-			if (initialInput) {
+		internalFieldStore.isTouched.value = false;
+		internalFieldStore.isDirty.value = false;
+		if (internalFieldStore.kind === "array" || internalFieldStore.kind === "object") {
+			const objectInput = initialInput == null ? initialInput : true;
+			internalFieldStore.startInput.value = objectInput;
+			internalFieldStore.input.value = objectInput;
+			if (internalFieldStore.kind === "array") if (initialInput) {
 				const newItems = initialInput.map(createId);
 				internalFieldStore.startItems.value = newItems;
 				internalFieldStore.items.value = newItems;
@@ -136,10 +147,8 @@ function resetItemState(internalFieldStore, initialInput) {
 				internalFieldStore.startItems.value = [];
 				internalFieldStore.items.value = [];
 			}
-		} else if (internalFieldStore.kind === "object") for (const key in internalFieldStore.children) resetItemState(internalFieldStore.children[key], initialInput?.[key]);
-		else {
-			internalFieldStore.isTouched.value = false;
-			internalFieldStore.isDirty.value = false;
+			else for (const key in internalFieldStore.children) resetItemState(internalFieldStore.children[key], initialInput?.[key]);
+		} else {
 			internalFieldStore.startInput.value = initialInput;
 			internalFieldStore.input.value = initialInput;
 		}
@@ -156,15 +165,27 @@ function resetItemState(internalFieldStore, initialInput) {
 function swapItemState(firstInternalFieldStore, secondInternalFieldStore) {
 	batch(() => {
 		untrack(() => {
+			const tempElements = firstInternalFieldStore.elements;
+			firstInternalFieldStore.elements = secondInternalFieldStore.elements;
+			secondInternalFieldStore.elements = tempElements;
+			const tempErrors = firstInternalFieldStore.errors.value;
+			firstInternalFieldStore.errors.value = secondInternalFieldStore.errors.value;
+			secondInternalFieldStore.errors.value = tempErrors;
+			const tempStartInput = firstInternalFieldStore.startInput.value;
+			firstInternalFieldStore.startInput.value = secondInternalFieldStore.startInput.value;
+			secondInternalFieldStore.startInput.value = tempStartInput;
+			const tempInput = firstInternalFieldStore.input.value;
+			firstInternalFieldStore.input.value = secondInternalFieldStore.input.value;
+			secondInternalFieldStore.input.value = tempInput;
+			const tempIsTouched = firstInternalFieldStore.isTouched.value;
+			firstInternalFieldStore.isTouched.value = secondInternalFieldStore.isTouched.value;
+			secondInternalFieldStore.isTouched.value = tempIsTouched;
+			const tempIsDirty = firstInternalFieldStore.isDirty.value;
+			firstInternalFieldStore.isDirty.value = secondInternalFieldStore.isDirty.value;
+			secondInternalFieldStore.isDirty.value = tempIsDirty;
 			if (firstInternalFieldStore.kind === "array" && secondInternalFieldStore.kind === "array") {
 				const firstItems = firstInternalFieldStore.items.value;
 				const secondItems = secondInternalFieldStore.items.value;
-				const tempIsTouched = firstInternalFieldStore.isTouched.value;
-				firstInternalFieldStore.isTouched.value = secondInternalFieldStore.isTouched.value;
-				secondInternalFieldStore.isTouched.value = tempIsTouched;
-				const tempIsDirty = firstInternalFieldStore.isDirty.value;
-				firstInternalFieldStore.isDirty.value = secondInternalFieldStore.isDirty.value;
-				secondInternalFieldStore.isDirty.value = tempIsDirty;
 				const tempStartItems = firstInternalFieldStore.startItems.value;
 				firstInternalFieldStore.startItems.value = secondInternalFieldStore.startItems.value;
 				secondInternalFieldStore.startItems.value = tempStartItems;
@@ -191,33 +212,25 @@ function swapItemState(firstInternalFieldStore, secondInternalFieldStore) {
 					swapItemState(firstInternalFieldStore.children[index], secondInternalFieldStore.children[index]);
 				}
 			} else if (firstInternalFieldStore.kind === "object" && secondInternalFieldStore.kind === "object") for (const key in firstInternalFieldStore.children) swapItemState(firstInternalFieldStore.children[key], secondInternalFieldStore.children[key]);
-			else if (firstInternalFieldStore.kind === "value" && secondInternalFieldStore.kind === "value") {
-				const tempIsTouched = firstInternalFieldStore.isTouched.value;
-				firstInternalFieldStore.isTouched.value = secondInternalFieldStore.isTouched.value;
-				secondInternalFieldStore.isTouched.value = tempIsTouched;
-				const tempIsDirty = firstInternalFieldStore.isDirty.value;
-				firstInternalFieldStore.isDirty.value = secondInternalFieldStore.isDirty.value;
-				secondInternalFieldStore.isDirty.value = tempIsDirty;
-				const tempStartInput = firstInternalFieldStore.startInput.value;
-				firstInternalFieldStore.startInput.value = secondInternalFieldStore.startInput.value;
-				secondInternalFieldStore.startInput.value = tempStartInput;
-				const tempInput = firstInternalFieldStore.input.value;
-				firstInternalFieldStore.input.value = secondInternalFieldStore.input.value;
-				secondInternalFieldStore.input.value = tempInput;
-			}
 		});
 	});
 }
 function getFieldInput(internalFieldStore) {
 	if (internalFieldStore.kind === "array") {
-		const value = [];
-		for (let index = 0; index < internalFieldStore.items.value.length; index++) value[index] = getFieldInput(internalFieldStore.children[index]);
-		return value;
+		if (internalFieldStore.input.value) {
+			const value = [];
+			for (let index = 0; index < internalFieldStore.items.value.length; index++) value[index] = getFieldInput(internalFieldStore.children[index]);
+			return value;
+		}
+		return internalFieldStore.input.value;
 	}
 	if (internalFieldStore.kind === "object") {
-		const value = {};
-		for (const key in internalFieldStore.children) value[key] = getFieldInput(internalFieldStore.children[key]);
-		return value;
+		if (internalFieldStore.input.value) {
+			const value = {};
+			for (const key in internalFieldStore.children) value[key] = getFieldInput(internalFieldStore.children[key]);
+			return value;
+		}
+		return internalFieldStore.input.value;
 	}
 	return internalFieldStore.input.value;
 }
@@ -248,17 +261,16 @@ function getElementInput(element, internalFieldStore) {
 	return element.value;
 }
 function getFieldBool(internalFieldStore, type) {
+	if (internalFieldStore[type].value) return true;
 	if (internalFieldStore.kind === "array") {
-		if (internalFieldStore[type].value) return true;
 		for (let index = 0; index < internalFieldStore.items.value.length; index++) if (getFieldBool(internalFieldStore.children[index], type)) return true;
 		return false;
 	}
 	if (internalFieldStore.kind == "object") {
-		if (type === "errors" && internalFieldStore[type].value) return true;
 		for (const key in internalFieldStore.children) if (getFieldBool(internalFieldStore.children[key], type)) return true;
 		return false;
 	}
-	return !!internalFieldStore[type].value;
+	return false;
 }
 function getFieldStore(internalFormStore, path) {
 	let internalFieldStore = internalFormStore;
@@ -274,38 +286,53 @@ function setFieldBool(internalFieldStore, type, bool) {
 		else internalFieldStore[type].value = bool;
 	});
 }
-function setFieldInput(internalFieldStore, input) {
-	batch(() => {
-		if (internalFieldStore.kind === "array") {
-			const arrayInput = input ?? [];
-			const items = untrack(() => internalFieldStore.items.value);
-			if (arrayInput.length < items.length) internalFieldStore.items.value = items.slice(0, arrayInput.length);
-			else if (arrayInput.length > items.length) {
-				if (arrayInput.length > internalFieldStore.children.length) {
-					const path = JSON.parse(internalFieldStore.name);
-					for (let index = internalFieldStore.children.length; index < arrayInput.length; index++) {
-						internalFieldStore.children[index] = {};
-						path.push(index);
-						initializeFieldStore(internalFieldStore.children[index], internalFieldStore.schema.item, arrayInput[index], path);
-						path.pop();
-					}
+function setNestedInput(internalFieldStore, input) {
+	internalFieldStore.isTouched.value = true;
+	if (internalFieldStore.kind === "array") {
+		const arrayInput = input ?? [];
+		const items = internalFieldStore.items.value;
+		if (arrayInput.length < items.length) internalFieldStore.items.value = items.slice(0, arrayInput.length);
+		else if (arrayInput.length > items.length) {
+			if (arrayInput.length > internalFieldStore.children.length) {
+				const path = JSON.parse(internalFieldStore.name);
+				for (let index = internalFieldStore.children.length; index < arrayInput.length; index++) {
+					internalFieldStore.children[index] = {};
+					path.push(index);
+					initializeFieldStore(internalFieldStore.children[index], internalFieldStore.schema.item, arrayInput[index], path);
+					path.pop();
 				}
-				internalFieldStore.items.value = [...items, ...arrayInput.slice(items.length).map(createId)];
 			}
-			for (let index = 0; index < items.length; index++) setFieldInput(internalFieldStore.children[index], arrayInput[index]);
-			internalFieldStore.isDirty.value = untrack(() => internalFieldStore.startItems.value).length !== items.length;
-		} else if (internalFieldStore.kind === "object") for (const key in internalFieldStore.children) setFieldInput(internalFieldStore.children[key], input?.[key]);
-		else {
-			internalFieldStore.input.value = input;
-			internalFieldStore.isTouched.value = true;
-			const startInput = untrack(() => internalFieldStore.startInput.value);
-			internalFieldStore.isDirty.value = startInput !== input && (startInput !== void 0 || input !== "" && !Number.isNaN(input));
+			internalFieldStore.items.value = [...items, ...arrayInput.slice(items.length).map(createId)];
 		}
+		for (let index = 0; index < items.length; index++) setNestedInput(internalFieldStore.children[index], arrayInput[index]);
+		internalFieldStore.input.value = input == null ? input : true;
+		internalFieldStore.isDirty.value = internalFieldStore.startInput.value !== internalFieldStore.input.value || internalFieldStore.startItems.value.length !== items.length;
+	} else if (internalFieldStore.kind === "object") {
+		for (const key in internalFieldStore.children) setNestedInput(internalFieldStore.children[key], input?.[key]);
+		internalFieldStore.input.value = input == null ? input : true;
+		internalFieldStore.isDirty.value = internalFieldStore.startInput.value !== internalFieldStore.input.value;
+	} else {
+		internalFieldStore.input.value = input;
+		const startInput = internalFieldStore.startInput.value;
+		internalFieldStore.isDirty.value = startInput !== input && (startInput !== void 0 || input !== "" && !Number.isNaN(input));
+	}
+}
+function setFieldInput(internalFormStore, path, input) {
+	batch(() => {
+		untrack(() => {
+			let internalFieldStore = internalFormStore;
+			for (let index = 0; index < path.length; index++) {
+				internalFieldStore = internalFieldStore.children[path[index]];
+				if (index < path.length - 1) internalFieldStore.input.value = true;
+				else setNestedInput(internalFieldStore, input);
+			}
+		});
 	});
 }
 function setInitialFieldInput(internalFieldStore, initialInput) {
 	batch(() => {
 		if (internalFieldStore.kind === "array") {
+			internalFieldStore.input.value = initialInput == null ? initialInput : true;
 			const initialArrayInput = initialInput ?? [];
 			if (initialArrayInput.length > internalFieldStore.children.length) {
 				const path = JSON.parse(internalFieldStore.name);
@@ -318,8 +345,10 @@ function setInitialFieldInput(internalFieldStore, initialInput) {
 			}
 			internalFieldStore.initialItems.value = initialArrayInput.map(createId);
 			for (let index = 0; index < internalFieldStore.children.length; index++) setInitialFieldInput(internalFieldStore.children[index], initialArrayInput[index]);
-		} else if (internalFieldStore.kind === "object") for (const key in internalFieldStore.children) setInitialFieldInput(internalFieldStore.children[key], initialInput?.[key]);
-		else internalFieldStore.initialInput.value = initialInput;
+		} else if (internalFieldStore.kind === "object") {
+			internalFieldStore.input.value = initialInput == null ? initialInput : true;
+			for (const key in internalFieldStore.children) setInitialFieldInput(internalFieldStore.children[key], initialInput?.[key]);
+		} else internalFieldStore.initialInput.value = initialInput;
 	});
 }
 function walkFieldStore(internalFieldStore, callback) {
@@ -380,8 +409,8 @@ async function validateFormInput(internalFormStore, config) {
 	});
 	return result;
 }
-function validateIfRequired(internalFormStore, internalFieldStore, validationModes) {
-	if (validationModes === (internalFormStore.validate === "initial" || (internalFormStore.validate === "submit" ? untrack(() => internalFormStore.isSubmitted.value) : untrack(() => getFieldBool(internalFieldStore, "errors"))) ? internalFormStore.revalidate : internalFormStore.validate)) validateFormInput(internalFormStore);
+function validateIfRequired(internalFormStore, internalFieldStore, validationMode) {
+	if (validationMode === (internalFormStore.validate === "initial" || (internalFormStore.validate === "submit" ? untrack(() => internalFormStore.isSubmitted.value) : untrack(() => getFieldBool(internalFieldStore, "errors"))) ? internalFormStore.revalidate : internalFormStore.validate)) validateFormInput(internalFormStore);
 }
 const INTERNAL = "~internal";
 
@@ -423,7 +452,12 @@ function handleSubmit(form, handler) {
 }
 function insert(form, config) {
 	const internalFormStore = form[INTERNAL];
-	const internalArrayStore = getFieldStore(internalFormStore, config.path);
+	let internalFieldStore = internalFormStore;
+	for (let index = 0; index < config.path.length; index++) {
+		internalFieldStore = internalFieldStore.children[config.path[index]];
+		if (index < config.path.length - 1) internalFieldStore.input.value = true;
+	}
+	const internalArrayStore = internalFieldStore;
 	const items = untrack(() => internalArrayStore.items.value);
 	const insertIndex = config.at === void 0 ? items.length : config.at;
 	if (insertIndex >= 0 && insertIndex <= items.length) batch(() => {
@@ -437,6 +471,7 @@ function insert(form, config) {
 			path.push(insertIndex);
 			initializeFieldStore(internalArrayStore.children[insertIndex], internalArrayStore.schema.item, config.initialInput, path);
 		} else resetItemState(internalArrayStore.children[insertIndex], config.initialInput);
+		internalArrayStore.input.value = true;
 		internalArrayStore.isTouched.value = true;
 		internalArrayStore.isDirty.value = true;
 		validateIfRequired(internalFormStore, internalArrayStore, "input");
@@ -496,17 +531,20 @@ function reset(form, config) {
 			const internalFieldStore = config?.path ? getFieldStore(internalFormStore, config.path) : internalFormStore;
 			if (config?.initialInput) setInitialFieldInput(internalFieldStore, config.initialInput);
 			walkFieldStore(internalFieldStore, (internalFieldStore$1) => {
+				internalFieldStore$1.elements = internalFieldStore$1.initialElements;
 				if (!config?.keepErrors) internalFieldStore$1.errors.value = null;
+				if (!config?.keepTouched) internalFieldStore$1.isTouched.value = false;
+				internalFieldStore$1.startInput.value = internalFieldStore$1.initialInput.value;
+				if (!config?.keepInput) internalFieldStore$1.input.value = internalFieldStore$1.initialInput.value;
 				if (internalFieldStore$1.kind === "array") {
 					internalFieldStore$1.startItems.value = internalFieldStore$1.initialItems.value;
 					if (!config?.keepInput || internalFieldStore$1.startItems.value.length === internalFieldStore$1.items.value.length) internalFieldStore$1.items.value = internalFieldStore$1.initialItems.value;
-					if (!config?.keepTouched) internalFieldStore$1.isTouched.value = false;
-					internalFieldStore$1.isDirty.value = internalFieldStore$1.startItems.value !== internalFieldStore$1.items.value;
-				} else if (internalFieldStore$1.kind === "value") {
-					internalFieldStore$1.startInput.value = internalFieldStore$1.initialInput.value;
-					if (!config?.keepInput) internalFieldStore$1.input.value = internalFieldStore$1.initialInput.value;
-					if (!config?.keepTouched) internalFieldStore$1.isTouched.value = false;
-					internalFieldStore$1.isDirty.value = internalFieldStore$1.startInput.value !== internalFieldStore$1.input.value;
+					internalFieldStore$1.isDirty.value = internalFieldStore$1.startInput.value !== internalFieldStore$1.input.value || internalFieldStore$1.startItems.value !== internalFieldStore$1.items.value;
+				} else if (internalFieldStore$1.kind === "object") internalFieldStore$1.isDirty.value = internalFieldStore$1.startInput.value !== internalFieldStore$1.input.value;
+				else {
+					const startInput = internalFieldStore$1.startInput.value;
+					const input = internalFieldStore$1.input.value;
+					internalFieldStore$1.isDirty.value = startInput !== input && (startInput !== void 0 || input !== "" && !Number.isNaN(input));
 					for (const element of internalFieldStore$1.elements) if (element.type === "file") element.value = "";
 				}
 			});
@@ -523,9 +561,8 @@ function setErrors(form, config) {
 function setInput(form, config) {
 	batch(() => {
 		const internalFormStore = form[INTERNAL];
-		const internalFieldStore = config.path ? getFieldStore(internalFormStore, config.path) : internalFormStore;
-		setFieldInput(internalFieldStore, config.input);
-		validateIfRequired(internalFormStore, internalFieldStore, "input");
+		setFieldInput(internalFormStore, config.path ?? [], config.input);
+		validateIfRequired(internalFormStore, config.path ? getFieldStore(internalFormStore, config.path) : internalFormStore, "input");
 	});
 }
 function submit(form) {
@@ -568,7 +605,8 @@ function usePathSignal(path) {
 //#region src/hooks/useField/useField.ts
 function useField(form, config) {
 	const pathSignal = usePathSignal(config.path);
-	const internalFieldStore = useComputed$(() => getFieldStore(form[INTERNAL], pathSignal.value));
+	const internalFormStore = form[INTERNAL];
+	const internalFieldStore = useComputed$(() => getFieldStore(internalFormStore, pathSignal.value));
 	useTask$(({ track, cleanup }) => {
 		track(internalFieldStore);
 		cleanup(() => {
@@ -592,17 +630,17 @@ function useField(form, config) {
 			}),
 			onFocus$: $(() => {
 				setFieldBool(internalFieldStore.value, "isTouched", true);
-				validateIfRequired(form[INTERNAL], internalFieldStore.value, "touch");
+				validateIfRequired(internalFormStore, internalFieldStore.value, "touch");
 			}),
 			onInput$: $((_, element) => {
-				setFieldInput(internalFieldStore.value, getElementInput(element, internalFieldStore.value));
-				validateIfRequired(form[INTERNAL], internalFieldStore.value, "input");
+				setFieldInput(internalFormStore, pathSignal.value, getElementInput(element, internalFieldStore.value));
+				validateIfRequired(internalFormStore, internalFieldStore.value, "input");
 			}),
 			onChange$: $(() => {
-				validateIfRequired(form[INTERNAL], internalFieldStore.value, "change");
+				validateIfRequired(internalFormStore, internalFieldStore.value, "change");
 			}),
 			onBlur$: $(() => {
-				validateIfRequired(form[INTERNAL], internalFieldStore.value, "blur");
+				validateIfRequired(internalFormStore, internalFieldStore.value, "blur");
 			})
 		}
 	}));
@@ -669,7 +707,8 @@ const useForm$ = implicit$FirstArg(useFormQrl);
 */
 const Field = component$(({ of, path, render$ }) => {
 	const field = useField(of, { path });
-	return useResolvedQrl(render$)(field);
+	const render = useResolvedQrl(render$);
+	return render(field);
 });
 
 //#endregion
@@ -679,7 +718,8 @@ const Field = component$(({ of, path, render$ }) => {
 */
 const FieldArray = component$(({ of, path, render$ }) => {
 	const field = useFieldArray(of, { path });
-	return useResolvedQrl(render$)(field);
+	const render = useResolvedQrl(render$);
+	return render(field);
 });
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formisch/qwik",
   "description": "The modular and type-safe form library for Qwik",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "license": "MIT",
   "author": "Fabian Hiller",
   "homepage": "https://formisch.dev",
@@ -49,8 +49,8 @@
     "valibot": "^1.1.0",
     "vite": "7.0.4",
     "vite-tsconfig-paths": "^5.1.4",
-    "@formisch/core": "0.3.1",
-    "@formisch/methods": "0.2.0"
+    "@formisch/core": "0.4.0",
+    "@formisch/methods": "0.3.0"
   },
   "peerDependencies": {
     "@qwik.dev/core": ">=2",