cross-state 1.9.5 → 1.9.7

package/dist/react/index.js

@@ -1,7 +1,7 @@
-import { c as debounce, d as queue, h as autobind, m as calcDuration, n as createStore, p as isPromise, r as throttle, t as Store } from "../store-D4q5zD7q.js";
-import { a as set, c as deepEqual, i as remove, n as get, o as isObject, r as join, t as castArrayPath } from "../propAccess-BxCKNeOj.js";
-import { a as diff, i as toExtendedJsonString, n as fromExtendedJsonString } from "../extendedJson-DA3RQ_ly.js";
-import { a as useProp, c as useCache, d as useStore, f as useMemoEquals, i as useScope, l as LoadingBoundary, n as scopeMethods, o as useLatestFunction, r as ScopeProvider, s as cacheMethods, t as storeMethods, u as useLoadingBoundary } from "../storeMethods-CWeGkXoz.js";
+import { f as queue, h as autobind, l as debounce, m as isPromise, n as createStore, r as throttle, t as Store, u as calcDuration } from "../store-BmlnyYal.js";
+import { a as set, c as deepEqual, i as remove, n as get, o as isObject, r as join, t as castArrayPath } from "../propAccess-CsUaG5V_.js";
+import { a as diff, i as toExtendedJsonString, n as fromExtendedJsonString } from "../extendedJson-BOmrkRrD.js";
+import { a as useProp, c as useCache, d as useStore, f as useMemoEquals, i as useScope, l as LoadingBoundary, n as scopeMethods, o as useLatestFunction, r as ScopeProvider, s as cacheMethods, t as storeMethods, u as useLoadingBoundary } from "../storeMethods-pGlt0zfb.js";
 import { Fragment, createContext, createElement, forwardRef, startTransition, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { create } from "mutative";
@@ -29,96 +29,12 @@ function CustomInput({ name, children, ...props }) {
 	});
 }
 
-//#endregion
-//#region src/lib/wildcardMatch.ts
-function getWildCardMatches(object, path) {
-	const matches = {};
-	const [first, second, ...rest] = castArrayPath(path);
-	if (first === void 0) throw new Error("Path is empty");
-	if (!Array.isArray(object) && !isObject(object)) object = {};
-	for (const [key, value] of first !== "*" ? [[first, object[first]]] : Object.entries(object)) {
-		if (first !== "*" && first !== key) continue;
-		if (second === void 0) {
-			matches[key] = value;
-			continue;
-		}
-		for (const [subKey, subValue] of Object.entries(getWildCardMatches(value, [second, ...rest]))) matches[`${key}.${subKey}`] = subValue;
-	}
-	return matches;
-}
-
-//#endregion
-//#region src/react/form/closestFormContext.tsx
-const GeneralFormContext = createContext(null);
-function useClosestForm() {
-	return useContext(GeneralFormContext);
-}
-
-//#endregion
-//#region src/react/form/legacyFormField.tsx
-function LegacyFormField({ name = "", component, commitOnBlur, commitDebounce, inputFilter, defaultValue, serialize, deserialize = (x) => x, onChange, onBlur, ...restProps }) {
-	const form = this.useForm();
-	const getFormState = () => ({
-		...form,
-		...getDerivedState(form)
-	});
-	const [localValue, setLocalValue] = useState();
-	const value = this.useFormState((form$1) => {
-		const value$1 = form$1.getField(name).value;
-		if (serialize) return serialize(value$1, getFormState());
-		if (value$1 !== void 0) return value$1;
-		return defaultValue;
-	});
-	const setValue = useLatestFunction((x) => form.getField(name).setValue(deserialize(x, getFormState())));
-	const hasTriggeredValidations = this.useFormState((form$1) => form$1.hasTriggeredValidations);
-	const commitDebounceMs = commitDebounce !== void 0 ? calcDuration(commitDebounce) : void 0;
-	useEffect(() => {
-		if (localValue === void 0 || commitDebounceMs === void 0 || commitDebounceMs <= 0) return;
-		const timeout = setTimeout(() => {
-			setValue(localValue);
-			setLocalValue(void 0);
-		}, commitDebounceMs);
-		return () => clearTimeout(timeout);
-	}, [
-		localValue,
-		commitDebounceMs,
-		setValue
-	]);
-	let props = {
-		name,
-		value: localValue ?? value,
-		onChange: (event, ...moreArgs) => {
-			const value$1 = typeof event === "object" && event !== null && "target" in event ? event.target.value : event;
-			if (inputFilter && !inputFilter(value$1)) return;
-			if (commitOnBlur || commitDebounce) setLocalValue(value$1);
-			else setValue(value$1);
-			onChange?.(event, ...moreArgs);
-		},
-		onBlur(...args) {
-			if (localValue !== void 0) {
-				setValue(localValue);
-				setLocalValue(void 0);
-			}
-			onBlur?.(...args);
-		}
-	};
-	if (this.options.transformFieldProps) props = this.options.transformFieldProps(props, {
-		...form.getField(name),
-		hasTriggeredValidations
-	}, form);
-	if (component) return createElement(component, {
-		...restProps,
-		...props
-	});
-	return null;
-}
-
 //#endregion
 //#region src/react/form/formField.tsx
-function FormField({ name = "", commitOnBlur, commitDebounce, children, render = children, includeNestedErrors }) {
+function FormField({ name, commitOnBlur, commitDebounce, children, render = children, includeNestedErrors }) {
 	const form = this.useForm();
 	const field = this.useField(name);
-	const hasTriggeredValidations = this.useFormState((form$1) => form$1.hasTriggeredValidations);
+	const hasTriggeredValidations = this.useFormState((form) => form.hasTriggeredValidations);
 	const renderProps = useFormFieldProps.call(this, {
 		name,
 		commitOnBlur,
@@ -131,10 +47,10 @@ function FormField({ name = "", commitOnBlur, commitDebounce, children, render =
 	}, form) });
 	return null;
 }
-function useFormFieldProps({ name = "", commitOnBlur, commitDebounce, includeNestedErrors }) {
+function useFormFieldProps({ name, commitOnBlur, commitDebounce, includeNestedErrors }) {
 	const form = this.useForm();
 	const field = this.useField(name, { includeNestedErrors });
-	const hasTriggeredValidations = this.useFormState((form$1) => form$1.hasTriggeredValidations);
+	const hasTriggeredValidations = this.useFormState((form) => form.hasTriggeredValidations);
 	const [localValue, setLocalValue] = useState();
 	const commitDebounceMs = commitDebounce !== void 0 ? calcDuration(commitDebounce) : void 0;
 	const commitLocalValue = useLatestFunction(() => {
@@ -191,24 +107,24 @@ function FormForEach({ name, renderElement, renderAdditionalElement, filter, chi
 	const add = useCallback((...args) => {
 		form.getField(name).add(...args);
 	}, [form, name]);
-	const remove$1 = useCallback((key) => {
+	const remove = useCallback((key) => {
 		form.getField(name).remove(key);
 	}, [form, name]);
 	const setValue = useCallback((value) => {
 		form.getField(name).setValue(value);
 	}, [form, name]);
-	return /* @__PURE__ */ jsxs(Fragment$1, { children: [renderElement && items.map(({ key, name: name$1 }, index) => {
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [renderElement && items.map(({ key, name }, index) => {
 		return /* @__PURE__ */ jsx(Fragment, { children: renderElement({
-			name: name$1,
+			name,
 			key,
 			index,
-			remove: () => remove$1(key),
+			remove: () => remove(key),
 			count: items.length
 		}) }, key);
 	}), children?.({
 		names: items.map((item) => item.name),
 		add,
-		remove: remove$1,
+		remove,
 		setValue
 	})] });
 }
@@ -304,9 +220,93 @@ function useFormAutosave(form) {
 	};
 }
 
+//#endregion
+//#region src/lib/wildcardMatch.ts
+function getWildCardMatches(object, path) {
+	const matches = {};
+	const [first, second, ...rest] = castArrayPath(path);
+	if (first === void 0) throw new Error("Path is empty");
+	if (!Array.isArray(object) && !isObject(object)) object = {};
+	for (const [key, value] of first !== "*" ? [[first, object[first]]] : Object.entries(object)) {
+		if (first !== "*" && first !== key) continue;
+		if (second === void 0) {
+			matches[key] = value;
+			continue;
+		}
+		for (const [subKey, subValue] of Object.entries(getWildCardMatches(value, [second, ...rest]))) matches[`${key}.${subKey}`] = subValue;
+	}
+	return matches;
+}
+
+//#endregion
+//#region src/react/form/closestFormContext.tsx
+const GeneralFormContext = createContext(null);
+function useClosestForm() {
+	return useContext(GeneralFormContext);
+}
+
+//#endregion
+//#region src/react/form/legacyFormField.tsx
+function LegacyFormField({ name, component, commitOnBlur, commitDebounce, inputFilter, defaultValue, serialize, deserialize = (x) => x, onChange, onBlur, ...restProps }) {
+	const form = this.useForm();
+	const getFormState = () => ({
+		...form,
+		...getDerivedState(form)
+	});
+	const [localValue, setLocalValue] = useState();
+	const value = this.useFormState((form) => {
+		const value = form.getField(name).value;
+		if (serialize) return serialize(value, getFormState());
+		if (value !== void 0) return value;
+		return defaultValue;
+	});
+	const setValue = useLatestFunction((x) => form.getField(name).setValue(deserialize(x, getFormState())));
+	const hasTriggeredValidations = this.useFormState((form) => form.hasTriggeredValidations);
+	const commitDebounceMs = commitDebounce !== void 0 ? calcDuration(commitDebounce) : void 0;
+	useEffect(() => {
+		if (localValue === void 0 || commitDebounceMs === void 0 || commitDebounceMs <= 0) return;
+		const timeout = setTimeout(() => {
+			setValue(localValue);
+			setLocalValue(void 0);
+		}, commitDebounceMs);
+		return () => clearTimeout(timeout);
+	}, [
+		localValue,
+		commitDebounceMs,
+		setValue
+	]);
+	let props = {
+		name,
+		value: localValue ?? value,
+		onChange: (event, ...moreArgs) => {
+			const value = typeof event === "object" && event !== null && "target" in event ? event.target.value : event;
+			if (inputFilter && !inputFilter(value)) return;
+			if (commitOnBlur || commitDebounce) setLocalValue(value);
+			else setValue(value);
+			onChange?.(event, ...moreArgs);
+		},
+		onBlur(...args) {
+			if (localValue !== void 0) {
+				setValue(localValue);
+				setLocalValue(void 0);
+			}
+			onBlur?.(...args);
+		}
+	};
+	if (this.options.transformFieldProps) props = this.options.transformFieldProps(props, {
+		...form.getField(name),
+		hasTriggeredValidations
+	}, form);
+	if (component) return createElement(component, {
+		...restProps,
+		...props
+	});
+	return null;
+}
+
 //#endregion
 //#region src/react/form/form.tsx
-const FormContainer = forwardRef(function FormContainer$1({ form, ...formProps }, ref) {
+const FormContainer = forwardRef(function FormContainer({ form, ...formProps }, ref) {
 	const formInstance = form.useForm();
 	const hasTriggeredValidations = form.useFormState((state) => state.hasTriggeredValidations);
 	const hasErrors = form.useFormState((state) => hasTriggeredValidations && state.errors.size > 0);
@@ -455,7 +455,7 @@ var Form = class Form {
 	}
 	useField(name, { includeNestedErrors, ...useStoreOptions } = {}) {
 		const form = this.useForm();
-		this.useFormState((form$1) => [form$1.getField(name).value, form$1.original], useStoreOptions);
+		this.useFormState((form) => [form.getField(name).value, form.original], useStoreOptions);
 		return form.getField(name, { includeNestedErrors });
 	}
 	useFieldProps(name, options) {
@@ -471,7 +471,7 @@ var Form = class Form {
 				...defaultValue
 			},
 			validations: typeof validations === "function" ? validations : validations ? {
-				...this.options.validations,
+				...typeof this.options.validations === "function" ? void 0 : this.options.validations,
 				...validations
 			} : this.options.validations,
 			localizeError: localizeError ?? this.options.localizeError,
@@ -540,10 +540,10 @@ var Form = class Form {
 			isValid() {
 				return lazy("isValid", () => this.getErrors().size === 0);
 			},
-			validate({ reportValidity: reportValidity$1 = options.reportValidity, button } = {}) {
+			validate({ reportValidity = options.reportValidity, button } = {}) {
 				formState.set("hasTriggeredValidations", true);
 				updateValidity(this.getErrors(), button);
-				switch (reportValidity$1) {
+				switch (reportValidity) {
 					case "browser":
 						formRef.current?.reportValidity();
 						break;
@@ -568,14 +568,14 @@ var Form = class Form {
 				formState.set("hasTriggeredValidations", false);
 			}
 		};
-		context.getField = (path, options$1) => lazy(`${path}:${options$1?.includeNestedErrors}`, () => getField(context, path, options$1));
+		context.getField = (path, options) => lazy(`${path}:${options?.includeNestedErrors}`, () => getField(context, path, options));
 		useEffect(() => {
-			const transform$1 = options.transform;
-			if (!transform$1) return;
+			const transform = options.transform;
+			if (!transform) return;
 			return context.formState.subscribe((state, prev) => {
 				const value = state.draft ?? options.original ?? options.defaultValue;
 				const previousValue = prev?.draft ?? options.original ?? options.defaultValue;
-				const result = create(value, (draft) => transform$1(draft, {
+				const result = create(value, (draft) => transform(draft, {
 					...context,
 					previousValue
 				}));
@@ -627,12 +627,12 @@ var Form = class Form {
 	ForEach(props) {
 		return Reflect.apply(FormForEach, this, [props]);
 	}
-	withForm(Component$1, formProps) {
-		const { Form: Form$1 } = this;
+	withForm(Component, formProps) {
+		const { Form } = this;
 		return function FormWrapper(props) {
-			return /* @__PURE__ */ jsx(Form$1, {
+			return /* @__PURE__ */ jsx(Form, {
 				...formProps,
-				children: /* @__PURE__ */ jsx(Component$1, { ...props })
+				children: /* @__PURE__ */ jsx(Component, { ...props })
 			});
 		};
 	}
@@ -810,24 +810,24 @@ function useDecoupledState(value, onChange, options = {}) {
 	const debounceOptions = useMemoEquals(options.debounce);
 	const throttleOptions = useMemoEquals(options.throttle);
 	const update = useMemo(() => {
-		const update$1 = async (value$1) => {
-			const result = latestOnChange(value$1);
+		const update = async (value) => {
+			const result = latestOnChange(value);
 			if (isPromise(result)) {
 				const ac = onChangeAC.current = new AbortController();
 				await result;
 				if (ac.signal.aborted) return;
 			}
-			latestOnCommit(value$1);
+			latestOnCommit(value);
 			setDirty(void 0);
 		};
 		let delayedUpdate;
-		if (debounceOptions) delayedUpdate = debounce(update$1, debounceOptions);
-		else if (throttleOptions) delayedUpdate = throttle(update$1, throttleOptions);
-		else delayedUpdate = (value$1) => startTransition(() => update$1(value$1));
-		return (value$1) => {
+		if (debounceOptions) delayedUpdate = debounce(update, debounceOptions);
+		else if (throttleOptions) delayedUpdate = throttle(update, throttleOptions);
+		else delayedUpdate = (value) => startTransition(() => update(value));
+		return (value) => {
 			onChangeAC.current?.abort();
-			setDirty({ v: value$1 });
-			delayedUpdate(value$1);
+			setDirty({ v: value });
+			delayedUpdate(value);
 		};
 	}, [
 		latestOnChange,