@fileverse-dev/formula-parser 0.2.70 → 0.2.72

package/es/error.js

@@ -1,3 +1,4 @@
+var _errors;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
@@ -10,7 +11,7 @@ export var ERROR_NULL = "NULL";
 export var ERROR_NUM = "NUM";
 export var ERROR_REF = "REF";
 export var ERROR_VALUE = "VALUE";
-var errors = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, "Syntax error"), ERROR_DIV_ZERO, "#DIV/0!"), ERROR_NAME, "Wrong function name or parameter"), ERROR_NOT_AVAILABLE, "#N/A"), ERROR_NULL, "#NULL!"), ERROR_NUM, "#NUM!"), ERROR_REF, "#REF!"), ERROR_VALUE, "#VALUE!");
+var errors = (_errors = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_errors, 'Error: lookup_range and result_range are required', "Lookup range and result range are required"), ERROR, "Syntax error"), ERROR_DIV_ZERO, "#DIV/0!"), ERROR_NAME, "Wrong function name or parameter"), ERROR_NOT_AVAILABLE, "#N/A"), ERROR_NULL, "#NULL!"), ERROR_NUM, "#NUM!"), ERROR_REF, "#REF!"), ERROR_VALUE, "#VALUE!"), 'search_key', "Error: search_key is required"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_errors, 'lookup_range', "Error: lookup_range is required"), 'result_range', "Error: result_range is required"), 'lookup_range_single', "Error: lookup_range must be a singular row or column"), 'result_range_invalid', "Error: result_range is invalid"), 'lookup_range_and_result_range', "Error: lookup_range and result_range must have the same number of columns"), 'match_mode_must', "Error: match_mode must be 0, 1, -1, or 2"), 'search_mode_must', "Error: search_mode must be 1, -1, 2, or -2"), 'binary_search_and_wildcard', "'Error: Binary search (search_mode ±2) cannot be used with wildcard matching (match_mode 2)"));
 
 /**
  * Return error type based on provided error id.

package/es/grammar-parser/grammar-parser.js

@@ -1,3 +1,9 @@
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 /* parser generated by jison 0.4.18 */
 /*
   Returns a Parser object of the following structure:
@@ -72,6 +78,24 @@
   }
 */
 
+export function checkIsCol(str) {
+  if (!str) return null;
+  // match pattern like A1:B10
+  var match = str.match(/^([A-Z]+)(\d+):([A-Z]+)(\d+)$/i);
+  if (!match) return null;
+  var _match = _slicedToArray(match, 5),
+    col1 = _match[1],
+    row1 = _match[2],
+    col2 = _match[3],
+    row2 = _match[4];
+  // same column, different rows → false
+  if (col1 === col2 && row1 !== row2) return false;
+  // same row, different columns → true
+  if (row1 === row2 && col1 !== col2) return true;
+  // otherwise not a straight row/col selection
+  return null;
+}
+
 /* addresses */
 var simpleSheetName = "[A-Za-z0-9_\xC0-\u02AF]+";
 var quotedSheetName = "'(?:(?!').|'')*'";
@@ -185,9 +209,15 @@ var parser = {
     35: "ERROR"
   },
   productions_: [0, [3, 2], [4, 1], [4, 1], [4, 1], [4, 3], [4, 3], [4, 3], [4, 3], [4, 4], [4, 4], [4, 4], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 2], [4, 2], [4, 3], [4, 4], [4, 1], [4, 1], [4, 2], [23, 1], [23, 1], [23, 1], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [22, 1], [22, 1], [22, 3], [22, 3], [6, 1], [6, 3], [7, 1], [7, 3], [7, 2], [2, 1]],
-  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
+  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */, initialInput) {
     /* this == yyval */
 
+    var isXlookuoColReference;
+    if (initialInput.toLowerCase().includes('xlookup')) {
+      var _initialInput$split, _initialInput$split$, _initialInput$split$$, _initialInput$split2, _initialInput$split2$, _initialInput$split2$2;
+      var t = initialInput.includes('XLOOKUP') ? initialInput === null || initialInput === void 0 ? void 0 : (_initialInput$split = initialInput.split('XLOOKUP(')) === null || _initialInput$split === void 0 ? void 0 : (_initialInput$split$ = _initialInput$split[1]) === null || _initialInput$split$ === void 0 ? void 0 : (_initialInput$split$$ = _initialInput$split$.split(',')) === null || _initialInput$split$$ === void 0 ? void 0 : _initialInput$split$$[1] : initialInput === null || initialInput === void 0 ? void 0 : (_initialInput$split2 = initialInput.split('xlookup(')) === null || _initialInput$split2 === void 0 ? void 0 : (_initialInput$split2$ = _initialInput$split2[1]) === null || _initialInput$split2$ === void 0 ? void 0 : (_initialInput$split2$2 = _initialInput$split2$.split(',')) === null || _initialInput$split2$2 === void 0 ? void 0 : _initialInput$split2$2[1];
+      isXlookuoColReference = checkIsCol(t);
+    }
     var $0 = $$.length - 1;
     switch (yystate) {
       case 1:
@@ -262,7 +292,7 @@ var parser = {
         this.$ = yy.callFunction($$[$0 - 2]);
         break;
       case 22:
-        this.$ = yy.callFunction($$[$0 - 3], $$[$0 - 1]);
+        this.$ = yy.callFunction($$[$0 - 3], $$[$0 - 1], isXlookuoColReference);
         break;
       case 26:
       case 27:
@@ -1060,7 +1090,7 @@ var parser = {
             if (ranges) {
               yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
             }
-            r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
+            r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack, input].concat(args));
             if (typeof r !== "undefined") {
               return {
                 v: r

package/es/parser.js

@@ -50,8 +50,8 @@ var Parser = /*#__PURE__*/function (_Emitter) {
         return _this._callVariable(variable);
       },
       evaluateByOperator: evaluateByOperator,
-      callFunction: function callFunction(name, params) {
-        return _this._callFunction(name, params);
+      callFunction: function callFunction(name, params, isXlookuoColReference) {
+        return _this._callFunction(name, params, isXlookuoColReference);
       },
       cellValue: function cellValue(value) {
         return _this._callCellValue(value);
@@ -194,6 +194,10 @@ var Parser = /*#__PURE__*/function (_Emitter) {
     key: "_callFunction",
     value: function _callFunction(name) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      var isXlookuoColReference = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      if (name.toLowerCase().includes('xlookup')) {
+        params.splice(3, 0, String(isXlookuoColReference));
+      }
       var fn = this.getFunction(name);
       var value;
       if (fn) {

package/lib/error.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ERROR_VALUE = exports.ERROR_REF = exports.ERROR_NUM = exports.ERROR_NULL = exports.ERROR_NOT_AVAILABLE = exports.ERROR_NAME = exports.ERROR_DIV_ZERO = exports.ERROR = void 0;
 exports["default"] = error;
 exports.isValidStrict = isValidStrict;
+var _errors;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
@@ -18,7 +19,7 @@ var ERROR_NULL = exports.ERROR_NULL = "NULL";
 var ERROR_NUM = exports.ERROR_NUM = "NUM";
 var ERROR_REF = exports.ERROR_REF = "REF";
 var ERROR_VALUE = exports.ERROR_VALUE = "VALUE";
-var errors = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, "Syntax error"), ERROR_DIV_ZERO, "#DIV/0!"), ERROR_NAME, "Wrong function name or parameter"), ERROR_NOT_AVAILABLE, "#N/A"), ERROR_NULL, "#NULL!"), ERROR_NUM, "#NUM!"), ERROR_REF, "#REF!"), ERROR_VALUE, "#VALUE!");
+var errors = (_errors = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_errors, 'Error: lookup_range and result_range are required', "Lookup range and result range are required"), ERROR, "Syntax error"), ERROR_DIV_ZERO, "#DIV/0!"), ERROR_NAME, "Wrong function name or parameter"), ERROR_NOT_AVAILABLE, "#N/A"), ERROR_NULL, "#NULL!"), ERROR_NUM, "#NUM!"), ERROR_REF, "#REF!"), ERROR_VALUE, "#VALUE!"), 'search_key', "Error: search_key is required"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_errors, 'lookup_range', "Error: lookup_range is required"), 'result_range', "Error: result_range is required"), 'lookup_range_single', "Error: lookup_range must be a singular row or column"), 'result_range_invalid', "Error: result_range is invalid"), 'lookup_range_and_result_range', "Error: lookup_range and result_range must have the same number of columns"), 'match_mode_must', "Error: match_mode must be 0, 1, -1, or 2"), 'search_mode_must', "Error: search_mode must be 1, -1, 2, or -2"), 'binary_search_and_wildcard', "'Error: Binary search (search_mode ±2) cannot be used with wildcard matching (match_mode 2)"));
 
 /**
  * Return error type based on provided error id.

package/lib/grammar-parser/grammar-parser.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Parser = Parser;
+exports.checkIsCol = checkIsCol;
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 /* parser generated by jison 0.4.18 */
 /*
   Returns a Parser object of the following structure:
@@ -78,6 +85,24 @@ exports.Parser = Parser;
   }
 */
 
+function checkIsCol(str) {
+  if (!str) return null;
+  // match pattern like A1:B10
+  var match = str.match(/^([A-Z]+)(\d+):([A-Z]+)(\d+)$/i);
+  if (!match) return null;
+  var _match = _slicedToArray(match, 5),
+    col1 = _match[1],
+    row1 = _match[2],
+    col2 = _match[3],
+    row2 = _match[4];
+  // same column, different rows → false
+  if (col1 === col2 && row1 !== row2) return false;
+  // same row, different columns → true
+  if (row1 === row2 && col1 !== col2) return true;
+  // otherwise not a straight row/col selection
+  return null;
+}
+
 /* addresses */
 var simpleSheetName = "[A-Za-z0-9_\xC0-\u02AF]+";
 var quotedSheetName = "'(?:(?!').|'')*'";
@@ -191,9 +216,15 @@ var parser = {
     35: "ERROR"
   },
   productions_: [0, [3, 2], [4, 1], [4, 1], [4, 1], [4, 3], [4, 3], [4, 3], [4, 3], [4, 4], [4, 4], [4, 4], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 3], [4, 2], [4, 2], [4, 3], [4, 4], [4, 1], [4, 1], [4, 2], [23, 1], [23, 1], [23, 1], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [23, 3], [22, 1], [22, 1], [22, 3], [22, 3], [6, 1], [6, 3], [7, 1], [7, 3], [7, 2], [2, 1]],
-  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
+  performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */, initialInput) {
     /* this == yyval */
 
+    var isXlookuoColReference;
+    if (initialInput.toLowerCase().includes('xlookup')) {
+      var _initialInput$split, _initialInput$split$, _initialInput$split$$, _initialInput$split2, _initialInput$split2$, _initialInput$split2$2;
+      var t = initialInput.includes('XLOOKUP') ? initialInput === null || initialInput === void 0 ? void 0 : (_initialInput$split = initialInput.split('XLOOKUP(')) === null || _initialInput$split === void 0 ? void 0 : (_initialInput$split$ = _initialInput$split[1]) === null || _initialInput$split$ === void 0 ? void 0 : (_initialInput$split$$ = _initialInput$split$.split(',')) === null || _initialInput$split$$ === void 0 ? void 0 : _initialInput$split$$[1] : initialInput === null || initialInput === void 0 ? void 0 : (_initialInput$split2 = initialInput.split('xlookup(')) === null || _initialInput$split2 === void 0 ? void 0 : (_initialInput$split2$ = _initialInput$split2[1]) === null || _initialInput$split2$ === void 0 ? void 0 : (_initialInput$split2$2 = _initialInput$split2$.split(',')) === null || _initialInput$split2$2 === void 0 ? void 0 : _initialInput$split2$2[1];
+      isXlookuoColReference = checkIsCol(t);
+    }
     var $0 = $$.length - 1;
     switch (yystate) {
       case 1:
@@ -268,7 +299,7 @@ var parser = {
         this.$ = yy.callFunction($$[$0 - 2]);
         break;
       case 22:
-        this.$ = yy.callFunction($$[$0 - 3], $$[$0 - 1]);
+        this.$ = yy.callFunction($$[$0 - 3], $$[$0 - 1], isXlookuoColReference);
         break;
       case 26:
       case 27:
@@ -1066,7 +1097,7 @@ var parser = {
             if (ranges) {
               yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
             }
-            r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
+            r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack, input].concat(args));
             if (typeof r !== "undefined") {
               return {
                 v: r

package/lib/parser.js

@@ -58,8 +58,8 @@ var Parser = /*#__PURE__*/function (_Emitter) {
         return _this._callVariable(variable);
       },
       evaluateByOperator: _evaluateByOperator["default"],
-      callFunction: function callFunction(name, params) {
-        return _this._callFunction(name, params);
+      callFunction: function callFunction(name, params, isXlookuoColReference) {
+        return _this._callFunction(name, params, isXlookuoColReference);
       },
       cellValue: function cellValue(value) {
         return _this._callCellValue(value);
@@ -202,6 +202,10 @@ var Parser = /*#__PURE__*/function (_Emitter) {
     key: "_callFunction",
     value: function _callFunction(name) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      var isXlookuoColReference = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      if (name.toLowerCase().includes('xlookup')) {
+        params.splice(3, 0, String(isXlookuoColReference));
+      }
       var fn = this.getFunction(name);
       var value;
       if (fn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formula-parser",
-  "version": "0.2.70",
+  "version": "0.2.72",
   "description": "Formula parser",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -48,7 +48,7 @@
     "webpack-cli": "^4.2.0"
   },
   "dependencies": {
-    "@fileverse-dev/formulajs": "4.4.20",
+    "@fileverse-dev/formulajs": "4.4.21",
     "tiny-emitter": "^2.1.0"
   },
   "jest": {