@borgar/fx 2.1.1 → 3.0.0

package/lib/a1.js

@@ -1,27 +1,35 @@
-import { MAX_ROWS, MAX_COLS, tokenHandlersRefsA1 } from './constants.js';
+import { MAX_ROWS, MAX_COLS } from './constants.js';
 import { parseRef } from './parseRef.js';
+import { stringifyPrefix } from './stringifyPrefix.js';
 
-export function fromCol (colStr) {
-  const c = (colStr || '').toUpperCase();
-  let d = 0;
-  let i = 0;
-  for (; i !== c.length; ++i) {
-    const chr = c.charCodeAt(i);
-    if (chr >= 65 && chr <= 90) { // omits any non A-Z character
-      d = 26 * d + chr - 64;
-    }
+export function fromCol (columnId) {
+  const x = (columnId || '');
+  const l = x.length;
+  let n = 0;
+  if (l > 2) {
+    const c = x.charCodeAt(l - 3);
+    const a = c > 95 ? 32 : 0;
+    n += (1 + c - a - 65) * 676;
+  }
+  if (l > 1) {
+    const c = x.charCodeAt(l - 2);
+    const a = c > 95 ? 32 : 0;
+    n += (1 + c - a - 65) * 26;
   }
-  return d - 1;
+  if (l) {
+    const c = x.charCodeAt(l - 1);
+    const a = c > 95 ? 32 : 0;
+    n += (c - a) - 65;
+  }
+  return n;
 }
 
 export function toCol (left) {
-  let n = left;
-  let c = '';
-  while (n >= 0) {
-    c = String.fromCharCode(n % 26 + 65) + c;
-    n = Math.floor(n / 26) - 1;
-  }
-  return c;
+  return (
+    (left >= 702 ? String.fromCharCode((((left - 702) / 676) - 0) % 26 + 65) : '') +
+    (left >= 26 ? String.fromCharCode(Math.floor(((left / 26) - 1) % 26 + 65)) : '') +
+    String.fromCharCode((left % 26 + 65))
+  );
 }
 
 export function fromRow (rowStr) {
@@ -42,98 +50,127 @@ export function toAbsolute (range) {
   return { top, left, bottom, right, $left: true, $right: true, $top: true, $bottom: true };
 }
 
+// TODO: add a setting for partials?
+const toColStr = (c, a) => (a ? '$' : '') + toCol(c);
+const toRowStr = (r, a) => (a ? '$' : '') + toRow(r);
 export function toA1 (range) {
-  const toAbs = d => (d ? '$' : '');
   const { top, left, bottom, right, $left, $right, $top, $bottom } = range;
+  const noLeft = left == null;
+  const noRight = right == null;
+  const noTop = top == null;
+  const noBottom = bottom == null;
   // A:A
-  if (top === 0 && bottom === MAX_ROWS) {
-    return toAbs($left) + toCol(left) + ':' + toAbs($right) + toCol(right);
+  if ((top === 0 && bottom >= MAX_ROWS) || (noTop && noBottom)) {
+    return toColStr(left, $left) + ':' + toColStr(right, $right);
   }
   // 1:1
-  if (left === 0 && right === MAX_COLS) {
-    return toAbs($top) + toRow(top) + ':' + toAbs($bottom) + toRow(bottom);
+  else if ((left === 0 && right >= MAX_COLS) || (noLeft && noRight)) {
+    return toRowStr(top, $top) + ':' + toRowStr(bottom, $bottom);
+  }
+  // A1:1
+  else if (!noLeft && !noTop && !noRight && noBottom) {
+    return toColStr(left, $left) + toRowStr(top, $top) + ':' + toColStr(right, $right);
+  }
+  // A:A1 => A1:1
+  else if (!noLeft && noTop && !noRight && !noBottom) {
+    return toColStr(left, $left) + toRowStr(bottom, $bottom) + ':' + toColStr(right, $right);
+  }
+  // A1:A
+  else if (!noLeft && !noTop && noRight && !noBottom) {
+    return toColStr(left, $left) + toRowStr(top, $top) + ':' + toRowStr(bottom, $bottom);
+  }
+  // A:A1 => A1:A
+  else if (noLeft && !noTop && !noRight && !noBottom) {
+    return toColStr(right, $right) + toRowStr(top, $top) + ':' + toRowStr(bottom, $bottom);
   }
   // A1:A1
-  if (right != null && bottom != null && (right !== left || bottom !== top)) {
-    return toAbs($left) + toCol(left) + toAbs($top) + toRow(top) + ':' + toAbs($right) + toCol(right) + toAbs($bottom) + toRow(bottom);
+  else if (right !== left || bottom !== top || $right !== $left || $bottom !== $top) {
+    return toColStr(left, $left) + toRowStr(top, $top) + ':' + toColStr(right, $right) + toRowStr(bottom, $bottom);
   }
   // A1
-  return toAbs($left) + toCol(left) + toAbs($top) + toRow(top);
+  return toColStr(left, $left) + toRowStr(top, $top);
+}
+
+function splitA1 (str) {
+  const m = /^(?=.)(\$(?=\D))?([A-Za-z]{0,3})?(\$)?([1-9][0-9]{0,6})?$/.exec(str);
+  if (!m || (!m[2] && !m[4])) {
+    return null;
+  }
+  return [
+    m[4] ? fromRow(m[4]) : null, // row index or null
+    m[2] ? fromCol(m[2]) : null, // col index or null
+    !!m[3], // is row absolute?
+    !!m[1]  // is col absolute?
+  ];
 }
 
 export function fromA1 (rangeStr) {
-  let m;
-  let top = 0;
-  let left = 0;
-  let bottom = MAX_ROWS;
-  let right = MAX_COLS;
+  let top = null;
+  let left = null;
+  let bottom = null;
+  let right = null;
   let $top = false;
   let $left = false;
   let $bottom = false;
   let $right = false;
-  // A:A
-  if ((m = /^(\$?)([A-Z]{1,3}):(\$?)([A-Z]{1,3})$/.exec(rangeStr))) {
-    const a = fromCol(m[2]);
-    const b = fromCol(m[4]);
-    left = Math.min(a, b);
-    right = Math.max(a, b);
-    $left = !!m[a <= b ? 1 : 3];
-    $right = !!m[a <= b ? 3 : 1];
-    $top = true;
-    $bottom = true;
-    return { top, left, bottom, right, $top, $left, $bottom, $right };
+  const [ part1, part2, part3 ] = rangeStr.split(':');
+  if (part3) {
+    return null;
   }
-  // 1:1
-  else if ((m = /^(\$?)([1-9]\d{0,6}):(\$?)([1-9]\d{0,6})$/.exec(rangeStr))) {
-    const a = fromRow(m[2]);
-    const b = fromRow(m[4]);
-    top = Math.min(a, b);
-    bottom = Math.max(a, b);
-    $top = !!m[a <= b ? 1 : 3];
-    $bottom = !!m[a <= b ? 3 : 1];
-    $left = true;
-    $right = true;
-    return { top, left, bottom, right, $top, $left, $bottom, $right };
-  }
-  // A1 | A1:B2
-  else {
-    const [ part1, part2 ] = rangeStr.split(':');
-    if ((m = /^(\$?)([A-Z]{1,3})(\$?)([1-9]\d{0,6})$/i.exec(part1))) {
-      left = fromCol(m[2]);
-      top = fromRow(m[4]);
-      $left = !!m[1];
-      $top = !!m[3];
-      if (part2 && (m = /^(\$?)([A-Z]{1,3})(\$?)([1-9]\d{0,6})$/i.exec(part2))) {
-        right = fromCol(m[2]);
-        bottom = fromRow(m[4]);
-        $right = !!m[1];
-        $bottom = !!m[3];
-        // need to flip?
-        if (bottom < top) {
-          [ top, bottom, $top, $bottom ] = [ bottom, top, $bottom, $top ];
-        }
-        if (right < left) {
-          [ left, right, $left, $right ] = [ right, left, $right, $left ];
-        }
-      }
-      else {
-        bottom = top;
-        right = left;
-        $bottom = $top;
-        $right = $left;
-      }
-      return { top, left, bottom, right, $top, $left, $bottom, $right };
+  const p1 = splitA1(part1);
+  const p2 = part2 ? splitA1(part2) : null;
+  if (!p1 || (part2 && !p2)) {
+    // invalid section
+    return null;
+  }
+  // part 1 bits
+  if (p1[0] != null && p1[1] != null) {
+    [ top, left, $top, $left ] = p1;
+  }
+  else if (p1[0] == null && p1[1] != null) {
+    [ , left, , $left ] = p1;
+  }
+  else if (p1[0] != null && p1[1] == null) {
+    [ top, , $top ] = p1;
+  }
+  // part 2 bits
+  if (!part2) {
+    // part 2 must exist if either top or left is null:
+    // this disallows a single num or col patterns
+    if (top == null || left == null) {
+      return null;
     }
+    bottom = top;
+    right = left;
+    $bottom = $top;
+    $right = $left;
   }
-  return null;
+  else if (p2[0] != null && p2[1] != null) {
+    [ bottom, right, $bottom, $right ] = p2;
+  }
+  else if (p2[0] == null && p2[1] != null) {
+    [ , right, , $right ] = p2;
+  }
+  else if (p2[0] != null && p2[1] == null) {
+    [ bottom, , $bottom ] = p2;
+  }
+  // flip left/right and top/bottom as needed
+  // for partial ranges we perfer the coord on the left-side of the :
+  if (right != null && (left == null || (left != null && right < left))) {
+    [ left, right, $left, $right ] = [ right, left, $right, $left ];
+  }
+  if (bottom != null && (top == null || (top != null && bottom < top))) {
+    [ top, bottom, $top, $bottom ] = [ bottom, top, $bottom, $top ];
+  }
+  return { top, left, bottom, right, $top, $left, $bottom, $right };
 }
 
-export function parseA1Ref (ref, allow_named = true) {
-  const d = parseRef(ref, allow_named, tokenHandlersRefsA1);
+export function parseA1Ref (ref, { allowNamed = true, allowTernary = false } = {}) {
+  const d = parseRef(ref, { allowNamed, allowTernary, r1c1: false });
   if (d && (d.r0 || d.name)) {
     let range = null;
     if (d.r0) {
-      range = d.r1 ? fromA1(d.r0 + ':' + d.r1) : fromA1(d.r0);
+      range = fromA1(d.r1 ? d.r0 + ':' + d.r1 : d.r0);
     }
     if (d.name || range) {
       d.range = range;
@@ -148,6 +185,32 @@ export function parseA1Ref (ref, allow_named = true) {
   return null;
 }
 
+export function stringifyA1Ref (ref) {
+  return stringifyPrefix(ref) + (
+    ref.name ? ref.name : toA1(ref.range)
+  );
+}
+
+export function addRangeBounds (range) {
+  if (range.top == null) {
+    range.top = 0;
+    range.$top = false;
+  }
+  if (range.bottom == null) {
+    range.bottom = MAX_ROWS;
+    range.$bottom = false;
+  }
+  if (range.left == null) {
+    range.left = 0;
+    range.$left = false;
+  }
+  if (range.right == null) {
+    range.right = MAX_COLS;
+    range.$right = false;
+  }
+  return range;
+}
+
 export default {
   fromCol,
   toCol,
@@ -155,5 +218,7 @@ export default {
   toAbsolute,
   to: toA1,
   from: fromA1,
-  parse: parseA1Ref
+  parse: parseA1Ref,
+  addBounds: addRangeBounds,
+  stringify: stringifyA1Ref
 };

package/lib/a1.spec.js

@@ -0,0 +1,264 @@
+/* eslint-disable object-property-newline, object-curly-newline */
+import { test, Test } from 'tape';
+import {
+  fromCol,
+  toCol,
+  fromRow,
+  toRow,
+  toRelative,
+  toAbsolute,
+  parseA1Ref,
+  stringifyA1Ref,
+  toA1
+} from './a1.js';
+import { MAX_COLS, MAX_ROWS } from './constants.js';
+
+Test.prototype.isA1Equal = function isTokens (expr, expect, opts) {
+  if (expect) {
+    expect = {
+      context: [],
+      name: '',
+      range: null,
+      ...expect
+    };
+    if (expect.range && typeof expect.range === 'object') {
+      // mix in some defaults so we don't have to write things out in full
+      expect.range = {
+        top: null, left: null, bottom: null, right: null,
+        $top: false, $left: false, $bottom: false, $right: false,
+        ...expect.range
+      };
+    }
+  }
+  this.deepEqual(parseA1Ref(expr, opts), expect, expr);
+};
+
+// What happens when B2:A1 -> should work!
+test('convert to and from column and row ids', t => {
+  t.is(fromCol('a'), 0);
+  t.is(fromCol('A'), 0);
+  t.is(fromCol('AA'), 26);
+  t.is(fromCol('zz'), 701);
+  t.is(fromCol('ZZZ'), 18277);
+  t.is(toCol(0), 'A');
+  t.is(toCol(26), 'AA');
+  t.is(toCol(701), 'ZZ');
+  t.is(toCol(18277), 'ZZZ');
+  t.is(fromRow('11'), 10);
+  t.is(fromRow('1'), 0);
+  t.is(toRow(12), '13');
+  t.is(toRow(77), '78');
+  t.end();
+});
+
+test('parse A1 references', t => {
+  t.isA1Equal('A1', { range: { top: 0, left: 0, bottom: 0, right: 0 } });
+  t.isA1Equal('A1:B2', { range: { top: 0, left: 0, bottom: 1, right: 1 } });
+
+  t.isA1Equal('$A1:B2', { range: { top: 0, left: 0, bottom: 1, right: 1, $left: true } });
+  t.isA1Equal('A$1:B2', { range: { top: 0, left: 0, bottom: 1, right: 1, $top: true } });
+  t.isA1Equal('A1:$B2', { range: { top: 0, left: 0, bottom: 1, right: 1, $right: true } });
+  t.isA1Equal('A1:B$2', { range: { top: 0, left: 0, bottom: 1, right: 1, $bottom: true } });
+
+  t.isA1Equal('A:A', { range: { left: 0, right: 0 } });
+  t.isA1Equal('C:C', { range: { left: 2, right: 2 } });
+  t.isA1Equal('C:$C', { range: { left: 2, right: 2, $right: true } });
+  t.isA1Equal('$C:C', { range: { left: 2, right: 2, $left: true } });
+  t.isA1Equal('$C:$C', { range: { left: 2, right: 2, $left: true, $right: true } });
+
+  t.isA1Equal('1:1', { range: { top: 0, bottom: 0 } });
+  t.isA1Equal('10:10', { range: { top: 9, bottom: 9 } });
+  t.isA1Equal('10:$10', { range: { top: 9, bottom: 9, $bottom: true } });
+  t.isA1Equal('$10:10', { range: { top: 9, bottom: 9, $top: true } });
+  t.isA1Equal('$10:$10', { range: { top: 9, bottom: 9, $top: true, $bottom: true } });
+
+  t.isA1Equal('XFD1048576', { range: { top: 1048575, left: 16383, bottom: 1048575, right: 16383 } });
+
+  t.isA1Equal('Sheet1!A1', {
+    context: [ 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('\'Sheet1\'!A1', {
+    context: [ 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('\'Sheet1\'\'s\'!A1', {
+    context: [ 'Sheet1\'s' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('[Workbook.xlsx]Sheet1!A1', {
+    context: [ 'Workbook.xlsx', 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal("'[Workbook.xlsx]Sheet1'!A1", {
+    context: [ 'Workbook.xlsx', 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal("'[Workbook.xlsx]Sheet1'!A1", {
+    context: [ 'Workbook.xlsx', 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal("='[Workbook.xlsx]Sheet1'!A1", {
+    context: [ 'Workbook.xlsx', 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('[foo bar]Sheet1!A1', {
+    context: [ 'foo bar', 'Sheet1' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('[a "b" c]d!A1', {
+    context: [ 'a "b" c', 'd' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  // unless we know the contexts available, we don't know that this is a sheet
+  // or a filename, so we can't reject it:
+  t.isA1Equal('0123456789abcdefghijklmnopqrstuvwxyz!A1', {
+    context: [ '0123456789abcdefghijklmnopqrstuvwxyz' ],
+    range: { top: 0, left: 0, bottom: 0, right: 0 }
+  });
+
+  t.isA1Equal('[Workbook.xlsx]!A1', null);
+  t.isA1Equal('[Workbook.xlsx]!A1:B2', null);
+  t.isA1Equal('[Workbook.xlsx]!A:A', null);
+  t.isA1Equal('[Workbook.xlsx]!1:1', null);
+  t.isA1Equal('[]Sheet1!A1', null);
+  t.isA1Equal('namedrange', { name: 'namedrange' });
+
+  t.isA1Equal('Workbook.xlsx!namedrange', {
+    context: [ 'Workbook.xlsx' ],
+    name: 'namedrange'
+  });
+
+  t.isA1Equal("'Workbook.xlsx'!namedrange", {
+    context: [ 'Workbook.xlsx' ],
+    name: 'namedrange'
+  });
+
+  t.isA1Equal('[Workbook.xlsx]!namedrange', null);
+  t.isA1Equal('pensioneligibilitypartner1', { name: 'pensioneligibilitypartner1' });
+  t.isA1Equal('XFE1048577', { name: 'XFE1048577' });
+
+  // with named ranges disallowed
+  t.isA1Equal('namedrange', null, { allowNamed: false });
+  t.isA1Equal('Workbook.xlsx!namedrange', null, { allowNamed: false });
+  t.isA1Equal('pensioneligibilitypartner1', null, { allowNamed: false });
+  t.isA1Equal('XFE1048577', null, { allowNamed: false });
+
+  t.end();
+});
+
+test('A1 partial ranges', t => {
+  const opt = { allowTernary: true };
+  // partials are not allowed by defult
+  t.isA1Equal('A10:A', null);
+  t.isA1Equal('B3:2', null);
+  // unbounded bottom:
+  t.isA1Equal('A10:A', { range: { top: 9, left: 0, right: 0 } }, opt);
+  t.isA1Equal('A:A10', { range: { top: 9, left: 0, right: 0 } }, opt);
+  t.isA1Equal('A$5:A', { range: { top: 4, left: 0, right: 0, $top: true } }, opt);
+  t.isA1Equal('A:A$5', { range: { top: 4, left: 0, right: 0, $top: true } }, opt);
+  t.isA1Equal('A$5:A', { range: { top: 4, left: 0, right: 0, $top: true } }, opt);
+  t.isA1Equal('A:$B5', { range: { top: 4, left: 0, right: 1, $right: true } }, opt);
+  t.isA1Equal('$B:B3', { range: { top: 2, left: 1, right: 1, $left: true } }, opt);
+  t.isA1Equal('$B:C5', { range: { top: 4, left: 1, right: 2, $left: true } }, opt);
+  t.isA1Equal('C2:B', { range: { top: 1, left: 1, right: 2 } }, opt);
+  t.isA1Equal('C:B2', { range: { top: 1, left: 1, right: 2 } }, opt);
+  // unbounded right:
+  t.isA1Equal('D1:1', { range: { top: 0, left: 3, bottom: 0 } }, opt);
+  t.isA1Equal('1:D2', { range: { top: 0, left: 3, bottom: 1 } }, opt);
+  t.isA1Equal('2:$D3', { range: { top: 1, left: 3, bottom: 2, $left: true } }, opt);
+  t.isA1Equal('$D2:3', { range: { top: 1, left: 3, bottom: 2, $left: true } }, opt);
+  t.isA1Equal('1:D$1', { range: { top: 0, left: 3, bottom: 0, $bottom: true } }, opt);
+  t.isA1Equal('$1:D1', { range: { top: 0, left: 3, bottom: 0, $top: true } }, opt);
+  t.isA1Equal('AA$3:4', { range: { top: 2, left: 26, bottom: 3, $top: true } }, opt);
+  t.isA1Equal('B3:2', { range: { top: 1, bottom: 2, left: 1 } }, opt);
+  t.isA1Equal('3:B2', { range: { top: 1, bottom: 2, left: 1 } }, opt);
+  t.end();
+});
+
+test('A1 serialization', t => {
+  // cell: A1
+  t.is(toA1({ top: 9, bottom: 9, left: 2, right: 2 }), 'C10', 'C10');
+  t.is(toA1({ top: 9, bottom: 9, left: 2, right: 2, $top: true, $bottom: true }), 'C$10', 'C$10');
+  t.is(toA1({ top: 9, bottom: 9, left: 2, right: 2, $left: true, $right: true }), '$C10', '$C10');
+  t.is(toA1({ top: 9, bottom: 9, left: 2, right: 2, $top: true, $bottom: true, $left: true, $right: true }), '$C$10', '$C$10');
+  // rect: A1:A1
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4 }), 'E3', 'E3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4, $right: true }), 'E3:$E3', 'E3:$E3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4, $top: true }), 'E$3:E3', 'E$3:E3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4, $left: true }), '$E3:E3', '$E3:E3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4, $bottom: true }), 'E3:E$3', 'E3:E$3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 4, $bottom: true, $right: true }), 'E3:$E$3', 'E3:$E$3');
+  t.is(toA1({ top: 2, bottom: 2, left: 4, right: 5 }), 'E3:F3', 'E3:F3');
+  t.is(toA1({ top: 2, bottom: 3, left: 4, right: 4 }), 'E3:E4', 'E3:E4');
+  t.is(toA1({ top: 2, bottom: 3, left: 4, right: 5 }), 'E3:F4', 'E3:F4');
+  // ray: A:A, 1:1
+  t.is(toA1({ left: 0, right: 0 }), 'A:A', '1:A');
+  t.is(toA1({ top: 0, bottom: MAX_ROWS, left: 0, right: 0 }), 'A:A', 'A:A (2)');
+  t.is(toA1({ left: 10, right: 15 }), 'K:P', 'K:P');
+  t.is(toA1({ left: 10, right: 15, $left: true }), '$K:P', '$K:P');
+  t.is(toA1({ left: 10, right: 15, $right: true }), 'K:$P', 'K:$P');
+  t.is(toA1({ left: 10, right: 15, $left: true, $right: true }), '$K:$P', '$K:$P');
+  t.is(toA1({ top: 0, bottom: 0 }), '1:1', '1:1');
+  t.is(toA1({ top: 0, bottom: 0, left: 0, right: MAX_COLS }), '1:1', '1:1 (2)');
+  t.is(toA1({ top: 10, bottom: 15 }), '11:16', '11:16');
+  t.is(toA1({ top: 10, bottom: 15, $top: true }), '$11:16', '$11:16');
+  t.is(toA1({ top: 10, bottom: 15, $bottom: true }), '11:$16', '11:$16');
+  t.is(toA1({ top: 10, bottom: 15, $top: true, $bottom: true }), '$11:$16', '$11:$16');
+  // partial: A1:A, A1:1, A:A1, 1:A1
+  t.is(toA1({ top: 9, left: 0, right: 0 }), 'A10:A', 'A10:A');
+  t.is(toA1({ bottom: 9, left: 0, right: 0 }), 'A10:A', 'A:A10 → A10:A');
+  t.is(toA1({ top: 9, left: 0, right: 0, $top: true }), 'A$10:A', 'A$10:A');
+  t.is(toA1({ top: 9, left: 0, right: 0, $left: true }), '$A10:A', '$A10:A');
+  t.is(toA1({ top: 9, left: 0, right: 0, $right: true }), 'A10:$A', 'A10:$A');
+  t.is(toA1({ top: 0, left: 3, bottom: 0 }), 'D1:1', 'D1:1');
+  t.is(toA1({ top: 0, right: 3, bottom: 0 }), 'D1:1', '1:D1 → D1:1');
+  t.is(toA1({ top: 0, left: 3, bottom: 0, $top: true }), 'D$1:1', 'D$1:1');
+  t.is(toA1({ top: 0, left: 3, bottom: 0, $left: true }), '$D1:1', '$D1:1');
+  t.is(toA1({ top: 0, left: 3, bottom: 0, $bottom: true }), 'D1:$1', 'D1:$1');
+  t.end();
+});
+
+test('stringifyA1Ref', t => {
+  const rangeA1 = { top: 0, bottom: 0, left: 0, right: 0 };
+  const testRef = (ref, expect) => t.is(stringifyA1Ref(ref), expect, expect);
+  testRef({ range: rangeA1 }, 'A1');
+  testRef({ context: [ 'Sheet1' ], range: rangeA1 }, 'Sheet1!A1');
+  testRef({ context: [ 'Sheet 1' ], range: rangeA1 }, "'Sheet 1'!A1");
+  testRef({ context: [ 'MyFile.xlsx', 'Sheet1' ], range: rangeA1 }, '[MyFile.xlsx]Sheet1!A1');
+  testRef({ context: [ 'My File.xlsx', 'Sheet1' ], range: rangeA1 }, "'[My File.xlsx]Sheet1'!A1");
+  testRef({ context: [ 'MyFile.xlsx' ], range: rangeA1 }, 'MyFile.xlsx!A1');
+  testRef({ context: [ 'My File.xlsx' ], range: rangeA1 }, "'My File.xlsx'!A1");
+  testRef({ name: 'foo' }, 'foo');
+  testRef({ context: [ 'Sheet1' ], name: 'foo' }, 'Sheet1!foo');
+  testRef({ context: [ 'Sheet 1' ], name: 'foo' }, "'Sheet 1'!foo");
+  testRef({ context: [ 'MyFile.xlsx', 'Sheet1' ], name: 'foo' }, '[MyFile.xlsx]Sheet1!foo');
+  testRef({ context: [ 'My File.xlsx', 'Sheet1' ], name: 'foo' }, "'[My File.xlsx]Sheet1'!foo");
+  testRef({ context: [ 'MyFile.xlsx' ], name: 'foo' }, 'MyFile.xlsx!foo');
+  testRef({ context: [ 'My File.xlsx' ], name: 'foo' }, "'My File.xlsx'!foo");
+  t.end();
+});
+
+test('A1 utilities', t => {
+  const relA1Range = {
+    top: 0, left: 0, bottom: 0, right: 0,
+    $top: false, $left: false, $bottom: false, $right: false
+  };
+  const absA1Range = {
+    top: 0, left: 0, bottom: 0, right: 0,
+    $top: true, $left: true, $bottom: true, $right: true
+  };
+  t.deepEqual(toAbsolute(relA1Range), absA1Range, 'toAbsolute');
+  t.deepEqual(toRelative(absA1Range), relA1Range, 'toRelative');
+  t.end();
+});
+

package/lib/addMeta.js

@@ -1,24 +1,66 @@
-import { RANGE, RANGE_BEAM, UNKNOWN } from './constants.js';
-import { parseA1Ref, toRelative, toA1 } from './a1.js';
+import { RANGE, RANGE_BEAM, RANGE_TERNARY, UNKNOWN } from './constants.js';
+import { parseA1Ref } from './a1.js';
 
 function getIDer () {
   let i = 1;
   return () => 'fxg' + (i++);
 }
 
+function sameValue (a, b) {
+  if (a == null && b == null) {
+    return true;
+  }
+  return a === b;
+}
+
+function sameStr (a, b) {
+  if (!a && !b) {
+    return true;
+  }
+  return String(a).toLowerCase() === String(b).toLowerCase();
+}
+
+function isEquivalent (refA, refB) {
+  // if named, name must match
+  if ((refA.name || refB.name) && refA.name !== refB.name) {
+    return false;
+  }
+  // if ranged, range must have the same dimensions (we don't care about $)
+  if (refA.range || refB.range) {
+    if (
+      !sameValue(refA.range.top, refB.range.top) ||
+      !sameValue(refA.range.bottom, refB.range.bottom) ||
+      !sameValue(refA.range.left, refB.range.left) ||
+      !sameValue(refA.range.right, refB.range.right)
+    ) {
+      return false;
+    }
+  }
+  // must have same context
+  if (
+    !sameStr(refA.context[0], refB.context[0]) ||
+    !sameStr(refA.context[1], refB.context[1])
+  ) {
+    return false;
+  }
+  return true;
+}
+
 // when context is Sheet1, we should consider Sheet!A1 == A1
 export function addMeta (tokens, { sheetName = '', workbookName = '' } = {}) {
   const parenStack = [];
   let arrayStart = null;
-  const a1Map = {};
   const uid = getIDer();
+  const knownRefs = [];
+
+  const getCurrDepth = () => parenStack.length + (arrayStart ? 1 : 0);
 
   tokens.forEach((token, i) => {
     token.index = i;
-    token.depth = parenStack.length;
+    token.depth = getCurrDepth();
     if (token.value === '(') {
-      token.depth = parenStack.length + 1;
       parenStack.push(token);
+      token.depth = getCurrDepth();
     }
     else if (token.value === ')') {
       const counter = parenStack.pop();
@@ -35,6 +77,7 @@ export function addMeta (tokens, { sheetName = '', workbookName = '' } = {}) {
     else if (token.value === '{') {
       if (!arrayStart) {
         arrayStart = token;
+        token.depth = getCurrDepth();
       }
       else {
         token.error = true;
@@ -44,6 +87,7 @@ export function addMeta (tokens, { sheetName = '', workbookName = '' } = {}) {
       if (arrayStart) {
         const pairId = uid();
         token.groupId = pairId;
+        token.depth = arrayStart.depth;
         arrayStart.groupId = pairId;
       }
       else {
@@ -51,16 +95,31 @@ export function addMeta (tokens, { sheetName = '', workbookName = '' } = {}) {
       }
       arrayStart = null;
     }
-    else if (token.type === RANGE || token.type === RANGE_BEAM) {
-      const ref = parseA1Ref(token.value, false);
-      const a1 = ref && (`[${ref.workbookName || workbookName}]${ref.sheetName || sheetName}!${ref.range ? toA1(toRelative(ref.range)) : ref.name}`).toLowerCase();
-      if (a1) {
-        if (a1 in a1Map) {
-          token.groupId = a1Map[a1];
+    else if (token.type === RANGE || token.type === RANGE_BEAM || token.type === RANGE_TERNARY) {
+      const ref = parseA1Ref(token.value, { allowNamed: false, allowTernary: true });
+      if (ref && ref.range) {
+        ref.source = token.value;
+        if (!ref.context.length) {
+          ref.context = [ workbookName, sheetName ];
+        }
+        else if (ref.context.length === 1) {
+          const scope = ref.context[0];
+          if (scope === sheetName || scope === workbookName) {
+            ref.context = [ workbookName, sheetName ];
+          }
+          else {
+            // a single scope on a non-named range is going to be a sheet name
+            ref.context = [ workbookName, scope ];
+          }
+        }
+        const known = knownRefs.find(d => isEquivalent(d, ref));
+        if (known) {
+          token.groupId = known.groupId;
         }
         else {
-          token.groupId = uid();
-          a1Map[a1] = token.groupId;
+          ref.groupId = uid();
+          token.groupId = ref.groupId;
+          knownRefs.push(ref);
         }
       }
     }