attaform 0.20.1 → 0.20.2

package/dist/shared/{attaform.BPy-4qRx.cjs → attaform.z5j3LwJz.cjs}

@@ -832,12 +832,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) {
@@ -861,14 +857,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]);
@@ -924,38 +934,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;
@@ -978,7 +989,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) {
@@ -992,11 +1004,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);
@@ -1006,6 +1019,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();
@@ -1046,7 +1060,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) {
@@ -1056,17 +1070,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);
@@ -1078,7 +1093,7 @@ const vRegisterText = {
         }
         el.value = typeof normalized === "number" ? String(normalized) : normalized;
         if (trim === true && lazy !== true) {
-          el[assignKey]?.(normalized);
+          fireAssigner(el, value, normalized);
         }
       });
     }
@@ -1142,7 +1157,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) {
           vue.warn(
@@ -1154,11 +1168,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) {
@@ -1174,9 +1188,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);
@@ -1236,7 +1250,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));
@@ -1281,12 +1295,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) {
@@ -1658,6 +1674,7 @@ exports.createIsSensitivePath = createIsSensitivePath;
 exports.createPersistOptInRegistry = createPersistOptInRegistry;
 exports.createRegistry = createRegistry;
 exports.ensureAttaformInstalled = ensureAttaformInstalled;
+exports.getOrAssignElementId = getOrAssignElementId;
 exports.getRegistryFromApp = getRegistryFromApp;
 exports.isPathPrefix = isPathPrefix;
 exports.isRegisterValue = isRegisterValue;
@@ -1673,4 +1690,4 @@ exports.segmentsForPathKey = segmentsForPathKey;
 exports.useRegister = useRegister;
 exports.useRegistry = useRegistry;
 exports.vRegister = vRegister;
-//# sourceMappingURL=attaform.BPy-4qRx.cjs.map
+//# sourceMappingURL=attaform.z5j3LwJz.cjs.map