@syncfusion/ej2-calculate 35.1.37 → 35.1.39

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

@@ -22083,6 +22083,13 @@ var Parser = /** @__PURE__ @class */ (function () {
                             var criteriaStr = this_1.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
                             substr = substr.split(criteriaStr).join(criteriaStr.split(argsSep).join(this_1.parent.tic + this_1.parent.tic));
                         }
+                        else if ((libFormula === 'VLOOKUP' || libFormula === 'HLOOKUP') && substr.includes('{')) {
+                            var leftBraceIdx = substr.indexOf('{');
+                            var criteriaStr = this_1.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
+                            var protectedStr = criteriaStr.split(';').join(this_1.parent.tic + 'RSEP' + this_1.parent.tic)
+                                .split(argsSep).join(this_1.parent.tic + 'CSEP' + this_1.parent.tic);
+                            substr = substr.split(criteriaStr).join(protectedStr);
+                        }
                     }
                     try {
                         var args = void 0;
@@ -24052,7 +24059,52 @@ var Calculate = /** @__PURE__ @class */ (function (_super) {
                 return errorStrings[CommonErrors.Value];
             }
         }
-        var rangeArr = argArr[1].split(':');
+        var rangeArg = argArr[1];
+        var rowSepMarker = this.tic + 'RSEP' + this.tic;
+        var isInlineArray = rangeArg.includes(rowSepMarker) ||
+            (rangeArg.startsWith('(') && rangeArg.endsWith(')') && rangeArg.includes(rowSepMarker));
+        if (isInlineArray) {
+            var innerStr = rangeArg.startsWith('(') && rangeArg.endsWith(')')
+                ? rangeArg.substring(1, rangeArg.length - 1) : rangeArg;
+            var rowBoundary = this.tic + 'RSEP' + this.tic;
+            var colBoundary_1 = this.tic + 'CSEP' + this.tic;
+            var rows = innerStr.split(rowBoundary).map(function (rowStr) {
+                return rowStr.split(colBoundary_1).map(function (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();
+                });
+            });
+            var numRows = rows.length;
+            var numCols = rows[0] ? rows[0].length : 0;
+            var matchColIdx = colNumIdx - 1;
+            if (isVlookup && numCols <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            if (!isVlookup && numRows <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            var lookupValUpper = lookupValue.toUpperCase();
+            var iterCount = isVlookup ? numRows : numCols;
+            for (var r = 0; r < iterCount; r++) {
+                var cellVal = (isVlookup ? rows[r][0] : rows[0][r]) || '';
+                var isMatch = this.isNumber(lookupValue) && this.isNumber(cellVal)
+                    ? this.parseFloat(lookupValue) === this.parseFloat(cellVal) : cellVal.toUpperCase() === lookupValUpper;
+                if (isMatch) {
+                    var 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];
+        }
+        var rangeArr = rangeArg.split(':');
         var startIdx;
         var endIdx;
         var idx;
@@ -25665,8 +25717,8 @@ var Calculate = /** @__PURE__ @class */ (function (_super) {
         return { op: op, criteria: criteria };
     };
     Calculate.prototype.processNestedFormula = function (pText, sFormula, fResult) {
-        if (fResult && !fResult.toString().includes('"')) {
-            var formulaEndIdx = pText.indexOf(sFormula) + sFormula.length;
+        if (!fResult.toString().includes('"')) {
+            var formulaEndIdx = pText.lastIndexOf(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 + '"');