@bolttech/form-engine-core 0.0.2-beta.3 → 0.0.2-beta.4

package/index.esm.js

@@ -1962,16 +1962,6 @@ const conditions = (value, validations) => {
   return !result;
 };
 
-/**
- * @internal
- * Parses date value to avoid type format errors.
- *
- * @param {string} value - the value to be parsed into a valid date.
- * @returns {string | null} - returns a pareable string format or null to handle validation exceptions.
- */
-const parseDateValue = value => {
-  return (value === null || value === void 0 ? void 0 : value.toString()) ? value.toString() : null;
-};
 /**
  * @internal
  * Validates if a date string matches a specific date format.
@@ -1996,7 +1986,6 @@ const parseDateValue = value => {
  * invalidStringDate("1997/25/07", "MMDDYYYY");
  */
 const invalidStringDate = (value, format) => {
-  if (parseDateValue(value) === null) return false;
   if (!value.includes('/') && !value.includes('-') || !format) {
     return true;
   }
@@ -2049,21 +2038,15 @@ const getIntervalsDate = (date, intervals) => {
  * console.log(formattedDate2); // '12/01/2023'
  */
 const dateRearrangeMapper = {
-  DDMMYYYY: val => {
-    const value = parseDateValue(val);
-    if (value === null) return '';
+  DDMMYYYY: value => {
     const dateParts = value.split(value.includes('/') ? '/' : '-');
     return `${dateParts[1]}/${dateParts[0]}/${dateParts[2]}`;
   },
-  YYYYMMDD: val => {
-    const value = parseDateValue(val);
-    if (value === null) return '';
+  YYYYMMDD: value => {
     const dateParts = value.split(value.includes('/') ? '/' : '-');
     return `${dateParts[1]}/${dateParts[2]}/${dateParts[0]}`;
   },
-  YYYYDDMM: val => {
-    const value = parseDateValue(val);
-    if (value === null) return '';
+  YYYYDDMM: value => {
     const dateParts = value.split(value.includes('/') ? '/' : '-');
     return `${dateParts[2]}/${dateParts[1]}/${dateParts[0]}`;
   },
@@ -2096,7 +2079,6 @@ const dateRearrangeMapper = {
  */
 const betweenDates = (value, validations) => {
   var _a;
-  if (parseDateValue(value) === null) return false;
   let fail = false;
   if (((_a = validations.betweenDates) === null || _a === void 0 ? void 0 : _a.length) != 2) return false;
   for (const validation of validations.betweenDates) {
@@ -2142,27 +2124,23 @@ const betweenDates = (value, validations) => {
  * ```
  */
 const date = (value, validations) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-  if (parseDateValue(value) === null) return true;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   if (!((_b = (_a = validations.date) === null || _a === void 0 ? void 0 : _a.target) === null || _b === void 0 ? void 0 : _b.value) && !((_d = (_c = validations.date) === null || _c === void 0 ? void 0 : _c.origin) === null || _d === void 0 ? void 0 : _d.intervals)) {
     return false;
   }
-  const originValue = parseDateValue(validations.date.origin.value || value);
-  if (originValue === null) return false;
+  const originValue = validations.date.origin.value || value;
   const mappedValue = dateRearrangeMapper[(_e = validations.date) === null || _e === void 0 ? void 0 : _e.origin.format](originValue).toString();
   let originDate = new Date(mappedValue);
   let targetDate = new Date();
   let target = new Date();
-  const targetValue = parseDateValue((_g = (_f = validations === null || validations === void 0 ? void 0 : validations.date) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.value);
-  if (targetValue === null) return false;
-  if ((_j = (_h = validations.date) === null || _h === void 0 ? void 0 : _h.target) === null || _j === void 0 ? void 0 : _j.format) {
-    target = new Date(dateRearrangeMapper[(_l = (_k = validations.date) === null || _k === void 0 ? void 0 : _k.target) === null || _l === void 0 ? void 0 : _l.format](targetValue).toString());
+  if ((_g = (_f = validations.date) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.format) {
+    target = new Date(dateRearrangeMapper[(_j = (_h = validations.date) === null || _h === void 0 ? void 0 : _h.target) === null || _j === void 0 ? void 0 : _j.format](validations.date.target.value).toString());
     targetDate = target;
   }
   if (validations.date.origin.intervals) {
     targetDate = getIntervalsDate(originDate, validations.date.origin.intervals);
     const date = new Date();
-    if (((_m = validations.date.target) === null || _m === void 0 ? void 0 : _m.value) && target) {
+    if (((_k = validations.date.target) === null || _k === void 0 ? void 0 : _k.value) && target) {
       date.setDate(target.getDate());
       date.setMonth(target.getMonth());
     }
@@ -2171,7 +2149,7 @@ const date = (value, validations) => {
   if (validations.date.onlyValidDate && (!(targetDate instanceof Date && isFinite(targetDate)) || !(targetDate instanceof Date && isFinite(originDate)) || originValue.length < 8)) {
     return true;
   }
-  if (invalidStringDate(mappedValue, (_o = validations.date) === null || _o === void 0 ? void 0 : _o.origin.format)) {
+  if (invalidStringDate(mappedValue, (_l = validations.date) === null || _l === void 0 ? void 0 : _l.origin.format)) {
     return false;
   }
   const originTimestamp = originDate.getTime();
@@ -2184,7 +2162,7 @@ const date = (value, validations) => {
     '===': originTimestamp === targetTimestamp,
     '!==': originTimestamp !== targetTimestamp
   };
-  return operationsMapper[(_p = validations.date) === null || _p === void 0 ? void 0 : _p.operator];
+  return operationsMapper[(_m = validations.date) === null || _m === void 0 ? void 0 : _m.operator];
 };
 /**
  * @function validDate
@@ -2206,7 +2184,6 @@ const date = (value, validations) => {
  * ```
  */
 const validDate = (value, validations) => {
-  if (parseDateValue(value) === null) return false;
   if (!validations.validDate || !value) return false;
   if (/[^a-zA-Z0-9\s-]/.test(value)) return true;
   const dateParts = dateRearrangeMapper[validations.validDate](value).toString().split(/[/-]/);
@@ -3279,9 +3256,12 @@ class FormCore {
     const result = splittedString.map(splittedStringVal => {
       // skip operator logic parsing and pass element directly
       if (splittedStringVal.length <= 1) {
-        return getTemplateValue(splittedStringVal[0]);
+        return {
+          parse: false,
+          value: getTemplateValue(splittedStringVal[0])
+        };
       }
-      return splittedStringVal.filter(Boolean).reduce((acc, curr) => {
+      const value = splittedStringVal.filter(Boolean).reduce((acc, curr) => {
         if (curr.match(TEMPLATE_REGEX_OPERATOR_MATCHER)) {
           return `${acc}${curr}`;
         }
@@ -3320,12 +3300,21 @@ class FormCore {
         }
         return `${acc}${value}`;
       }, '');
+      return {
+        parse: true,
+        value
+      };
     });
-    return result.map(el => {
+    return result.map(({
+      parse,
+      value
+    }) => {
       try {
-        return new Function(`return ${el}`)();
+        return parse ? new Function(`return ${value}`)() : value;
       } catch (_a) {
-        return el;
+        console.warn(`unhandled parsing on ${expression} returning`);
+        console.warn(value);
+        return value;
       }
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolttech/form-engine-core",
-  "version": "0.0.2-beta.03",
+  "version": "0.0.2-beta.04",
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js",