formstand 0.26.0 → 0.26.1

package/dist/index.js

@@ -200,10 +200,12 @@ var hasOwnSlot = (obj, path) => parsePath(path).reduce(
 ).ok;
 var writeIntoArray = (arr, index, rest, value, kindAt, prefix) => {
   const length = Math.max(arr.length, index + 1);
-  return Array.from(
-    { length },
-    (_, i) => i === index ? writeSegments(arr[i], rest, value, kindAt, [...prefix, index]) : arr[i]
-  );
+  const child = writeSegments(arr[index], rest, value, kindAt, [
+    ...prefix,
+    index
+  ]);
+  if (index < arr.length && child === arr[index]) return arr;
+  return Array.from({ length }, (_, i) => i === index ? child : arr[i]);
 };
 var refusesHugeIndex = (index) => {
   if (index > MAX_ARRAY_INDEX) {
@@ -235,10 +237,12 @@ var writeSegments = (obj, segments, value, kindAt, prefix) => {
       return obj;
     }
     const key2 = String(head);
-    return {
-      ...obj,
-      [key2]: writeSegments(obj[key2], rest, value, kindAt, [...prefix, key2])
-    };
+    const child = writeSegments(obj[key2], rest, value, kindAt, [
+      ...prefix,
+      key2
+    ]);
+    if (child === obj[key2] && Object.hasOwn(obj, key2)) return obj;
+    return { ...obj, [key2]: child };
   }
   const kind = kindAt?.(prefix.map(String).join(".")) ?? (typeof head === "number" ? "array" : "record");
   if (kind === "array") {
@@ -317,7 +321,11 @@ var unwrapForWalk = (s) => {
   if (s instanceof z.ZodDefault || s instanceof z.ZodPrefault || s instanceof z.ZodCatch || s instanceof z.ZodReadonly || s instanceof z.ZodNonOptional) {
     return s.def.innerType;
   }
-  if (s instanceof z.ZodPipe) return s.def.in;
+  if (s instanceof z.ZodPipe) {
+    const input = s.def.in;
+    return input instanceof z.ZodTransform ? s.def.out : input;
+  }
+  if (s instanceof z.ZodLazy) return s.def.getter();
   return null;
 };
 var isLeafSchema = (s) => s instanceof z.ZodString || s instanceof z.ZodNumber || s instanceof z.ZodBoolean || s instanceof z.ZodBigInt || s instanceof z.ZodDate || s instanceof z.ZodEnum || s instanceof z.ZodLiteral || s instanceof z.ZodNull || s instanceof z.ZodUndefined || s instanceof z.ZodVoid || s instanceof z.ZodNaN || s instanceof z.ZodSymbol;
@@ -383,10 +391,31 @@ var hasChecks = (s) => {
   const checks = s.def.checks;
   return checks !== void 0 && checks.length > 0;
 };
-var fieldSchemaForIntrospection = (schema, path) => {
-  const childOf = (s, segment) => {
+var optionClaims = (option, discriminator, tag) => {
+  const strip = (s) => {
     const inner = unwrapForWalk(s);
-    if (inner !== null) return childOf(inner, segment);
+    return inner === null ? s : strip(inner);
+  };
+  const node = strip(option);
+  if (!(node instanceof z.ZodObject)) return false;
+  const shape = node.shape;
+  const at = Object.hasOwn(shape, discriminator) ? shape[discriminator] : void 0;
+  if (at === void 0) return false;
+  const leaf = strip(at);
+  if (leaf instanceof z.ZodLiteral) {
+    return leaf.def.values.includes(tag);
+  }
+  if (leaf instanceof z.ZodEnum) {
+    return Object.values(leaf.def.entries).includes(
+      tag
+    );
+  }
+  return false;
+};
+var fieldSchemaForIntrospection = (schema, path, values) => {
+  const childOf = (s, segment, holder) => {
+    const inner = unwrapForWalk(s);
+    if (inner !== null) return childOf(inner, segment, holder);
     if (s instanceof z.ZodObject && typeof segment === "string") {
       const shape = s.shape;
       return Object.hasOwn(shape, segment) ? shape[segment] ?? null : null;
@@ -400,19 +429,45 @@ var fieldSchemaForIntrospection = (schema, path) => {
     if (s instanceof z.ZodRecord) {
       return s.valueType;
     }
+    if (s instanceof z.ZodIntersection) {
+      return childOf(s.def.left, segment, holder) ?? childOf(s.def.right, segment, holder);
+    }
     if (s instanceof z.ZodDiscriminatedUnion || s instanceof z.ZodUnion) {
       const options = s.def.options;
-      return options.reduce(
-        (found, option) => found ?? childOf(option, segment),
+      const discriminator = s instanceof z.ZodDiscriminatedUnion ? s.def.discriminator : null;
+      const tag = discriminator !== null && typeof holder === "object" && holder !== null ? holder[discriminator] : void 0;
+      const live = discriminator === null || tag === void 0 ? void 0 : options.find((option) => optionClaims(option, discriminator, tag));
+      const candidates = live === void 0 ? options : [live];
+      return candidates.reduce(
+        (found, option) => found ?? childOf(option, segment, holder),
         null
       );
     }
     return null;
   };
-  return parsePath(path).reduce(
-    (current, segment) => current === null ? null : childOf(current, segment),
-    schema
-  );
+  const segments = parsePath(path);
+  return segments.reduce(
+    (acc, segment) => acc.s === null ? acc : {
+      s: childOf(
+        acc.s,
+        segment,
+        values === void 0 ? void 0 : getAtPath(values, acc.prefix)
+      ),
+      prefix: acc.prefix === "" ? String(segment) : `${acc.prefix}.${String(segment)}`
+    },
+    { s: schema, prefix: "" }
+  ).s;
+};
+var schemaAcceptsUndefined = (schema) => schema instanceof z.ZodOptional || schema instanceof z.ZodDefault || schema instanceof z.ZodPrefault || schema instanceof z.ZodNullable && schemaAcceptsUndefined(schema.unwrap());
+var isObjectSchemaAt = (schema, path) => {
+  const sub = fieldSchemaForIntrospection(schema, path);
+  if (sub === null) return true;
+  const strip = (s) => {
+    const inner = unwrapForWalk(s);
+    return inner === null ? s : strip(inner);
+  };
+  const node = strip(sub);
+  return !(node instanceof z.ZodUnion || node instanceof z.ZodDiscriminatedUnion || node instanceof z.ZodRecord || node instanceof z.ZodMap || node instanceof z.ZodSet || node instanceof z.ZodArray || node instanceof z.ZodTuple || isLeafSchema(node));
 };
 var containerKindAt = (schema) => (prefix) => {
   const unwrapAll = (s) => {
@@ -532,7 +587,8 @@ var scopeParse = (result, path, viaSubschema) => {
 var pruneUnreported = (prev, full) => {
   const entries = Object.entries(prev);
   const kept = entries.filter(([k]) => Object.hasOwn(full, k));
-  return kept.length === entries.length ? prev : Object.fromEntries(kept);
+  const unchanged = kept.length === entries.length && kept.every(([k, list]) => full[k] === list);
+  return unchanged ? prev : Object.fromEntries(kept.map(([k, list]) => [k, full[k] ?? list]));
 };
 var dropEmptyLists = (map) => {
   const entries = Object.entries(map);
@@ -904,7 +960,14 @@ var createForm = (schema, options) => {
           fresh.flatMap((path) => Object.entries(errorsFor(path)))
         ),
         fresh,
-        parsed.kind === "full" ? parsed.errors : null
+        // The prune map describes the values the batch STARTED with.
+        // A skip scope (an index into an empty array) still reads as
+        // fresh after an unrelated change, so a batch can commit under
+        // changed values; pruning with the stale map then dropped
+        // errors committed elsewhere in flight (an email error landing
+        // while a wizard step with such a path validated). The prune
+        // rides only while the whole values reference held.
+        parsed.kind === "full" && live.values === valuesAtStart ? parsed.errors : null
       ),
       isValidating: omitKeys(state.isValidating, ownedKeys)
     }));
@@ -1078,12 +1141,14 @@ var createForm = (schema, options) => {
       }
     }
   };
-  if (options.validateOnMount === true) {
+  const judgeBaseline = () => {
+    if (options.validateOnMount !== true) return;
     const result = validate();
     if (result.kind === "pending") {
       void result.promise.catch(reportBackgroundFailure);
     }
-  }
+  };
+  judgeBaseline();
   return Object.freeze({
     schema,
     store,
@@ -1098,8 +1163,12 @@ var createForm = (schema, options) => {
       return store.subscribe((state) => {
         const next = snapshotField(state, path);
         if (!shallowFieldEqual(ref.current, next)) {
+          const prev = ref.current;
           ref.current = next;
-          listener(next);
+          listener(
+            next,
+            prev
+          );
         }
       });
     },
@@ -1134,10 +1203,12 @@ var createForm = (schema, options) => {
       if (Object.is(getAtPath(currentValues, path), value) && (value !== void 0 || hasOwnSlot(currentValues, path))) {
         return;
       }
+      const next = setAtPath(currentValues, path, value, kindAt);
+      if (next === currentValues) return;
       clearArrayOpsUnder(store, path);
       store.setState((state) => ({
         ...state,
-        values: setAtPath(state.values, path, value, kindAt),
+        values: next,
         ...errorChannels(state, {
           serverErrors: releaseSpine(state.serverErrors, path)
         })
@@ -1244,6 +1315,7 @@ var createForm = (schema, options) => {
         isValidating: emptyBools,
         isValidatingForm: false
       }));
+      judgeBaseline();
     },
     reset: (nextInitial, resetOptions) => {
       sequences.clear();
@@ -1268,6 +1340,7 @@ var createForm = (schema, options) => {
           isValidatingForm: false
         };
       });
+      if (resetOptions?.keepErrors !== true) judgeBaseline();
     },
     resetField: (path) => {
       const initialSlot = slotAtPath(
@@ -1362,6 +1435,7 @@ var createForm = (schema, options) => {
     },
     snapshot: () => store.getState(),
     restore: (snap) => {
+      sequences.clear();
       clearArrayOpsUnder(store, "");
       store.setState(() => {
         const schemaErrors = dropEmptyLists(snap.schemaErrors ?? emptyErrors);
@@ -1468,6 +1542,7 @@ var persistForm = (form, options) => {
   const schema = form.schema;
   const fillRequiredGaps = (draft, initial, path) => {
     if (!isPlainObject(draft) || !isPlainObject(initial)) return draft;
+    if (!isObjectSchemaAt(schema, path)) return draft;
     return Object.keys(initial).reduce(
       (acc, key) => {
         const childPath = joinPath(path, key);
@@ -1477,21 +1552,34 @@ var persistForm = (form, options) => {
         }
         if (initial[key] === void 0) return acc;
         const sub = fieldSchemaForIntrospection(schema, childPath);
-        return sub !== null && isClearableSchema(sub) ? acc : { ...acc, [key]: initial[key] };
+        return sub !== null && schemaAcceptsUndefined(sub) ? acc : { ...acc, [key]: initial[key] };
       },
       draft
     );
   };
+  const applying = { current: false };
   const applyDraft = (values) => {
     const filled = fillRequiredGaps(
       values,
       form.getState().initialValues,
       ""
     );
-    if (apply === "edit" || apply === "restore") {
-      form.setValues(filled);
-    } else {
-      form.adoptValues(filled);
+    applying.current = true;
+    try {
+      if (apply === "edit" || apply === "restore") {
+        form.setValues(filled);
+      } else {
+        form.adoptValues(filled);
+      }
+    } finally {
+      applying.current = false;
+    }
+  };
+  const isCurrent = (values) => {
+    try {
+      return JSON.stringify(values) === JSON.stringify(form.getState().values);
+    } catch {
+      return false;
     }
   };
   const referenceShape = () => {
@@ -1502,7 +1590,7 @@ var persistForm = (form, options) => {
     }
   };
   const flexibleAt = (path) => schemaAllowsKindChangeAt(schema, path);
-  const inspect = () => {
+  const inspect = (skipWhenCurrent) => {
     const raw = (() => {
       try {
         return storage === null ? null : storage.getItem(options.key);
@@ -1548,14 +1636,15 @@ var persistForm = (form, options) => {
           reason: `its shape conflicts with the form's initial values at "${conflict}" (set the version option when the schema changes)`
         };
       }
+      if (skipWhenCurrent && isCurrent(values)) return { kind: "applied" };
       applyDraft(values);
       return { kind: "applied" };
     } catch {
       return { kind: "ignored", reason: "it is not valid JSON" };
     }
   };
-  const load = () => {
-    const outcome = inspect();
+  const loadWith = (skipWhenCurrent) => {
+    const outcome = inspect(skipWhenCurrent);
     if (outcome.kind === "ignored" && isDevBuild()) {
       console.warn(
         `[formstand] persistForm: ignored the draft under "${options.key}": ${outcome.reason}. The next edit overwrites it.`
@@ -1563,6 +1652,7 @@ var persistForm = (form, options) => {
     }
     return outcome.kind === "applied";
   };
+  const load = () => loadWith(false);
   const writeDraft = (values) => {
     try {
       storage?.setItem(
@@ -1576,10 +1666,11 @@ var persistForm = (form, options) => {
   };
   const writes = createDebouncer(debounceMs);
   if (apply !== "manual") {
-    load();
+    loadWith(true);
   }
   const cleared = { current: false };
   const unsubscribe = form.watchValues((values) => {
+    if (applying.current) return;
     if (cleared.current && values === form.getState().initialValues) return;
     cleared.current = false;
     writes.schedule(() => writeDraft(values));
@@ -1608,15 +1699,27 @@ var usePersistForm = (form, options) => {
     latestOptions.current = options;
   });
   const key = options.key;
-  const storage = options.storage;
+  const hasStorage = options.storage !== void 0;
+  const storageProxy = useMemo(
+    () => ({
+      getItem: (k) => latestOptions.current.storage?.getItem(k) ?? null,
+      setItem: (k, v) => latestOptions.current.storage?.setItem(k, v),
+      removeItem: (k) => latestOptions.current.storage?.removeItem(k)
+    }),
+    []
+  );
   useEffect(() => {
-    const handle = persistForm(form, latestOptions.current);
+    const options2 = latestOptions.current;
+    const handle = persistForm(form, {
+      ...options2,
+      ...options2.storage === void 0 ? {} : { storage: storageProxy }
+    });
     inner.current = handle;
     return () => {
       inner.current = null;
       handle.dispose();
     };
-  }, [form, key, storage]);
+  }, [form, key, hasStorage, storageProxy]);
   return useMemo(
     () => ({
       load: () => inner.current?.load() ?? false,
@@ -1688,6 +1791,12 @@ var numberInputProps = (field) => ({
 });
 var dateToInputText = (value) => {
   if (value === void 0 || value === null) return "";
+  if (typeof value === "string") {
+    const text = value;
+    const parsed = parseDateText(text);
+    if (parsed.kind === "date") return dateToInputText(parsed.value);
+    if (/^\d{4}-\d{2}-\d{2}$/.test(text.trim())) return "";
+  }
   const date = value instanceof Date ? value : new Date(value);
   if (Number.isNaN(date.getTime())) return "";
   const pad = (part) => String(part).padStart(2, "0");
@@ -1788,6 +1897,15 @@ var useMaskedInput = (field, options) => {
     }
   };
 };
+var settleOnLiveValues = async (form, fields, round = 0) => {
+  const before = fields.map((path) => form.getField(path));
+  const result = await form.validateFieldsAsync(fields);
+  const changed = fields.some(
+    (path, i) => !Object.is(form.getField(path), before[i])
+  );
+  if (!changed) return result;
+  return round < 3 ? settleOnLiveValues(form, fields, round + 1) : null;
+};
 var useFormSteps = (form, steps) => {
   const [step, setStep] = useState(0);
   const [visited, setVisited] = useState(
@@ -1801,7 +1919,8 @@ var useFormSteps = (form, steps) => {
     async (index) => {
       const definition = latest.current[index];
       if (definition === void 0) return true;
-      const result = await form.validateFieldsAsync(definition.fields);
+      const result = await settleOnLiveValues(form, definition.fields);
+      if (result === null) return false;
       if (result.kind === "invalid") {
         Object.keys(result.errors).forEach((key) => {
           form.setTouched(key, true);
@@ -1813,46 +1932,49 @@ var useFormSteps = (form, steps) => {
     [form]
   );
   const currentStep = useRef(step);
-  useEffect(() => {
-    currentStep.current = step;
-  });
+  const navigate = useCallback((target) => {
+    currentStep.current = target;
+    setStep(target);
+  }, []);
   const next = useCallback(async () => {
-    const ok = await validateStep(step);
+    const from = currentStep.current;
+    const ok = await validateStep(from);
     if (!ok) return false;
-    if (currentStep.current !== step) return false;
-    const target = Math.min(step + 1, latest.current.length - 1);
-    setStep(target);
+    if (currentStep.current !== from) return false;
+    const target = Math.max(0, Math.min(from + 1, latest.current.length - 1));
+    navigate(target);
     setVisited((prev) => /* @__PURE__ */ new Set([...prev, target]));
     return true;
-  }, [validateStep, step]);
+  }, [validateStep, navigate]);
   const back = useCallback(() => {
-    setStep((prev) => Math.max(prev - 1, 0));
-  }, []);
+    navigate(Math.max(currentStep.current - 1, 0));
+  }, [navigate]);
   const goTo = useCallback(
     async (target) => {
       const count = latest.current.length;
       if (!Number.isFinite(target)) return currentStep.current;
+      const from = currentStep.current;
       const clamped = Math.max(0, Math.min(Math.trunc(target), count - 1));
-      if (clamped <= step) {
-        setStep(clamped);
+      if (clamped <= from) {
+        navigate(clamped);
         return clamped;
       }
-      const walk = async (from) => {
-        if (from >= clamped) return clamped;
-        return await validateStep(from) ? walk(from + 1) : from;
+      const walk = async (at) => {
+        if (at >= clamped) return clamped;
+        return await validateStep(at) ? walk(at + 1) : at;
       };
-      const landed = await walk(step);
-      if (currentStep.current !== step) return currentStep.current;
-      setStep(landed);
+      const landed = await walk(from);
+      if (currentStep.current !== from) return currentStep.current;
+      navigate(landed);
       setVisited(
         (prev) => /* @__PURE__ */ new Set([
           ...prev,
-          ...Array.from({ length: landed - step + 1 }, (_, i) => step + i)
+          ...Array.from({ length: landed - from + 1 }, (_, i) => from + i)
         ])
       );
       return landed;
     },
-    [validateStep, step]
+    [validateStep, navigate]
   );
   const errorFlags = useFormSelectorShallow(
     form,
@@ -1945,6 +2067,7 @@ var createFormContext = () => {
   return { Provider, useFormContext };
 };
 function useField(form, pathArg, options) {
+  const formSchema = form.schema;
   const slice = useStore(
     form.store,
     useShallow((state) => {
@@ -1960,25 +2083,26 @@ function useField(form, pathArg, options) {
         error: entryAt(state.errors, p),
         touched: flagAt(state.touched, p),
         dirty: isFieldDirty(value, initialValue2),
-        isValidating: flagAt(state.isValidating, p)
+        isValidating: flagAt(state.isValidating, p),
+        // Resolved inside the selector so a discriminant change re-reads
+        // the ACTIVE variant's wrapper for a key the variants share; the
+        // schema node is a stable reference, so the shallow compare holds.
+        schema: formSchema === void 0 ? null : fieldSchemaForIntrospection(formSchema, p, state.values)
       };
     })
   );
   const path = slice.path;
-  const formSchema = form.schema;
+  const sub = slice.schema;
   const initialValue = slice.initialValue;
   const { emptyValue, clearable } = useMemo(() => {
-    if (formSchema !== void 0) {
-      const sub = fieldSchemaForIntrospection(formSchema, path);
-      if (sub !== null) {
-        return {
-          emptyValue: emptyValueForSchema(sub),
-          clearable: isClearableSchema(sub)
-        };
-      }
+    if (sub !== null) {
+      return {
+        emptyValue: emptyValueForSchema(sub),
+        clearable: isClearableSchema(sub)
+      };
     }
     return initialValue === null ? { emptyValue: null, clearable: true } : { emptyValue: void 0, clearable: false };
-  }, [formSchema, path, initialValue]);
+  }, [sub, initialValue]);
   const debounceMs = options?.debounceMs;
   const debouncerRef = useRef(null);
   useEffect(() => {
@@ -2088,10 +2212,11 @@ function useField(form, pathArg, options) {
 }
 
 // src/react/useVariantField.ts
-function useVariantField(form, unionPath, field) {
+function useVariantField(form, unionPath, field, options) {
   return useField(
     form,
-    `${unionPath}.${field}`
+    `${unionPath}.${field}`,
+    options
   );
 }
 var EMPTY_ITEMS = [];
@@ -2254,6 +2379,12 @@ function useFieldArray(form, pathArg) {
   const items = slice.items;
   const error = slice.error;
   const ids = deriveIds(form.store, path, items).ids;
+  const validateNow = useCallback(() => {
+    const result = form.validateField?.(path);
+    if (result?.kind === "pending") {
+      void result.promise.catch(reportBackgroundFailure);
+    }
+  }, [form, path]);
   const revalidate = useCallback(() => {
     const state = form.store.getState();
     if (shouldValidateOn(
@@ -2263,9 +2394,9 @@ function useFieldArray(form, pathArg) {
       state.submitCount > 0,
       flagAt(state.touched, path)
     )) {
-      form.validateField?.(path);
+      validateNow();
     }
-  }, [form, path]);
+  }, [form, path, validateNow]);
   const push = useCallback(
     (item) => {
       form.arrayPush(path, item);
@@ -2330,13 +2461,17 @@ function useFieldArray(form, pathArg) {
       state.submitCount > 0,
       true
     )) {
-      form.validateField?.(path);
+      validateNow();
     }
-  }, [form, path]);
+  }, [form, path, validateNow]);
   const validate = useCallback(
     () => form.validateField?.(path) ?? { kind: "valid" },
     [form, path]
   );
+  const validateAsync2 = useCallback(
+    () => form.validateFieldAsync?.(path) ?? Promise.resolve({ kind: "valid" }),
+    [form, path]
+  );
   const replace = useCallback(
     (next) => {
       form.setValue?.(path, next);
@@ -2346,7 +2481,15 @@ function useFieldArray(form, pathArg) {
   );
   const update = useCallback(
     (index, item) => {
-      form.setValue?.(`${path}.${index}`, item);
+      const current = getAtPath(form.store.getState().values, path);
+      const length = Array.isArray(current) ? current.length : 0;
+      if (!Number.isInteger(index) || index < 0 || index >= length) {
+        console.warn(
+          `[formstand] array op on "${path}" with an out-of-range or non-integer index (length ${String(length)}). Operation skipped.`
+        );
+        return;
+      }
+      form.setValue?.(`${path}.${String(index)}`, item);
       revalidate();
     },
     [form, path, revalidate]
@@ -2378,6 +2521,7 @@ function useFieldArray(form, pathArg) {
       setTouched,
       onBlur,
       validate,
+      validateAsync: validateAsync2,
       push,
       remove,
       insert,
@@ -2401,6 +2545,7 @@ function useFieldArray(form, pathArg) {
       setTouched,
       onBlur,
       validate,
+      validateAsync2,
       push,
       remove,
       insert,
@@ -2428,7 +2573,7 @@ var useFormError = (form) => useStore(
 function useFormValues(form) {
   return useStore(form.store, (state) => state.values);
 }
-function useFields(form, paths) {
+function useFields(form, paths, options) {
   const [arity] = useState(paths.length);
   if (paths.length !== arity) {
     throw new Error(
@@ -2438,7 +2583,11 @@ function useFields(form, paths) {
   const fields = paths.map(
     (path) => (
       // eslint-disable-next-line react-hooks/rules-of-hooks -- a fixed hook count by the stable-arity contract above; each element must be a REAL UseFieldReturn so it spreads into the prop builders
-      useField(form, path)
+      useField(
+        form,
+        path,
+        options
+      )
     )
   );
   return useMemo(() => {
@@ -2501,10 +2650,11 @@ var capitalize = (name) => name.length === 0 ? name : name.charAt(0).toUpperCase
 var createFormHooks = (form, name) => {
   const structural = form;
   const useBoundField = (path, options) => useField(structural, path, options);
-  const useBoundVariantField = (unionPath, field) => useVariantField(
+  const useBoundVariantField = (unionPath, field, options) => useVariantField(
     structural,
     unionPath,
-    field
+    field,
+    options
   );
   const useBoundFieldArray = (path) => useFieldArray(structural, path);
   const useBoundVariantFieldArray = (unionPath, field) => useVariantFieldArray(
@@ -2520,9 +2670,10 @@ var createFormHooks = (form, name) => {
   const useBoundIsValidating = (path) => useIsValidating(structural, path);
   const useBoundIsSubmitting = () => useIsSubmitting(structural);
   const useBoundValues = () => useFormValues(structural);
-  const useBoundFields = (paths) => useFields(
+  const useBoundFields = (paths, options) => useFields(
     structural,
-    paths
+    paths,
+    options
   );
   const useBoundSubmitCount = () => useSubmitCount(structural);
   const useBoundSteps = (steps) => useFormSteps(form, steps);
@@ -2572,7 +2723,7 @@ var FieldShell = ({
   wrapLabel,
   children
 }) => /* @__PURE__ */ jsxs("div", { className: "zf-field", children: [
-  wrapLabel === true ? /* @__PURE__ */ jsxs("label", { htmlFor: id, className: "zf-label", children: [
+  wrapLabel === true && label !== void 0 ? /* @__PURE__ */ jsxs("label", { htmlFor: id, className: "zf-label", children: [
     children,
     " ",
     label