@aemforms/af-formatters 0.22.90 → 0.22.92

package/esm/afb-formatters.js

@@ -360,7 +360,6 @@ function parseDate(dateString, language, skeleton, timeZone, bUseUTC = false) {
     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 => {
@@ -377,8 +376,7 @@ function parseDate(dateString, language, skeleton, timeZone, bUseUTC = false) {
     const months = monthNames(language, Object.fromEntries(parsed));
     parsed.forEach(([option, value, len]) => {
         if (option === 'literal') {
-            if (isSeparator(value)) regexParts.push(`[^${digits[0]}-${digits[9]}]`);
-            else regexParts.push(value);
+            regexParts.push(value);
         } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
             regexParts.push(twoDigit);
             lookups.push(['month', monthNumber]);
@@ -430,9 +428,9 @@ function parseDate(dateString, language, skeleton, timeZone, bUseUTC = false) {
         }
         return regexParts;
     }, []);
-    const regex = new RegExp(regexParts.join(''));
+    const regex = new RegExp(`^${regexParts.join('')}$`);
     const match = dateString.match(regex);
-    if (match === null) return dateString;
+    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];

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
@@ -427,7 +427,7 @@ function parseDate(dateString, language, skeleton, timeZone) {
     // 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') {
-      if (isSeparator(value)) regexParts.push(`[^${digits[0]}-${digits[9]}]`);else regexParts.push(value);
+      regexParts.push(value);
     } else if (option === 'month' && ['numeric', '2-digit'].includes(value)) {
       regexParts.push(twoDigit);
       lookups.push(['month', monthNumber]);
@@ -486,9 +486,9 @@ function parseDate(dateString, language, skeleton, timeZone) {
 
     return regexParts;
   }, []);
-  const regex = new RegExp(regexParts.join(''));
+  const regex = new RegExp(`^${regexParts.join('')}$`);
   const match = dateString.match(regex);
-  if (match === null) return dateString; // now loop through all the matched pieces and build up an object we'll use to create a Date object
+  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,

package/package.json

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