attaform 0.24.0 → 0.24.2

package/dist/shared/{attaform.DwkU0oY9.cjs → attaform.B7UdTs_o.cjs}

@@ -1,6 +1,7 @@
 'use strict';
 
 const vue = require('vue');
+const registerProtocol = require('./attaform.CjdepGnw.cjs');
 
 const __DEV__ = (typeof process !== "undefined" ? process.env.NODE_ENV : "production") !== "production";
 
@@ -261,21 +262,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 (!vue.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",
@@ -304,36 +291,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 = vue.effectScope(true);
   scope.run(() => {
-    vue.watch(displayState, () => applyAria(el, rv), { flush: "post" });
+    vue.watch(displayState, () => applyAria(el, rv, vnode), { flush: "post" });
   });
   el[ariaScopeKey] = () => scope.stop();
 }
@@ -341,10 +344,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;
@@ -400,7 +405,7 @@ function fireAssigner(el, registerValue, value) {
   if (isDefaultAssigner(fn) || isConsumerWrapped(fn)) {
     return fn(value);
   }
-  if (!isRegisterValue(registerValue)) {
+  if (!registerProtocol.isRegisterValue(registerValue)) {
     return fn(value, void 0);
   }
   return wrapWithTransforms(
@@ -568,7 +573,7 @@ function setAssignFunction(el, vnode, value) {
     el[assignKey] = makeNoopAssigner();
     return;
   }
-  if (!isRegisterValue(value)) {
+  if (!registerProtocol.isRegisterValue(value)) {
     vue.warn(
       `v-register expected a RegisterValue, got '${typeof value}'. Bind to form.register('field') \u2014 not the field's ref, value, or path string.`
     );
@@ -601,7 +606,7 @@ function readFilesFromInput(el) {
 const fileScopeKey = Symbol.for("attaform:file-scope");
 const vRegisterFile = {
   created(el, { value }, vnode) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     const input = el;
     value.registerElement(input);
     setAssignFunction(input, vnode, value);
@@ -634,10 +639,10 @@ const vRegisterFile = {
     input[fileScopeKey] = () => scope.stop();
   },
   beforeUpdate(el, { value }) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     const input = el;
     const currentRaw = value.innerRef.value;
-    if (isBlankFileValue(currentRaw) && !isTransforming(value)) {
+    if (isBlankFileValue(currentRaw) && !registerProtocol.isTransforming(value)) {
       value.setValueWithInternalPath(currentRaw, { blank: true });
       if (input.value !== "") input.value = "";
     }
@@ -649,14 +654,14 @@ const vRegisterFile = {
       stop();
       delete el[fileScopeKey];
     }
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     value.deregisterElement(el);
   }
 };
 
 function syncElementRegistration(el, value, oldValue) {
-  const wasRegistered = isRegisterValue(oldValue);
-  const isRegistered = isRegisterValue(value);
+  const wasRegistered = registerProtocol.isRegisterValue(oldValue);
+  const isRegistered = registerProtocol.isRegisterValue(value);
   if (!wasRegistered && !isRegistered) return;
   const samePathAndStore = wasRegistered && isRegistered && oldValue.path === value.path && oldValue.formKey === value.formKey;
   if (wasRegistered && !samePathAndStore) {
@@ -697,8 +702,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;
 }
@@ -725,12 +728,12 @@ const vRegisterText = {
   created(el, { value, modifiers: { lazy, trim, number } }, vnode) {
     const castToNumberAtCreated = number === true || vnode.props?.["type"] === "number";
     const liveCastToNumber = () => number === true || el.getAttribute("type") === "number";
-    if (isRegisterValue(value)) {
+    if (registerProtocol.isRegisterValue(value)) {
       value.registerElement(el);
       setAssignFunction(el, vnode, value);
     }
     el._syncFromStorage = () => {
-      if (!isRegisterValue(value)) return;
+      if (!registerProtocol.isRegisterValue(value)) return;
       const storage = value.innerRef.value;
       const display = storage == null ? "" : String(storage);
       if (el.value !== display) el.value = display;
@@ -752,7 +755,7 @@ const vRegisterText = {
           if (validity?.badInput === true) {
             return;
           }
-          if (isRegisterValue(value)) {
+          if (registerProtocol.isRegisterValue(value)) {
             writeLastTypedForm(value, null);
             value.markBlank();
           }
@@ -761,29 +764,29 @@ const vRegisterText = {
         const typedString = domValue;
         domValue = looseToNumber(domValue);
         if (typeof domValue !== "number") {
-          if (isRegisterValue(value)) {
+          if (registerProtocol.isRegisterValue(value)) {
             writeLastTypedForm(value, null);
             value.markBlank();
           }
           return;
         }
         if (!Number.isFinite(domValue)) {
-          if (isRegisterValue(value)) {
+          if (registerProtocol.isRegisterValue(value)) {
             const target2 = value.displayValue.value;
             if (el.value !== target2) el.value = target2;
           }
           return;
         }
-        if (isRegisterValue(value)) writeLastTypedForm(value, typedString);
+        if (registerProtocol.isRegisterValue(value)) writeLastTypedForm(value, typedString);
       }
-      if (domValue === "" && isRegisterValue(value) && !value.acceptsString && !value.acceptsUndefined) {
+      if (domValue === "" && registerProtocol.isRegisterValue(value) && !value.acceptsString && !value.acceptsUndefined) {
         writeLastTypedForm(value, null);
         value.markBlank();
         return;
       }
-      const commit = domValue === "" && isRegisterValue(value) && value.acceptsUndefined ? void 0 : domValue;
+      const commit = domValue === "" && registerProtocol.isRegisterValue(value) && value.acceptsUndefined ? void 0 : domValue;
       fireAssigner(el, value, commit);
-      if (isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !isTransforming(value)) {
+      if (registerProtocol.isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !registerProtocol.isTransforming(value)) {
         const storage = value.innerRef.value;
         if (storage !== domValue) {
           const display = storage == null ? "" : String(storage);
@@ -801,11 +804,11 @@ const vRegisterText = {
         if (castToNumber) {
           const cast = looseToNumber(normalized);
           if (typeof cast === "number" && Number.isFinite(cast)) {
-            if (isRegisterValue(value)) writeLastTypedForm(value, null);
+            if (registerProtocol.isRegisterValue(value)) writeLastTypedForm(value, null);
             el.value = String(cast);
             if (lazy !== true) fireAssigner(el, value, cast);
           } else {
-            if (isRegisterValue(value)) {
+            if (registerProtocol.isRegisterValue(value)) {
               writeLastTypedForm(value, null);
               value.markBlank();
             }
@@ -841,7 +844,7 @@ const vRegisterText = {
   },
   // set value on mounted so it's after min/max for type="range"
   mounted(el, { value }) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     el.value = value.displayValue.value;
     setupValueSync(
       el,
@@ -856,7 +859,7 @@ const vRegisterText = {
   beforeUpdate(el, { value, oldValue, modifiers: { lazy, trim } }, vnode) {
     setAssignFunction(el, vnode, value);
     if (el.composing === true) return;
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     const target = value.displayValue.value;
     if (el.value === target) {
       return;
@@ -878,11 +881,11 @@ const vRegisterCheckbox = {
   // #4096 array checkboxes need to be deep traversed
   deep: true,
   created(el, { value }, vnode) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     value.registerElement(el);
     setAssignFunction(el, vnode, value);
     el._syncFromStorage = () => {
-      if (!isRegisterValue(value)) return;
+      if (!registerProtocol.isRegisterValue(value)) return;
       setChecked(el, value);
       el._lastAppliedModel = value.innerRef.value;
     };
@@ -928,7 +931,7 @@ const vRegisterCheckbox = {
       } else {
         fireAssigner(el, value, getCheckboxValue(el, checked));
       }
-      if (isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !isTransforming(value)) {
+      if (registerProtocol.isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !registerProtocol.isTransforming(value)) {
         setChecked(el, value);
         el._lastAppliedModel = value.innerRef.value;
       }
@@ -937,7 +940,7 @@ const vRegisterCheckbox = {
   // set initial checked on mount to wait for true-value/false-value
   mounted(el, { value }) {
     setChecked(el, value);
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     el._lastAppliedModel = value.innerRef.value;
     setupValueSync(el, value.innerRef, () => {
       setChecked(el, value);
@@ -960,7 +963,7 @@ const vRegisterCheckbox = {
   // reference equality tracks "did the model move" exactly.
   beforeUpdate(el, binding, vnode) {
     setAssignFunction(el, vnode, binding.value);
-    if (!isRegisterValue(binding.value)) return;
+    if (!registerProtocol.isRegisterValue(binding.value)) return;
     const currentModel = binding.value.innerRef.value;
     if (el._lastAppliedModel === currentModel) return;
     setChecked(el, binding.value);
@@ -968,7 +971,7 @@ const vRegisterCheckbox = {
   }
 };
 function setChecked(el, value) {
-  if (!isRegisterValue(value)) return;
+  if (!registerProtocol.isRegisterValue(value)) return;
   const originalValue = value.innerRef.value;
   let checked;
   if (isArray(originalValue)) {
@@ -985,11 +988,11 @@ function setChecked(el, value) {
 }
 const vRegisterRadio = {
   created(el, { value }, vnode) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     value.registerElement(el);
     setAssignFunction(el, vnode, value);
     el._syncFromStorage = () => {
-      if (!isRegisterValue(value)) return;
+      if (!registerProtocol.isRegisterValue(value)) return;
       const currentModel = value.innerRef.value;
       const target = looseEqual(currentModel, applyCoerce(getValue(el), value));
       if (el.checked !== target) el.checked = target;
@@ -999,7 +1002,7 @@ const vRegisterRadio = {
       if (shouldBailListener(el)) return;
       noteInteraction(value);
       fireAssigner(el, value, getValue(el));
-      if (isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !isTransforming(value)) {
+      if (registerProtocol.isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !registerProtocol.isTransforming(value)) {
         const currentModel = value.innerRef.value;
         const target = looseEqual(currentModel, applyCoerce(getValue(el), value));
         if (el.checked !== target) el.checked = target;
@@ -1015,7 +1018,7 @@ const vRegisterRadio = {
   // model. Checkbox already uses `mounted: setChecked` for the same
   // reason.
   mounted(el, { value }) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     el.checked = looseEqual(value.innerRef.value, applyCoerce(getValue(el), value));
     el._lastAppliedModel = value.innerRef.value;
     setupValueSync(el, value.innerRef, () => {
@@ -1033,7 +1036,7 @@ const vRegisterRadio = {
   // write triggers `beforeUpdate` mid-click and writes back the
   // prior model state, clobbering the in-flight selection.
   beforeUpdate(el, { value }, vnode) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     setAssignFunction(el, vnode, value);
     const currentModel = value.innerRef.value;
     if (el._lastAppliedModel === currentModel) return;
@@ -1045,10 +1048,10 @@ const vRegisterSelect = {
   // <select multiple> value need to be deep traversed
   deep: true,
   created(el, { value, modifiers: { number } }, vnode) {
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     value.registerElement(el);
     el._syncFromStorage = () => {
-      if (!isRegisterValue(value)) return;
+      if (!registerProtocol.isRegisterValue(value)) return;
       setSelected(el, value);
       el._lastAppliedModel = value.innerRef.value;
     };
@@ -1068,7 +1071,7 @@ const vRegisterSelect = {
           el._assigning = false;
         });
       }
-      if (isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !isTransforming(value)) {
+      if (registerProtocol.isRegisterValue(value) && isDefaultAssigner(el[assignKey]) && !registerProtocol.isTransforming(value)) {
         setSelected(el, value);
         el._lastAppliedModel = value.innerRef.value;
       }
@@ -1079,7 +1082,7 @@ const vRegisterSelect = {
   // <option>s.
   mounted(el, { value }) {
     setSelected(el, value);
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     el._lastAppliedModel = value.innerRef.value;
     setupValueSync(el, value.innerRef, () => {
       if (el._assigning === true) return;
@@ -1108,7 +1111,7 @@ const vRegisterSelect = {
   // DOM is already in sync from the user's click.
   updated(el, { value }) {
     if (el._assigning === true) return;
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     const currentModel = value.innerRef.value;
     if (el._lastAppliedModel === currentModel) return;
     setSelected(el, value);
@@ -1116,7 +1119,7 @@ const vRegisterSelect = {
   }
 };
 function setSelected(el, value) {
-  if (!isRegisterValue(value)) return;
+  if (!registerProtocol.isRegisterValue(value)) return;
   const externalValue = value.innerRef.value;
   const isMultiple = el.multiple;
   const isArrayValue = isArray(externalValue);
@@ -1180,14 +1183,14 @@ const warnedUnsupportedElements = __DEV__ ? /* @__PURE__ */ new WeakSet() : null
 const vRegisterDynamic = {
   created(el, binding, vnode) {
     callModelHook(el, binding, vnode, null, "created");
-    if (isRegisterValue(binding.value)) setupAria(el, binding.value, vnode);
+    if (registerProtocol.isRegisterValue(binding.value)) setupAria(el, binding.value, vnode);
   },
   mounted(el, binding, vnode) {
     callModelHook(el, binding, vnode, null, "mounted");
     if (__DEV__ && warnedUnsupportedElements !== null && !INTERACTIVE_TAG_NAMES.has(el.tagName) && !warnedUnsupportedElements.has(el)) {
       void vue.nextTick(() => {
         if (warnedUnsupportedElements.has(el)) return;
-        const hasMarker = el[REGISTER_OWNER_MARKER] === true;
+        const hasMarker = el[registerProtocol.REGISTER_OWNER_MARKER] === true;
         const hasUserAssigner = !isDefaultAssigner(
           el[assignKey]
         );
@@ -1204,17 +1207,17 @@ const vRegisterDynamic = {
     callModelHook(el, binding, vnode, prevVNode, "beforeUpdate");
     const ariaEl = el;
     const value = binding.value;
-    if (!isRegisterValue(value) || value.ariaEnabled !== true || value.ariaDisplayState === void 0) {
+    if (!registerProtocol.isRegisterValue(value) || value.ariaEnabled !== true || value.ariaDisplayState === void 0) {
       teardownAria(ariaEl);
     } else {
       const old = binding.oldValue;
-      const pathChanged = !isRegisterValue(old) || old.path !== value.path;
+      const pathChanged = !registerProtocol.isRegisterValue(old) || old.path !== value.path;
       if (pathChanged) {
         teardownAria(ariaEl);
         setupAria(ariaEl, value, vnode);
       } else {
         mergeAriaLocks(ariaEl, vnode);
-        applyAria(ariaEl, value);
+        applyAria(ariaEl, value, vnode);
       }
     }
   },
@@ -1225,7 +1228,7 @@ const vRegisterDynamic = {
     removeTrackedListeners(el);
     teardownAria(el);
     teardownValueSync(el);
-    if (!isRegisterValue(value)) return;
+    if (!registerProtocol.isRegisterValue(value)) return;
     value.deregisterElement(el);
     delete el.composing;
     delete el._assigning;
@@ -1241,9 +1244,13 @@ const vRegisterDynamic = {
   // describedby matches the client after hydration.
   getSSRProps(binding, vnode) {
     const rv = binding.value;
-    if (!isRegisterValue(rv)) return void 0;
+    if (!registerProtocol.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?.[registerProtocol.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 };
@@ -1291,7 +1298,7 @@ function callModelHook(el, binding, vnode, prevVNode, hook) {
   fn?.(el, binding, vnode, prevVNode);
 }
 const vRegister = vRegisterDynamic;
-vRegisterDynamic[V_REGISTER_MARKER] = true;
+vRegisterDynamic[registerProtocol.V_REGISTER_MARKER] = true;
 
 function installAttaformOnApp(app, options, source) {
   if (app._attaform !== void 0) {
@@ -1449,13 +1456,11 @@ exports.INTERACTIVE_TAG_NAMES = INTERACTIVE_TAG_NAMES;
 exports.InvalidPathError = InvalidPathError;
 exports.InvalidUseFormConfigError = InvalidUseFormConfigError;
 exports.OutsideSetupError = OutsideSetupError;
-exports.REGISTER_OWNER_MARKER = REGISTER_OWNER_MARKER;
 exports.ROOT_PATH = ROOT_PATH;
 exports.ROOT_PATH_KEY = ROOT_PATH_KEY;
 exports.RegistryNotInstalledError = RegistryNotInstalledError;
 exports.ReservedFormKeyError = ReservedFormKeyError;
 exports.SubmitErrorHandlerError = SubmitErrorHandlerError;
-exports.V_REGISTER_MARKER = V_REGISTER_MARKER;
 exports.__DEV__ = __DEV__;
 exports.assignKey = assignKey;
 exports.canonicalizePath = canonicalizePath;
@@ -1465,7 +1470,6 @@ exports.createRegistry = createRegistry;
 exports.ensureAttaformInstalled = ensureAttaformInstalled;
 exports.getRegistryFromApp = getRegistryFromApp;
 exports.isPathPrefix = isPathPrefix;
-exports.isRegisterValue = isRegisterValue;
 exports.kAttaformAncestorWizard = kAttaformAncestorWizard;
 exports.kAttaformRegistry = kAttaformRegistry;
 exports.kAttaformWizardActiveStepResolver = kAttaformWizardActiveStepResolver;
@@ -1479,4 +1483,4 @@ exports.segmentsForPathKey = segmentsForPathKey;
 exports.toError = toError;
 exports.useRegistry = useRegistry;
 exports.vRegister = vRegister;
-//# sourceMappingURL=attaform.DwkU0oY9.cjs.map
+//# sourceMappingURL=attaform.B7UdTs_o.cjs.map