@omegagrid/grid-core 0.2.7 → 0.2.8

package/dist/calculations/formula.d.ts

@@ -41,19 +41,39 @@ export declare class Formula {
     get variables(): [number, string, string?][];
     get cells(): [number, CellRange, string?][];
     get ranges(): [number, CellRange, string?][];
+    private _colors;
     get colors(): Map<string, FormulaColorItem>;
     constructor(expression: FormulaString, tokenizer: Tokenizer);
     findTokenIndexAtPosition(pos: number): number;
+    /**
+     * Finds sheet token for the given reange token index
+     *
+     * @param tokenIndex
+     */
+    findSheetTokenIndex(tokenIndex: number): number;
+    /**
+     * Removes sheet token for the given token index (range or sheet itself)
+     * @param tokenIndex
+     * @returns number of tokens removed
+     */
+    removeSheetToken(tokenIndex: number): number;
+    getNamedColor(name: string): string;
     getTokenPosition(index: number): {
         min: number;
         max: number;
     };
     updateToken(index: number, newValue: string): void;
     removeToken(index: number): void;
-    insertToken(index: number, value: string, type: TokenType): void;
+    /**
+     * Inserts a new token at the given index
+     * @param index
+     * @param value
+     * @param type
+     * @returns number of inserted tokens
+     */
+    insertToken(index: number, value: string, type: TokenType): number;
     clone(): Formula;
     updateDependecies(): void;
-    getNamedColor(name: string): string;
     createFormulaString(html?: boolean, fnPrefix?: string): string;
     createExpressionTree(): ExpressionNode;
     createExpressionJSCode(node: ExpressionNode, parent?: ExpressionNode, arrayMode?: boolean): string;

package/dist/calculations/formula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formula.d.ts","sourceRoot":"","sources":["../../src/calculations/formula.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAIrC,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,cAAc,GAAG;IACrB,YAAY;IACT,CAAC,EAAE,MAAM,CAAC;IACb,iBAAiB;IACjB,EAAE,EAAE,SAAS,CAAC;IACd,YAAY;IACZ,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,eAAe;IACZ,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,MAAM,YAAuE,CAAC;AAC/G,eAAO,MAAM,aAAa,UAAW,MAAM,WAAqD,CAAC;AACjG,eAAO,MAAM,kBAAkB,UAAW,MAAM,WAAkD,CAAC;AAMnG,qBAAa,OAAO;IAkCP,OAAO,CAAC,UAAU;aAAiC,SAAS,EAAE,SAAS;IAhCnF,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,UAAU,CAA8B;IAEhD,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,OAAO,CAAiC;IAEhD,OAAO,CAAC,GAAG,CAAkB;IAC7B,IAAI,EAAE,oBAAgH;IAEtH,OAAO,CAAC,OAAO,CAAU;IACzB,IAAI,MAAM,YAA0B;IAEpC,IAAI,SAAS,gCAA6B;IAC1C,IAAI,KAAK,mCAAyB;IAClC,IAAI,MAAM,mCAA0B;IAEpC,IAAI,MAAM,kCAWT;gBAEmB,UAAU,EAAE,aAAa,EAAkB,SAAS,EAAE,SAAS;IAKnF,wBAAwB,CAAC,GAAG,EAAE,MAAM;IASpC,gBAAgB,CAAC,KAAK,EAAE,MAAM;;;;IAQ9B,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAM3C,WAAW,CAAC,KAAK,EAAE,MAAM;IAMzB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAMzD,KAAK;IAIL,iBAAiB;IA0BjB,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,mBAAmB,CAAC,IAAI,UAAQ,EAAE,QAAQ,GAAE,MAAa;IAiDzD,oBAAoB,IAAK,cAAc;IAwGvC,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,OAAO,GAAI,MAAM;IAgCnG,OAAO;IAKP,QAAQ,CAAC,MAAM,UAAQ;IAIvB,aAAa;IAIb,KAAK,CAAC,OAAO,EAAE,YAAY;IAyB3B,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAO/B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CA0B5C"}
+{"version":3,"file":"formula.d.ts","sourceRoot":"","sources":["../../src/calculations/formula.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAIrC,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,cAAc,GAAG;IACrB,YAAY;IACT,CAAC,EAAE,MAAM,CAAC;IACb,iBAAiB;IACjB,EAAE,EAAE,SAAS,CAAC;IACd,YAAY;IACZ,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,eAAe;IACZ,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,MAAM,YAAuE,CAAC;AAC/G,eAAO,MAAM,aAAa,UAAW,MAAM,WAAqD,CAAC;AACjG,eAAO,MAAM,kBAAkB,UAAW,MAAM,WAAkD,CAAC;AAKnG,qBAAa,OAAO;IAyCP,OAAO,CAAC,UAAU;aAAiC,SAAS,EAAE,SAAS;IAvCnF,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,UAAU,CAA8B;IAEhD,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,OAAO,CAAiC;IAEhD,OAAO,CAAC,GAAG,CAAkB;IAC7B,IAAI,EAAE,oBAAgH;IAEtH,OAAO,CAAC,OAAO,CAAU;IACzB,IAAI,MAAM,YAA0B;IAEpC,IAAI,SAAS,gCAA6B;IAC1C,IAAI,KAAK,mCAAyB;IAClC,IAAI,MAAM,mCAA0B;IAGpC,OAAO,CAAC,OAAO,CAAgC;IAE/C,IAAI,MAAM,kCAeT;gBAEmB,UAAU,EAAE,aAAa,EAAkB,SAAS,EAAE,SAAS;IAKnF,wBAAwB,CAAC,GAAG,EAAE,MAAM;IASpC;;;;OAIG;IACH,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAI,MAAM;IAYhD;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,EAAE,MAAM;IAmBnC,aAAa,CAAC,IAAI,EAAE,MAAM;IAI1B,gBAAgB,CAAC,KAAK,EAAE,MAAM;;;;IAQ9B,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAM3C,WAAW,CAAC,KAAK,EAAE,MAAM;IAMzB;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAI,MAAM;IAgBnE,KAAK;IAIL,iBAAiB;IA0BjB,mBAAmB,CAAC,IAAI,UAAQ,EAAE,QAAQ,GAAE,MAAa;IAsDzD,oBAAoB,IAAK,cAAc;IAwGvC,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,OAAO,GAAI,MAAM;IAgCnG,OAAO;IAKP,QAAQ,CAAC,MAAM,UAAQ;IAIvB,aAAa;IAIb,KAAK,CAAC,OAAO,EAAE,YAAY;IAyB3B,iBAAiB,CAAC,KAAK,EAAE,MAAM;IAO/B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAW5C"}

package/dist/calculations/formula.js

@@ -13,7 +13,6 @@ const stripFormulaPrefix = (value) => (0, exports.isFormula)(value) ? value.subs
 exports.stripFormulaPrefix = stripFormulaPrefix;
 const colors = ['#5B97FF', '#FF616B', '#B77CFF', '#00B02C', '#FC58BE', '#FF9000', '#2EB0B3'];
 const getColor = (index) => colors[index % colors.length];
-const getTokenSize = (token) => token[0].length + (token[1] == tokenization_1.TokenType.Sheet ? 3 : 0);
 class Formula {
     get fn() { var _a; return (_a = this._fn) !== null && _a !== void 0 ? _a : (this._fn = (new Function('t', 'ctx', 'return ' + this.compile()))); }
     get tokens() { return this._tokens; }
@@ -21,16 +20,21 @@ class Formula {
     get cells() { return this._cells; }
     get ranges() { return this._ranges; }
     get colors() {
-        const colormap = new Map();
-        for (let i = 0; i < this._tokens.length; i++) {
-            const t = this._tokens[i];
-            if ([tokenization_1.TokenType.Variable, tokenization_1.TokenType.Cell, tokenization_1.TokenType.Range].includes(t[1])) {
-                const sheet = i > 0 && this._tokens[i - 1][1] == tokenization_1.TokenType.Sheet ? this._tokens[i - 1][0] : null;
-                const key = (sheet ? ('\'' + sheet + '\'!') : '') + t[0];
-                colormap.set(key, { color: getColor(colormap.size), address: t[0], sheet: sheet, type: t[1], tokenIndex: i });
-            }
+        if (!this._colors) {
+            this._colors = new Map();
+            let sheet;
+            this._tokens.forEach((t, i) => {
+                if ([tokenization_1.TokenType.Cell, tokenization_1.TokenType.Range].includes(t[1])) {
+                    const key = (sheet ? ('\'' + sheet + '\'!') : '') + t[0];
+                    this._colors.set(key, { color: getColor(this._colors.size), address: t[0], sheet: sheet, type: t[1], tokenIndex: i });
+                    sheet = null;
+                }
+                else if (t[1] == tokenization_1.TokenType.Sheet) {
+                    sheet = t[0];
+                }
+            });
         }
-        return colormap;
+        return this._colors;
     }
     constructor(expression, tokenizer) {
         this.expression = expression;
@@ -41,18 +45,64 @@ class Formula {
     findTokenIndexAtPosition(pos) {
         let i = 0;
         return this._tokens.findIndex(token => {
-            const size = getTokenSize(token);
+            const size = token[0].length;
             if (pos >= i && pos <= i + size)
                 return true;
             i += size;
         });
     }
+    /**
+     * Finds sheet token for the given reange token index
+     *
+     * @param tokenIndex
+     */
+    findSheetTokenIndex(tokenIndex) {
+        const token = this._tokens[tokenIndex];
+        if (![tokenization_1.TokenType.Cell, tokenization_1.TokenType.Range].includes(token[1]))
+            return -1;
+        if (tokenIndex == 0 || this._tokens[tokenIndex - 1][1] != tokenization_1.TokenType.SheetSeparator)
+            return -1;
+        let i = tokenIndex - 2;
+        while (i >= 0) {
+            if (this._tokens[i][1] == tokenization_1.TokenType.Sheet)
+                return i;
+            i--;
+        }
+        return -1;
+    }
+    /**
+     * Removes sheet token for the given token index (range or sheet itself)
+     * @param tokenIndex
+     * @returns number of tokens removed
+     */
+    removeSheetToken(tokenIndex) {
+        if (this._tokens[tokenIndex][1] != tokenization_1.TokenType.Sheet) {
+            tokenIndex = this.findSheetTokenIndex(tokenIndex);
+        }
+        if (tokenIndex > -1) {
+            if (tokenIndex > 0 && this._tokens[tokenIndex - 1][1] == tokenization_1.TokenType.SheetQuote)
+                tokenIndex--;
+            let maxIndex = tokenIndex;
+            while (maxIndex < this._tokens.length && [
+                tokenization_1.TokenType.SheetSeparator, tokenization_1.TokenType.SheetQuote, tokenization_1.TokenType.Sheet
+            ].includes(this._tokens[maxIndex][1])) {
+                maxIndex++;
+            }
+            this._tokens.splice(tokenIndex, maxIndex - tokenIndex);
+            return maxIndex - tokenIndex;
+        }
+        return 0;
+    }
+    getNamedColor(name) {
+        var _a, _b;
+        return (_b = (_a = this.colors.get(name)) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : 'inherit';
+    }
     getTokenPosition(index) {
         let min = 0;
         for (let i = 0; i < index; i++) {
-            min += getTokenSize(this._tokens[i]);
+            min += this._tokens[i][0].length;
         }
-        return { min: min, max: min + getTokenSize(this._tokens[index]) };
+        return { min: min, max: min + this._tokens[index][0].length };
     }
     updateToken(index, newValue) {
         this._fn = null;
@@ -64,10 +114,28 @@ class Formula {
         this._formula = null;
         this._tokens.splice(index, 1);
     }
+    /**
+     * Inserts a new token at the given index
+     * @param index
+     * @param value
+     * @param type
+     * @returns number of inserted tokens
+     */
     insertToken(index, value, type) {
         this._fn = null;
         this._formula = null;
-        this._tokens.splice(index, 0, [value, type]);
+        const tokens = [];
+        if (type == tokenization_1.TokenType.Sheet && /\s/.test(value)) {
+            tokens.push([this.tokenizer.options.sheetQuote, tokenization_1.TokenType.SheetQuote]);
+            tokens.push([value, tokenization_1.TokenType.Sheet]);
+            tokens.push([this.tokenizer.options.sheetQuote, tokenization_1.TokenType.SheetQuote]);
+        }
+        else {
+            tokens.push([value, type]);
+        }
+        tokens.push(['!', tokenization_1.TokenType.SheetSeparator]);
+        this._tokens.splice(index, 0, ...tokens);
+        return tokens.length;
     }
     clone() {
         return new Formula(this.createFormulaString(), this.tokenizer);
@@ -97,14 +165,12 @@ class Formula {
             }
         });
     }
-    getNamedColor(name) {
-        var _a, _b;
-        return (_b = (_a = this.colors.get(name)) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : 'inherit';
-    }
     createFormulaString(html = false, fnPrefix = null) {
         const opts = this.tokenizer.options;
         let formula = '';
         let token;
+        let sheet;
+        let colorKey;
         for (let i = 0; i < this._tokens.length; i++) {
             token = this._tokens[i];
             switch (token[1]) {
@@ -115,14 +181,17 @@ class Formula {
                     formula += '!';
                     break;
                 case tokenization_1.TokenType.Sheet:
-                    formula += html ? `<span style="font-style:italic">${token[0]}</span>` : token[0];
+                    sheet = token[0];
+                    formula += html ? `<span style="font-style:italic">${sheet}</span>` : sheet;
                     break;
                 case tokenization_1.TokenType.Variable:
                     formula += token[0];
                     break;
                 case tokenization_1.TokenType.Range:
                 case tokenization_1.TokenType.Cell:
-                    formula += html ? `<span style="color:${this.getNamedColor(token[0])}">${token[0]}</span>` : token[0];
+                    colorKey = (sheet ? ('\'' + sheet + '\'!') : '') + token[0];
+                    formula += html ? `<span style="color:${this.getNamedColor(colorKey)}">${token[0]}</span>` : token[0];
+                    sheet = null;
                     break;
                 case tokenization_1.TokenType.StringQuote:
                     formula += opts.stringQuote;
@@ -274,7 +343,7 @@ class Formula {
                     return 't.op(' + args[0] + ',' + args[1] + ',\'' + node.t + '\')';
                 }
                 else {
-                    return '(' + node.c.map(n => this.createExpressionJSCode(n, node, arrayMode)).join(node.t) + ')';
+                    return '(' + node.c.map(n => this.createExpressionJSCode(n, node, arrayMode)).join(operators_1.operatorMap.get(node.t)[0]) + ')';
                 }
             default:
                 return node.t;

package/dist/calculations/formula.js.map

@@ -1 +1 @@
-{"version":3,"file":"formula.js","sourceRoot":"","sources":["../../src/calculations/formula.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formula.js","sourceRoot":"","sources":["../../src/calculations/formula.ts"],"names":[],"mappings":"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"}

package/dist/calculations/tokenization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenization.d.ts","sourceRoot":"","sources":["../../src/calculations/tokenization.ts"],"names":[],"mappings":"AAEA,oBAAY,SAAS;IACpB,MAAM,IAAA;IACN,OAAO,IAAA;IACP,MAAM,IAAA;IACN,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,iBAAiB,IAAA;IACjB,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,QAAQ,IAAA;IACR,IAAI,IAAA;IACJ,QAAQ,KAAA;IACR,KAAK,KAAA;IACL,KAAK,KAAA;IACL,UAAU,KAAA;IACV,cAAc,KAAA;IACd,OAAO,KAAA;CACP;AAED,MAAM,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAGxC,eAAO,MAAM,QAAQ,SAAU,MAAM,YAA6B,CAAC;AAGnE,eAAO,MAAM,MAAM,UAAW,MAAM,YAGnC,CAAA;AAGD,eAAO,MAAM,QAAQ,SAAU,MAAM,YAGR,CAAC;AAI9B,MAAM,MAAM,mBAAmB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,CAAA;AASD,qBAAa,SAAS;IACrB,SAAgB,OAAO,EAAE,mBAAmB,CAAC;gBAEjC,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAIlD,QAAQ,CAAC,OAAO,EAAE,MAAM;CA4HxB"}
+{"version":3,"file":"tokenization.d.ts","sourceRoot":"","sources":["../../src/calculations/tokenization.ts"],"names":[],"mappings":"AAEA,oBAAY,SAAS;IACpB,MAAM,IAAA;IACN,OAAO,IAAA;IACP,MAAM,IAAA;IACN,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,iBAAiB,IAAA;IACjB,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,QAAQ,IAAA;IACR,IAAI,IAAA;IACJ,QAAQ,KAAA;IACR,KAAK,KAAA;IACL,KAAK,KAAA;IACL,UAAU,KAAA;IACV,cAAc,KAAA;IACd,OAAO,KAAA;CACP;AAED,MAAM,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAGxC,eAAO,MAAM,QAAQ,SAAU,MAAM,YAA6B,CAAC;AAGnE,eAAO,MAAM,MAAM,UAAW,MAAM,YAGnC,CAAA;AAGD,eAAO,MAAM,QAAQ,SAAU,MAAM,YAGR,CAAC;AAI9B,MAAM,MAAM,mBAAmB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,CAAA;AASD,qBAAa,SAAS;IACrB,SAAgB,OAAO,EAAE,mBAAmB,CAAC;gBAEjC,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAIlD,QAAQ,CAAC,OAAO,EAAE,MAAM;CAkIxB"}

package/dist/calculations/tokenization.js

@@ -55,6 +55,7 @@ class Tokenizer {
         let isSheet = false;
         let type;
         let closed = false;
+        let negative = false;
         while (offset < len) {
             char = formula.charAt(offset);
             code = char.charCodeAt(0);
@@ -63,7 +64,7 @@ class Tokenizer {
             }
             else if ((0, exports.isNumber)(code)) {
                 // number token
-                token = char;
+                token = (negative ? '-' : '') + char;
                 ++offset;
                 while (offset < len) {
                     char = formula.charAt(offset);
@@ -80,6 +81,7 @@ class Tokenizer {
                         break;
                     }
                 }
+                negative = false;
                 tokens.push([token, TokenType.Number]);
             }
             else if ((0, exports.isLetter)(code) || char == '$') {
@@ -138,11 +140,16 @@ class Tokenizer {
                 } while (offset < len);
             }
             else if ((0, operators_1.isOperator)(char)) {
-                token = char;
-                while ((0, operators_1.isOperator)(formula.charAt(offset + 1))) {
-                    token += formula.charAt(++offset);
+                if (char === '-' && (0, exports.isNumber)(formula.charCodeAt(offset + 1))) {
+                    negative = true;
+                }
+                else {
+                    token = char;
+                    while ((0, operators_1.isOperator)(formula.charAt(offset + 1))) {
+                        token += formula.charAt(++offset);
+                    }
+                    tokens.push([token, TokenType.Operator]);
                 }
-                tokens.push([token, TokenType.Operator]);
                 ++offset;
             }
             else if (char === '(') {

package/dist/calculations/tokenization.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenization.js","sourceRoot":"","sources":["../../src/calculations/tokenization.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tokenization.js","sourceRoot":"","sources":["../../src/calculations/tokenization.ts"],"names":[],"mappings":"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"}

package/dist/model/cellModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cellModel.d.ts","sourceRoot":"","sources":["../../src/model/cellModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cellModel.d.ts","sourceRoot":"","sources":["../../src/model/cellModel.ts"],"names":[],"mappings":"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"}

package/dist/model/cellModel.js

@@ -115,8 +115,8 @@ class CellModel extends elementModel_1.ElementModel {
         }
         return null;
     }
-    get elm1() { return this.row.priority < this.column.priority ? this.row : this.column; }
-    get elm2() { return this.row.priority >= this.column.priority ? this.row : this.column; }
+    get elm1() { return this.row.priority >= this.column.priority ? this.row : this.column; }
+    get elm2() { return this.row.priority < this.column.priority ? this.row : this.column; }
     get clickable() { var _a, _b; return (_b = (_a = super.clickable) !== null && _a !== void 0 ? _a : this.elm1.clickable) !== null && _b !== void 0 ? _b : this.elm2.clickable; }
     get type() { var _a, _b, _c; return (_c = (_b = (_a = super.type) !== null && _a !== void 0 ? _a : this.elm1.type) !== null && _b !== void 0 ? _b : this.elm2.type) !== null && _c !== void 0 ? _c : core_1.UIValueType.General; }
     set type(value) { this._type = value; }

package/dist/model/cellModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"cellModel.js","sourceRoot":"","sources":["../../src/model/cellModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cellModel.js","sourceRoot":"","sources":["../../src/model/cellModel.ts"],"names":[],"mappings":"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"}

package/dist/model/columnModel.d.ts

@@ -41,6 +41,8 @@ export type ColumnSource = {
     levelButtons?: boolean;
     /** custom camparison function for column sorting */
     comparer?: Comparer;
+    /** if column priority is higher then row priority, column properties has precedence over row properties */
+    priority?: number;
 } & tree.TreeNodeSource & ElementSource;
 declare const ColumnModel_base: (new (...input: any[]) => {
     index: number;

package/dist/model/columnModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columnModel.d.ts","sourceRoot":"","sources":["../../src/model/columnModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"columnModel.d.ts","sourceRoot":"","sources":["../../src/model/columnModel.ts"],"names":[],"mappings":"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"}

package/dist/model/columnModel.js

@@ -48,7 +48,7 @@ class ColumnModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel)
         this._width = ColumnModel.DEFAULT_WIDTH;
         this._levelIndent = false;
         this._levelButtons = false;
-        this._priority = 2;
+        this._priority = 1;
         if (source)
             this.populate(source);
     }
@@ -81,6 +81,8 @@ class ColumnModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel)
         this._comparer = source.comparer;
         this.data = source.data;
         this._mergedHeaders = null;
+        if (source.priority != null)
+            this._priority = source.priority;
     }
     getSourceData() {
         const data = super.getSourceData();

package/dist/model/columnModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"columnModel.js","sourceRoot":"","sources":["../../src/model/columnModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"columnModel.js","sourceRoot":"","sources":["../../src/model/columnModel.ts"],"names":[],"mappings":"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"}

package/dist/model/rowModel.d.ts

@@ -7,6 +7,8 @@ import { ElementModel, ElementSource } from "./elementModel";
 export type RowSource = {
     h?: number;
     data?: Record<string | number, any>;
+    /** if row priority is higher then column priority, row properties has precedence over column properties */
+    priority?: number;
 } & tree.TreeNodeSource & ElementSource;
 declare const RowModel_base: (new (...input: any[]) => {
     index: number;

package/dist/model/rowModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rowModel.d.ts","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAS,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU7D,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACjC,GAAG,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvC,qBAAa,QAAS,SAAQ,aAAgC;IAE7D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,MAAM,CAAc;IAC5B,IAAI,KAAK,gBAAyB;IAElC,OAAO,CAAC,KAAK,CAA6B;IAC1C,IAAI,IAAI,IACK,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CADP;IAChC,IAAI,IAAI,CAAC,CAAC,EAAG,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,EAAoB;IAE3D,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IACQ,MAAM,CAD4C;IACpE,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAA0B;IAElD,OAAO,CAAC,SAAS,CAAK;IACtB,IAAI,QAAQ,IACQ,MAAM,CADc;IACxC,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAA4B;IAEtD,IAAI,OAAO,WAAmC;IAC9C,IAAI,KAAK,cAA+D;IAExE,IAAI,UAAU,YAA6B;IAC3C,IAAI,OAAO,IACI,MAAM,CADiB;IACtC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAGpB;IAED,IAAI,MAAM,cAAuE;IAEjF,iBAAiB,MAAO,MAAM,aAAqB;IAEnD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,GAAI,SAAS;gBAiBpC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS;IAKhD,QAAQ,CAAC,MAAM,EAAE,SAAS;IAM1B,aAAa;IAOb,MAAM;IAKN,QAAQ;IAKR,IAAI,IAAI,aAA6C;IACrD,IAAI,IAAI,aAA6C;IAErD,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED;;;;OAIG;IACH,cAAc,CAAC,CAAC,EAAE,MAAM;IAKxB,WAAW,CAAC,CAAC,EAAE,MAAM;IAKrB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,qBAAqB;CAIrB"}
+{"version":3,"file":"rowModel.d.ts","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAS,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU7D,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,2GAA2G;IAC3G,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvC,qBAAa,QAAS,SAAQ,aAAgC;IAE7D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,MAAM,CAAc;IAC5B,IAAI,KAAK,gBAAyB;IAElC,OAAO,CAAC,KAAK,CAA6B;IAC1C,IAAI,IAAI,IACK,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,CADP;IAChC,IAAI,IAAI,CAAC,CAAC,EAAG,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,GAAG,CAAC,EAAoB;IAE3D,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IACQ,MAAM,CAD4C;IACpE,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAA0B;IAElD,OAAO,CAAC,SAAS,CAAK;IACtB,IAAI,QAAQ,IACQ,MAAM,CADc;IACxC,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAA4B;IAEtD,IAAI,OAAO,WAAmC;IAC9C,IAAI,KAAK,cAA+D;IAExE,IAAI,UAAU,YAA6B;IAC3C,IAAI,OAAO,IACI,MAAM,CADiB;IACtC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAGpB;IAED,IAAI,MAAM,cAAuE;IAEjF,iBAAiB,MAAO,MAAM,aAAqB;IAEnD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,GAAI,SAAS;gBAiBpC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS;IAKhD,QAAQ,CAAC,MAAM,EAAE,SAAS;IAO1B,aAAa;IAOb,MAAM;IAKN,QAAQ;IAKR,IAAI,IAAI,aAA6C;IACrD,IAAI,IAAI,aAA6C;IAErD,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED,IAAI,WAAW,IAAK,QAAQ,CAI3B;IAED;;;;OAIG;IACH,cAAc,CAAC,CAAC,EAAE,MAAM;IAKxB,WAAW,CAAC,CAAC,EAAE,MAAM;IAKrB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,UAAQ;IAqBjE,qBAAqB;CAIrB"}

package/dist/model/rowModel.js

@@ -48,7 +48,7 @@ class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
     }
     constructor(model, source) {
         super(model, source);
-        this._priority = 1;
+        this._priority = 2;
         this.isCellInitialized = (c) => !!this.cells[c];
         this._cells = [];
     }
@@ -56,7 +56,9 @@ class RowModel extends core_1.tree.TreeNodeMixin(elementModel_1.ElementModel) {
         var _a;
         super.populate(source);
         this._height = (_a = source.h) !== null && _a !== void 0 ? _a : constants_1.default.DEFAULT_ROW_HEIGHT;
-        this._data = source.data;
+        this._data = source.data; // TODO: make clone?
+        if (source.priority != null)
+            this._priority = source.priority;
     }
     getSourceData() {
         const data = super.getSourceData();

package/dist/model/rowModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"rowModel.js","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rowModel.js","sourceRoot":"","sources":["../../src/model/rowModel.ts"],"names":[],"mappings":"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"}

package/dist/model/selectionModel.d.ts

@@ -11,8 +11,7 @@ export declare class SelectionModel {
     constructor(c1: number, r1: number, c2?: number, r2?: number);
     static fromRange(r: CellRange): SelectionModel;
     setCoords(c1?: number, r1?: number, c2?: number, r2?: number): void;
-    setRangeAddress(address: string): void;
-    setRange(range: CellRange): void;
+    setRange(range: CellRange | string): void;
     move(c: number, r: number, maxColumns?: number, maxRows?: number): void;
     moveRange(c: number, r: number, maxColumns?: number, maxRows?: number): void;
     moveActiveCell(c: number, r: number): void;

package/dist/model/selectionModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectionModel.d.ts","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,cAAc;IAE1B,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,UAAS;IAEf,IAAI,gBAAgB,IAAI;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAK7C;gBAEW,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM;IAK5D,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS;IAI7B,SAAS,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM;IAK5D,eAAe,CAAC,OAAO,EAAE,MAAM;IAI/B,QAAQ,CAAC,KAAK,EAAE,SAAS;IAKzB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAWhE,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAIrE,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;CAKnC"}
+{"version":3,"file":"selectionModel.d.ts","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,cAAc;IAE1B,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,UAAS;IAEf,IAAI,gBAAgB,IAAI;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAK7C;gBAEW,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM;IAK5D,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS;IAI7B,SAAS,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM;IAK5D,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAC,MAAM;IAMhC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAWhE,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAIrE,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;CAKnC"}

package/dist/model/selectionModel.js

@@ -21,10 +21,9 @@ class SelectionModel {
         this.range.setCoords(c1, r1, c2, r2);
         this.activeCell.setCoords(0, 0);
     }
-    setRangeAddress(address) {
-        this.setRange(range_1.CellRange.fromA1(address));
-    }
     setRange(range) {
+        if (typeof range === 'string')
+            range = range_1.CellRange.fromA1(range);
         this.range.setCoords(range.c1, range.r1, range.c2, range.r2);
         this.activeCell.setCoords(0, 0);
     }

package/dist/model/selectionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectionModel.js","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAE5C,MAAa,cAAc;IAO1B,IAAI,gBAAgB;QACnB,OAAO;YACN,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;YACrC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;SACrC,CAAA;IACF,CAAC;IAED,YAAY,EAAU,EAAE,EAAU,EAAE,EAAW,EAAE,EAAW;QAT5D,WAAM,GAAG,KAAK,CAAC;QAUd,IAAI,CAAC,KAAK,GAAG,IAAI,iBAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,CAAY;QAC5B,OAAO,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,SAAS,CAAC,EAAW,EAAE,EAAW,EAAE,EAAW,EAAE,EAAW;QAC3D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,eAAe,CAAC,OAAe;QAC9B,IAAI,CAAC,QAAQ,CAAC,iBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QAC/D,IAAI,CAAC,KAAK,CAAC,SAAS,CACnB,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAClC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QACpE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,CAAS,EAAE,CAAS;QAClC,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CAED;AAzDD,wCAyDC"}
+{"version":3,"file":"selectionModel.js","sourceRoot":"","sources":["../../src/model/selectionModel.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAE5C,MAAa,cAAc;IAO1B,IAAI,gBAAgB;QACnB,OAAO;YACN,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;YACrC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE;SACrC,CAAA;IACF,CAAC;IAED,YAAY,EAAU,EAAE,EAAU,EAAE,EAAW,EAAE,EAAW;QAT5D,WAAM,GAAG,KAAK,CAAC;QAUd,IAAI,CAAC,KAAK,GAAG,IAAI,iBAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,CAAY;QAC5B,OAAO,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,SAAS,CAAC,EAAW,EAAE,EAAW,EAAE,EAAW,EAAE,EAAW;QAC3D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,QAAQ,CAAC,KAAuB;QAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,KAAK,GAAG,iBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QAC/D,IAAI,CAAC,KAAK,CAAC,SAAS,CACnB,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAClC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAClC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS,EAAE,UAAmB,EAAE,OAAgB;QACpE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,CAAS,EAAE,CAAS;QAClC,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CAED;AAtDD,wCAsDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omegagrid/grid-core",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "license": "UNLICENSED",
   "description": "Grid model, no ui components",
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@lit/localize": "^0.12.1",
-    "@omegagrid/core": "^0.2.7",
+    "@omegagrid/core": "^0.2.8",
     "@stdlib/stats": "^0.0.13",
     "color": "^4.2.3",
     "lit": "^3.1.1",