@pega/cosmos-react-condition-builder 2.0.0-dev.2.1 → 2.0.0-dev.20.0

package/lib/components/ConditionBuilder/core/formatter.js

@@ -1,11 +1,21 @@
 // cSpell:words LPAREN RPAREN
 // FIXME: TR (Several constructs in this file need to be localized)
 import { hasProp } from '@pega/cosmos-react-core';
+import { getFormattedValue } from '@pega/cosmos-react-core/lib/components/Number/utils';
+import { getQuarter } from '@pega/cosmos-react-core/lib/components/DateTime/Input/utils';
 import { convertMsToTimeValue } from './time-utils';
 const LPAREN = '(';
 const RPAREN = ')';
+export function formatRelativeDate(translate, timePeriod, datePart, interval) {
+    const translationKey = timePeriod === 'CURRENT'
+        ? `condition_builder_current_${datePart.toLowerCase().slice(0, -1)}`
+        : `condition_builder_${timePeriod.toLowerCase()}_X_${datePart.toLowerCase()}`;
+    return translate(translationKey, [interval ?? 0], {
+        count: interval ?? 0
+    });
+}
 /** Returns a user-friendly text representation of a given leaf condition */
-function formatLeafCondition(leaf, fields) {
+function formatLeafCondition(leaf, fields, translate, { locale = 'en-US' } = {}) {
     const { lhs, comparator, rhs } = leaf;
     // Determine texts for LHS and RHS
     const lhsField = fields.find(f => f.name === lhs.field); // Expecting valid inputs
@@ -18,15 +28,87 @@ function formatLeafCondition(leaf, fields) {
             rhsText = rhsField.label || rhsField.name; // label is optional
         }
         else if (hasProp(rhs, 'value')) {
-            // If RHS is a single value
-            if (lhsField.type === 'TIME_ONLY') {
-                // For these cases, rhs.value is stored as # of milliseconds since day-start
-                rhsText = convertMsToTimeValue(rhs.value);
+            if (hasProp(rhs, 'dateFunction')) {
+                // If RHS is a date function value
+                switch (rhs.dateFunction) {
+                    case 'YEARS':
+                        rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {
+                            year: 'numeric'
+                        });
+                        break;
+                    case 'QUARTERS': {
+                        const formattedYear = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {
+                            year: 'numeric'
+                        });
+                        const quarterNumber = getQuarter(rhs.value);
+                        rhsText = `${translate(`date_quarter_q${quarterNumber}`, [formattedYear])}`;
+                        break;
+                    }
+                    case 'MONTHS':
+                        rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {
+                            year: 'numeric',
+                            month: 'short'
+                        });
+                        break;
+                    case 'WEEKS':
+                        rhsText = `Week of ${new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {
+                            year: 'numeric',
+                            month: 'short',
+                            day: 'numeric'
+                        })}`;
+                        break;
+                    case 'DAYS':
+                        rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {
+                            year: 'numeric',
+                            month: 'short',
+                            day: 'numeric'
+                        });
+                        break;
+                    case 'HOURS':
+                        rhsText = new Date(rhs.value).toLocaleString(locale, {
+                            year: 'numeric',
+                            month: 'short',
+                            day: 'numeric',
+                            hour: 'numeric',
+                            hour12: true
+                        });
+                        break;
+                    case 'MONTHS_OF_YEAR':
+                        rhsText = new Date(2021, rhs.value - 1, 1).toLocaleString(locale, {
+                            month: 'long'
+                        });
+                        break;
+                    case 'DAYS_OF_MONTH':
+                        rhsText = `Day ${rhs.value} of month`;
+                        break;
+                    case 'DAYS_OF_WEEK':
+                        // Choosing Feb-2021 as it starts on a Monday
+                        rhsText = new Date(2021, 1, rhs.value).toLocaleString(locale, {
+                            weekday: 'long'
+                        });
+                        break;
+                    default: // Not needed
+                }
             }
             else {
-                rhsText = rhs.value.toString();
+                // If RHS is a single literal value
+                switch (lhsField.type) {
+                    case 'TIME_ONLY':
+                        // For these cases, rhs.value is stored as # of milliseconds since day-start
+                        rhsText = convertMsToTimeValue(rhs.value);
+                        break;
+                    case 'NUMBER':
+                        rhsText = getFormattedValue(rhs.value.toString(), locale, true, 4);
+                        break;
+                    default:
+                        rhsText = rhs.value;
+                }
             }
         }
+        else if (hasProp(rhs, 'relativeDate')) {
+            const { relativeDate: { timePeriod, interval, datePart } } = rhs;
+            rhsText = formatRelativeDate(translate, timePeriod, datePart, interval);
+        }
         else {
             rhsText = rhs.values.join(', '); // If RHS is a list of values
         }
@@ -73,32 +155,32 @@ function formatLeafCondition(leaf, fields) {
     }
 }
 /** Returns a user-friendly text representation of the given node in a condition */
-function formatConditionNode(node, fields) {
+function formatConditionNode(node, fields, translate, options) {
     if (hasProp(node, 'AND')) {
-        const childStrings = node.AND.map(n => formatConditionNode(n, fields));
+        const childStrings = node.AND.map(n => formatConditionNode(n, fields, translate, options));
         return `(${childStrings.join(' AND ')})`;
     }
     if (hasProp(node, 'OR')) {
-        const childStrings = node.OR.map(n => formatConditionNode(n, fields));
+        const childStrings = node.OR.map(n => formatConditionNode(n, fields, translate, options));
         return `(${childStrings.join(' OR ')})`;
     }
     if (hasProp(node, 'NOT')) {
-        const childString = formatConditionNode(node.NOT, fields);
+        const childString = formatConditionNode(node.NOT, fields, translate, options);
         if (childString.startsWith(LPAREN) && childString.endsWith(RPAREN)) {
             // Avoid double brackets when the child node is an AND/OR node
             return `NOT ${childString}`;
         }
         return `NOT (${childString})`;
     }
-    return formatLeafCondition(node.condition, fields); // If leaf-level is reached
+    return formatLeafCondition(node.condition, fields, translate, options); // If leaf-level is reached
 }
 /**
  * Returns a user-friendly text representation of a given complex condition
  * The input `fields` are used to look up display labels for the fields
  */
-export default function formatCondition(condition, fields) {
+export default function formatCondition(condition, fields, translate, options) {
     // Recursively format the tree, starting at the root node
-    let text = formatConditionNode(condition, fields);
+    let text = formatConditionNode(condition, fields, translate, options);
     // If the root node is AND/OR, there will be extra parentheses. Remove them
     if (text.startsWith(LPAREN) && text.endsWith(RPAREN)) {
         text = text.slice(1, -1);

package/lib/components/ConditionBuilder/core/formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/formatter.ts"],"names":[],"mappings":"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","sourcesContent":["// cSpell:words LPAREN RPAREN\n// FIXME: TR (Several constructs in this file need to be localized)\n\nimport { hasProp } from '@pega/cosmos-react-core';\n\nimport { Condition, LeafCondition, Field } from '../ConditionBuilder.types';\n\nimport { convertMsToTimeValue } from './time-utils';\n\nconst LPAREN = '(';\nconst RPAREN = ')';\n\n/** Returns a user-friendly text representation of a given leaf condition */\nfunction formatLeafCondition(leaf: LeafCondition, fields: Field[]): string {\n  const { lhs, comparator, rhs } = leaf;\n\n  // Determine texts for LHS and RHS\n  const lhsField = fields.find(f => f.name === lhs.field) as Field; // Expecting valid inputs\n  const lhsText = lhsField.label || lhsField.name; // label is optional\n  let rhsText = '';\n  if (rhs) {\n    if (hasProp(rhs, 'field')) {\n      // If RHS is another field\n      const rhsField = fields.find(f => f.name === rhs.field) as Field; // Expecting valid inputs\n      rhsText = rhsField.label || rhsField.name; // label is optional\n    } else if (hasProp(rhs, 'value')) {\n      // If RHS is a single value\n      if (lhsField.type === 'TIME_ONLY') {\n        // For these cases, rhs.value is stored as # of milliseconds since day-start\n        rhsText = convertMsToTimeValue(rhs.value as number);\n      } else {\n        rhsText = rhs.value.toString();\n      }\n    } else {\n      rhsText = rhs.values.join(', '); // If RHS is a list of values\n    }\n  }\n\n  switch (comparator) {\n    case 'IS_NULL':\n      return `${lhsText} is null`;\n    case 'IS_NOT_NULL':\n      return `${lhsText} is not null`;\n    case 'IS_TRUE':\n      return `${lhsText} is true`;\n    case 'IS_FALSE':\n      return `${lhsText} is false`;\n    case 'EQ':\n      return `${lhsText} is ${rhsText}`;\n    case 'NEQ':\n      return `${lhsText} isn't ${rhsText}`;\n    case 'IN':\n      return `${lhsText} is among ${rhsText}`;\n    case 'NOT_IN':\n      return `${lhsText} is not among ${rhsText}`;\n    case 'GT':\n      return `${lhsText} > ${rhsText}`;\n    case 'GTE':\n      return `${lhsText} >= ${rhsText}`;\n    case 'LT':\n      return `${lhsText} < ${rhsText}`;\n    case 'LTE':\n      return `${lhsText} <= ${rhsText}`;\n    case 'STARTS_WITH':\n      return `${lhsText} starts with ${rhsText}`;\n    case 'NOT_STARTS_WITH':\n      return `${lhsText} doesn't start with ${rhsText}`;\n    case 'ENDS_WITH':\n      return `${lhsText} ends with ${rhsText}`;\n    case 'NOT_ENDS_WITH':\n      return `${lhsText} doesn't end with ${rhsText}`;\n    case 'CONTAINS':\n      return `${lhsText} contains ${rhsText}`;\n    case 'NOT_CONTAINS':\n      return `${lhsText} doesn't contain ${rhsText}`;\n    default:\n      return ''; // Not needed\n  }\n}\n\n/** Returns a user-friendly text representation of the given node in a condition */\nfunction formatConditionNode(node: Condition, fields: Field[]): string {\n  if (hasProp(node, 'AND')) {\n    const childStrings = node.AND.map(n => formatConditionNode(n, fields));\n    return `(${childStrings.join(' AND ')})`;\n  }\n\n  if (hasProp(node, 'OR')) {\n    const childStrings = node.OR.map(n => formatConditionNode(n, fields));\n    return `(${childStrings.join(' OR ')})`;\n  }\n\n  if (hasProp(node, 'NOT')) {\n    const childString = formatConditionNode(node.NOT, fields);\n    if (childString.startsWith(LPAREN) && childString.endsWith(RPAREN)) {\n      // Avoid double brackets when the child node is an AND/OR node\n      return `NOT ${childString}`;\n    }\n    return `NOT (${childString})`;\n  }\n\n  return formatLeafCondition(node.condition, fields); // If leaf-level is reached\n}\n\n/**\n * Returns a user-friendly text representation of a given complex condition\n * The input `fields` are used to look up display labels for the fields\n */\nexport default function formatCondition(condition: Condition, fields: Field[]): string {\n  // Recursively format the tree, starting at the root node\n  let text = formatConditionNode(condition, fields);\n\n  // If the root node is AND/OR, there will be extra parentheses. Remove them\n  if (text.startsWith(LPAREN) && text.endsWith(RPAREN)) {\n    text = text.slice(1, -1);\n  }\n\n  return text;\n}\n"]}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/formatter.ts"],"names":[],"mappings":"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","sourcesContent":["// cSpell:words LPAREN RPAREN\n// FIXME: TR (Several constructs in this file need to be localized)\nimport { hasProp, TranslationPack } from '@pega/cosmos-react-core';\nimport { getFormattedValue } from '@pega/cosmos-react-core/lib/components/Number/utils';\nimport { TranslationFunction } from '@pega/cosmos-react-core/lib/i18n/translate';\nimport { getQuarter } from '@pega/cosmos-react-core/lib/components/DateTime/Input/utils';\n\nimport { Condition, LeafCondition, Field } from '../ConditionBuilder.types';\n\nimport { DatePart, TimePeriod } from './types';\nimport { convertMsToTimeValue } from './time-utils';\n\nconst LPAREN = '(';\nconst RPAREN = ')';\n\n/** Options object optionally passed to formatCondition method. */\ninterface ConditionFormatOptions {\n  locale?: string;\n}\n\nexport function formatRelativeDate(\n  translate: TranslationFunction<TranslationPack>,\n  timePeriod: TimePeriod,\n  datePart: DatePart,\n  interval?: number\n): string {\n  const translationKey =\n    timePeriod === 'CURRENT'\n      ? `condition_builder_current_${datePart.toLowerCase().slice(0, -1)}`\n      : `condition_builder_${timePeriod.toLowerCase()}_X_${datePart.toLowerCase()}`;\n  return translate(translationKey as keyof TranslationPack, [interval ?? 0], {\n    count: interval ?? 0\n  });\n}\n\n/** Returns a user-friendly text representation of a given leaf condition */\nfunction formatLeafCondition(\n  leaf: LeafCondition,\n  fields: Field[],\n  translate: TranslationFunction<TranslationPack>,\n  { locale = 'en-US' }: ConditionFormatOptions = {}\n): string {\n  const { lhs, comparator, rhs } = leaf;\n\n  // Determine texts for LHS and RHS\n  const lhsField = fields.find(f => f.name === lhs.field) as Field; // Expecting valid inputs\n  const lhsText = lhsField.label || lhsField.name; // label is optional\n  let rhsText = '';\n  if (rhs) {\n    if (hasProp(rhs, 'field')) {\n      // If RHS is another field\n      const rhsField = fields.find(f => f.name === rhs.field) as Field; // Expecting valid inputs\n      rhsText = rhsField.label || rhsField.name; // label is optional\n    } else if (hasProp(rhs, 'value')) {\n      if (hasProp(rhs, 'dateFunction')) {\n        // If RHS is a date function value\n        switch (rhs.dateFunction) {\n          case 'YEARS':\n            rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {\n              year: 'numeric'\n            });\n            break;\n          case 'QUARTERS': {\n            const formattedYear = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {\n              year: 'numeric'\n            });\n            const quarterNumber = getQuarter(rhs.value);\n            rhsText = `${translate(`date_quarter_q${quarterNumber}`, [formattedYear])}`;\n            break;\n          }\n          case 'MONTHS':\n            rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {\n              year: 'numeric',\n              month: 'short'\n            });\n            break;\n          case 'WEEKS':\n            rhsText = `Week of ${new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {\n              year: 'numeric',\n              month: 'short',\n              day: 'numeric'\n            })}`;\n            break;\n          case 'DAYS':\n            rhsText = new Date(`${rhs.value}T00:00:00`).toLocaleString(locale, {\n              year: 'numeric',\n              month: 'short',\n              day: 'numeric'\n            });\n            break;\n          case 'HOURS':\n            rhsText = new Date(rhs.value).toLocaleString(locale, {\n              year: 'numeric',\n              month: 'short',\n              day: 'numeric',\n              hour: 'numeric',\n              hour12: true\n            });\n            break;\n          case 'MONTHS_OF_YEAR':\n            rhsText = new Date(2021, (rhs.value as number) - 1, 1).toLocaleString(locale, {\n              month: 'long'\n            });\n            break;\n          case 'DAYS_OF_MONTH':\n            rhsText = `Day ${rhs.value} of month`;\n            break;\n          case 'DAYS_OF_WEEK':\n            // Choosing Feb-2021 as it starts on a Monday\n            rhsText = new Date(2021, 1, rhs.value as number).toLocaleString(locale, {\n              weekday: 'long'\n            });\n            break;\n          default: // Not needed\n        }\n      } else {\n        // If RHS is a single literal value\n        switch (lhsField.type) {\n          case 'TIME_ONLY':\n            // For these cases, rhs.value is stored as # of milliseconds since day-start\n            rhsText = convertMsToTimeValue(rhs.value as number);\n            break;\n          case 'NUMBER':\n            rhsText = getFormattedValue(rhs.value.toString(), locale, true, 4);\n            break;\n          default:\n            rhsText = rhs.value as string;\n        }\n      }\n    } else if (hasProp(rhs, 'relativeDate')) {\n      const {\n        relativeDate: { timePeriod, interval, datePart }\n      } = rhs;\n      rhsText = formatRelativeDate(translate, timePeriod, datePart, interval);\n    } else {\n      rhsText = rhs.values.join(', '); // If RHS is a list of values\n    }\n  }\n\n  switch (comparator) {\n    case 'IS_NULL':\n      return `${lhsText} is null`;\n    case 'IS_NOT_NULL':\n      return `${lhsText} is not null`;\n    case 'IS_TRUE':\n      return `${lhsText} is true`;\n    case 'IS_FALSE':\n      return `${lhsText} is false`;\n    case 'EQ':\n      return `${lhsText} is ${rhsText}`;\n    case 'NEQ':\n      return `${lhsText} isn't ${rhsText}`;\n    case 'IN':\n      return `${lhsText} is among ${rhsText}`;\n    case 'NOT_IN':\n      return `${lhsText} is not among ${rhsText}`;\n    case 'GT':\n      return `${lhsText} > ${rhsText}`;\n    case 'GTE':\n      return `${lhsText} >= ${rhsText}`;\n    case 'LT':\n      return `${lhsText} < ${rhsText}`;\n    case 'LTE':\n      return `${lhsText} <= ${rhsText}`;\n    case 'STARTS_WITH':\n      return `${lhsText} starts with ${rhsText}`;\n    case 'NOT_STARTS_WITH':\n      return `${lhsText} doesn't start with ${rhsText}`;\n    case 'ENDS_WITH':\n      return `${lhsText} ends with ${rhsText}`;\n    case 'NOT_ENDS_WITH':\n      return `${lhsText} doesn't end with ${rhsText}`;\n    case 'CONTAINS':\n      return `${lhsText} contains ${rhsText}`;\n    case 'NOT_CONTAINS':\n      return `${lhsText} doesn't contain ${rhsText}`;\n    default:\n      return ''; // Not needed\n  }\n}\n\n/** Returns a user-friendly text representation of the given node in a condition */\nfunction formatConditionNode(\n  node: Condition,\n  fields: Field[],\n  translate: TranslationFunction<TranslationPack>,\n  options?: ConditionFormatOptions\n): string {\n  if (hasProp(node, 'AND')) {\n    const childStrings = node.AND.map(n => formatConditionNode(n, fields, translate, options));\n    return `(${childStrings.join(' AND ')})`;\n  }\n\n  if (hasProp(node, 'OR')) {\n    const childStrings = node.OR.map(n => formatConditionNode(n, fields, translate, options));\n    return `(${childStrings.join(' OR ')})`;\n  }\n\n  if (hasProp(node, 'NOT')) {\n    const childString = formatConditionNode(node.NOT, fields, translate, options);\n    if (childString.startsWith(LPAREN) && childString.endsWith(RPAREN)) {\n      // Avoid double brackets when the child node is an AND/OR node\n      return `NOT ${childString}`;\n    }\n    return `NOT (${childString})`;\n  }\n\n  return formatLeafCondition(node.condition, fields, translate, options); // If leaf-level is reached\n}\n\n/**\n * Returns a user-friendly text representation of a given complex condition\n * The input `fields` are used to look up display labels for the fields\n */\nexport default function formatCondition(\n  condition: Condition,\n  fields: Field[],\n  translate: TranslationFunction<TranslationPack>,\n  options?: ConditionFormatOptions\n): string {\n  // Recursively format the tree, starting at the root node\n  let text = formatConditionNode(condition, fields, translate, options);\n\n  // If the root node is AND/OR, there will be extra parentheses. Remove them\n  if (text.startsWith(LPAREN) && text.endsWith(RPAREN)) {\n    text = text.slice(1, -1);\n  }\n\n  return text;\n}\n"]}

package/lib/components/ConditionBuilder/core/transformer.d.ts

@@ -0,0 +1,7 @@
+import './extendDayJs';
+import { Condition, Field } from '../ConditionBuilder.types';
+/** This function transforms Conditions with Relative Dates into Conditions with Date Ranges.
+ * Do not use this function unless you need to convert Relative Dates into Date Ranges.
+ */
+export default function transformComplexCondition(condition: Condition, fields: Field[], currentDateTime?: string): Condition;
+//# sourceMappingURL=transformer.d.ts.map

package/lib/components/ConditionBuilder/core/transformer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/transformer.ts"],"names":[],"mappings":"AAGA,OAAO,eAAe,CAAC;AAIvB,OAAO,EAAE,SAAS,EAAiB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AA+I5E;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EAAE,EACf,eAAe,CAAC,EAAE,MAAM,GACvB,SAAS,CA0BX"}

package/lib/components/ConditionBuilder/core/transformer.js

@@ -0,0 +1,164 @@
+// cSpell:words DDTHH
+import dayjs from 'dayjs';
+import './extendDayJs';
+import { hasProp } from '@pega/cosmos-react-core';
+const dayjsDateParts = {
+    MINUTES: 'minute',
+    HOURS: 'hour',
+    DAYS: 'day',
+    WEEKS: 'week',
+    QUARTERS: 'quarter',
+    MONTHS: 'month',
+    YEARS: 'year'
+};
+function transformLeafCondition(node, fields, currentDateTime) {
+    if (node.rhs && hasProp(node.rhs, 'relativeDate')) {
+        const { lhs, comparator, rhs } = node;
+        const field = fields.find(f => f.name === lhs.field);
+        if (field === undefined) {
+            return {
+                condition: node
+            };
+        }
+        const { timePeriod, interval, datePart } = rhs.relativeDate;
+        const dateFormat = field.type === 'DATE_ONLY' ? 'YYYY-MM-DD' : 'YYYY-MM-DDTHH:mm:ss';
+        const dayjsDatePart = dayjsDateParts[datePart];
+        const now = dayjs(currentDateTime);
+        let startDate = now;
+        let endDate = now;
+        if (timePeriod === 'CURRENT') {
+            startDate = now.startOf(dayjsDatePart);
+            endDate = now.endOf(dayjsDatePart);
+        }
+        else if (timePeriod === 'LAST' && interval && interval >= 1) {
+            startDate = now.subtract(interval, dayjsDatePart);
+        }
+        else if (timePeriod === 'PREVIOUS' && interval && interval >= 1) {
+            startDate = now.startOf(dayjsDatePart).subtract(interval, dayjsDatePart);
+            endDate = now.subtract(1, dayjsDatePart).endOf(dayjsDatePart);
+        }
+        else if (timePeriod === 'NEXT' && interval && interval >= 1) {
+            startDate = now.add(1, dayjsDatePart).startOf(dayjsDatePart);
+            endDate = now.endOf(dayjsDatePart).add(interval, dayjsDatePart);
+        }
+        switch (comparator) {
+            case 'EQ':
+                return {
+                    AND: [
+                        {
+                            condition: {
+                                lhs: node.lhs,
+                                comparator: 'LTE',
+                                rhs: {
+                                    value: endDate.format(dateFormat)
+                                }
+                            }
+                        },
+                        {
+                            condition: {
+                                lhs: node.lhs,
+                                comparator: 'GTE',
+                                rhs: {
+                                    value: startDate.format(dateFormat)
+                                }
+                            }
+                        }
+                    ]
+                };
+            case 'NEQ':
+                return {
+                    OR: [
+                        {
+                            condition: {
+                                lhs: node.lhs,
+                                comparator: 'GT',
+                                rhs: {
+                                    value: endDate.format(dateFormat)
+                                }
+                            }
+                        },
+                        {
+                            condition: {
+                                lhs: node.lhs,
+                                comparator: 'LT',
+                                rhs: {
+                                    value: startDate.format(dateFormat)
+                                }
+                            }
+                        }
+                    ]
+                };
+            case 'GT':
+                return {
+                    condition: {
+                        lhs: node.lhs,
+                        comparator: 'GT',
+                        rhs: {
+                            value: endDate.format(dateFormat)
+                        }
+                    }
+                };
+            case 'GTE':
+                return {
+                    condition: {
+                        lhs: node.lhs,
+                        comparator: 'GTE',
+                        rhs: {
+                            value: startDate.format(dateFormat)
+                        }
+                    }
+                };
+            case 'LT':
+                return {
+                    condition: {
+                        lhs: node.lhs,
+                        comparator: 'LT',
+                        rhs: {
+                            value: startDate.format(dateFormat)
+                        }
+                    }
+                };
+            case 'LTE':
+                return {
+                    condition: {
+                        lhs: node.lhs,
+                        comparator: 'LTE',
+                        rhs: {
+                            value: endDate.format(dateFormat)
+                        }
+                    }
+                };
+            default:
+                return {
+                    condition: node
+                };
+        }
+    }
+    return {
+        condition: node
+    };
+}
+/** This function transforms Conditions with Relative Dates into Conditions with Date Ranges.
+ * Do not use this function unless you need to convert Relative Dates into Date Ranges.
+ */
+export default function transformComplexCondition(condition, fields, currentDateTime) {
+    if (hasProp(condition, 'AND')) {
+        const childNodes = condition.AND.map(n => transformComplexCondition(n, fields, currentDateTime));
+        return {
+            AND: childNodes
+        };
+    }
+    if (hasProp(condition, 'OR')) {
+        const childNodes = condition.OR.map(n => transformComplexCondition(n, fields, currentDateTime));
+        return {
+            OR: childNodes
+        };
+    }
+    if (hasProp(condition, 'NOT')) {
+        return {
+            NOT: transformComplexCondition(condition.NOT, fields, currentDateTime)
+        };
+    }
+    return transformLeafCondition(condition.condition, fields, currentDateTime);
+}
+//# sourceMappingURL=transformer.js.map

package/lib/components/ConditionBuilder/core/transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/transformer.ts"],"names":[],"mappings":"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","sourcesContent":["// cSpell:words DDTHH\n\nimport dayjs, { QUnitType } from 'dayjs';\nimport './extendDayJs';\n\nimport { hasProp } from '@pega/cosmos-react-core';\n\nimport { Condition, LeafCondition, Field } from '../ConditionBuilder.types';\n\nimport { DatePart } from './types';\n\nconst dayjsDateParts: Record<DatePart, QUnitType> = {\n  MINUTES: 'minute',\n  HOURS: 'hour',\n  DAYS: 'day',\n  WEEKS: 'week' as QUnitType,\n  QUARTERS: 'quarter',\n  MONTHS: 'month',\n  YEARS: 'year'\n};\n\nfunction transformLeafCondition(\n  node: LeafCondition,\n  fields: Field[],\n  currentDateTime?: string\n): Condition {\n  if (node.rhs && hasProp(node.rhs, 'relativeDate')) {\n    const { lhs, comparator, rhs } = node;\n    const field = fields.find(f => f.name === lhs.field);\n    if (field === undefined) {\n      return {\n        condition: node\n      };\n    }\n    const { timePeriod, interval, datePart } = rhs.relativeDate;\n    const dateFormat = field.type === 'DATE_ONLY' ? 'YYYY-MM-DD' : 'YYYY-MM-DDTHH:mm:ss';\n    const dayjsDatePart = dayjsDateParts[datePart];\n    const now = dayjs(currentDateTime);\n    let startDate = now;\n    let endDate = now;\n    if (timePeriod === 'CURRENT') {\n      startDate = now.startOf(dayjsDatePart);\n      endDate = now.endOf(dayjsDatePart);\n    } else if (timePeriod === 'LAST' && interval && interval >= 1) {\n      startDate = now.subtract(interval, dayjsDatePart);\n    } else if (timePeriod === 'PREVIOUS' && interval && interval >= 1) {\n      startDate = now.startOf(dayjsDatePart).subtract(interval, dayjsDatePart);\n      endDate = now.subtract(1, dayjsDatePart).endOf(dayjsDatePart);\n    } else if (timePeriod === 'NEXT' && interval && interval >= 1) {\n      startDate = now.add(1, dayjsDatePart).startOf(dayjsDatePart);\n      endDate = now.endOf(dayjsDatePart).add(interval, dayjsDatePart);\n    }\n    switch (comparator) {\n      case 'EQ':\n        return {\n          AND: [\n            {\n              condition: {\n                lhs: node.lhs,\n                comparator: 'LTE',\n                rhs: {\n                  value: endDate.format(dateFormat)\n                }\n              }\n            },\n            {\n              condition: {\n                lhs: node.lhs,\n                comparator: 'GTE',\n                rhs: {\n                  value: startDate.format(dateFormat)\n                }\n              }\n            }\n          ]\n        };\n      case 'NEQ':\n        return {\n          OR: [\n            {\n              condition: {\n                lhs: node.lhs,\n                comparator: 'GT',\n                rhs: {\n                  value: endDate.format(dateFormat)\n                }\n              }\n            },\n            {\n              condition: {\n                lhs: node.lhs,\n                comparator: 'LT',\n                rhs: {\n                  value: startDate.format(dateFormat)\n                }\n              }\n            }\n          ]\n        };\n      case 'GT':\n        return {\n          condition: {\n            lhs: node.lhs,\n            comparator: 'GT',\n            rhs: {\n              value: endDate.format(dateFormat)\n            }\n          }\n        };\n      case 'GTE':\n        return {\n          condition: {\n            lhs: node.lhs,\n            comparator: 'GTE',\n            rhs: {\n              value: startDate.format(dateFormat)\n            }\n          }\n        };\n      case 'LT':\n        return {\n          condition: {\n            lhs: node.lhs,\n            comparator: 'LT',\n            rhs: {\n              value: startDate.format(dateFormat)\n            }\n          }\n        };\n      case 'LTE':\n        return {\n          condition: {\n            lhs: node.lhs,\n            comparator: 'LTE',\n            rhs: {\n              value: endDate.format(dateFormat)\n            }\n          }\n        };\n      default:\n        return {\n          condition: node\n        };\n    }\n  }\n  return {\n    condition: node\n  };\n}\n\n/** This function transforms Conditions with Relative Dates into Conditions with Date Ranges.\n * Do not use this function unless you need to convert Relative Dates into Date Ranges.\n */\nexport default function transformComplexCondition(\n  condition: Condition,\n  fields: Field[],\n  currentDateTime?: string\n): Condition {\n  if (hasProp(condition, 'AND')) {\n    const childNodes: Condition[] = condition.AND.map(n =>\n      transformComplexCondition(n, fields, currentDateTime)\n    );\n    return {\n      AND: childNodes\n    };\n  }\n\n  if (hasProp(condition, 'OR')) {\n    const childNodes: Condition[] = condition.OR.map(n =>\n      transformComplexCondition(n, fields, currentDateTime)\n    );\n    return {\n      OR: childNodes\n    };\n  }\n\n  if (hasProp(condition, 'NOT')) {\n    return {\n      NOT: transformComplexCondition(condition.NOT, fields, currentDateTime)\n    };\n  }\n\n  return transformLeafCondition(condition.condition, fields, currentDateTime);\n}\n"]}

package/lib/components/ConditionBuilder/core/types.d.ts

@@ -36,6 +36,12 @@ export declare type ComparatorsByType = {
     type: 'TIME_ONLY';
     comparators: DateTimeComparator[];
 };
-export declare type RHSType = 'LITERAL' | 'FIELD';
+export declare type RHSType = 'LITERAL' | 'FIELD' | 'DATE_FUNCTION' | 'RELATIVE_DATE';
+/** Date function types supported on the RHS */
+export declare type DateFunction = 'YEARS' | 'QUARTERS' | 'MONTHS' | 'WEEKS' | 'DAYS' | 'HOURS' | 'MONTHS_OF_YEAR' | 'DAYS_OF_MONTH' | 'DAYS_OF_WEEK';
+/** "Relative Date" Time Periods supported on the RHS */
+export declare type TimePeriod = 'LAST' | 'PREVIOUS' | 'CURRENT' | 'NEXT';
+/** "Relative Date" Date Parts supported on the RHS */
+export declare type DatePart = 'MINUTES' | 'HOURS' | 'DAYS' | 'WEEKS' | 'MONTHS' | 'QUARTERS' | 'YEARS';
 export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/components/ConditionBuilder/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/types.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,oBAAY,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAEhG,aAAK,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAChD,aAAK,kBAAkB,GAAG,IAAI,GAAG,KAAK,CAAC;AACvC,aAAK,eAAe,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC;AACnD,aAAK,kBAAkB,GAAG,SAAS,GAAG,UAAU,CAAC;AACjD,aAAK,cAAc,GAAG,IAAI,GAAG,QAAQ,CAAC;AACtC,aAAK,mBAAmB,GACpB,aAAa,GACb,iBAAiB,GACjB,WAAW,GACX,eAAe,GACf,UAAU,GACV,cAAc,CAAC;AAEnB,gCAAgC;AAChC,oBAAY,UAAU,GAClB,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,cAAc,GACd,eAAe,GACf,mBAAmB,CAAC;AAExB,+CAA+C;AAC/C,aAAK,iBAAiB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAElF,4CAA4C;AAC5C,aAAK,cAAc,GAAG,kBAAkB,GAAG,cAAc,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjG,8CAA8C;AAC9C,aAAK,gBAAgB,GAAG,kBAAkB,GAAG,cAAc,GAAG,eAAe,GAAG,cAAc,CAAC;AAE/F,qEAAqE;AACrE,aAAK,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,GAAG,cAAc,CAAC;AAEhF,qEAAqE;AACrE,oBAAY,iBAAiB,GACzB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,iBAAiB,EAAE,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,WAAW,EAAE,gBAAgB,EAAE,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,CAAC;AAE7D,oBAAY,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/types.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,oBAAY,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAEhG,aAAK,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAChD,aAAK,kBAAkB,GAAG,IAAI,GAAG,KAAK,CAAC;AACvC,aAAK,eAAe,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC;AACnD,aAAK,kBAAkB,GAAG,SAAS,GAAG,UAAU,CAAC;AACjD,aAAK,cAAc,GAAG,IAAI,GAAG,QAAQ,CAAC;AACtC,aAAK,mBAAmB,GACpB,aAAa,GACb,iBAAiB,GACjB,WAAW,GACX,eAAe,GACf,UAAU,GACV,cAAc,CAAC;AAEnB,gCAAgC;AAChC,oBAAY,UAAU,GAClB,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,cAAc,GACd,eAAe,GACf,mBAAmB,CAAC;AAExB,+CAA+C;AAC/C,aAAK,iBAAiB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAElF,4CAA4C;AAC5C,aAAK,cAAc,GAAG,kBAAkB,GAAG,cAAc,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjG,8CAA8C;AAC9C,aAAK,gBAAgB,GAAG,kBAAkB,GAAG,cAAc,GAAG,eAAe,GAAG,cAAc,CAAC;AAE/F,qEAAqE;AACrE,aAAK,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,GAAG,cAAc,CAAC;AAEhF,qEAAqE;AACrE,oBAAY,iBAAiB,GACzB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,iBAAiB,EAAE,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,WAAW,EAAE,gBAAgB,EAAE,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,kBAAkB,EAAE,CAAA;CAAE,CAAC;AAE7D,oBAAY,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,CAAC;AAE9E,+CAA+C;AAC/C,oBAAY,YAAY,GACpB,OAAO,GACP,UAAU,GACV,QAAQ,GACR,OAAO,GACP,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,eAAe,GACf,cAAc,CAAC;AAEnB,wDAAwD;AACxD,oBAAY,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC;AAElE,sDAAsD;AACtD,oBAAY,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC"}

package/lib/components/ConditionBuilder/core/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/types.ts"],"names":[],"mappings":"","sourcesContent":["/** Supported field types */\nexport type FieldType = 'BOOLEAN' | 'TEXT' | 'NUMBER' | 'DATE_TIME' | 'DATE_ONLY' | 'TIME_ONLY';\n\ntype NullComparator = 'IS_NULL' | 'IS_NOT_NULL';\ntype EqualityComparator = 'EQ' | 'NEQ';\ntype RangeComparator = 'GT' | 'GTE' | 'LT' | 'LTE';\ntype TruenessComparator = 'IS_TRUE' | 'IS_FALSE';\ntype ListComparator = 'IN' | 'NOT_IN';\ntype TextMatchComparator =\n  | 'STARTS_WITH'\n  | 'NOT_STARTS_WITH'\n  | 'ENDS_WITH'\n  | 'NOT_ENDS_WITH'\n  | 'CONTAINS'\n  | 'NOT_CONTAINS';\n\n/** All supported Comparators */\nexport type Comparator =\n  | TruenessComparator\n  | NullComparator\n  | EqualityComparator\n  | ListComparator\n  | RangeComparator\n  | TextMatchComparator;\n\n/** Comparators supported for BOOLEAN fields */\ntype BooleanComparator = TruenessComparator | EqualityComparator | NullComparator;\n\n/** Comparators supported for TEXT fields */\ntype TextComparator = EqualityComparator | ListComparator | TextMatchComparator | NullComparator;\n\n/** Comparators supported for NUMBER fields */\ntype NumberComparator = EqualityComparator | ListComparator | RangeComparator | NullComparator;\n\n/** Comparators supported for DATE_TIME/DATE_ONLY/TIME_ONLY fields */\ntype DateTimeComparator = EqualityComparator | RangeComparator | NullComparator;\n\n/** Type definition to specify supported comparators by field-type */\nexport type ComparatorsByType =\n  | { type: 'BOOLEAN'; comparators: BooleanComparator[] }\n  | { type: 'TEXT'; comparators: TextComparator[] }\n  | { type: 'NUMBER'; comparators: NumberComparator[] }\n  | { type: 'DATE_TIME'; comparators: DateTimeComparator[] }\n  | { type: 'DATE_ONLY'; comparators: DateTimeComparator[] }\n  | { type: 'TIME_ONLY'; comparators: DateTimeComparator[] };\n\nexport type RHSType = 'LITERAL' | 'FIELD';\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/types.ts"],"names":[],"mappings":"","sourcesContent":["/** Supported field types */\nexport type FieldType = 'BOOLEAN' | 'TEXT' | 'NUMBER' | 'DATE_TIME' | 'DATE_ONLY' | 'TIME_ONLY';\n\ntype NullComparator = 'IS_NULL' | 'IS_NOT_NULL';\ntype EqualityComparator = 'EQ' | 'NEQ';\ntype RangeComparator = 'GT' | 'GTE' | 'LT' | 'LTE';\ntype TruenessComparator = 'IS_TRUE' | 'IS_FALSE';\ntype ListComparator = 'IN' | 'NOT_IN';\ntype TextMatchComparator =\n  | 'STARTS_WITH'\n  | 'NOT_STARTS_WITH'\n  | 'ENDS_WITH'\n  | 'NOT_ENDS_WITH'\n  | 'CONTAINS'\n  | 'NOT_CONTAINS';\n\n/** All supported Comparators */\nexport type Comparator =\n  | TruenessComparator\n  | NullComparator\n  | EqualityComparator\n  | ListComparator\n  | RangeComparator\n  | TextMatchComparator;\n\n/** Comparators supported for BOOLEAN fields */\ntype BooleanComparator = TruenessComparator | EqualityComparator | NullComparator;\n\n/** Comparators supported for TEXT fields */\ntype TextComparator = EqualityComparator | ListComparator | TextMatchComparator | NullComparator;\n\n/** Comparators supported for NUMBER fields */\ntype NumberComparator = EqualityComparator | ListComparator | RangeComparator | NullComparator;\n\n/** Comparators supported for DATE_TIME/DATE_ONLY/TIME_ONLY fields */\ntype DateTimeComparator = EqualityComparator | RangeComparator | NullComparator;\n\n/** Type definition to specify supported comparators by field-type */\nexport type ComparatorsByType =\n  | { type: 'BOOLEAN'; comparators: BooleanComparator[] }\n  | { type: 'TEXT'; comparators: TextComparator[] }\n  | { type: 'NUMBER'; comparators: NumberComparator[] }\n  | { type: 'DATE_TIME'; comparators: DateTimeComparator[] }\n  | { type: 'DATE_ONLY'; comparators: DateTimeComparator[] }\n  | { type: 'TIME_ONLY'; comparators: DateTimeComparator[] };\n\nexport type RHSType = 'LITERAL' | 'FIELD' | 'DATE_FUNCTION' | 'RELATIVE_DATE';\n\n/** Date function types supported on the RHS */\nexport type DateFunction =\n  | 'YEARS'\n  | 'QUARTERS'\n  | 'MONTHS'\n  | 'WEEKS'\n  | 'DAYS'\n  | 'HOURS'\n  | 'MONTHS_OF_YEAR'\n  | 'DAYS_OF_MONTH'\n  | 'DAYS_OF_WEEK';\n\n/** \"Relative Date\" Time Periods supported on the RHS */\nexport type TimePeriod = 'LAST' | 'PREVIOUS' | 'CURRENT' | 'NEXT';\n\n/** \"Relative Date\" Date Parts supported on the RHS */\nexport type DatePart = 'MINUTES' | 'HOURS' | 'DAYS' | 'WEEKS' | 'MONTHS' | 'QUARTERS' | 'YEARS';\n"]}

package/lib/components/ConditionBuilder/core/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAqQnF,yDAAyD;AACzD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,EAAE,4CAA4C;AACjG,WAAW,GAAE,OAAe,EAC5B,kBAAkB,GAAE,OAAe,GAClC;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAqB9C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA0D5D;AAkDD,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,SAAS,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,EAAE,CAAA;CAAE,CAUjG;AAGD,mIAAmI;AACnI,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,SAAS,EACf,WAAW,GAAE,MAAW,GACvB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAA;CAAE,CAkBnE;AAED,qHAAqH;AACrH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAwBnE;AAED,8FAA8F;AAC9F,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAMrE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,MAAM,CAG7E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/ConditionBuilder/core/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAiQnF,yDAAyD;AACzD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,EAAE,4CAA4C;AACjG,WAAW,GAAE,OAAe,EAC5B,kBAAkB,GAAE,OAAe,GAClC;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAqB9C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA0D5D;AAkDD,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,SAAS,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,EAAE,CAAA;CAAE,CAUjG;AAGD,mIAAmI;AACnI,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,SAAS,EACf,WAAW,GAAE,MAAW,GACvB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAA;CAAE,CAkBnE;AAED,qHAAqH;AACrH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAwBnE;AAED,8FAA8F;AAC9F,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAMrE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,MAAM,CAG7E"}

package/lib/components/ConditionBuilder/core/utils.js

@@ -53,16 +53,12 @@ function findInvalidPatterns(tokens) {
         const token = tokens[i];
         const tokenType = isIntegerToken(token) ? NUMBER : token; // To simplify comparisons below
         // The expression can only start with NOT, LPAREN or NUMBER
-        if (i === 0) {
-            if (![NOT, LPAREN, NUMBER].includes(tokenType)) {
-                return `Unexpected "${token}" at the beginning.`; // FIXME: TR
-            }
+        if (i === 0 && ![NOT, LPAREN, NUMBER].includes(tokenType)) {
+            return `Unexpected "${token}" at the beginning.`; // FIXME: TR
         }
         // The expression can only end with RPAREN or NUMBER
-        if (i === tokens.length - 1) {
-            if (![RPAREN, NUMBER].includes(tokenType)) {
-                return `Unexpected "${token}" at the end.`; // FIXME: TR
-            }
+        if (i === tokens.length - 1 && ![RPAREN, NUMBER].includes(tokenType)) {
+            return `Unexpected "${token}" at the end.`; // FIXME: TR
         }
         // If there is a previous token, check if it is supposed to precede the current token
         if (i > 0) {