@syncfusion/ej2-calculate 35.1.39 → 35.1.41

package/dist/es6/ej2-calculate.es2015.js

@@ -11433,7 +11433,7 @@ class LogicalFormulas extends FormulaModuleBase {
             const condUpper = condition.toUpperCase();
             const parsedVal = this.parent.parseFloat(condition);
             if (condUpper === this.parent.trueValue || (parsedVal < 0 || parsedVal > 0)) {
-                if (nestedFormula && argArr[1].includes(':')) {
+                if (nestedFormula && argArr[1].includes(':') && this.parent.isCellReference(argArr[1])) {
                     cellValues = this.parent.getCellCollection(argArr[1]);
                     for (let i = 0; i < cellValues.length; i++) {
                         cellVal = this.parent.getValueFromArg(cellValues[i]);
@@ -11449,7 +11449,7 @@ class LogicalFormulas extends FormulaModuleBase {
                 if (isNullOrUndefined(argArr[2])) {
                     return this.parent.falseValue;
                 }
-                if (nestedFormula && argArr[2].includes(':')) {
+                if (nestedFormula && argArr[2].includes(':') && this.parent.isCellReference(argArr[2])) {
                     cellValues = this.parent.getCellCollection(argArr[2]);
                     for (let i = 0; i < cellValues.length; i++) {
                         cellVal = this.parent.getValueFromArg(cellValues[i]);
@@ -14642,6 +14642,11 @@ class TextExtraFormulas extends FormulaModuleBase {
         return this.substringSide(args, false);
     }
     substringSide(args, fromLeft) {
+        let nestedFormula;
+        if (args && args.length > 0 && args[args.length - 1] === 'nestedFormulaTrue') {
+            nestedFormula = true;
+            args.pop();
+        }
         const errCollection = this.parent.getErrorStrings();
         if (isNullOrUndefined(args) || (args.length === 1 && args[0] === '')) {
             return this.parent.formulaErrorStrings[FormulasErrorsStrings.InvalidArguments];
@@ -14664,10 +14669,8 @@ class TextExtraFormulas extends FormulaModuleBase {
                 return errCollection[CommonErrors.Value];
             }
         }
-        if (fromLeft) {
-            return text.substring(0, count);
-        }
-        return count >= text.length ? text : text.substring(text.length - count);
+        const result = fromLeft ? text.substring(0, count) : (count >= text.length ? text : text.substring(text.length - count));
+        return nestedFormula ? this.parent.tic + result + this.parent.tic : result;
     }
     /**
      * Returns a specific number of characters from a text string starting at the position you specify.
@@ -14747,6 +14750,11 @@ class TextExtraFormulas extends FormulaModuleBase {
      * @returns {string | number} - Computed text result or an Excel error token such as `#VALUE!`.
      */
     ComputeTRIM(...args) {
+        let nestedFormula;
+        if (args && args.length > 0 && args[args.length - 1] === 'nestedFormulaTrue') {
+            nestedFormula = true;
+            args.pop();
+        }
         const errCollection = this.parent.getErrorStrings();
         if (isNullOrUndefined(args) || args.length !== 1) {
             return this.parent.formulaErrorStrings[FormulasErrorsStrings.WrongNumberArguments];
@@ -14755,7 +14763,8 @@ class TextExtraFormulas extends FormulaModuleBase {
         if (errCollection.indexOf(text) > -1) {
             return text;
         }
-        return text.trim().replace(/\s+/g, ' ');
+        const result = text.trim().replace(/\s+/g, ' ');
+        return nestedFormula ? this.parent.tic + result + this.parent.tic : result;
     }
     /**
      * Replaces characters within text.
@@ -19701,12 +19710,23 @@ class Parser {
                             const criteriaStr = this.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
                             substr = substr.split(criteriaStr).join(criteriaStr.split(argsSep).join(this.parent.tic + this.parent.tic));
                         }
-                        else if ((libFormula === 'VLOOKUP' || libFormula === 'HLOOKUP') && substr.includes('{')) {
-                            const leftBraceIdx = substr.indexOf('{');
-                            const criteriaStr = this.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
-                            const protectedStr = criteriaStr.split(';').join(this.parent.tic + 'RSEP' + this.parent.tic)
-                                .split(argsSep).join(this.parent.tic + 'CSEP' + this.parent.tic);
-                            substr = substr.split(criteriaStr).join(protectedStr);
+                        if ((libFormula === 'VLOOKUP' || libFormula === 'HLOOKUP') && substr.includes('{')) {
+                            let searchStartIdx = 0;
+                            let leftBraceIdx = substr.indexOf('{', searchStartIdx);
+                            while (leftBraceIdx > -1) {
+                                const rightBraceIdx = substr.indexOf('}', leftBraceIdx);
+                                if (rightBraceIdx > leftBraceIdx) {
+                                    const criteriaStr = this.parent.substring(substr, leftBraceIdx, rightBraceIdx - leftBraceIdx + 1);
+                                    const protectedStr = criteriaStr.split(';').join(this.parent.tic + 'RSEP' + this.parent.tic)
+                                        .split(argsSep).join(this.parent.tic + 'CSEP' + this.parent.tic);
+                                    substr = substr.split(criteriaStr).join(protectedStr);
+                                    searchStartIdx = leftBraceIdx + protectedStr.length;
+                                    leftBraceIdx = substr.indexOf('{', searchStartIdx);
+                                }
+                                else {
+                                    break;
+                                }
+                            }
                         }
                     }
                     try {
@@ -21251,7 +21271,7 @@ let Calculate = class Calculate extends Base {
                         }
                         if (nestedFormula && libFormula) {
                             const formulas = ['IF', 'INDEX', 'SORT', 'T', 'EXACT',
-                                'PROPER', 'DOLLAR', 'DATE', 'TEXT', 'ISNUMBER'];
+                                'PROPER', 'DOLLAR', 'DATE', 'TEXT', 'ISNUMBER', 'TRIM', 'LEFT'];
                             if (formulas.some((formula) => formula === libFormula)) {
                                 args.push('nestedFormulaTrue');
                             }
@@ -23297,8 +23317,8 @@ let Calculate = class Calculate extends Base {
         return { op, criteria };
     }
     processNestedFormula(pText, sFormula, fResult) {
-        if (!fResult.toString().includes('"')) {
-            const formulaEndIdx = pText.lastIndexOf(sFormula) + sFormula.length;
+        if (fResult && !fResult.toString().includes('"')) {
+            const formulaEndIdx = pText.indexOf(sFormula) + sFormula.length;
             if (pText[formulaEndIdx] === '"' && this.getErrorStrings().indexOf(fResult.toString()) < 0 &&
                 !this.isNumber(fResult) && fResult !== this.trueValue && fResult !== this.falseValue) {
                 return pText.split(sFormula).join('"' + fResult + '"');