@paragrav/rhf-utils 0.61.0 → 0.62.0

package/dist/esm/relay.mjs

@@ -1,222 +1,84 @@
-import { jsx as v } from "react/jsx-runtime";
-import a from "react";
-import { c as V, i as f, a as x, u as R, b as M } from "./getFlatFieldErrors.mjs";
-import { useFormState as h } from "react-hook-form";
-const {
-  Provider: j,
-  useRequired: y
-} = V(), p = (s) => s.reduce(
-  (t, e) => ({
+import { i as o, b as a, c as m, d as u } from "./FormRelaySetter.mjs";
+import { F as x, a as M, e as D } from "./FormRelaySetter.mjs";
+import { useFormState as y } from "react-hook-form";
+import r from "react";
+const l = (t) => t.reduce(
+  (i, s) => ({
     // booleans
-    isDirty: t.isDirty || e.state.isDirty,
-    isSubmitting: t.isSubmitting || e.state.isSubmitting,
-    isLoading: t.isLoading || e.state.isLoading,
-    isSubmitted: t.isSubmitted || e.state.isSubmitted,
-    isSubmitSuccessful: t.isSubmitSuccessful || e.state.isSubmitSuccessful,
-    isValidating: t.isValidating || e.state.isValidating,
-    isValid: t.isValid || e.state.isValid,
-    isReady: t.isReady || e.state.isReady,
-    disabled: t.disabled || e.state.disabled,
+    isDirty: i.isDirty || s.isDirty,
+    isSubmitting: i.isSubmitting || s.isSubmitting,
+    isLoading: i.isLoading || s.isLoading,
+    isSubmitted: i.isSubmitted || s.isSubmitted,
+    isSubmitSuccessful: i.isSubmitSuccessful || s.isSubmitSuccessful,
+    isValidating: i.isValidating || s.isValidating,
+    isValid: i.isValid || s.isValid,
+    isReady: i.isReady || s.isReady,
+    disabled: i.disabled || s.disabled,
     // objects
-    errors: t.errors || !f(e.state.errors),
-    dirtyFields: t.dirtyFields || !f(e.state.dirtyFields),
-    touchedFields: t.touchedFields || !f(e.state.touchedFields),
-    validatingFields: t.validatingFields || !f(e.state.validatingFields),
+    hasErrors: i.hasErrors || s.errors && !o(s.errors),
+    hasDirtyFields: i.hasDirtyFields || s.dirtyFields && !o(s.dirtyFields),
+    hasTouchedFields: i.hasTouchedFields || s.touchedFields && !o(s.touchedFields),
+    hasValidatingFields: i.hasValidatingFields || s.validatingFields && !o(s.validatingFields),
     // counts
-    submitCount: t.submitCount + e.state.submitCount,
-    // composites
-    isSubmitUnsuccessful: t.isSubmitUnsuccessful || e.state.isSubmitted && !e.state.isSubmitSuccessful,
-    isMountedFlagged: t.isMountedFlagged || !!e.options?.flaggedState?.isMounted
+    submitCount: (i.submitCount ?? 0) + (s.submitCount ?? 0),
+    // supplemental
+    isMounted: i.isMounted || s.isMounted
   }),
   // initial values
   {
-    isDirty: !1,
-    isSubmitting: !1,
-    isLoading: !1,
-    isSubmitted: !1,
-    isSubmitSuccessful: !1,
-    isValidating: !1,
-    isReady: !1,
-    isValid: !1,
-    disabled: !1,
+    isDirty: void 0,
+    isSubmitting: void 0,
+    isLoading: void 0,
+    isSubmitted: void 0,
+    isSubmitSuccessful: void 0,
+    isValidating: void 0,
+    isReady: void 0,
+    isValid: void 0,
+    disabled: void 0,
     // objects
-    errors: !1,
-    dirtyFields: !1,
-    touchedFields: !1,
-    validatingFields: !1,
+    hasErrors: void 0,
+    hasDirtyFields: void 0,
+    hasTouchedFields: void 0,
+    hasValidatingFields: void 0,
     // counts
-    submitCount: 0,
-    // composites
-    isSubmitUnsuccessful: !1,
-    isMountedFlagged: !1
+    submitCount: void 0,
+    // supplemental
+    isMounted: void 0
   }
-), A = ({
-  children: s
-}) => {
-  const [t, e] = a.useState({}), o = a.useCallback(
-    (i, l, r) => {
-      if (t[l.formId]) throw new Error("Form id already exists.");
-      e((m) => ({
-        ...m,
-        [l.formId]: { state: i, utils: l, options: r }
-      }));
-    },
+), R = (t) => a().state[t], b = (t) => {
+  const i = a().state, s = g(i, t), e = l(
+    s.map(({ state: n }) => n)
+  ), d = JSON.stringify(e);
+  return r.useMemo(
+    () => e,
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  ), n = a.useCallback((i, l) => {
-    e((r) => {
-      const m = r[i];
-      if (!m) throw new Error("Form id doesn't exist");
-      return {
-        ...r,
-        [i]: { ...m, state: l }
-      };
-    });
-  }, []), u = a.useCallback((i) => {
-    e(
-      (l) => Object.fromEntries(
-        Object.entries(l).filter(([r]) => r !== i)
-      )
-    );
-  }, []), d = a.useCallback((i) => t[i], [t]), b = a.useCallback(() => {
-    const i = Object.values(t);
-    if (i.length > 1) throw new Error("More than one form.");
-    return i[0];
-  }, [t]), S = P(t), F = a.useCallback(
-    (i) => S[i],
-    [S]
-  ), c = E(t);
-  return /* @__PURE__ */ v(
-    j,
-    {
-      value: {
-        // push
-        add: o,
-        update: n,
-        remove: u,
-        // pull
-        get: d,
-        getOnly: b,
-        getGroup: F,
-        any: c
-      },
-      children: s
-    }
+    [d]
   );
-}, E = (s) => a.useMemo(
-  () => p(Object.values(s)),
-  [s]
-), P = (s) => a.useMemo(() => {
-  const t = Object.values(s).reduce(
-    (o, n) => (
-      // wrap (to flatten -- instead of distinguishing between `undefined|string|string[]`)
-      [n.options?.group].filter((u) => !!u).flat().reduce(
-        (u, d) => ({
-          ...u,
-          // existing list of states for this group PLUS this form
-          [d]: [...u[d] ?? [], n]
-        }),
-        // initial value (parent accumulator)
-        o
-      )
-    ),
-    // initial value
-    {}
-  );
-  return Object.fromEntries(
-    Object.entries(t).map(([o, n]) => [
-      // preserve key
-      o,
-      // condense states to "any" for this group
-      p(n)
-    ])
-  );
-}, [s]), w = () => y().getOnly(), q = () => y().any, J = (s) => y().get(s), N = (s) => y().getGroup(s), T = () => {
-  const s = x();
-  if (s)
-    return {
-      state: h(),
-      utils: s
-    };
-  const t = w();
-  return t && // normalize for compatibility with rhf above
-  {
-    state: t.state,
-    utils: t.utils
-  };
-}, G = (s) => {
-  const [t] = a.useState(s);
-  U(t), k();
-}, U = (s) => {
-  const t = R(), e = y(), o = C();
-  a.useEffect(
-    () => (e.add(o, t, s), () => {
-      e.remove(t.formId);
-    }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-}, k = () => {
-  const s = R(), t = y(), e = C();
-  a.useEffect(
-    // when form state changes, publish to relay context
-    () => {
-      t.update(s.formId, e);
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [e]
-  );
-}, C = () => {
-  const {
-    errors: s,
-    isDirty: t,
-    isSubmitting: e,
-    isValid: o,
-    isReady: n,
-    isSubmitted: u,
-    isSubmitSuccessful: d,
-    dirtyFields: b,
-    disabled: S,
-    isLoading: F,
-    isValidating: c,
-    submitCount: i,
-    touchedFields: l,
-    validatingFields: r,
-    defaultValues: m
-  } = h(), g = {
-    errors: s,
-    isDirty: t,
-    isSubmitting: e,
-    isValid: o,
-    isReady: n,
-    isSubmitted: u,
-    isSubmitSuccessful: d,
-    dirtyFields: b,
-    disabled: S,
-    isLoading: F,
-    isValidating: c,
-    submitCount: i,
-    touchedFields: l,
-    validatingFields: r,
-    defaultValues: m
-  }, O = JSON.stringify({
-    ...g,
-    errors: M(s)
-  });
-  return a.useMemo(
-    // when watch JSON changes, update memo
-    () => g,
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [O]
-  );
-}, W = (s) => (G(s), null);
+}, g = (t, i) => Object.values(t).filter(
+  ({ options: s, utils: e }) => (
+    // no criteria specified
+    !i || // groups specified
+    "groups" in i && i.groups.filter((d) => s.groups?.includes(d)).length || // predicate specified
+    "predicate" in i && i.predicate({
+      groups: s.groups,
+      options: e.options
+    })
+  )
+), {
+  useMaybe: F
+} = m(), f = () => {
+  if (u()) {
+    const s = y();
+    return l([s]);
+  }
+  const i = F();
+  return i ? i.state : b();
+};
 export {
-  A as FormStateRelayContextProvider,
-  W as FormStateRelayPusher,
-  q as useFormStateRelayPullAny,
-  J as useFormStateRelayPullById,
-  N as useFormStateRelayPullGroup,
-  w as useFormStateRelayPullOnlyOrThrow,
-  G as useFormStateRelayPusher,
-  T as useFormStateWithUtilsViaRhfOrRelay
+  x as FormRelayContextProvider,
+  M as FormRelaySetter,
+  f as useFirstFormStateGroup,
+  b as useFormRelayGroup,
+  R as useFormRelayId,
+  D as useFormRelaySet
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@paragrav/rhf-utils",
   "author": "paragrav.dev",
-  "version": "0.61.0",
+  "version": "0.62.0",
   "description": "Integration utilities for react-hook-form.",
   "type": "module",
   "sideEffects": false,
@@ -60,16 +60,16 @@
     }
   },
   "devDependencies": {
-    "@eslint/compat": "^2.0.1",
+    "@eslint/compat": "^2.0.2",
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.2",
-    "@playwright/experimental-ct-react": "^1.57.0",
-    "@playwright/test": "^1.57.0",
+    "@playwright/experimental-ct-react": "^1.58.2",
+    "@playwright/test": "^1.58.2",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^24.10.8",
-    "@typescript-eslint/eslint-plugin": "^8.53.0",
-    "@typescript-eslint/parser": "^8.53.0",
-    "@vitejs/plugin-react": "^5.1.2",
+    "@types/node": "^24.10.13",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
+    "@vitejs/plugin-react": "^5.1.4",
     "clean-publish": "^6.0.1",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
@@ -81,22 +81,22 @@
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.26",
+    "eslint-plugin-react-refresh": "^0.5.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^17.0.0",
-    "happy-dom": "^20.1.0",
+    "globals": "^17.3.0",
+    "happy-dom": "^20.6.1",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
-    "prettier": "^3.7.4",
-    "rollup": "^4.55.1",
+    "prettier": "^3.8.1",
+    "rollup": "^4.57.1",
     "safe-stable-stringify": "^2.5.0",
-    "terser": "^5.44.1",
+    "terser": "^5.46.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.0",
+    "typescript-eslint": "^8.55.0",
     "vite": "^7.3.1",
     "vite-plugin-dts": "^4.5.4",
-    "vite-tsconfig-paths": "^6.0.4",
-    "vitest": "^4.0.17"
+    "vite-tsconfig-paths": "^6.1.0",
+    "vitest": "^4.0.18"
   },
   "resolutions": {
     "esbuild": "^0.25.0",

package/dist/dts/form/RhfUtilsFormStateWithUtilsType.d.ts

@@ -1,7 +0,0 @@
-import { FormState } from 'react-hook-form';
-import { RhfUtilsContextProps } from './context/utils/RhfUtilsContextPropsType';
-import { SafeFieldValues } from './rhf/SafeFieldValuesType';
-export type RhfUtilsFormStateWithUtilsType<TFieldValues extends SafeFieldValues = SafeFieldValues> = {
-    state: FormState<TFieldValues>;
-    utils: RhfUtilsContextProps;
-};

package/dist/dts/form/state/relay/FormStateRelayedAggregatedType.d.ts

@@ -1,10 +0,0 @@
-import { Merge } from '../../../utils/types';
-import { FormStateRelayed } from './FormStateRelayedType';
-export type FormStateRelayedAggregated = Merge<Omit<FormStateRelayed, 'defaultValues'>, Record<Extract<keyof FormStateRelayed, 'dirtyFields' | 'touchedFields' | 'validatingFields' | 'errors'>, boolean> & {
-    /** Sum of all submit counts. */
-    submitCount: number;
-    /** Any submitted and not successful? */
-    isSubmitUnsuccessful: boolean;
-    /** Consider form flagged when mounted. (Corresponds to {@link FormStateRelayedOptions.flaggedState.isMounted}.) */
-    isMountedFlagged: boolean;
-}>;

package/dist/dts/form/state/relay/FormStateRelayedItemType.d.ts

@@ -1,11 +0,0 @@
-import { SafeFieldValues } from '../../rhf/SafeFieldValuesType';
-import { RhfUtilsFormStateWithUtilsType } from '../../RhfUtilsFormStateWithUtilsType';
-import { FormStateRelayedOptions } from './FormStateRelayedOptionsType';
-import { FormStateRelayed } from './FormStateRelayedType';
-export type FormStateRelayedItem<TFieldValues extends SafeFieldValues = SafeFieldValues> = {
-    state: FormStateRelayed<TFieldValues>;
-    options?: FormStateRelayedOptions;
-};
-export type FormStateRelayedItemWithUtils<TFieldValues extends SafeFieldValues = SafeFieldValues> = RhfUtilsFormStateWithUtilsType<TFieldValues> & {
-    options?: FormStateRelayedOptions;
-};

package/dist/dts/form/state/relay/FormStateRelayedOptionsType.d.ts

@@ -1,20 +0,0 @@
-export type FormStateRelayedOptions = {
-    /**
-     * Arbitrary group name(s) for this form.
-     *
-     * Think of it like class or category names.
-     * (e.g., "parent" or "children")
-     */
-    group?: string | string[];
-    /**
-     * Denote certain state(s) as flagged.
-     */
-    flaggedState?: {
-        /**
-         * Flag when mounted.
-         *
-         * (e.g., forms that are unmounted by default)
-         */
-        isMounted?: true;
-    };
-};

package/dist/dts/form/state/relay/FormStateRelayedType.d.ts

@@ -1,3 +0,0 @@
-import { FormState } from 'react-hook-form';
-import { SafeFieldValues } from '../../rhf/SafeFieldValuesType';
-export type FormStateRelayed<TFieldValues extends SafeFieldValues = SafeFieldValues> = FormState<TFieldValues>;

package/dist/dts/form/state/relay/pull/hooks.d.ts

@@ -1,31 +0,0 @@
-import { SafeFieldValues } from '../../../rhf/SafeFieldValuesType';
-import { RhfUtilsFormStateWithUtilsType } from '../../../RhfUtilsFormStateWithUtilsType';
-import { FormStateRelayedAggregated } from '../FormStateRelayedAggregatedType';
-import { FormStateRelayedItemWithUtils } from '../FormStateRelayedItemType';
-/**
- * Watch only form -- without worrying about ID.
- *
- * @throws If more than one form is being tracked.
- */
-export declare const useFormStateRelayPullOnlyOrThrow: () => FormStateRelayedItemWithUtils | undefined;
-/**
- * Watch all forms via {@link FormStateRelayedAggregated}.
- */
-export declare const useFormStateRelayPullAny: () => FormStateRelayedAggregated;
-/**
- * Watch single form's state.
- *
- * @param formId Watched form identifier.
- */
-export declare const useFormStateRelayPullById: (formId: string) => FormStateRelayedItemWithUtils | undefined;
-/**
- * Compute single boolean for group's form state to denote whether it's flagged via default algorithm.
- * (i.e., is dirty or submitting or submit unsuccessful or mounted flagged)
- *
- * @param group Group name to watch.
- */
-export declare const useFormStateRelayPullGroup: (group: string) => FormStateRelayedAggregated | undefined;
-/**
- * Use form state with utils either through RHF or relay.
- */
-export declare const useFormStateWithUtilsViaRhfOrRelay: <TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues>() => RhfUtilsFormStateWithUtilsType<TFieldValues> | undefined;

package/dist/dts/form/state/relay/push/FormStateRelayPusher.d.ts

@@ -1,4 +0,0 @@
-import { FormStateRelayPushOptions } from './useFormStateRelayPusher';
-type Props = FormStateRelayPushOptions;
-export declare const FormStateRelayPusher: React.FC<Props>;
-export {};

package/dist/dts/form/state/relay/push/useFormStateRelayPusher.d.ts

@@ -1,3 +0,0 @@
-import { FormStateRelayedOptions } from '../FormStateRelayedOptionsType';
-export type FormStateRelayPushOptions = FormStateRelayedOptions;
-export declare const useFormStateRelayPusher: (options?: FormStateRelayPushOptions) => void;

package/dist/dts/form/state/relay/useFormStateRelayContext.d.ts

@@ -1,20 +0,0 @@
-import { RhfUtilsContextProps } from '../../context/utils/RhfUtilsContextPropsType';
-import { FormStateRelayedAggregated } from './FormStateRelayedAggregatedType';
-import { FormStateRelayedItemWithUtils } from './FormStateRelayedItemType';
-import { FormStateRelayedOptions } from './FormStateRelayedOptionsType';
-import { FormStateRelayed } from './FormStateRelayedType';
-export type FormStateRelayContext = {
-    add: (state: FormStateRelayed, utils: RhfUtilsContextProps, options?: FormStateRelayedOptions) => void;
-    update: (id: string, state: FormStateRelayed) => void;
-    remove: (id: string) => void;
-    /**
-     * Get form state by ID.
-     *
-     * @throws Error if not found.
-     */
-    get: (id: string) => FormStateRelayedItemWithUtils | undefined;
-    getOnly: () => FormStateRelayedItemWithUtils | undefined;
-    any: FormStateRelayedAggregated;
-    getGroup: (group: string) => FormStateRelayedAggregated | undefined;
-};
-export declare const _FormStateRelayContextProvider: import('react').Provider<FormStateRelayContext | undefined>, useFormStateRelayContext: () => FormStateRelayContext;

package/dist/dts/form/state/relay/utils.d.ts

@@ -1,4 +0,0 @@
-import { FormStateRelayedAggregated } from './FormStateRelayedAggregatedType';
-import { FormStateRelayedItem } from './FormStateRelayedItemType';
-/** Condense list of form states to singular booleans. */
-export declare const getFormContextRelayReducedFormState: (forms: FormStateRelayedItem[]) => FormStateRelayedAggregated;

package/dist/esm/getFlatFieldErrors.mjs

@@ -1,55 +0,0 @@
-import a from "react";
-import { get as c } from "react-hook-form";
-import { flatten as f } from "flat";
-function d() {
-  const e = a.createContext(void 0), r = () => a.useContext(e), s = () => {
-    const t = r();
-    if (t === void 0) throw new Error();
-    return t;
-  };
-  return {
-    Provider: e.Provider,
-    useMaybe: r,
-    useRequired: s
-  };
-}
-const {
-  Provider: x,
-  useRequired: g,
-  useMaybe: E
-} = d(), h = (e) => Object.keys(e).length === 0, u = (e) => f(e), b = (e) => {
-  const r = u(e), s = Object.keys(r);
-  return Object.fromEntries(
-    s.reduce(
-      (t, n) => {
-        const o = n.replace(
-          l,
-          ""
-        );
-        if (o === n) return t;
-        const i = c(e, o, void 0);
-        return i && t.push([o, i]), t;
-      },
-      []
-      // entries
-    )
-  );
-}, l = /\.(?:type|message)\b$/, v = (e) => Object.fromEntries(
-  Object.entries(b(e)).map(([r, s]) => [
-    r,
-    {
-      type: s.type,
-      message: s.message
-      // strip out ref, etc. (avoid circular JSON error)
-    }
-  ])
-);
-export {
-  x as _,
-  E as a,
-  v as b,
-  d as c,
-  b as g,
-  h as i,
-  g as u
-};