@aurodesignsystem-dev/auro-formkit 0.0.0-pr1503.2 → 0.0.0-pr1505.0

package/components/input/dist/index.js

@@ -4490,7 +4490,7 @@ class AuroFormValidation {
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-input') && elem.errorMessage === '') {
         const input = elem.renderRoot.querySelector('input');
 
-        if (input.validationMessage.length > 0) {
+        if (input && input.validationMessage.length > 0) {
           elem.errorMessage = input.validationMessage;
         }
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-combobox') && elem.errorMessage === '') {
@@ -10331,7 +10331,6 @@ class AuroInputUtilities {
     const maskOptions = this.getMaskOptions('date', normalizedFormat);
 
     if (!(valueObject instanceof Date) || Number.isNaN(valueObject.getTime()) || !maskOptions || typeof maskOptions.format !== 'function') {
-      console.debug('Invalid date object or mask options for formatting', { valueObject, maskOptions }); // eslint-disable-line no-console
       return undefined;
     }
 
@@ -11034,7 +11033,7 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get valueObject() {
-    return this._valueObject;
+    return this._valueObject || this._computeDateObjectFallback(this.value);
   }
 
   /**
@@ -11042,7 +11041,7 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get minObject() {
-    return this._minObject;
+    return this._minObject || this._computeDateObjectFallback(this.min);
   }
 
   /**
@@ -11050,7 +11049,31 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get maxObject() {
-    return this._maxObject;
+    return this._maxObject || this._computeDateObjectFallback(this.max);
+  }
+
+  /**
+   * Parses a date string into a Date object when the corresponding `_*Object`
+   * field hasn't been synced yet by `updated()`. Returns undefined when the
+   * input type/format isn't a full date or the string is not a valid date.
+   *
+   * Why this exists: a parent (datepicker) can call `inputN.validate()` from
+   * inside its own `updated()` before this input's `updated()` has run
+   * `syncDateValues()` — so `_valueObject`/`_maxObject` are still `undefined`
+   * and range checks would otherwise silently no-op (flipping the result to
+   * `valid` or `patternMismatch`).
+   * @private
+   * @param {string|undefined} dateStr - ISO date string from `value`/`min`/`max`.
+   * @returns {Date|undefined}
+   */
+  _computeDateObjectFallback(dateStr) {
+    if (!dateStr || !this.util || !this.util.isFullDateFormat(this.type, this.format)) {
+      return undefined;
+    }
+    if (!dateFormatter.isValidDate(dateStr)) {
+      return undefined;
+    }
+    return dateFormatter.stringToDateInstance(dateStr);
   }
 
   /**
@@ -11075,8 +11098,30 @@ class BaseInput extends AuroElement {
   connectedCallback() {
     super.connectedCallback();
 
+    // Mark for query selectors when registered under a versioned tag (e.g. inside
+    // a datepicker/combobox). Must run before parent components call validate() on
+    // their inner inputs — the validation framework matches via tag-or-attribute,
+    // and parents trigger validation during their own updated() cycle, which can
+    // precede this input's firstUpdated().
+    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
+      this.setAttribute('auro-input', '');
+    }
+
     this.locale = this.domHandler.getLocale(this);
     notifyOnLangChange(this);
+
+    // Pre-compute lengthForType and date-object fields so a parent (e.g. datepicker)
+    // calling our validate() synchronously during its own updated() cycle sees
+    // populated values. Without this, range validation silently no-ops because
+    // `max.length === lengthForType` fails when lengthForType is still undefined.
+    // Rebuild util here (constructor seeded with en-US default) so configureDataForType's
+    // locale-derived format lookup uses the actual locale just resolved above.
+    this.util = new AuroInputUtilities({
+      locale: this.locale,
+      format: this.format
+    });
+    this.configureDataForType();
+    this.syncDateValues();
   }
 
   disconnectedCallback() {
@@ -11097,8 +11142,8 @@ class BaseInput extends AuroElement {
     }
 
     // add attribute for query selectors when auro-input is registered under a custom name
-    if (this.tagName.toLowerCase() !== 'auro-input') {
-      this.setAttribute('auro-input', true);
+    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
+      this.setAttribute('auro-input', '');
     }
     this.inputId = this.id ? `${this.id}-input` : window.crypto.randomUUID();
 
@@ -11146,6 +11191,12 @@ class BaseInput extends AuroElement {
             return;
           }
 
+          // While configureAutoFormatting is running, imask's internal updateControl
+          // writes el.value to align display with the masked value. A synthetic input
+          // event from that write would re-enter handleInput → processCreditCard mid-setup
+          // and clobber a Lit value that was just pushed by the parent combobox.
+          if (component._configuringMask) return;
+
           // If all guard clauses are passed, dispatch the event
           const inputEvent = new InputEvent('input', {
             bubbles: true,
@@ -11264,7 +11315,16 @@ class BaseInput extends AuroElement {
 
       if (formattedValue !== this.inputElement.value) {
         this.skipNextProgrammaticInputEvent = true;
-        if (formattedValue) {
+        if (this.maskInstance && this.type === 'credit-card') {
+          // Route through the mask so its _value and el.value stay in lock-step
+          // (set value calls updateControl which writes el.value = displayValue).
+          // Writing el.value directly leaves the mask thinking displayValue is
+          // stale; _saveSelection on the next focus/click then warns. Scoped to
+          // credit-card so date's own formattedValue (raw ISO when calendar-invalid)
+          // isn't re-masked through the mm/dd/yyyy mask, which would truncate it
+          // and flip validity from patternMismatch to tooShort.
+          this.maskInstance.value = formattedValue || '';
+        } else if (formattedValue) {
           this.inputElement.value = formattedValue;
         } else {
           this.inputElement.value = '';
@@ -11373,58 +11433,73 @@ class BaseInput extends AuroElement {
    * @returns {void}
    */
   configureAutoFormatting() {
-    if (this.maskInstance) {
-      this.maskInstance.destroy();
-    }
-
-    // Pass new format to util
-    this.util.updateFormat(this.format);
-
-    const maskOptions = this.util.getMaskOptions(this.type, this.format);
-
-    if (this.inputElement && maskOptions.mask) {
-
-      // Stash and clear any existing value before IMask init.
-      // IMask's constructor processes the current input value which requires
-      // selection state — clearing first avoids that scenario entirely.
-      // When the format changes (e.g. locale switch) and we have a valid ISO
-      // model value, compute the display string for the NEW format instead of
-      // re-using the old display string, which may be invalid in the new mask.
-      let existingValue = this.inputElement.value;
-      if (
-        this.util.isFullDateFormat(this.type, this.format) &&
-        this.value &&
-        dateFormatter.isValidDate(this.value) &&
-        this.valueObject instanceof Date &&
-        !Number.isNaN(this.valueObject.getTime()) &&
-        typeof maskOptions.format === 'function'
-      ) {
-        existingValue = maskOptions.format(this.valueObject);
+    // Re-entrancy guard. The patched-setter's synthetic input event (suppressed
+    // by _configuringMask above) could otherwise trigger handleInput →
+    // processCreditCard → configureAutoFormatting before the outer call's
+    // set value has finished its alignCursor pass.
+    if (this._configuringMask) return;
+    this._configuringMask = true;
+    try {
+      if (this.maskInstance) {
+        this.maskInstance.destroy();
       }
 
-      this.skipNextProgrammaticInputEvent = true;
-      this.inputElement.value = '';
-
-      this.maskInstance = IMask(this.inputElement, maskOptions);
+      // Pass new format to util
+      this.util.updateFormat(this.format);
 
-      this.maskInstance.on('accept', () => {
-        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
-        if (this.type === "date") {
-          this._rawMaskValue = this.maskInstance.value;
+      const maskOptions = this.util.getMaskOptions(this.type, this.format);
+
+      if (this.inputElement && maskOptions.mask) {
+
+        // Stash and clear any existing value before IMask init.
+        // IMask's constructor processes the current input value which requires
+        // selection state — clearing first avoids that scenario entirely.
+        // When the format changes (e.g. locale switch) and we have a valid ISO
+        // model value, compute the display string for the NEW format instead of
+        // re-using the old display string, which may be invalid in the new mask.
+        let existingValue = this.inputElement.value;
+        if (
+          this.util.isFullDateFormat(this.type, this.format) &&
+          this.value &&
+          dateFormatter.isValidDate(this.value) &&
+          this.valueObject instanceof Date &&
+          !Number.isNaN(this.valueObject.getTime()) &&
+          typeof maskOptions.format === 'function'
+        ) {
+          existingValue = maskOptions.format(this.valueObject);
         }
-      });
 
-      this.maskInstance.on('complete', () => {
-        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
-        if (this.type === "date") {
-          this._rawMaskValue = this.maskInstance.value;
-        }
-      });
+        this.skipNextProgrammaticInputEvent = true;
+        this.inputElement.value = '';
+
+        this.maskInstance = IMask(this.inputElement, maskOptions);
+
+        this.maskInstance.on('accept', () => {
+          // Suppress propagation during configureAutoFormatting's own value-restoration
+          // (line below) — the mask emits 'accept' on every value-set, including ours,
+          // and we don't want to overwrite a value the parent just pushed.
+          if (this._configuringMask) return;
+          this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+          if (this.type === "date") {
+            this._rawMaskValue = this.maskInstance.value;
+          }
+        });
 
-      // Restore the stashed value through IMask so it's properly masked
-      if (existingValue) {
-        this.maskInstance.value = existingValue;
+        this.maskInstance.on('complete', () => {
+          if (this._configuringMask) return;
+          this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+          if (this.type === "date") {
+            this._rawMaskValue = this.maskInstance.value;
+          }
+        });
+
+        // Restore the stashed value through IMask so it's properly masked
+        if (existingValue) {
+          this.maskInstance.value = existingValue;
+        }
       }
+    } finally {
+      this._configuringMask = false;
     }
   }
 
@@ -11711,10 +11786,10 @@ class BaseInput extends AuroElement {
       },
       {
         name: 'Diners club',
-        regex: /^(?<num>36|38)\d{0}/u,
+        regex: /^(?<num>30[0-5]|36|38)\d{0}/u,
         formatLength: 16,
         errorMessage: CreditCardValidationMessage,
-        cardIcon: 'credit-card',
+        cardIcon: 'cc-dinersclub',
         maskFormat: "0000 000000 0000"
       },
       {
@@ -12124,7 +12199,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202606151650';
+var formkitVersion = '202606171946';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.

package/components/input/dist/registered.js

@@ -4490,7 +4490,7 @@ class AuroFormValidation {
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-input') && elem.errorMessage === '') {
         const input = elem.renderRoot.querySelector('input');
 
-        if (input.validationMessage.length > 0) {
+        if (input && input.validationMessage.length > 0) {
           elem.errorMessage = input.validationMessage;
         }
       } else if (this.runtimeUtils.elementMatch(elem, 'auro-combobox') && elem.errorMessage === '') {
@@ -10331,7 +10331,6 @@ class AuroInputUtilities {
     const maskOptions = this.getMaskOptions('date', normalizedFormat);
 
     if (!(valueObject instanceof Date) || Number.isNaN(valueObject.getTime()) || !maskOptions || typeof maskOptions.format !== 'function') {
-      console.debug('Invalid date object or mask options for formatting', { valueObject, maskOptions }); // eslint-disable-line no-console
       return undefined;
     }
 
@@ -11034,7 +11033,7 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get valueObject() {
-    return this._valueObject;
+    return this._valueObject || this._computeDateObjectFallback(this.value);
   }
 
   /**
@@ -11042,7 +11041,7 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get minObject() {
-    return this._minObject;
+    return this._minObject || this._computeDateObjectFallback(this.min);
   }
 
   /**
@@ -11050,7 +11049,31 @@ class BaseInput extends AuroElement {
    * @returns {Date|undefined}
    */
   get maxObject() {
-    return this._maxObject;
+    return this._maxObject || this._computeDateObjectFallback(this.max);
+  }
+
+  /**
+   * Parses a date string into a Date object when the corresponding `_*Object`
+   * field hasn't been synced yet by `updated()`. Returns undefined when the
+   * input type/format isn't a full date or the string is not a valid date.
+   *
+   * Why this exists: a parent (datepicker) can call `inputN.validate()` from
+   * inside its own `updated()` before this input's `updated()` has run
+   * `syncDateValues()` — so `_valueObject`/`_maxObject` are still `undefined`
+   * and range checks would otherwise silently no-op (flipping the result to
+   * `valid` or `patternMismatch`).
+   * @private
+   * @param {string|undefined} dateStr - ISO date string from `value`/`min`/`max`.
+   * @returns {Date|undefined}
+   */
+  _computeDateObjectFallback(dateStr) {
+    if (!dateStr || !this.util || !this.util.isFullDateFormat(this.type, this.format)) {
+      return undefined;
+    }
+    if (!dateFormatter.isValidDate(dateStr)) {
+      return undefined;
+    }
+    return dateFormatter.stringToDateInstance(dateStr);
   }
 
   /**
@@ -11075,8 +11098,30 @@ class BaseInput extends AuroElement {
   connectedCallback() {
     super.connectedCallback();
 
+    // Mark for query selectors when registered under a versioned tag (e.g. inside
+    // a datepicker/combobox). Must run before parent components call validate() on
+    // their inner inputs — the validation framework matches via tag-or-attribute,
+    // and parents trigger validation during their own updated() cycle, which can
+    // precede this input's firstUpdated().
+    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
+      this.setAttribute('auro-input', '');
+    }
+
     this.locale = this.domHandler.getLocale(this);
     notifyOnLangChange(this);
+
+    // Pre-compute lengthForType and date-object fields so a parent (e.g. datepicker)
+    // calling our validate() synchronously during its own updated() cycle sees
+    // populated values. Without this, range validation silently no-ops because
+    // `max.length === lengthForType` fails when lengthForType is still undefined.
+    // Rebuild util here (constructor seeded with en-US default) so configureDataForType's
+    // locale-derived format lookup uses the actual locale just resolved above.
+    this.util = new AuroInputUtilities({
+      locale: this.locale,
+      format: this.format
+    });
+    this.configureDataForType();
+    this.syncDateValues();
   }
 
   disconnectedCallback() {
@@ -11097,8 +11142,8 @@ class BaseInput extends AuroElement {
     }
 
     // add attribute for query selectors when auro-input is registered under a custom name
-    if (this.tagName.toLowerCase() !== 'auro-input') {
-      this.setAttribute('auro-input', true);
+    if (this.tagName.toLowerCase() !== 'auro-input' && !this.hasAttribute('auro-input')) {
+      this.setAttribute('auro-input', '');
     }
     this.inputId = this.id ? `${this.id}-input` : window.crypto.randomUUID();
 
@@ -11146,6 +11191,12 @@ class BaseInput extends AuroElement {
             return;
           }
 
+          // While configureAutoFormatting is running, imask's internal updateControl
+          // writes el.value to align display with the masked value. A synthetic input
+          // event from that write would re-enter handleInput → processCreditCard mid-setup
+          // and clobber a Lit value that was just pushed by the parent combobox.
+          if (component._configuringMask) return;
+
           // If all guard clauses are passed, dispatch the event
           const inputEvent = new InputEvent('input', {
             bubbles: true,
@@ -11264,7 +11315,16 @@ class BaseInput extends AuroElement {
 
       if (formattedValue !== this.inputElement.value) {
         this.skipNextProgrammaticInputEvent = true;
-        if (formattedValue) {
+        if (this.maskInstance && this.type === 'credit-card') {
+          // Route through the mask so its _value and el.value stay in lock-step
+          // (set value calls updateControl which writes el.value = displayValue).
+          // Writing el.value directly leaves the mask thinking displayValue is
+          // stale; _saveSelection on the next focus/click then warns. Scoped to
+          // credit-card so date's own formattedValue (raw ISO when calendar-invalid)
+          // isn't re-masked through the mm/dd/yyyy mask, which would truncate it
+          // and flip validity from patternMismatch to tooShort.
+          this.maskInstance.value = formattedValue || '';
+        } else if (formattedValue) {
           this.inputElement.value = formattedValue;
         } else {
           this.inputElement.value = '';
@@ -11373,58 +11433,73 @@ class BaseInput extends AuroElement {
    * @returns {void}
    */
   configureAutoFormatting() {
-    if (this.maskInstance) {
-      this.maskInstance.destroy();
-    }
-
-    // Pass new format to util
-    this.util.updateFormat(this.format);
-
-    const maskOptions = this.util.getMaskOptions(this.type, this.format);
-
-    if (this.inputElement && maskOptions.mask) {
-
-      // Stash and clear any existing value before IMask init.
-      // IMask's constructor processes the current input value which requires
-      // selection state — clearing first avoids that scenario entirely.
-      // When the format changes (e.g. locale switch) and we have a valid ISO
-      // model value, compute the display string for the NEW format instead of
-      // re-using the old display string, which may be invalid in the new mask.
-      let existingValue = this.inputElement.value;
-      if (
-        this.util.isFullDateFormat(this.type, this.format) &&
-        this.value &&
-        dateFormatter.isValidDate(this.value) &&
-        this.valueObject instanceof Date &&
-        !Number.isNaN(this.valueObject.getTime()) &&
-        typeof maskOptions.format === 'function'
-      ) {
-        existingValue = maskOptions.format(this.valueObject);
+    // Re-entrancy guard. The patched-setter's synthetic input event (suppressed
+    // by _configuringMask above) could otherwise trigger handleInput →
+    // processCreditCard → configureAutoFormatting before the outer call's
+    // set value has finished its alignCursor pass.
+    if (this._configuringMask) return;
+    this._configuringMask = true;
+    try {
+      if (this.maskInstance) {
+        this.maskInstance.destroy();
       }
 
-      this.skipNextProgrammaticInputEvent = true;
-      this.inputElement.value = '';
-
-      this.maskInstance = IMask(this.inputElement, maskOptions);
+      // Pass new format to util
+      this.util.updateFormat(this.format);
 
-      this.maskInstance.on('accept', () => {
-        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
-        if (this.type === "date") {
-          this._rawMaskValue = this.maskInstance.value;
+      const maskOptions = this.util.getMaskOptions(this.type, this.format);
+
+      if (this.inputElement && maskOptions.mask) {
+
+        // Stash and clear any existing value before IMask init.
+        // IMask's constructor processes the current input value which requires
+        // selection state — clearing first avoids that scenario entirely.
+        // When the format changes (e.g. locale switch) and we have a valid ISO
+        // model value, compute the display string for the NEW format instead of
+        // re-using the old display string, which may be invalid in the new mask.
+        let existingValue = this.inputElement.value;
+        if (
+          this.util.isFullDateFormat(this.type, this.format) &&
+          this.value &&
+          dateFormatter.isValidDate(this.value) &&
+          this.valueObject instanceof Date &&
+          !Number.isNaN(this.valueObject.getTime()) &&
+          typeof maskOptions.format === 'function'
+        ) {
+          existingValue = maskOptions.format(this.valueObject);
         }
-      });
 
-      this.maskInstance.on('complete', () => {
-        this.value = this.util.toModelValue(this.maskInstance.value, this.format);
-        if (this.type === "date") {
-          this._rawMaskValue = this.maskInstance.value;
-        }
-      });
+        this.skipNextProgrammaticInputEvent = true;
+        this.inputElement.value = '';
+
+        this.maskInstance = IMask(this.inputElement, maskOptions);
+
+        this.maskInstance.on('accept', () => {
+          // Suppress propagation during configureAutoFormatting's own value-restoration
+          // (line below) — the mask emits 'accept' on every value-set, including ours,
+          // and we don't want to overwrite a value the parent just pushed.
+          if (this._configuringMask) return;
+          this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+          if (this.type === "date") {
+            this._rawMaskValue = this.maskInstance.value;
+          }
+        });
 
-      // Restore the stashed value through IMask so it's properly masked
-      if (existingValue) {
-        this.maskInstance.value = existingValue;
+        this.maskInstance.on('complete', () => {
+          if (this._configuringMask) return;
+          this.value = this.util.toModelValue(this.maskInstance.value, this.format);
+          if (this.type === "date") {
+            this._rawMaskValue = this.maskInstance.value;
+          }
+        });
+
+        // Restore the stashed value through IMask so it's properly masked
+        if (existingValue) {
+          this.maskInstance.value = existingValue;
+        }
       }
+    } finally {
+      this._configuringMask = false;
     }
   }
 
@@ -11711,10 +11786,10 @@ class BaseInput extends AuroElement {
       },
       {
         name: 'Diners club',
-        regex: /^(?<num>36|38)\d{0}/u,
+        regex: /^(?<num>30[0-5]|36|38)\d{0}/u,
         formatLength: 16,
         errorMessage: CreditCardValidationMessage,
-        cardIcon: 'credit-card',
+        cardIcon: 'cc-dinersclub',
         maskFormat: "0000 000000 0000"
       },
       {
@@ -12124,7 +12199,7 @@ class AuroHelpText extends LitElement {
   }
 }
 
-var formkitVersion = '202606151650';
+var formkitVersion = '202606171946';
 
 // Copyright (c) 2025 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.