attaform 0.20.0 → 0.20.2

package/dist/shared/{attaform.BKozEdTr.mjs → attaform.QG5TG8lB.mjs}

@@ -830,12 +830,8 @@ function syncElementRegistration(el, value, oldValue) {
   const wasRegistered = isRegisterValue(oldValue);
   const isRegistered = isRegisterValue(value);
   if (!wasRegistered && !isRegistered) return;
-  if (wasRegistered && isRegistered) {
-    const old = oldValue;
-    const next = value;
-    if (old.path === next.path && old.persistOptIns === next.persistOptIns) return;
-  }
-  if (wasRegistered) {
+  const samePathAndStore = wasRegistered && isRegistered && oldValue.path === value.path && oldValue.persistOptIns === value.persistOptIns;
+  if (wasRegistered && !samePathAndStore) {
     oldValue.deregisterElement(el);
   }
   if (isRegistered) {
@@ -859,14 +855,28 @@ function isRegisterValue(val) {
 function writeLastTypedForm(rv, next) {
   rv.lastTypedForm.value = next;
 }
-function computePersistMeta(el, registerValue) {
-  const elementId = getOrAssignElementId(el);
-  return { persist: registerValue.persistOptIns.hasOptIn(elementId, registerValue.path) };
-}
 const DEFAULT_ASSIGNER_TAG = Symbol.for("attaform:default-assigner-tag");
 function isDefaultAssigner(fn) {
   return typeof fn === "function" && fn[DEFAULT_ASSIGNER_TAG] === true;
 }
+const CONSUMER_WRAPPED_TAG = Symbol.for("attaform:consumer-wrapped-assigner");
+function isConsumerWrapped(fn) {
+  return typeof fn === "function" && fn[CONSUMER_WRAPPED_TAG] === true;
+}
+function fireAssigner(el, registerValue, value) {
+  const fn = el[assignKey];
+  if (fn === void 0) return void 0;
+  if (isDefaultAssigner(fn) || isConsumerWrapped(fn)) {
+    return fn(value);
+  }
+  if (!isRegisterValue(registerValue)) {
+    return fn(value, void 0);
+  }
+  const r = runTransforms(value, registerValue);
+  if (!r.ok) return false;
+  const coerced = applyCoerce(r.value, registerValue);
+  return fn(coerced, registerValue);
+}
 function shouldBailListener(el) {
   if (INTERACTIVE_TAG_NAMES.has(el.tagName)) return false;
   return isDefaultAssigner(el[assignKey]);
@@ -922,38 +932,39 @@ function logTransformAsync(path) {
     );
   }
 }
-const getModelAssigner = (el, vnode, registerValue) => {
+const getModelAssigner = (vnode, registerValue) => {
   const fn = vnode.props?.["onUpdate:registerValue"] ?? vnode.props?.["on:update:registerValue"];
   if (isArray(fn)) {
     const fnArr = fn.filter((x) => isFunction(x));
-    return (value) => {
+    const wrapped = (value) => {
       const r = runTransforms(value, registerValue);
       if (!r.ok) return false;
       const coerced = applyCoerce(r.value, registerValue);
       invokeArrayFns(fnArr, coerced, registerValue);
       return void 0;
     };
+    wrapped[CONSUMER_WRAPPED_TAG] = true;
+    return wrapped;
   }
   if (isFunction(fn)) {
     const handler = fn;
-    return (value) => {
+    const wrapped = (value) => {
       const r = runTransforms(value, registerValue);
       if (!r.ok) return false;
       const coerced = applyCoerce(r.value, registerValue);
       return handler(coerced, registerValue);
     };
+    wrapped[CONSUMER_WRAPPED_TAG] = true;
+    return wrapped;
   }
   const defaultAssigner = (value) => {
     if (value === void 0 && registerValue.acceptsUndefined) {
-      return registerValue.setValueWithInternalPath(
-        void 0,
-        computePersistMeta(el, registerValue)
-      );
+      return registerValue.setValueWithInternalPath(void 0);
     }
     const r = runTransforms(value, registerValue);
     if (!r.ok) return false;
     const coerced = applyCoerce(r.value, registerValue);
-    return registerValue.setValueWithInternalPath(coerced, computePersistMeta(el, registerValue));
+    return registerValue.setValueWithInternalPath(coerced);
   };
   defaultAssigner[DEFAULT_ASSIGNER_TAG] = true;
   return defaultAssigner;
@@ -976,7 +987,8 @@ function makeNoopAssigner() {
   return noop;
 }
 function setAssignFunction(el, vnode, value) {
-  if (el[assignKey] !== void 0 && !isDefaultAssigner(el[assignKey])) {
+  const current = el[assignKey];
+  if (current !== void 0 && !isDefaultAssigner(current) && !isConsumerWrapped(current)) {
     return;
   }
   if (value === void 0) {
@@ -990,11 +1002,12 @@ function setAssignFunction(el, vnode, value) {
     el[assignKey] = makeNoopAssigner();
     return;
   }
-  el[assignKey] = getModelAssigner(el, vnode, value);
+  el[assignKey] = getModelAssigner(vnode, value);
 }
 const vRegisterText = {
   created(el, { value, modifiers: { lazy, trim, number } }, vnode) {
-    const castToNumber = number === true || vnode.props?.["type"] === "number";
+    const castToNumberAtCreated = number === true || vnode.props?.["type"] === "number";
+    const liveCastToNumber = () => number === true || el.getAttribute("type") === "number";
     if (isRegisterValue(value)) {
       value.registerElement(el);
       setAssignFunction(el, vnode, value);
@@ -1004,6 +1017,7 @@ const vRegisterText = {
       const target = e.target;
       if (target === null || target.composing) return;
       noteInteraction(value);
+      const castToNumber = liveCastToNumber();
       let domValue = el.value;
       if (trim === true && lazy === true) {
         domValue = domValue.trim();
@@ -1044,7 +1058,7 @@ const vRegisterText = {
         return;
       }
       const commit = domValue === "" && isRegisterValue(value) && value.acceptsUndefined ? void 0 : domValue;
-      el[assignKey]?.(commit);
+      fireAssigner(el, value, commit);
       if (isRegisterValue(value) && isDefaultAssigner(el[assignKey])) {
         const storage = value.innerRef.value;
         if (storage !== domValue) {
@@ -1054,17 +1068,18 @@ const vRegisterText = {
         }
       }
     });
-    if (trim === true || castToNumber) {
+    if (trim === true || castToNumberAtCreated) {
       addTrackedListener(el, "change", () => {
         if (shouldBailListener(el)) return;
         let normalized = el.value;
         if (trim === true) normalized = normalized.trim();
+        const castToNumber = liveCastToNumber();
         if (castToNumber) {
           const cast = looseToNumber(normalized);
           if (typeof cast === "number" && Number.isFinite(cast)) {
             if (isRegisterValue(value)) writeLastTypedForm(value, null);
             el.value = String(cast);
-            if (lazy !== true) el[assignKey]?.(cast);
+            if (lazy !== true) fireAssigner(el, value, cast);
           } else {
             if (isRegisterValue(value)) {
               writeLastTypedForm(value, null);
@@ -1076,7 +1091,7 @@ const vRegisterText = {
         }
         el.value = typeof normalized === "number" ? String(normalized) : normalized;
         if (trim === true && lazy !== true) {
-          el[assignKey]?.(normalized);
+          fireAssigner(el, value, normalized);
         }
       });
     }
@@ -1140,7 +1155,6 @@ const vRegisterCheckbox = {
       const explicitValueRequired = true;
       const rawElementValue = getValue(el, explicitValueRequired);
       const checked = el.checked;
-      const assign = el[assignKey];
       if (isArray(modelValue)) {
         if (rawElementValue === void 0) {
           warn(
@@ -1152,11 +1166,11 @@ const vRegisterCheckbox = {
         const index = looseIndexOf(modelValue, elementValue);
         const found = index !== -1;
         if (checked && !found) {
-          assign?.(modelValue.concat(elementValue));
+          fireAssigner(el, value, modelValue.concat(elementValue));
         } else if (!checked && found) {
           const filtered = [...modelValue];
           filtered.splice(index, 1);
-          assign?.(filtered);
+          fireAssigner(el, value, filtered);
         }
       } else if (isSet(modelValue)) {
         if (rawElementValue === void 0) {
@@ -1172,9 +1186,9 @@ const vRegisterCheckbox = {
         } else {
           cloned.delete(elementValue);
         }
-        assign?.(cloned);
+        fireAssigner(el, value, cloned);
       } else {
-        assign?.(getCheckboxValue(el, checked));
+        fireAssigner(el, value, getCheckboxValue(el, checked));
       }
       if (isRegisterValue(value) && isDefaultAssigner(el[assignKey])) {
         setChecked(el, value);
@@ -1234,7 +1248,7 @@ const vRegisterRadio = {
     addTrackedListener(el, "change", () => {
       if (shouldBailListener(el)) return;
       noteInteraction(value);
-      el[assignKey]?.(getValue(el));
+      fireAssigner(el, value, getValue(el));
       if (isRegisterValue(value) && isDefaultAssigner(el[assignKey])) {
         const currentModel = value.innerRef.value;
         const target = looseEqual(currentModel, applyCoerce(getValue(el), value));
@@ -1279,12 +1293,14 @@ const vRegisterSelect = {
   created(el, { value, modifiers: { number } }, vnode) {
     if (!isRegisterValue(value)) return;
     value.registerElement(el);
-    const isSetModel = isSet(value.innerRef.value);
     addTrackedListener(el, "change", () => {
       if (shouldBailListener(el)) return;
       noteInteraction(value);
+      const isSetModel = isSet(value.innerRef.value);
       const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map((o) => number === true ? looseToNumber(getValue(o)) : getValue(o));
-      const wrote = el[assignKey]?.(
+      const wrote = fireAssigner(
+        el,
+        value,
         el.multiple ? isSetModel ? new Set(selectedVal) : selectedVal : selectedVal[0]
       );
       if (wrote !== false) {
@@ -1631,5 +1647,5 @@ function isPathPrefix(prefix, path) {
   return true;
 }
 
-export { AnonPersistError as A, parseDottedPath as B, pathKeyToDotted as C, DEFAULT_SENSITIVE_NAMES as D, segmentsForPathKey as E, FORM_ERRORS_PATH as F, useRegister as G, useRegistry as H, INTERACTIVE_TAG_NAMES as I, vRegister as J, OutsideSetupError as O, ROOT_PATH as R, SubmitErrorHandlerError as S, __DEV__ as _, AttaformError as a, FORM_ERRORS_PATH_KEY as b, InvalidPathError as c, InvalidUseFormConfigError as d, ROOT_PATH_KEY as e, RegistryNotInstalledError as f, ReservedFormKeyError as g, allowSensitivePersist as h, assignKey as i, canonicalizePath as j, captureUserCallSite as k, coerceToPathKey as l, createAttaform as m, createIsSensitivePath as n, createPersistOptInRegistry as o, createRegistry as p, ensureAttaformInstalled as q, getRegistryFromApp as r, isPathPrefix as s, isRegisterValue as t, isSensitivePath as u, kAttaformAncestorWizard as v, kAttaformRegistry as w, kAttaformWizardActiveStepResolver as x, kFormContext as y, kFormInstanceId as z };
-//# sourceMappingURL=attaform.BKozEdTr.mjs.map
+export { AnonPersistError as A, kFormInstanceId as B, parseDottedPath as C, DEFAULT_SENSITIVE_NAMES as D, pathKeyToDotted as E, FORM_ERRORS_PATH as F, segmentsForPathKey as G, useRegister as H, INTERACTIVE_TAG_NAMES as I, useRegistry as J, vRegister as K, OutsideSetupError as O, ROOT_PATH as R, SubmitErrorHandlerError as S, __DEV__ as _, AttaformError as a, FORM_ERRORS_PATH_KEY as b, InvalidPathError as c, InvalidUseFormConfigError as d, ROOT_PATH_KEY as e, RegistryNotInstalledError as f, ReservedFormKeyError as g, allowSensitivePersist as h, assignKey as i, canonicalizePath as j, captureUserCallSite as k, coerceToPathKey as l, createAttaform as m, createIsSensitivePath as n, createPersistOptInRegistry as o, createRegistry as p, ensureAttaformInstalled as q, getOrAssignElementId as r, getRegistryFromApp as s, isPathPrefix as t, isRegisterValue as u, isSensitivePath as v, kAttaformAncestorWizard as w, kAttaformRegistry as x, kAttaformWizardActiveStepResolver as y, kFormContext as z };
+//# sourceMappingURL=attaform.QG5TG8lB.mjs.map