@formisch/qwik 0.9.6 → 0.10.1

package/README.md

@@ -28,9 +28,9 @@ const LoginSchema = v.object({
 });
 
 export default component$(() => {
-  const loginForm = useForm$({
+  const loginForm = useForm$(() => ({
     schema: LoginSchema,
-  });
+  }));
 
   return (
     <Form of={loginForm} onSubmit$={(output, event) => console.log(output)}>

package/dist/index.d.ts

@@ -1,16 +1,16 @@
 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_internal0 from "@qwik.dev/core/internal";
 
 //#region ../../packages/core/dist/index.qwik.d.ts
 
-//#region src/types/schema.d.ts
+//#region src/types/schema/schema.d.ts
 /**
 * Schema type.
 */
 type Schema = v.GenericSchema | v.GenericSchemaAsync;
 //#endregion
-//#region src/types/signal.d.ts
+//#region src/types/signal/signal.d.ts
 /**
 * Signal interface.
 */
@@ -25,13 +25,13 @@ interface Signal<T> {
 */
 
 //#endregion
-//#region src/types/field.d.ts
+//#region src/types/field/field.d.ts
 /**
 * Field element type.
 */
 type FieldElement = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
 //#endregion
-//#region src/types/field.qwik.d.ts
+//#region src/types/field/field.qwik.d.ts
 /**
 * Internal base store interface.
 */
@@ -197,7 +197,7 @@ type InternalFieldStore = InternalArrayStore | InternalObjectStore | InternalVal
 */
 declare const INTERNAL: "~internal";
 //#endregion
-//#region src/types/utils.d.ts
+//#region src/types/utils/utils.d.ts
 /**
 * Checks if a type is `any`.
 */
@@ -223,7 +223,7 @@ type DeepPartial<TValue> = TValue extends Record<PropertyKey, unknown> | readonl
 */
 type PartialValues<TValue> = TValue extends readonly (infer TItem)[] ? number extends TValue["length"] ? (TItem extends Record<PropertyKey, unknown> | readonly unknown[] ? { [TKey in keyof TItem]: PartialValues<TItem[TKey]> } : TItem)[] : { [TKey in keyof TValue]: PartialValues<TValue[TKey]> } : TValue extends Record<PropertyKey, unknown> ? { [TKey in keyof TValue]: PartialValues<TValue[TKey]> } : TValue | undefined;
 //#endregion
-//#region src/types/form.d.ts
+//#region src/types/form/form.d.ts
 /**
 * Validation mode type.
 */
@@ -237,7 +237,7 @@ type SubmitHandler<TSchema extends Schema> = (output: v.InferOutput<TSchema>) =>
 */
 type SubmitEventHandler<TSchema extends Schema> = (output: v.InferOutput<TSchema>, event: SubmitEvent) => MaybePromise<unknown>;
 //#endregion
-//#region src/types/form.qwik.d.ts
+//#region src/types/form/form.qwik.d.ts
 /**
 * Form config interface.
 */
@@ -308,7 +308,7 @@ interface BaseFormStore<TSchema extends Schema = Schema> {
   readonly [INTERNAL]: InternalFormStore<TSchema>;
 }
 //#endregion
-//#region src/types/path.d.ts
+//#region src/types/path/path.d.ts
 /**
 * Path key type.
 */
@@ -322,42 +322,88 @@ type Path = readonly PathKey[];
 */
 type RequiredPath = readonly [PathKey, ...Path];
 /**
-* Extracts the exact keys of a tuple, array or object.
+* Extracts the exact keys of a tuple, array or object. Tuples return their
+* literal numeric indices, dynamic arrays return `number`, objects return
+* their `keyof` keys, and any other input returns `never`.
 */
-type KeyOf<TValue> = IsAny<TValue> extends true ? never : TValue extends readonly unknown[] ? number extends TValue["length"] ? number : { [TKey in keyof TValue]: TKey extends `${infer TIndex extends number}` ? TIndex : never }[number] : TValue extends Record<string, unknown> ? keyof TValue & PathKey : never;
+type ExactKeysOf<TValue> = IsAny<TValue> extends true ? never : TValue extends readonly unknown[] ? number extends TValue["length"] ? number : { [TKey in keyof TValue]: TKey extends `${infer TIndex extends number}` ? TIndex : never }[number] : TValue extends Record<PropertyKey, unknown> ? keyof TValue & PathKey : never;
 /**
-* Merges array and object unions into a single object.
+* Returns the flat object of all indexable properties of `TValue`. For object
+* unions, properties from every member are merged so that any single property
+* is accessible. For primitives and other non-indexable types, the result is
+* `{}`.
 *
-* Hint: This is necessary to make any property accessible. By default,
-* properties that do not exist in all union options are not accessible
-* and result in "any" when accessed.
+* Hint: This is necessary to make properties accessible across union members.
+* By default, properties that do not exist in all union options are not
+* accessible and result in "any" when accessed.
 */
-type MergeUnion<TValue> = { [TKey in KeyOf<TValue>]: TValue extends Record<TKey, infer TItem> ? TItem : never };
+type PropertiesOf<TValue> = { [TKey in ExactKeysOf<TValue>]: TValue extends Record<TKey, infer TItem> ? TItem : never };
 /**
 * Lazily evaluates only the first valid path segment based on the given value.
 */
-type LazyPath<TValue, TPathToCheck extends Path, TValidPath extends Path = readonly []> = TPathToCheck extends readonly [] ? TValidPath : TPathToCheck extends readonly [infer TFirstKey extends KeyOf<TValue>, ...infer TPathRest extends Path] ? LazyPath<Required<MergeUnion<TValue>[TFirstKey]>, TPathRest, readonly [...TValidPath, TFirstKey]> : IsNever<KeyOf<TValue>> extends false ? readonly [...TValidPath, KeyOf<TValue>] : TValidPath;
+type LazyPath<TValue, TPathToCheck extends Path, TValidPath extends Path = readonly []> = TPathToCheck extends readonly [] ? TValidPath : TPathToCheck extends readonly [infer TFirstKey extends ExactKeysOf<TValue>, ...infer TPathRest extends Path] ? LazyPath<Required<PropertiesOf<TValue>[TFirstKey]>, TPathRest, readonly [...TValidPath, TFirstKey]> : IsNever<ExactKeysOf<TValue>> extends false ? readonly [...TValidPath, ExactKeysOf<TValue>] : TValidPath;
 /**
 * Returns the path if valid, otherwise the first possible valid path based on
 * the given value.
 */
 type ValidPath<TValue, TPath extends RequiredPath> = TPath extends LazyPath<Required<TValue>, TPath> ? TPath : LazyPath<Required<TValue>, TPath>;
 /**
+* Detects whether the consuming project is configured with
+* `exactOptionalPropertyTypes: true`.
+*
+* Hint: If `false` the built-in `Required<T>` strips `| undefined` from
+* optional properties, so `Required<{ key?: undefined }>['key']` collapses
+* to `never` — under strict mode the same expression yields `undefined`.
+*/
+type IsExactOptionalProps = Required<{
+  key?: undefined;
+}>["key"] extends never ? false : true;
+/**
+* Like the built-in `Required<T>`, but preserves `| undefined` in two
+* places where `Required<T>` strips it:
+*
+* 1. Optional property values under `exactOptionalPropertyTypes: false`
+*    — without this, input typings for `v.optional`/`v.nullish` schemas
+*    narrow incorrectly (issue #15).
+* 2. Array/tuple element types — e.g. `(string | undefined)[]` stays
+*    `(string | undefined)[]` instead of becoming `string[]`. Arrays
+*    fall through unchanged because they only have a numeric index
+*    signature and don't structurally extend `Record<PropertyKey,
+*    unknown>` (which requires string keys).
+*/
+type ExactRequired<TValue> = TValue extends Record<PropertyKey, unknown> ? IsExactOptionalProps extends true ? Required<TValue> : { [TKey in keyof Required<TValue>]: TValue[TKey] } : TValue;
+/**
 * Extracts the value type at the given path.
 */
-type PathValue<TValue, TPath extends Path> = TPath extends readonly [infer TKey, ...infer TRest extends Path] ? TKey extends KeyOf<Required<TValue>> ? PathValue<MergeUnion<Required<TValue>>[TKey], TRest> : unknown : TValue;
+type PathValue<TValue, TPath extends Path> = TPath extends readonly [infer TKey, ...infer TRest extends Path] ? TKey extends ExactKeysOf<ExactRequired<TValue>> ? PathValue<PropertiesOf<ExactRequired<TValue>>[TKey], TRest> : unknown : TValue;
 /**
-* Checks if a value is an array or contains one.
+* Checks whether a value is an array or contains one anywhere in its shape.
+*
+* Hint: The inner conditionals (`TValue extends readonly unknown[]` and
+* `TValue extends Record<PropertyKey, unknown>`) distribute over union members,
+* so the inner expression returns the union of each member's result (e.g.
+* `true | false` when some members contain arrays and others don't).
+* Downstream code uses `IsOrHasArray<T> extends true`, but
+* `boolean extends true` is `false` — so we collapse the result via
+* `true extends ...`, which is `true` whenever at least one union member
+* contributed `true`.
 */
-type IsOrHasArray<TValue> = IsAny<TValue> extends true ? false : TValue extends readonly unknown[] ? true : TValue extends Record<string, unknown> ? true extends { [TKey in keyof TValue]: IsOrHasArray<TValue[TKey]> }[keyof TValue] ? true : false : false;
+type IsOrHasArray<TValue> = true extends (IsAny<TValue> extends true ? false : TValue extends readonly unknown[] ? true : TValue extends Record<PropertyKey, unknown> ? { [TKey in keyof TValue]: IsOrHasArray<TValue[TKey]> }[keyof TValue] : false) ? true : false;
 /**
 * Extracts the exact keys of a tuple, array or object that contain arrays.
 */
-type KeyOfArrayPath<TValue> = IsAny<TValue> extends true ? never : TValue extends readonly (infer TItem)[] ? number extends TValue["length"] ? IsOrHasArray<TItem> extends true ? number : never : { [TKey in keyof TValue]: TKey extends `${infer TIndex extends number}` ? IsOrHasArray<NonNullable<TValue[TKey]>> extends true ? TIndex : never : never }[number] : TValue extends Record<string, unknown> ? { [TKey in keyof TValue]: IsOrHasArray<NonNullable<TValue[TKey]>> extends true ? TKey : never }[keyof TValue] & PathKey : never;
+type ExactKeysOfArrayPath<TValue> = IsAny<TValue> extends true ? never : TValue extends readonly (infer TItem)[] ? number extends TValue["length"] ? IsOrHasArray<TItem> extends true ? number : never : { [TKey in keyof TValue]: TKey extends `${infer TIndex extends number}` ? IsOrHasArray<NonNullable<TValue[TKey]>> extends true ? TIndex : never : never }[number] : TValue extends Record<PropertyKey, unknown> ? { [TKey in keyof TValue]: IsOrHasArray<NonNullable<TValue[TKey]>> extends true ? TKey : never }[keyof TValue] & PathKey : never;
+/**
+* Returns the flat object of indexable properties of `TValue` whose values
+* are or contain arrays. Mirrors `PropertiesOf` but keyed by
+* `ExactKeysOfArrayPath` so the lookup is provably valid for array-path
+* navigation in `LazyArrayPath`.
+*/
+type PropertiesOfArrayPath<TValue> = { [TKey in ExactKeysOfArrayPath<TValue>]: TValue extends Record<TKey, infer TItem> ? TItem : never };
 /**
 * Lazily evaluates only the first valid array path segment based on the given value.
 */
-type LazyArrayPath<TValue, TPathToCheck extends Path, TValidPath extends Path = readonly []> = TPathToCheck extends readonly [] ? TValue extends readonly unknown[] ? TValidPath : readonly [...TValidPath, KeyOfArrayPath<TValue>] : TPathToCheck extends readonly [infer TFirstKey extends KeyOfArrayPath<TValue>, ...infer TPathRest extends Path] ? LazyArrayPath<Required<MergeUnion<TValue>[TFirstKey]>, TPathRest, readonly [...TValidPath, TFirstKey]> : IsNever<KeyOfArrayPath<TValue>> extends false ? readonly [...TValidPath, KeyOfArrayPath<TValue>] : never;
+type LazyArrayPath<TValue, TPathToCheck extends Path, TValidPath extends Path = readonly []> = TPathToCheck extends readonly [] ? TValue extends readonly unknown[] ? TValidPath : readonly [...TValidPath, ExactKeysOfArrayPath<TValue>] : TPathToCheck extends readonly [infer TFirstKey extends ExactKeysOfArrayPath<TValue>, ...infer TPathRest extends Path] ? LazyArrayPath<Required<PropertiesOfArrayPath<TValue>[TFirstKey]>, TPathRest, readonly [...TValidPath, TFirstKey]> : IsNever<ExactKeysOfArrayPath<TValue>> extends false ? readonly [...TValidPath, ExactKeysOfArrayPath<TValue>] : never;
 /**
 * Returns the path if valid, otherwise the first possible valid array path
 * based on the given value.
@@ -989,7 +1035,7 @@ interface FieldProps<TSchema extends Schema = Schema, TFieldPath extends Require
  *
  * @returns The UI of the field to be rendered.
  */
-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_internal0.PublicProps<FieldProps<TSchema, TFieldPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal0.DevJSX) => JSXOutput;
 //#endregion
 //#region src/components/FieldArray/FieldArray.d.ts
 /**
@@ -1017,7 +1063,7 @@ interface FieldArrayProps<TSchema extends Schema = Schema, TFieldArrayPath exten
  *
  * @returns The UI of the field array to be rendered.
  */
-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_internal0.PublicProps<FieldArrayProps<TSchema, TFieldArrayPath>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal0.DevJSX) => JSXOutput;
 //#endregion
 //#region src/components/Form/Form.d.ts
 /**
@@ -1039,7 +1085,7 @@ type FormProps<TSchema extends Schema = Schema> = Omit<PropsOf<'form'>, 'onSubmi
  *
  * @returns The a native form element.
  */
-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_internal0.PublicProps<FormProps<TSchema>>, key: string | null, flags: number, dev?: _qwik_dev_core_internal0.DevJSX) => JSXOutput;
 //#endregion
 //#region src/hooks/useField/useField.d.ts
 /**
@@ -1086,17 +1132,19 @@ declare function useFieldArray<TSchema extends Schema, TFieldArrayPath extends R
  * Creates a reactive form store from a form configuration. The form store
  * manages form state and provides reactive properties.
  *
- * @param configQrl The QRL containing the form configuration.
+ * @param configQrl The QRL containing a function that returns the form configuration.
  *
  * @returns The form store with reactive properties.
  */
-declare function useFormQrl<TSchema extends Schema>(configQrl: QRL<FormConfig<TSchema>>): FormStore<TSchema>;
+declare function useFormQrl<TSchema extends Schema>(configQrl: QRL<() => FormConfig<TSchema>>): FormStore<TSchema>;
 /**
  * Creates a reactive form store from a form configuration. The form store
  * manages form state and provides reactive properties.
  *
+ * @param configFn A function that returns the form configuration.
+ *
  * @returns The form store with reactive properties.
  */
-declare const useForm$: <TSchema extends Schema>(qrl: FormConfig<TSchema>) => FormStore<TSchema>;
+declare const useForm$: <TSchema extends Schema>(qrl: () => FormConfig<TSchema>) => FormStore<TSchema>;
 //#endregion
 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 SubmitEventHandler, 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

@@ -86,7 +86,7 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path, nu
 			if (internalFieldStore.kind === "object") {
 				internalFieldStore.children ??= {};
 				for (const key in schema.entries) {
-					internalFieldStore.children[key] = {};
+					internalFieldStore.children[key] ??= {};
 					path.push(key);
 					initializeFieldStore(internalFieldStore.children[key], schema.entries[key], initialInput?.[key], path);
 					path.pop();
@@ -97,6 +97,7 @@ function initializeFieldStore(internalFieldStore, schema, initialInput, path, nu
 				internalFieldStore.input = createSignal(objectInput);
 			}
 		} else {
+			if (internalFieldStore.kind && internalFieldStore.kind !== "value") throw new Error(`Store initialized as "${internalFieldStore.kind}" cannot be reinitialized as "value"`);
 			internalFieldStore.kind = "value";
 			if (internalFieldStore.kind === "value") {
 				internalFieldStore.initialInput = createSignal(initialInput);
@@ -568,6 +569,7 @@ function focus(form, config) {
 function getAllErrors(form) {
 	let allErrors = null;
 	walkFieldStore(form[INTERNAL], (internalFieldStore) => {
+		if (internalFieldStore.kind === "array") internalFieldStore.items.value;
 		const errors = internalFieldStore.errors.value;
 		if (errors) if (allErrors) allErrors.push(...errors);
 		else allErrors = [...errors];
@@ -620,7 +622,15 @@ function insert(form, config) {
 		const newItems = [...items];
 		newItems.splice(insertIndex, 0, createId());
 		internalArrayStore.items.value = newItems;
-		for (let index = items.length; index > insertIndex; index--) copyItemState(internalArrayStore.children[index - 1], internalArrayStore.children[index]);
+		for (let index = items.length; index > insertIndex; index--) {
+			if (!internalArrayStore.children[index]) {
+				const path = JSON.parse(internalArrayStore.name);
+				internalArrayStore.children[index] = {};
+				path.push(index);
+				initializeFieldStore(internalArrayStore.children[index], internalArrayStore.schema.item, void 0, path);
+			}
+			copyItemState(internalArrayStore.children[index - 1], internalArrayStore.children[index]);
+		}
 		if (!internalArrayStore.children[insertIndex]) {
 			const path = JSON.parse(internalArrayStore.name);
 			internalArrayStore.children[insertIndex] = {};
@@ -705,7 +715,7 @@ function reset(form, config) {
 		untrack(() => {
 			const internalFormStore = form[INTERNAL];
 			const internalFieldStore = config?.path ? getFieldStore(internalFormStore, config.path) : internalFormStore;
-			if (config?.initialInput) setInitialFieldInput(internalFieldStore, config.initialInput);
+			if (config && "initialInput" in config) setInitialFieldInput(internalFieldStore, config.initialInput);
 			walkFieldStore(internalFieldStore, (internalFieldStore$1) => {
 				internalFieldStore$1.elements = internalFieldStore$1.initialElements;
 				if (!config?.keepErrors) internalFieldStore$1.errors.value = null;
@@ -899,12 +909,13 @@ function useResolvedQrl(qrl) {
 //#region src/hooks/useForm$/useForm$.ts
 /* @__NO_SIDE_EFFECTS__ */
 function useFormQrl(configQrl) {
-	const config = useResolvedQrl(configQrl);
+	const configFn = useResolvedQrl(configQrl);
+	const config = configFn();
 	const form = useConstant(() => {
 		const internalFormStore = createFormStore({
 			...config,
 			schema: JSON.parse(JSON.stringify(config.schema))
-		}, $(async (input) => v.safeParseAsync((await configQrl.resolve()).schema, input)));
+		}, $(async (input) => v.safeParseAsync((await configQrl.resolve())().schema, input)));
 		return {
 			[INTERNAL]: internalFormStore,
 			isSubmitting: internalFormStore.isSubmitting,
@@ -926,6 +937,8 @@ function useFormQrl(configQrl) {
 * Creates a reactive form store from a form configuration. The form store
 * manages form state and provides reactive properties.
 *
+* @param configFn A function that returns the form configuration.
+*
 * @returns The form store with reactive properties.
 */
 const useForm$ = implicit$FirstArg(useFormQrl);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formisch/qwik",
-  "description": "The modular and type-safe form library for Qwik",
-  "version": "0.9.6",
+  "description": "The lightweight, schema-first, and fully type-safe form library for Qwik",
+  "version": "0.10.1",
   "license": "MIT",
   "author": "Fabian Hiller",
   "homepage": "https://formisch.dev",