attaform 0.24.0 → 0.24.2

package/dist/shared/{attaform.CwFZGv5-.d.ts → attaform.Bx6pgrIy.d.cts}

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { G as GenericForm, u as FlatPath, O as NestedType, F as FormKey, U as UseFormConfiguration, a as AbstractSchema, D as DefaultValuesInput, af as ValidateOnConfig, b as UseFormReturnType } from './attaform.GJbSmwLB.js';
+import { G as GenericForm, u as FlatPath, O as NestedType, F as FormKey, U as UseFormConfiguration, a as AbstractSchema, ar as AcceptableDefaults, af as ValidateOnConfig, b as UseFormReturnType } from './attaform.DUc6cetN.cjs';
 
 /**
  * The shape `form.values.<key>` returns at runtime.
@@ -223,8 +223,9 @@ type PathOutput<Schema extends z.ZodType, Path extends string> = z.output<Schema
 type FormOf<Schema extends SupportedRootSchema> = z.input<Schema> extends GenericForm ? z.input<Schema> : never;
 type OutOf<Schema extends SupportedRootSchema> = z.output<Schema> extends GenericForm ? z.output<Schema> : never;
 type ReadOf<Schema extends SupportedRootSchema> = StorageShape<Schema> extends GenericForm ? StorageShape<Schema> : never;
-declare function useForm<Schema extends SupportedRootSchema, K extends FormKey = FormKey>(configuration: Omit<UseFormConfiguration<FormOf<Schema>, OutOf<Schema>, AbstractSchema<FormOf<Schema>, OutOf<Schema>>, DefaultValuesInput<FormOf<Schema>>, K>, 'schema' | 'validateOn' | 'debounceMs'> & {
+declare function useForm<Schema extends SupportedRootSchema, K extends FormKey = FormKey>(configuration: Omit<UseFormConfiguration<FormOf<Schema>, OutOf<Schema>, AbstractSchema<FormOf<Schema>, OutOf<Schema>>, never, K>, 'schema' | 'validateOn' | 'debounceMs' | 'defaultValues'> & {
     schema: Schema;
+    defaultValues?: AcceptableDefaults<FormOf<Schema>, z.input<Schema>>;
 } & ValidateOnConfig): UseFormReturnType<FormOf<Schema>, OutOf<Schema>, ReadOf<Schema>, K>;
 
 export { useForm as u };

package/dist/shared/{attaform.Df-s8j1X.mjs → attaform.C0au8oXd.mjs}

@@ -1,4 +1,5 @@
-import { shallowReactive, getCurrentInstance, inject, isRef, effectScope, watch, warn, nextTick } from 'vue';
+import { shallowReactive, getCurrentInstance, inject, effectScope, watch, warn, nextTick } from 'vue';
+import { i as isRegisterValue, a as isTransforming, S as SSR_COMPONENT_HOST_MODIFIER, R as REGISTER_OWNER_MARKER, V as V_REGISTER_MARKER } from './attaform.WvcckZMD.mjs';
 
 const __DEV__ = (typeof process !== "undefined" ? process.env.NODE_ENV : "production") !== "production";
 
@@ -259,21 +260,7 @@ function invokeArrayFns(fns, ...args) {
   }
 }
 
-const V_REGISTER_MARKER = Symbol.for("attaform:v-register-directive");
-const REGISTER_OWNER_MARKER = Symbol.for("attaform:register-owner-marker");
-function isRegisterValue(val) {
-  if (typeof val !== "object" || val === null) return false;
-  if (!("innerRef" in val)) return false;
-  if (!isRef(val.innerRef)) return false;
-  if (!("registerElement" in val)) return false;
-  if (typeof val.registerElement !== "function") return false;
-  if (!("setValueWithInternalPath" in val)) return false;
-  if (typeof val.setValueWithInternalPath !== "function") return false;
-  return true;
-}
-function isTransforming(value) {
-  return isRegisterValue(value) && value.transforming;
-}
+const INTERACTIVE_TAG_NAMES = /* @__PURE__ */ new Set(["INPUT", "SELECT", "TEXTAREA"]);
 
 const MANAGED_ARIA_ATTRS = [
   "aria-invalid",
@@ -302,36 +289,52 @@ function setAriaAttr(el, attr, value) {
   if (value === null) el.removeAttribute(attr);
   else el.setAttribute(attr, value);
 }
-function resolveAriaValue(attr, rv, ds) {
+function resolveAriaValue(attr, rv, ds, suppressRequired) {
   switch (attr) {
     case "aria-invalid":
       return ds === "error" ? "true" : null;
     case "aria-busy":
       return ds === "pending" ? "true" : null;
     case "aria-required":
-      return rv.isRequired === true ? "true" : null;
+      return rv.isRequired === true && !suppressRequired ? "true" : null;
     case "aria-describedby":
       return ds === "error" && rv.aria?.errorId !== void 0 ? rv.aria.errorId : null;
     default:
       return null;
   }
 }
-function applyAria(el, rv) {
+function suppressesRequired(rv, isCheckbox) {
+  if (!isCheckbox) return false;
+  const model = rv.innerRef.value;
+  return isArray(model) || isSet(model);
+}
+function isCheckboxInput(tagName, type) {
+  return tagName === "INPUT" && typeof type === "string" && type.toLowerCase() === "checkbox";
+}
+function applyAria(el, rv, vnode) {
   if (rv.ariaEnabled !== true || rv.ariaDisplayState === void 0) return;
+  if (!INTERACTIVE_TAG_NAMES.has(el.tagName)) return;
   const locks = el[ariaLockKey] ?? EMPTY_ARIA_LOCKS;
   const ds = rv.ariaDisplayState.value;
+  const vnodeType = vnode?.props?.["type"];
+  const checkbox = isCheckboxInput(
+    el.tagName,
+    typeof vnodeType === "string" ? vnodeType : el.type
+  );
+  const suppressRequired = suppressesRequired(rv, checkbox);
   for (const attr of MANAGED_ARIA_ATTRS) {
-    if (!locks.has(attr)) setAriaAttr(el, attr, resolveAriaValue(attr, rv, ds));
+    if (!locks.has(attr)) setAriaAttr(el, attr, resolveAriaValue(attr, rv, ds, suppressRequired));
   }
 }
 function setupAria(el, rv, vnode) {
   if (rv.ariaEnabled !== true || rv.ariaDisplayState === void 0) return;
+  if (!INTERACTIVE_TAG_NAMES.has(el.tagName)) return;
   mergeAriaLocks(el, vnode);
-  applyAria(el, rv);
+  applyAria(el, rv, vnode);
   const displayState = rv.ariaDisplayState;
   const scope = effectScope(true);
   scope.run(() => {
-    watch(displayState, () => applyAria(el, rv), { flush: "post" });
+    watch(displayState, () => applyAria(el, rv, vnode), { flush: "post" });
   });
   el[ariaScopeKey] = () => scope.stop();
 }
@@ -339,10 +342,12 @@ function getSSRAriaProps(rv, vnode) {
   if (rv.ariaEnabled !== true || rv.ariaDisplayState === void 0) return void 0;
   const props = vnode?.props ?? null;
   const ds = rv.ariaDisplayState.value;
+  const tagName = typeof vnode?.type === "string" ? vnode.type.toUpperCase() : "";
+  const suppressRequired = suppressesRequired(rv, isCheckboxInput(tagName, props?.["type"]));
   const out = {};
   for (const attr of MANAGED_ARIA_ATTRS) {
     if (props !== null && attr in props) continue;
-    const value = resolveAriaValue(attr, rv, ds);
+    const value = resolveAriaValue(attr, rv, ds, suppressRequired);
     if (value !== null) out[attr] = value;
   }
   return out;
@@ -695,8 +700,6 @@ function teardownValueSync(el) {
   delete carrier[valueSyncScopeKey];
 }
 
-const INTERACTIVE_TAG_NAMES = /* @__PURE__ */ new Set(["INPUT", "SELECT", "TEXTAREA"]);
-
 function writeLastTypedForm(rv, next) {
   rv.lastTypedForm.value = next;
 }
@@ -1212,7 +1215,7 @@ const vRegisterDynamic = {
         setupAria(ariaEl, value, vnode);
       } else {
         mergeAriaLocks(ariaEl, vnode);
-        applyAria(ariaEl, value);
+        applyAria(ariaEl, value, vnode);
       }
     }
   },
@@ -1241,7 +1244,11 @@ const vRegisterDynamic = {
     const rv = binding.value;
     if (!isRegisterValue(rv)) return void 0;
     const realVnode = vnode ?? null;
-    const ariaProps = getSSRAriaProps(rv, realVnode);
+    const isInteractiveElementVnode = realVnode !== null && typeof realVnode.type === "string" && INTERACTIVE_TAG_NAMES.has(realVnode.type.toUpperCase());
+    const modifiers = binding.modifiers;
+    const isComponentHostModifier = modifiers?.[SSR_COMPONENT_HOST_MODIFIER] === true;
+    const suppressHostAria = isComponentHostModifier || realVnode !== null && !isInteractiveElementVnode;
+    const ariaProps = suppressHostAria ? void 0 : getSSRAriaProps(rv, realVnode);
     const formStateProps = realVnode !== null ? getSSRFormStateProps(rv, realVnode) : void 0;
     if (ariaProps === void 0 && formStateProps === void 0) return void 0;
     return { ...ariaProps, ...formStateProps };
@@ -1442,5 +1449,5 @@ function pathsEqual(a, b) {
   return true;
 }
 
-export { AttaformError as A, REGISTER_OWNER_MARKER as B, kAttaformAncestorWizard as C, InvalidPathError as I, OutsideSetupError as O, ROOT_PATH as R, SubmitErrorHandlerError as S, V_REGISTER_MARKER as V, __DEV__ as _, InvalidUseFormConfigError as a, ROOT_PATH_KEY as b, RegistryNotInstalledError as c, ReservedFormKeyError as d, assignKey as e, canonicalizePath as f, createAttaform as g, createRegistry as h, getRegistryFromApp as i, isPathPrefix as j, isRegisterValue as k, kAttaformRegistry as l, kAttaformWizardActiveStepResolver as m, pathKeyToDotted as n, pathsEqual as o, parseDottedPath as p, keyForSegments as q, INTERACTIVE_TAG_NAMES as r, segmentsForPathKey as s, toError as t, useRegistry as u, vRegister as v, coerceToPathKey as w, ensureAttaformInstalled as x, kFormContext as y, kFormInstanceId as z };
-//# sourceMappingURL=attaform.Df-s8j1X.mjs.map
+export { AttaformError as A, InvalidPathError as I, OutsideSetupError as O, ROOT_PATH as R, SubmitErrorHandlerError as S, __DEV__ as _, InvalidUseFormConfigError as a, ROOT_PATH_KEY as b, RegistryNotInstalledError as c, ReservedFormKeyError as d, assignKey as e, canonicalizePath as f, createAttaform as g, createRegistry as h, getRegistryFromApp as i, isPathPrefix as j, kAttaformRegistry as k, kAttaformWizardActiveStepResolver as l, pathKeyToDotted as m, pathsEqual as n, keyForSegments as o, parseDottedPath as p, INTERACTIVE_TAG_NAMES as q, coerceToPathKey as r, segmentsForPathKey as s, toError as t, useRegistry as u, vRegister as v, ensureAttaformInstalled as w, kFormContext as x, kFormInstanceId as y, kAttaformAncestorWizard as z };
+//# sourceMappingURL=attaform.C0au8oXd.mjs.map