@borgar/fx 5.0.0 → 5.0.2

package/dist/index.cjs

@@ -84,6 +84,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";
@@ -103,24 +104,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],
@@ -152,7 +155,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;
@@ -542,7 +549,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 {
@@ -582,6 +589,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);
@@ -636,7 +644,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) {
@@ -853,7 +861,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) {
@@ -861,7 +869,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
@@ -956,9 +964,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) {
@@ -972,7 +980,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;
@@ -1037,7 +1045,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);
@@ -1073,6 +1081,11 @@ var lexersRefs = [
   lexNamed
 ];
 
+// lib/isRCTokenValue.ts
+function isRCTokenValue(value) {
+  return value === "r" || value === "R" || value === "c" || value === "C";
+}
+
 // lib/tokenize.ts
 var reLetLambda = /^l(?:ambda|et)$/i;
 var isType = (t, type) => t && t.type === type;
@@ -1080,12 +1093,13 @@ var isTextTokenType = (tokenType) => tokenType === REF_NAMED || tokenType === FU
 var causesBinaryMinus = (token) => {
   return !isType(token, OPERATOR) || (token.value === "%" || token.value === "}" || token.value === ")" || token.value === "#");
 };
-function fixRCNames(tokens2) {
+function fixRCNames(tokens2, r1c1Mode) {
   let withinCall = 0;
   let parenDepth = 0;
   let lastToken;
   for (const token of tokens2) {
-    if (token.type === OPERATOR) {
+    const tokenType = token.type;
+    if (tokenType === OPERATOR) {
       if (token.value === "(") {
         parenDepth++;
         if (lastToken.type === FUNCTION) {
@@ -1099,7 +1113,9 @@ function fixRCNames(tokens2) {
           withinCall = 0;
         }
       }
-    } else if (withinCall && token.type === UNKNOWN && /^[rc]$/.test(token.value)) {
+    } else if (withinCall && tokenType === UNKNOWN && isRCTokenValue(token.value)) {
+      token.type = REF_NAMED;
+    } else if (withinCall && r1c1Mode && tokenType === REF_BEAM && isRCTokenValue(token.value)) {
       token.type = REF_NAMED;
     }
     lastToken = token;
@@ -1186,9 +1202,8 @@ function getTokens(fx, tokenHandlers, options = {}) {
         letOrLambda++;
       }
     }
-    if (token.type === UNKNOWN && token.value.length === 1) {
-      const valLC = token.value.toLowerCase();
-      unknownRC += valLC === "r" || valLC === "c" ? 1 : 0;
+    if (token.value.length === 1 && (token.type === UNKNOWN || opts.r1c1 && token.type === REF_BEAM)) {
+      unknownRC += isRCTokenValue(token.value) ? 1 : 0;
     }
     if (negativeNumbers && token.type === NUMBER) {
       const last1 = lastToken;
@@ -1207,7 +1222,7 @@ function getTokens(fx, tokenHandlers, options = {}) {
     pushToken(token);
   }
   if (unknownRC && letOrLambda) {
-    fixRCNames(tokens2);
+    fixRCNames(tokens2, opts.r1c1);
   }
   for (const index of trimOps) {
     const before = tokens2[index - 1];
@@ -1813,6 +1828,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;
@@ -1823,12 +1856,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;
 }
@@ -1838,14 +1871,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;
 }
@@ -2297,6 +2330,7 @@ function parseRefXlsx(ref, opts = {}) {
 }
 
 // lib/translateToR1C1.ts
+var reLetLambda2 = /^l(?:ambda|et)$/i;
 var calc = (abs, vX, aX) => {
   if (vX == null) {
     return null;
@@ -2325,29 +2359,53 @@ function translateTokensToR1C1(tokens2, anchorCell) {
     throw new Error("translateTokensToR1C1 got an invalid anchorCell: " + anchorCell);
   }
   const { top, left } = anchorRange;
+  let withinCall = 0;
+  let parenDepth = 0;
   let offsetSkew = 0;
   const outTokens = [];
   for (let token of tokens2) {
     const tokenType = token?.type;
+    if (tokenType === OPERATOR) {
+      if (token.value === "(") {
+        parenDepth++;
+        const lastToken = outTokens[outTokens.length - 1];
+        if (lastToken && lastToken.type === FUNCTION) {
+          if (reLetLambda2.test(lastToken.value)) {
+            withinCall = parenDepth;
+          }
+        }
+      } else if (token.value === ")") {
+        parenDepth--;
+        if (parenDepth < withinCall) {
+          withinCall = 0;
+        }
+      }
+    }
     if (tokenType === REF_RANGE || tokenType === REF_BEAM || tokenType === REF_TERNARY) {
       token = cloneToken(token);
       const tokenValue = token.value;
       const ref = quickParseA1(tokenValue);
-      const d = ref.range;
-      const range = {};
-      range.r0 = calc(d.$top, d.top, top);
-      range.r1 = calc(d.$bottom, d.bottom, top);
-      range.c0 = calc(d.$left, d.left, left);
-      range.c1 = calc(d.$right, d.right, left);
-      range.$r0 = d.$top;
-      range.$r1 = d.$bottom;
-      range.$c0 = d.$left;
-      range.$c1 = d.$right;
-      if (d.trim) {
-        range.trim = d.trim;
+      if (ref) {
+        const d = ref.range;
+        const range = {};
+        range.r0 = calc(d.$top, d.top, top);
+        range.r1 = calc(d.$bottom, d.bottom, top);
+        range.c0 = calc(d.$left, d.left, left);
+        range.c1 = calc(d.$right, d.right, left);
+        range.$r0 = d.$top;
+        range.$r1 = d.$bottom;
+        range.$c0 = d.$left;
+        range.$c1 = d.$right;
+        if (d.trim) {
+          range.trim = d.trim;
+        }
+        ref.range = range;
+        let val = stringifyR1C1RefXlsx(ref);
+        if (isRCTokenValue(val) && withinCall) {
+          val += "[0]";
+        }
+        token.value = val;
       }
-      ref.range = range;
-      token.value = stringifyR1C1RefXlsx(ref);
       if (token.loc) {
         token.loc[0] += offsetSkew;
         offsetSkew += token.value.length - tokenValue.length;
@@ -2661,44 +2719,46 @@ function translateTokensToA1(tokens2, anchorCell, options = {}) {
       token = cloneToken(token);
       const tokenValue = token.value;
       const ref = parseR1C1RefXlsx(tokenValue, REF_OPTS);
-      const d = ref.range;
-      const range = { top: 0, left: 0 };
-      const r0 = toFixed(d.r0, d.$r0, top, MAX_ROWS, wrapEdges);
-      const r1 = toFixed(d.r1, d.$r1, top, MAX_ROWS, wrapEdges);
-      if (r0 > r1) {
-        range.top = r1;
-        range.$top = d.$r1;
-        range.bottom = r0;
-        range.$bottom = d.$r0;
-      } else {
-        range.top = r0;
-        range.$top = d.$r0;
-        range.bottom = r1;
-        range.$bottom = d.$r1;
-      }
-      const c0 = toFixed(d.c0, d.$c0, left, MAX_COLS, wrapEdges);
-      const c1 = toFixed(d.c1, d.$c1, left, MAX_COLS, wrapEdges);
-      if (c0 > c1) {
-        range.left = c1;
-        range.$left = d.$c1;
-        range.right = c0;
-        range.$right = d.$c0;
-      } else {
-        range.left = c0;
-        range.$left = d.$c0;
-        range.right = c1;
-        range.$right = d.$c1;
-      }
-      if (d.trim) {
-        range.trim = d.trim;
-      }
-      if (isNaN(r0) || isNaN(r1) || isNaN(c0) || isNaN(c1)) {
-        token.type = ERROR;
-        token.value = "#REF!";
-        delete token.groupId;
-      } else {
-        ref.range = range;
-        token.value = stringifyA1RefXlsx(ref);
+      if (ref) {
+        const d = ref.range;
+        const range = { top: 0, left: 0 };
+        const r0 = toFixed(d.r0, d.$r0, top, MAX_ROWS, wrapEdges);
+        const r1 = toFixed(d.r1, d.$r1, top, MAX_ROWS, wrapEdges);
+        if (r0 > r1) {
+          range.top = r1;
+          range.$top = d.$r1;
+          range.bottom = r0;
+          range.$bottom = d.$r0;
+        } else {
+          range.top = r0;
+          range.$top = d.$r0;
+          range.bottom = r1;
+          range.$bottom = d.$r1;
+        }
+        const c0 = toFixed(d.c0, d.$c0, left, MAX_COLS, wrapEdges);
+        const c1 = toFixed(d.c1, d.$c1, left, MAX_COLS, wrapEdges);
+        if (c0 > c1) {
+          range.left = c1;
+          range.$left = d.$c1;
+          range.right = c0;
+          range.$right = d.$c0;
+        } else {
+          range.left = c0;
+          range.$left = d.$c0;
+          range.right = c1;
+          range.$right = d.$c1;
+        }
+        if (d.trim) {
+          range.trim = d.trim;
+        }
+        if (isNaN(r0) || isNaN(r1) || isNaN(c0) || isNaN(c1)) {
+          token.type = ERROR;
+          token.value = "#REF!";
+          delete token.groupId;
+        } else {
+          ref.range = range;
+          token.value = stringifyA1RefXlsx(ref);
+        }
       }
       if (token.loc) {
         token.loc[0] += offsetSkew;