@syncfusion/ej2-calculate 35.1.37 → 35.1.40

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

@@ -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,6 +19710,24 @@ 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));
                         }
+                        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 {
                         let args;
@@ -21244,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');
                             }
@@ -21633,7 +21660,52 @@ let Calculate = class Calculate extends Base {
                 return errorStrings[CommonErrors.Value];
             }
         }
-        const rangeArr = argArr[1].split(':');
+        const rangeArg = argArr[1];
+        const rowSepMarker = this.tic + 'RSEP' + this.tic;
+        const isInlineArray = rangeArg.includes(rowSepMarker) ||
+            (rangeArg.startsWith('(') && rangeArg.endsWith(')') && rangeArg.includes(rowSepMarker));
+        if (isInlineArray) {
+            const innerStr = rangeArg.startsWith('(') && rangeArg.endsWith(')')
+                ? rangeArg.substring(1, rangeArg.length - 1) : rangeArg;
+            const rowBoundary = this.tic + 'RSEP' + this.tic;
+            const colBoundary = this.tic + 'CSEP' + this.tic;
+            const rows = innerStr.split(rowBoundary).map((rowStr) => {
+                return rowStr.split(colBoundary).map((cell) => {
+                    if (cell.startsWith(this.tic) && cell.endsWith(this.tic)) {
+                        return cell.substring(1, cell.length - 1);
+                    }
+                    if (this.isCellReference(cell.trim())) {
+                        return this.getValueFromArg(cell.trim());
+                    }
+                    return cell.trim();
+                });
+            });
+            const numRows = rows.length;
+            const numCols = rows[0] ? rows[0].length : 0;
+            const matchColIdx = colNumIdx - 1;
+            if (isVlookup && numCols <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            if (!isVlookup && numRows <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            const lookupValUpper = lookupValue.toUpperCase();
+            const iterCount = isVlookup ? numRows : numCols;
+            for (let r = 0; r < iterCount; r++) {
+                const cellVal = (isVlookup ? rows[r][0] : rows[0][r]) || '';
+                const isMatch = this.isNumber(lookupValue) && this.isNumber(cellVal)
+                    ? this.parseFloat(lookupValue) === this.parseFloat(cellVal) : cellVal.toUpperCase() === lookupValUpper;
+                if (isMatch) {
+                    const matchVal = isVlookup
+                        ? (rows[r][matchColIdx] !== undefined ? rows[r][matchColIdx] : '')
+                        : (rows[matchColIdx] !== undefined && rows[matchColIdx][r] !== undefined
+                            ? rows[matchColIdx][r] : '');
+                    return matchVal !== '' ? matchVal : '';
+                }
+            }
+            return errorStrings[CommonErrors.NA];
+        }
+        const rangeArr = rangeArg.split(':');
         let startIdx;
         let endIdx;
         let idx;