@aemforms/af-formatters 0.22.91 → 0.22.92

package/esm/afb-formatters.js

@@ -347,136 +347,99 @@ function formatDate(dateValue, language, skeleton, timeZone) {
     return parts.map(p => p[1]).join('');
 }
 function parseDate(dateString, language, skeleton, timeZone, bUseUTC = false) {
-    try {
-        if (skeleton.startsWith('date|')) {
-            skeleton = skeleton.split('|')[1];
+    if (skeleton.startsWith('date|')) {
+        skeleton = skeleton.split('|')[1];
+    }
+    const lookups = [];
+    const regexParts = [];
+    const calendar = calendarName(language);
+    const digits = digitChars(language);
+    const twoDigit = `([${digits[0]}-${digits[9]}]{1,2})`;
+    const threeDigit = `([${digits[0]}-${digits[9]}]{1,3})`;
+    const fourDigit = `([${digits[0]}-${digits[9]}]{1,4})`;
+    let hourCycle = 'h12';
+    let _bUseUTC = bUseUTC;
+    let _setFullYear = false;
+    const monthNumber = str => getNumber(str) - 1;
+    const getNumber = str => str.split('').reduce((total, digit) => (total * 10) + digits.indexOf(digit), 0);
+    const yearNumber = templateDigits => str => {
+        let year = getNumber(str);
+        year = year < 100 && templateDigits === 2 ? year + 2000 : year;
+        if (calendar === 'islamic') year = Math.ceil(year * 0.97 + 622);
+        if (templateDigits > 2 && year < 100) {
+            _setFullYear = true;
         }
-        const lookups = [];
-        const regexParts = [];
-        const calendar = calendarName(language);
-        const digits = digitChars(language);
-        const twoDigit = `\\b([${digits[0]}-${digits[9]}]{1,2})\\b`;
-        const threeDigit = `\\b([${digits[0]}-${digits[9]}]{1,3})\\b`;
-        const fourDigit = `\\b([${digits[0]}-${digits[9]}]{1,4})\\b`;
-        let hourCycle = 'h12';
-        let _bUseUTC = bUseUTC;
-        let _setFullYear = false;
-        const isSeparator = str => str.length === 1 && ':-/.'.includes(str);
-        const monthNumber = str => getNumber(str) - 1;
-        const getNumber = str => str.split('').reduce((total, digit) => (total * 10) + digits.indexOf(digit), 0);
-        const yearNumber = templateDigits => str => {
-            let year = getNumber(str);
-            year = year < 100 && templateDigits === 2 ? year + 2000 : year;
-            if (calendar === 'islamic') year = Math.ceil(year * 0.97 + 622);
-            if (templateDigits > 2 && year < 100) {
-                _setFullYear = true;
-            }
-            return year;
-        };
-        const monthLookup = list => month => list.indexOf(month);
-        const parsed = parseDateTimeSkeleton(skeleton, language);
-        const months = monthNames(language, Object.fromEntries(parsed));
-        parsed.forEach(([option, value, len]) => {
-            if (option === 'literal') {
-                if (value === '/') {
-                    regexParts.push('/');
-                } else if (value === '-') {
-                    regexParts.push('-');
-                } else if (value === ':') {
-                    regexParts.push(':');
-                } else if (isSeparator(value)) {
-                    regexParts.push(`[^${digits[0]}-${digits[9]}]`);
-                } else {
-                    regexParts.push(value);
-                }
-            } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
-                regexParts.push(twoDigit);
-                lookups.push(['month', monthNumber]);
-            } else if (option === 'month' && ['formatted', 'long', 'short', 'narrow'].includes(value)) {
-                regexParts.push(`(${months.join('|')})`);
-                lookups.push(['month', monthLookup(months)]);
-            } else if (['day', 'minute', 'second'].includes(option)) {
-                if (option === 'minute' || option === 'second') {
-                    _bUseUTC = false;
-                }
-                regexParts.push(twoDigit);
-                lookups.push([option, getNumber]);
-            } else if (option === 'fractionalSecondDigits') {
-                _bUseUTC = false;
-                regexParts.push(threeDigit);
-                lookups.push([option, (v, obj) => obj.fractionalSecondDigits + getNumber(v)]);
-            } else if (option === 'hour') {
-                _bUseUTC = false;
-                regexParts.push(twoDigit);
-                lookups.push([option, (v, obj) => obj.hour + getNumber(v)]);
-            } else if (option === 'year') {
-                regexParts.push('numeric' === value ? fourDigit : twoDigit);
-                lookups.push(['year', yearNumber(len)]);
-            } else if (option === 'dayPeriod') {
-                _bUseUTC = false;
-                const dayPeriod = getDayPeriod(language);
-                if (dayPeriod) {
-                    regexParts.push(dayPeriod.regex);
-                    lookups.push(['hour', dayPeriod.fn]);
-                }
-            } else if (option === 'hourCycle') {
-                _bUseUTC = false;
-                hourCycle = value;
-            } else if (option === 'x-timeZoneName') {
-                _bUseUTC = false;
-                regexParts.push('(?:GMT|UTC|Z)?([+\\-−0-9]{0,3}:?[0-9]{0,2})');
-                lookups.push([option, (v, obj) => {
-                    _bUseUTC = true;
-                    if (!v) return;
-                    const timeParts = v.replace(/−/, '-').match(/([+\-\d]{2,3}):?(\d{0,2})/);
-                    const hours = timeParts[1] * 1;
-                    obj.hour -= hours;
-                    const mins = timeParts.length > 2 ? timeParts[2] * 1 : 0;
-                    obj.minute -= (hours < 0) ? -mins : mins;
-                }]);
-            } else if (option !== 'timeZoneName') {
+        return year;
+    };
+    const monthLookup = list => month => list.indexOf(month);
+    const parsed = parseDateTimeSkeleton(skeleton, language);
+    const months = monthNames(language, Object.fromEntries(parsed));
+    parsed.forEach(([option, value, len]) => {
+        if (option === 'literal') {
+            regexParts.push(value);
+        } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
+            regexParts.push(twoDigit);
+            lookups.push(['month', monthNumber]);
+        } else if (option === 'month' && ['formatted', 'long', 'short', 'narrow'].includes(value)) {
+            regexParts.push(`(${months.join('|')})`);
+            lookups.push(['month', monthLookup(months)]);
+        } else if (['day', 'minute', 'second'].includes(option)) {
+            if (option === 'minute' || option === 'second') {
                 _bUseUTC = false;
-                regexParts.push('.+?');
-            }
-            return regexParts;
-        }, []);
-        const regex = new RegExp(regexParts.join(''));
-        const match = dateString.match(regex);
-        if (match === null) {
-            if (skeleton.toLowerCase() === 'yyyy-MM-dd'.toLowerCase()) {
-                return null;
-            } else {
-                const parsedDate = parseDate(dateString, language, 'yyyy-MM-dd', timeZone, bUseUTC);
-                if (parsedDate instanceof Date) {
-                    return parsedDate;
-                } else {
-                    return null;
-                }
             }
-        }
-        const dateObj = {year: 1972, month: 0, day: 1, hour: 0, minute: 0, second: 0, fractionalSecondDigits: 0};
-        match.slice(1).forEach((m, index) => {
-            const [element, func] = lookups[index];
-            dateObj[element] = func(m, dateObj);
-        });
-        if (hourCycle === 'h24' && dateObj.hour === 24) dateObj.hour = 0;
-        if (hourCycle === 'h12' && dateObj.hour === 12) dateObj.hour = 0;
-        if (_bUseUTC) {
-            const utcDate = new Date(Date.UTC(
-                dateObj.year,
-                dateObj.month,
-                dateObj.day,
-                dateObj.hour,
-                dateObj.minute,
-                dateObj.second,
-                dateObj.fractionalSecondDigits,
-            ));
-            if (_setFullYear) {
-                utcDate.setUTCFullYear(dateObj.year);
+            regexParts.push(twoDigit);
+            lookups.push([option, getNumber]);
+        } else if (option === 'fractionalSecondDigits') {
+            _bUseUTC = false;
+            regexParts.push(threeDigit);
+            lookups.push([option, (v, obj) => obj.fractionalSecondDigits + getNumber(v)]);
+        } else if (option === 'hour') {
+            _bUseUTC = false;
+            regexParts.push(twoDigit);
+            lookups.push([option, (v, obj) => obj.hour + getNumber(v)]);
+        } else if (option === 'year') {
+            regexParts.push('numeric' === value ? fourDigit : twoDigit);
+            lookups.push(['year', yearNumber(len)]);
+        } else if (option === 'dayPeriod') {
+            _bUseUTC = false;
+            const dayPeriod = getDayPeriod(language);
+            if (dayPeriod) {
+                regexParts.push(dayPeriod.regex);
+                lookups.push(['hour', dayPeriod.fn]);
             }
-            return utcDate;
+        } else if (option === 'hourCycle') {
+            _bUseUTC = false;
+            hourCycle = value;
+        } else if (option === 'x-timeZoneName') {
+            _bUseUTC = false;
+            regexParts.push('(?:GMT|UTC|Z)?([+\\-−0-9]{0,3}:?[0-9]{0,2})');
+            lookups.push([option, (v, obj) => {
+                _bUseUTC = true;
+                if (!v) return;
+                const timeParts = v.replace(/−/, '-').match(/([+\-\d]{2,3}):?(\d{0,2})/);
+                const hours = timeParts[1] * 1;
+                obj.hour -= hours;
+                const mins = timeParts.length > 2 ? timeParts[2] * 1 : 0;
+                obj.minute -= (hours < 0) ? - mins : mins;
+            }]);
+        } else if (option !== 'timeZoneName') {
+            _bUseUTC = false;
+            regexParts.push('.+?');
         }
-        const jsDate = new Date(
+        return regexParts;
+    }, []);
+    const regex = new RegExp(`^${regexParts.join('')}$`);
+    const match = dateString.match(regex);
+    if (match === null) return null;
+    const dateObj = {year: 1972, month: 0, day: 1, hour: 0, minute: 0, second: 0, fractionalSecondDigits: 0};
+    match.slice(1).forEach((m, index) => {
+        const [element, func] = lookups[index];
+        dateObj[element] = func(m, dateObj);
+    });
+    if (hourCycle === 'h24' && dateObj.hour === 24) dateObj.hour = 0;
+    if (hourCycle === 'h12' && dateObj.hour === 12) dateObj.hour = 0;
+    if (_bUseUTC) {
+        const utcDate = new Date(Date.UTC(
             dateObj.year,
             dateObj.month,
             dateObj.day,
@@ -484,14 +447,25 @@ function parseDate(dateString, language, skeleton, timeZone, bUseUTC = false) {
             dateObj.minute,
             dateObj.second,
             dateObj.fractionalSecondDigits,
-        );
+        ));
         if (_setFullYear) {
-            jsDate.setFullYear(dateObj.year);
+            utcDate.setUTCFullYear(dateObj.year);
         }
-        return timeZone == null ? jsDate : adjustTimeZone(jsDate, timeZone);
-    } catch (error) {
-        return null;
+        return utcDate;
+    }
+    const jsDate = new Date(
+        dateObj.year,
+        dateObj.month,
+        dateObj.day,
+        dateObj.hour,
+        dateObj.minute,
+        dateObj.second,
+        dateObj.fractionalSecondDigits,
+    );
+    if (_setFullYear) {
+        jsDate.setFullYear(dateObj.year);
     }
+    return timeZone == null ? jsDate : adjustTimeZone(jsDate, timeZone);
 }
 function parseDefaultDate(dateString, language, bUseUTC) {
     return parseDate(dateString, language, 'yyyy-MM-dd', null, bUseUTC);

package/lib/date/DateParser.js

@@ -15,24 +15,24 @@ exports.parseDefaultDate = parseDefaultDate;
 var _SkeletonParser = require("./SkeletonParser.js");
 
 /*************************************************************************
-* ADOBE CONFIDENTIAL
-* ___________________
-*
-* Copyright 2022 Adobe
-* All Rights Reserved.
-*
-* NOTICE: All information contained herein is, and remains
-* the property of Adobe and its suppliers, if any. The intellectual
-* and technical concepts contained herein are proprietary to Adobe
-* and its suppliers and are protected by all applicable intellectual
-* property laws, including trade secret and copyright laws.
-* Dissemination of this information or reproduction of this material
-* is strictly forbidden unless prior written permission is obtained
-* from Adobe.
-
-* Adobe permits you to use and modify this file solely in accordance with
-* the terms of the Adobe license agreement accompanying it.
-*************************************************************************/
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+
+ * Adobe permits you to use and modify this file solely in accordance with
+ * the terms of the Adobe license agreement accompanying it.
+ *************************************************************************/
 
 /**
  * Credit: https://git.corp.adobe.com/dc/dfl/blob/master/src/patterns/dates.js
@@ -377,182 +377,152 @@ function formatDate(dateValue, language, skeleton, timeZone) {
 function parseDate(dateString, language, skeleton, timeZone) {
   let bUseUTC = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
 
-  try {
-    // start by getting all the localized parts of a date/time picture:
-    // digits, calendar name
-    if (skeleton.startsWith('date|')) {
-      skeleton = skeleton.split('|')[1];
-    }
-
-    const lookups = [];
-    const regexParts = [];
-    const calendar = calendarName(language);
-    const digits = digitChars(language);
-    const twoDigit = `\\b([${digits[0]}-${digits[9]}]{1,2})\\b`;
-    const threeDigit = `\\b([${digits[0]}-${digits[9]}]{1,3})\\b`;
-    const fourDigit = `\\b([${digits[0]}-${digits[9]}]{1,4})\\b`;
-    let hourCycle = 'h12';
-    let _bUseUTC = bUseUTC;
-    let _setFullYear = false; // functions to process the results of the regex match
-
-    const isSeparator = str => str.length === 1 && ':-/.'.includes(str);
-
-    const monthNumber = str => getNumber(str) - 1;
+  // start by getting all the localized parts of a date/time picture:
+  // digits, calendar name
+  if (skeleton.startsWith('date|')) {
+    skeleton = skeleton.split('|')[1];
+  }
 
-    const getNumber = str => str.split('').reduce((total, digit) => total * 10 + digits.indexOf(digit), 0);
+  const lookups = [];
+  const regexParts = [];
+  const calendar = calendarName(language);
+  const digits = digitChars(language);
+  const twoDigit = `([${digits[0]}-${digits[9]}]{1,2})`;
+  const threeDigit = `([${digits[0]}-${digits[9]}]{1,3})`;
+  const fourDigit = `([${digits[0]}-${digits[9]}]{1,4})`;
+  let hourCycle = 'h12';
+  let _bUseUTC = bUseUTC;
+  let _setFullYear = false; // functions to process the results of the regex match
 
-    const yearNumber = templateDigits => str => {
-      let year = getNumber(str); //todo: align with AF
+  const isSeparator = str => str.length === 1 && ':-/.'.includes(str);
 
-      year = year < 100 && templateDigits === 2 ? year + 2000 : year;
-      if (calendar === 'islamic') year = Math.ceil(year * 0.97 + 622);
+  const monthNumber = str => getNumber(str) - 1;
 
-      if (templateDigits > 2 && year < 100) {
-        _setFullYear = true;
-      }
+  const getNumber = str => str.split('').reduce((total, digit) => total * 10 + digits.indexOf(digit), 0);
 
-      return year;
-    };
+  const yearNumber = templateDigits => str => {
+    let year = getNumber(str); //todo: align with AF
 
-    const monthLookup = list => month => list.indexOf(month);
-
-    const parsed = (0, _SkeletonParser.parseDateTimeSkeleton)(skeleton, language);
-    const months = monthNames(language, Object.fromEntries(parsed)); // build up a regex expression that identifies each option in the skeleton
-    // We build two parallel structures:
-    // 1. the regex expression that will extract parts of the date/time
-    // 2. a lookup array that will convert the matched results into date/time values
-
-    parsed.forEach(_ref => {
-      let [option, value, len] = _ref;
-
-      // use a generic regex pattern for all single-character separator literals.
-      // We are treating this as separators: / vs - vs : etc
-      // other literals are treated as same
-      if (option === 'literal') {
-        if (value === '/') {
-          regexParts.push('/');
-        } else if (value === '-') {
-          regexParts.push('-');
-        } else if (value === ':') {
-          regexParts.push(':');
-        } else if (isSeparator(value)) {
-          regexParts.push(`[^${digits[0]}-${digits[9]}]`);
-        } else {
-          regexParts.push(value);
-        }
-      } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
-        regexParts.push(twoDigit);
-        lookups.push(['month', monthNumber]);
-      } else if (option === 'month' && ['formatted', 'long', 'short', 'narrow'].includes(value)) {
-        regexParts.push(`(${months.join('|')})`);
-        lookups.push(['month', monthLookup(months)]);
-      } else if (['day', 'minute', 'second'].includes(option)) {
-        if (option === 'minute' || option === 'second') {
-          _bUseUTC = false;
-        }
+    year = year < 100 && templateDigits === 2 ? year + 2000 : year;
+    if (calendar === 'islamic') year = Math.ceil(year * 0.97 + 622);
 
-        regexParts.push(twoDigit);
-        lookups.push([option, getNumber]);
-      } else if (option === 'fractionalSecondDigits') {
-        _bUseUTC = false;
-        regexParts.push(threeDigit);
-        lookups.push([option, (v, obj) => obj.fractionalSecondDigits + getNumber(v)]);
-      } else if (option === 'hour') {
-        _bUseUTC = false;
-        regexParts.push(twoDigit);
-        lookups.push([option, (v, obj) => obj.hour + getNumber(v)]);
-      } else if (option === 'year') {
-        regexParts.push('numeric' === value ? fourDigit : twoDigit);
-        lookups.push(['year', yearNumber(len)]);
-      } else if (option === 'dayPeriod') {
-        _bUseUTC = false;
-        const dayPeriod = getDayPeriod(language);
+    if (templateDigits > 2 && year < 100) {
+      _setFullYear = true;
+    }
 
-        if (dayPeriod) {
-          regexParts.push(dayPeriod.regex);
-          lookups.push(['hour', dayPeriod.fn]);
-        } // Any other part that we don't need, we'll just add a non-greedy consumption
+    return year;
+  };
 
-      } else if (option === 'hourCycle') {
+  const monthLookup = list => month => list.indexOf(month);
+
+  const parsed = (0, _SkeletonParser.parseDateTimeSkeleton)(skeleton, language);
+  const months = monthNames(language, Object.fromEntries(parsed)); // build up a regex expression that identifies each option in the skeleton
+  // We build two parallel structures:
+  // 1. the regex expression that will extract parts of the date/time
+  // 2. a lookup array that will convert the matched results into date/time values
+
+  parsed.forEach(_ref => {
+    let [option, value, len] = _ref;
+
+    // use a generic regex pattern for all single-character separator literals.
+    // Then we'll be forgiving when it comes to separators: / vs - vs : etc
+    if (option === 'literal') {
+      regexParts.push(value);
+    } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
+      regexParts.push(twoDigit);
+      lookups.push(['month', monthNumber]);
+    } else if (option === 'month' && ['formatted', 'long', 'short', 'narrow'].includes(value)) {
+      regexParts.push(`(${months.join('|')})`);
+      lookups.push(['month', monthLookup(months)]);
+    } else if (['day', 'minute', 'second'].includes(option)) {
+      if (option === 'minute' || option === 'second') {
         _bUseUTC = false;
-        hourCycle = value;
-      } else if (option === 'x-timeZoneName') {
-        _bUseUTC = false; // we handle only the GMT offset picture
-
-        regexParts.push('(?:GMT|UTC|Z)?([+\\-−0-9]{0,3}:?[0-9]{0,2})');
-        lookups.push([option, (v, obj) => {
-          _bUseUTC = true; // v could be undefined if we're on GMT time
-
-          if (!v) return; // replace the unicode minus, then extract hours [and minutes]
-
-          const timeParts = v.replace(/−/, '-').match(/([+\-\d]{2,3}):?(\d{0,2})/);
-          const hours = timeParts[1] * 1;
-          obj.hour -= hours;
-          const mins = timeParts.length > 2 ? timeParts[2] * 1 : 0;
-          obj.minute -= hours < 0 ? -mins : mins;
-        }]);
-      } else if (option !== 'timeZoneName') {
-        _bUseUTC = false;
-        regexParts.push('.+?');
       }
 
-      return regexParts;
-    }, []);
-    const regex = new RegExp(regexParts.join(''));
-    const match = dateString.match(regex);
-
-    if (match === null) {
-      if (skeleton.toLowerCase() === 'yyyy-MM-dd'.toLowerCase()) {
-        return null;
-      } else {
-        // Try parsing with 'yyyy-MM-dd' skeleton
-        const parsedDate = parseDate(dateString, language, 'yyyy-MM-dd', timeZone, bUseUTC);
-
-        if (parsedDate instanceof Date) {
-          return parsedDate;
-        } else {
-          return null;
-        }
-      }
-    } // now loop through all the matched pieces and build up an object we'll use to create a Date object
+      regexParts.push(twoDigit);
+      lookups.push([option, getNumber]);
+    } else if (option === 'fractionalSecondDigits') {
+      _bUseUTC = false;
+      regexParts.push(threeDigit);
+      lookups.push([option, (v, obj) => obj.fractionalSecondDigits + getNumber(v)]);
+    } else if (option === 'hour') {
+      _bUseUTC = false;
+      regexParts.push(twoDigit);
+      lookups.push([option, (v, obj) => obj.hour + getNumber(v)]);
+    } else if (option === 'year') {
+      regexParts.push('numeric' === value ? fourDigit : twoDigit);
+      lookups.push(['year', yearNumber(len)]);
+    } else if (option === 'dayPeriod') {
+      _bUseUTC = false;
+      const dayPeriod = getDayPeriod(language);
+
+      if (dayPeriod) {
+        regexParts.push(dayPeriod.regex);
+        lookups.push(['hour', dayPeriod.fn]);
+      } // Any other part that we don't need, we'll just add a non-greedy consumption
+
+    } else if (option === 'hourCycle') {
+      _bUseUTC = false;
+      hourCycle = value;
+    } else if (option === 'x-timeZoneName') {
+      _bUseUTC = false; // we handle only the GMT offset picture
+
+      regexParts.push('(?:GMT|UTC|Z)?([+\\-−0-9]{0,3}:?[0-9]{0,2})');
+      lookups.push([option, (v, obj) => {
+        _bUseUTC = true; // v could be undefined if we're on GMT time
+
+        if (!v) return; // replace the unicode minus, then extract hours [and minutes]
+
+        const timeParts = v.replace(/−/, '-').match(/([+\-\d]{2,3}):?(\d{0,2})/);
+        const hours = timeParts[1] * 1;
+        obj.hour -= hours;
+        const mins = timeParts.length > 2 ? timeParts[2] * 1 : 0;
+        obj.minute -= hours < 0 ? -mins : mins;
+      }]);
+    } else if (option !== 'timeZoneName') {
+      _bUseUTC = false;
+      regexParts.push('.+?');
+    }
 
+    return regexParts;
+  }, []);
+  const regex = new RegExp(`^${regexParts.join('')}$`);
+  const match = dateString.match(regex);
+  if (match === null) return null; // now loop through all the matched pieces and build up an object we'll use to create a Date object
+
+  const dateObj = {
+    year: 1972,
+    month: 0,
+    day: 1,
+    hour: 0,
+    minute: 0,
+    second: 0,
+    fractionalSecondDigits: 0
+  };
+  match.slice(1).forEach((m, index) => {
+    const [element, func] = lookups[index];
+    dateObj[element] = func(m, dateObj);
+  });
+  if (hourCycle === 'h24' && dateObj.hour === 24) dateObj.hour = 0;
+  if (hourCycle === 'h12' && dateObj.hour === 12) dateObj.hour = 0;
 
-    const dateObj = {
-      year: 1972,
-      month: 0,
-      day: 1,
-      hour: 0,
-      minute: 0,
-      second: 0,
-      fractionalSecondDigits: 0
-    };
-    match.slice(1).forEach((m, index) => {
-      const [element, func] = lookups[index];
-      dateObj[element] = func(m, dateObj);
-    });
-    if (hourCycle === 'h24' && dateObj.hour === 24) dateObj.hour = 0;
-    if (hourCycle === 'h12' && dateObj.hour === 12) dateObj.hour = 0;
-
-    if (_bUseUTC) {
-      const utcDate = new Date(Date.UTC(dateObj.year, dateObj.month, dateObj.day, dateObj.hour, dateObj.minute, dateObj.second, dateObj.fractionalSecondDigits));
-
-      if (_setFullYear) {
-        utcDate.setUTCFullYear(dateObj.year);
-      }
+  if (_bUseUTC) {
+    const utcDate = new Date(Date.UTC(dateObj.year, dateObj.month, dateObj.day, dateObj.hour, dateObj.minute, dateObj.second, dateObj.fractionalSecondDigits));
 
-      return utcDate;
+    if (_setFullYear) {
+      utcDate.setUTCFullYear(dateObj.year);
     }
 
-    const jsDate = new Date(dateObj.year, dateObj.month, dateObj.day, dateObj.hour, dateObj.minute, dateObj.second, dateObj.fractionalSecondDigits);
+    return utcDate;
+  }
 
-    if (_setFullYear) {
-      jsDate.setFullYear(dateObj.year);
-    }
+  const jsDate = new Date(dateObj.year, dateObj.month, dateObj.day, dateObj.hour, dateObj.minute, dateObj.second, dateObj.fractionalSecondDigits);
 
-    return timeZone == null ? jsDate : adjustTimeZone(jsDate, timeZone);
-  } catch (error) {
-    return null;
+  if (_setFullYear) {
+    jsDate.setFullYear(dateObj.year);
   }
+
+  return timeZone == null ? jsDate : adjustTimeZone(jsDate, timeZone);
 }
 
 function parseDefaultDate(dateString, language, bUseUTC) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-formatters",
-  "version": "0.22.91",
+  "version": "0.22.92",
   "description": "Formatting Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",