@borgar/fx 5.0.1 → 5.0.2

package/dist/index.js

@@ -15,6 +15,7 @@ var REF_BEAM = "range_beam";
 var REF_TERNARY = "range_ternary";
 var REF_NAMED = "range_named";
 var REF_STRUCT = "structured";
+var REF_CELL = "cell";
 var FX_PREFIX = "fx_prefix";
 var UNKNOWN = "unknown";
 var UNARY = "UnaryExpression";
@@ -34,24 +35,26 @@ var MAX_ROWS = 2 ** 20 - 1;
 // lib/mergeRefTokens.ts
 var END = "$";
 var validRunsMerge = [
-  [REF_RANGE, ":", REF_RANGE],
-  [REF_RANGE, ".:", REF_RANGE],
-  [REF_RANGE, ":.", REF_RANGE],
-  [REF_RANGE, ".:.", REF_RANGE],
+  [REF_CELL, ":", REF_CELL],
+  [REF_CELL, ".:", REF_CELL],
+  [REF_CELL, ":.", REF_CELL],
+  [REF_CELL, ".:.", REF_CELL],
   [REF_RANGE],
   [REF_BEAM],
   [REF_TERNARY],
-  [CONTEXT, "!", REF_RANGE, ":", REF_RANGE],
-  [CONTEXT, "!", REF_RANGE, ".:", REF_RANGE],
-  [CONTEXT, "!", REF_RANGE, ":.", REF_RANGE],
-  [CONTEXT, "!", REF_RANGE, ".:.", REF_RANGE],
+  [CONTEXT, "!", REF_CELL, ":", REF_CELL],
+  [CONTEXT, "!", REF_CELL, ".:", REF_CELL],
+  [CONTEXT, "!", REF_CELL, ":.", REF_CELL],
+  [CONTEXT, "!", REF_CELL, ".:.", REF_CELL],
+  [CONTEXT, "!", REF_CELL],
   [CONTEXT, "!", REF_RANGE],
   [CONTEXT, "!", REF_BEAM],
   [CONTEXT, "!", REF_TERNARY],
-  [CONTEXT_QUOTE, "!", REF_RANGE, ":", REF_RANGE],
-  [CONTEXT_QUOTE, "!", REF_RANGE, ".:", REF_RANGE],
-  [CONTEXT_QUOTE, "!", REF_RANGE, ":.", REF_RANGE],
-  [CONTEXT_QUOTE, "!", REF_RANGE, ".:.", REF_RANGE],
+  [CONTEXT_QUOTE, "!", REF_CELL, ":", REF_CELL],
+  [CONTEXT_QUOTE, "!", REF_CELL, ".:", REF_CELL],
+  [CONTEXT_QUOTE, "!", REF_CELL, ":.", REF_CELL],
+  [CONTEXT_QUOTE, "!", REF_CELL, ".:.", REF_CELL],
+  [CONTEXT_QUOTE, "!", REF_CELL],
   [CONTEXT_QUOTE, "!", REF_RANGE],
   [CONTEXT_QUOTE, "!", REF_BEAM],
   [CONTEXT_QUOTE, "!", REF_TERNARY],
@@ -83,7 +86,11 @@ var matcher = (tokens2, currNode, anchorIndex, index = 0) => {
   while (i <= max) {
     const token = tokens2[anchorIndex - i];
     if (token) {
-      const key = token.type === OPERATOR ? token.value : token.type;
+      const value = token.value;
+      let key = token.type === OPERATOR ? value : token.type;
+      if (key === REF_RANGE && !value.includes(":")) {
+        key = REF_CELL;
+      }
       if (key in node) {
         node = node[key];
         i += 1;
@@ -473,7 +480,7 @@ function lexRangeA1(str, pos, options) {
         }
       }
     }
-    if (top && canEndRange(str, preOp)) {
+    if (top && canEndRange(str, preOp) && str.charCodeAt(preOp) !== 33) {
       return { type: REF_RANGE, value: str.slice(pos, preOp) };
     }
   } else {
@@ -513,6 +520,7 @@ var UC_C = 67;
 var LC_C = 99;
 var PLUS = 43;
 var MINUS = 45;
+var EXCL2 = 33;
 function lexR1C1Part(str, pos, isRow = false) {
   const start = pos;
   const c0 = str.charCodeAt(pos);
@@ -567,7 +575,7 @@ function lexRangeR1C1(str, pos, options) {
   p += r1;
   const c1 = lexR1C1Part(str, p);
   p += c1;
-  if (c1 || r1) {
+  if ((c1 || r1) && str.charCodeAt(p) !== EXCL2) {
     const op = advRangeOp(str, p);
     const preOp = p;
     if (op) {
@@ -784,7 +792,7 @@ function parseSRange(str, pos = 0) {
 }
 
 // lib/lexers/lexStructured.ts
-var EXCL2 = 33;
+var EXCL3 = 33;
 function lexStructured(str, pos) {
   const structData = parseSRange(str, pos);
   if (structData && structData.length) {
@@ -792,7 +800,7 @@ function lexStructured(str, pos) {
     while (isWS(str.charCodeAt(pos + i))) {
       i++;
     }
-    if (str.charCodeAt(pos + i) !== EXCL2) {
+    if (str.charCodeAt(pos + i) !== EXCL3) {
       return {
         type: REF_STRUCT,
         value: structData.token
@@ -887,9 +895,9 @@ function lexNamed(str, pos) {
 }
 
 // lib/lexers/lexRefOp.ts
-var EXCL3 = 33;
+var EXCL4 = 33;
 function lexRefOp(str, pos, opts) {
-  if (str.charCodeAt(pos) === EXCL3) {
+  if (str.charCodeAt(pos) === EXCL4) {
     return { type: OPERATOR, value: str[pos] };
   }
   if (!opts.r1c1) {
@@ -903,7 +911,7 @@ function lexRefOp(str, pos, opts) {
 // lib/lexers/lexNameFuncCntx.ts
 var BR_OPEN4 = 91;
 var PAREN_OPEN = 40;
-var EXCL4 = 33;
+var EXCL5 = 33;
 var OFFS = 32;
 var ALLOWED = new Uint8Array(180 - OFFS);
 var OK_NAME_0 = 1;
@@ -968,7 +976,7 @@ function lexNameFuncCntx(str, pos, opts) {
     } else {
       if (c === PAREN_OPEN && func) {
         return { type: FUNCTION, value: str.slice(start, pos) };
-      } else if (c === EXCL4 && cntx) {
+      } else if (c === EXCL5 && cntx) {
         return { type: CONTEXT, value: str.slice(start, pos) };
       }
       return nameOrUnknown(str, s, start, pos, name);
@@ -1751,6 +1759,24 @@ function parse(tokenlist, options = {}) {
 
 // lib/stringifyPrefix.ts
 var reBannedChars = /[^0-9A-Za-z._¡¤§¨ª\u00ad¯-\uffff]/;
+var reIsRangelike = /^(R|C|RC|[A-Z]{1,3}\d{1,7})$/i;
+function needQuotes(scope, yesItDoes = 0) {
+  if (yesItDoes) {
+    return 1;
+  }
+  if (scope) {
+    if (reBannedChars.test(scope)) {
+      return 1;
+    }
+    if (reIsRangelike.test(scope)) {
+      return 1;
+    }
+  }
+  return 0;
+}
+function quotePrefix(prefix2) {
+  return "'" + prefix2.replace(/'/g, "''") + "'";
+}
 function stringifyPrefix(ref) {
   let pre = "";
   let quote = 0;
@@ -1761,12 +1787,12 @@ function stringifyPrefix(ref) {
     if (scope) {
       const part = nth % 2 ? "[" + scope + "]" : scope;
       pre = part + pre;
-      quote += +reBannedChars.test(scope);
+      quote += needQuotes(scope, quote);
       nth++;
     }
   }
   if (quote) {
-    pre = "'" + pre.replace(/'/g, "''") + "'";
+    pre = quotePrefix(pre);
   }
   return pre ? pre + "!" : pre;
 }
@@ -1776,14 +1802,14 @@ function stringifyPrefixXlsx(ref) {
   const { workbookName, sheetName } = ref;
   if (workbookName) {
     pre += "[" + workbookName + "]";
-    quote += +reBannedChars.test(workbookName);
+    quote += needQuotes(workbookName);
   }
   if (sheetName) {
     pre += sheetName;
-    quote += +reBannedChars.test(sheetName);
+    quote += needQuotes(sheetName);
   }
   if (quote) {
-    pre = "'" + pre.replace(/'/g, "''") + "'";
+    pre = quotePrefix(pre);
   }
   return pre ? pre + "!" : pre;
 }