@samline/forms 2.3.0 → 2.3.2

package/dist/index.js

@@ -255,6 +255,7 @@ var applyFormat = async (state2, helpers, config) => {
   const formatOptions = config.options;
   const fieldNames = resolveFieldNames(config);
   const bucket = getRegistry(state2);
+  const phase1Entries = [];
   for (const fieldName of fieldNames) {
     const displayName = config.displayField ?? `${fieldName}_displayed`;
     const canonicalFields = helpers.getFieldsByName(fieldName);
@@ -279,28 +280,31 @@ var applyFormat = async (state2, helpers, config) => {
         displayName,
         mirrorIsOwned
       });
+      phase1Entries.push(existing);
     } else {
-      bucket.set(fieldName, {
+      const entry = {
         canonicalName: fieldName,
         displayName,
         visible,
         mirror,
         mirrorIsOwned,
         handler: UNBOUND
-      });
+      };
+      bucket.set(fieldName, entry);
       state2.formattedFields.set(fieldName, {
         config,
         displayName,
         mirrorIsOwned
       });
+      phase1Entries.push(entry);
     }
   }
   const formatter = await loadFormatter();
   if (!formatter) {
-    rollbackPhase1(bucket, state2.formattedFields);
+    rollbackPhase1(phase1Entries, bucket, state2.formattedFields);
     return;
   }
-  for (const [, entry] of bucket) {
+  for (const entry of phase1Entries) {
     if (entry.handler !== UNBOUND) {
       const current = entry.visible.value;
       if (current !== "") {
@@ -327,16 +331,16 @@ var applyFormat = async (state2, helpers, config) => {
     }
   }
 };
-var rollbackPhase1 = (bucket, registry2) => {
-  for (const [fieldName, entry] of bucket) {
+var rollbackPhase1 = (entries, bucket, registry2) => {
+  for (const entry of entries) {
     if (entry.visible.isConnected) {
-      restoreVisibleName(entry.visible, fieldName);
+      restoreVisibleName(entry.visible, entry.canonicalName);
     }
     if (entry.mirrorIsOwned && entry.mirror.isConnected) {
       entry.mirror.remove();
     }
-    bucket.delete(fieldName);
-    registry2.delete(fieldName);
+    bucket.delete(entry.canonicalName);
+    registry2.delete(entry.canonicalName);
   }
 };
 var createFormat = (state2, helpers) => (config) => {
@@ -354,6 +358,15 @@ var resolveCanonicalForName = (state2, name) => {
   }
   return null;
 };
+var resolveDisplayNameForName = (state2, name) => {
+  const bucket = registry.get(state2);
+  if (!bucket) return name;
+  for (const [canonical, entry] of bucket) {
+    if (canonical === name) return entry.displayName;
+    if (entry.displayName === name) return entry.displayName;
+  }
+  return name;
+};
 var cleanupFormatRegistry = (state2) => {
   if (!state2.element) {
     registry.delete(state2);
@@ -954,10 +967,11 @@ var createFormController = (target, options = {}) => {
     if (!name) return;
     clearFieldCache();
     const canonical = resolveCanonicalForName(state2, name) ?? name;
+    const displayName = resolveDisplayNameForName(state2, name);
     if (normalizedOptions.clearManualErrorsOnChange) {
       delete state2.manualErrors[canonical];
     }
-    syncVisualState([canonical]);
+    syncVisualState([displayName]);
     if (state2.isValidated && state2.validators[canonical]) {
       validateNames([canonical]);
     }