@progress/kendo-spreadsheet-common 1.2.10-develop.3 → 1.2.11-develop.1

package/dist/index-esm.js

@@ -1404,7 +1404,7 @@ function createKendoObj(calc, CalcError, Ref, CellRef, RangeRef) {
 }
 
 /* eslint-disable max-params */
- 
+
 
 let calc = {
     runtime: {
@@ -1494,11 +1494,10 @@ class Context {
         function add(a) {
             for (var i = 0; i < a.length; ++i) {
                 var cell = a[i];
-                if (cell.formula) {
+                if (cell.formula && cell.formula !== context.formula) {
                     formulas.push(cell.formula);
                 }
             }
-            return true;
         }
     }
 
@@ -1728,7 +1727,7 @@ class Matrix {
         return new CalcError("N/A");
     }
     set(row, col, data) {
-        if (col === '__proto__' || col === 'constructor' || col === 'prototype' 
+        if (col === '__proto__' || col === 'constructor' || col === 'prototype'
             || row === '__proto__' || row === 'constructor' || row === 'prototype') {
             return;
         }
@@ -2040,16 +2039,17 @@ let Formula$1 = class Formula {
                 this.onReady.push(callback);
             }
 
-            var ctx = new Context(this.resolve, this, ss, parentContext);
+            let p = parentContext;
+            var ctx = new Context(this.resolve, this, ss, p);
             var level = 0;
             // if the call chain leads back to this same formula, we have a circular dependency.
-            while (parentContext) {
-                if (parentContext.formula === this) {
+            while (p) {
+                if (p.formula === this) {
                     this.pending = false;
                     ctx.resolve(new CalcError("CIRCULAR"));
                     return;
                 }
-                parentContext = parentContext.parent;
+                p = p.parent;
                 ++level;
             }
 
@@ -2228,11 +2228,13 @@ function compileArgumentChecks(functionName, args) {
     var f;
     if (haveForced) {
         resolve += "this.resolveCells(toResolve, callback); } ";
-        f = new Function("kendo", "CalcError", "round", main + resolve + arrayArgs + " return { resolve: resolve, check: check, arrayArgs: arrayArgs };");
+        f = new Function("kendo", "CalcError", "round", "limitRef",
+                         main + resolve + arrayArgs + " return { resolve: resolve, check: check, arrayArgs: arrayArgs };");
     } else {
-        f = new Function("kendo", "CalcError", "round", main + " return { check: check };");
+        f = new Function("kendo", "CalcError", "round", "limitRef",
+                         main + " return { check: check };");
     }
-    f = f(calc.kendo, CalcError, limitPrecision$1);
+    f = f(calc.kendo, CalcError, limitPrecision$1, limitRef$1);
     if (!hasArrayArgs) {
         delete f.arrayArgs;
     }
@@ -2323,6 +2325,26 @@ function compileArgumentChecks(functionName, args) {
         return "($" + name + " = this.force($" + name + "))";
     }
 
+    function forceLeftColumn() {
+        if (forced) {
+            return "$" + name + "";
+        }
+        haveForced = true;
+        forced = true;
+        resolve += "toResolve.push(limitRef(args[i++], 'leftColumn')); ";
+        return "($" + name + " = this.force($" + name + "))";
+    }
+
+    function forceTopRow() {
+        if (forced) {
+            return "$" + name + "";
+        }
+        haveForced = true;
+        forced = true;
+        resolve += "toResolve.push(limitRef(args[i++], 'topRow')); ";
+        return "($" + name + " = this.force($" + name + "))";
+    }
+
     function forceNum(round) {
         return "("
             + (round
@@ -2377,6 +2399,9 @@ function compileArgumentChecks(functionName, args) {
             if (type[0] == "null") {
                 return "(" + cond("null") + " ? (($" + name + " = " + type[1] + "), true) : false)";
             }
+            if (type[0] == "#null") {
+                return "(" + cond("#null") + " ? (($" + name + " = " + type[1] + "), true) : false)";
+            }
             if (type[0] == "between" || type[0] == "[between]") {
                 return "(" + force() + " >= " + type[1] + " && " + "$" + name + " <= " + type[2] + " ? true : ((err = 'NUM'), false))";
             }
@@ -2435,6 +2460,14 @@ function compileArgumentChecks(functionName, args) {
             force();
             return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
         }
+        if (type == "vlookup-matrix") {
+            forceLeftColumn();
+            return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
+        }
+        if (type == "hlookup-matrix") {
+            forceTopRow();
+            return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
+        }
         if (type == "#matrix") {
             return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
         }
@@ -2450,6 +2483,9 @@ function compileArgumentChecks(functionName, args) {
         if (type == "null") {
             return "(" + force() + " == null)";
         }
+        if (type == "#null") {
+            return "($" + name + " == null)";
+        }
         if (type == "anyvalue") {
             return "(" + force() + " != null && i <= args.length)";
         }
@@ -2466,6 +2502,18 @@ function compileArgumentChecks(functionName, args) {
     }
 }
 
+function limitRef$1(ref, how) {
+    if (ref instanceof RangeRef) {
+        switch (how) {
+          case "topRow":
+            return ref.topRow();
+          case "leftColumn":
+            return ref.leftColumn();
+        }
+    }
+    return ret;
+}
+
 function limitPrecision$1(num, digits) {
     return num === parseInt(num, 10) ? num : +num.toPrecision(digits || 16);
 }
@@ -2906,6 +2954,7 @@ calc.runtime.isLeapYear = isLeapYear$1;
 calc.runtime.daysInYear = daysInYear$1;
 calc.runtime.parseDate = parseDate;
 calc.runtime.limitPrecision = limitPrecision$1;
+calc.runtime.limitRef = limitRef$1;
 calc.runtime.defineBuiltinFunction = defineBuiltinFunction$1;
 calc.runtime.defineAlias = defineAlias$1;
 calc.runtime.InputStream = InputStream;
@@ -23937,6 +23986,7 @@ const {
     FUNCS,
     defineBuiltinFunction,
     limitPrecision,
+    limitRef,
     packDate: packDate$1,
     unpackDate: unpackDate$1,
     daysInMonth,
@@ -29870,8 +29920,11 @@ defineBuiltinFunction('countif', false, function () {
 
 function fetchSumRange(continuation) {
     return function(callback, range, criteria, sumRange) {
-        var self = this;
-        if (sumRange instanceof Ref) {
+        let self = this;
+        let r = sumRange;
+        criteria = parseCriteria(criteria);
+
+        if (r instanceof Ref) {
             // make sure it covers the same area as `range`, as the “spec” mentions:
             //
             //     The sum_range argument does not have to be the same size and shape as the
@@ -29881,7 +29934,7 @@ function fetchSumRange(continuation) {
             //
             // It does make one wonder, since only the top-left cell in `sumRange` matters, why
             // should it be a range at all?  Oh well, Excel.
-            var r = sumRange.clone().toRangeRef();
+            r = r.clone().toRangeRef();
             if (r.width() != range.width || r.height() != range.height) {
                 if (!isFinite(r.topLeft.row)) {
                     r.topLeft.row = 0;
@@ -29891,12 +29944,27 @@ function fetchSumRange(continuation) {
                 }
                 r.bottomRight.row = r.topLeft.row + range.height - 1;
                 r.bottomRight.col = r.topLeft.col + range.width - 1;
-                return self.resolveCells([ r ], function(){
-                    callback(continuation(range, criteria, self.asMatrix(r)));
-                });
             }
+            let cells = [];
+            range.each(function(val, row, col){
+                if (criteria(val)) {
+                    cells.push(r.toCell(row, col));
+                }
+            });
+            return self.resolveCells(cells, function(){
+                let data = cells.map(x => self.getRefData(x));
+                return callback(continuation.call(self, data));
+            });
         }
-        callback(continuation(range, criteria, self.asMatrix(sumRange)));
+
+        // sumRange must be a Matrix if we get here.
+        let data = [];
+        range.each(function(val, row, col){
+            if (criteria(val)) {
+                data.push(r.get(row, col));
+            }
+        });
+        return callback(continuation.call(self, data));
     };
 }
 
@@ -29929,9 +29997,7 @@ defineBuiltinFunction('sumif', true, function () {
             var $sumRange = args[i++];
             if ($sumRange instanceof CalcError)
                 return $sumRange;
-            if (!($sumRange instanceof CellRef || $sumRange instanceof RangeRef || ((m = this.asMatrix($sumRange)) ? $sumRange = m : false) || (($sumRange = this.force($sumRange)) == null ? ($sumRange = $range, true) : false))) {
-                if ($sumRange instanceof CalcError)
-                    return $sumRange;
+            if (!($sumRange instanceof CellRef || $sumRange instanceof RangeRef || ((m = this.asMatrix($sumRange)) ? $sumRange = m : false) || ($sumRange == null ? ($sumRange = $range, true) : false))) {
                 return new CalcError(err);
             }
             xargs.push($sumRange);
@@ -29944,7 +30010,7 @@ defineBuiltinFunction('sumif', true, function () {
         var toResolve = [], i = 0;
         toResolve.push(args[i++]);
         toResolve.push(args[i++]);
-        toResolve.push(args[i++]);
+        i++;
         this.resolveCells(toResolve, callback);
     }
     function arrayArgs(args) {
@@ -29976,15 +30042,11 @@ defineBuiltinFunction('sumif', true, function () {
         resolve: resolve,
         arrayArgs: arrayArgs
     };
-}(), fetchSumRange(function (range, criteria, sumRange) {
-    var sum = 0;
-    criteria = parseCriteria(criteria);
-    range.each(function (val, row, col) {
-        if (criteria(val)) {
-            var v = sumRange.get(row, col);
-            if (numericPredicate(v)) {
-                sum += v || 0;
-            }
+}(), fetchSumRange(function (matchingCellsData) {
+    let sum = 0;
+    matchingCellsData.forEach(v => {
+        if (numericPredicate(v)) {
+            sum += v || 0;
         }
     });
     return sum;
@@ -30066,16 +30128,12 @@ defineBuiltinFunction('averageif', true, function () {
         resolve: resolve,
         arrayArgs: arrayArgs
     };
-}(), fetchSumRange(function (range, criteria, sumRange) {
-    var sum = 0, count = 0;
-    criteria = parseCriteria(criteria);
-    range.each(function (val, row, col) {
-        if (criteria(val)) {
-            var v = sumRange.get(row, col);
-            if (numericPredicate(v)) {
-                sum += v || 0;
-                count++;
-            }
+}(), fetchSumRange(function (matchingCellsData) {
+    let sum = 0, count = 0;
+    matchingCellsData.forEach(v => {
+        if (numericPredicate(v)) {
+            sum += v || 0;
+            count++;
         }
     });
     return count ? sum / count : new CalcError('DIV/0');
@@ -32789,7 +32847,7 @@ defineBuiltinFunction('hlookup', false, function () {
     function resolve(args, callback) {
         var toResolve = [], i = 0;
         toResolve.push(args[i++]);
-        toResolve.push(args[i++]);
+        toResolve.push(limitRef(args[i++], 'topRow'));
         toResolve.push(args[i++]);
         toResolve.push(args[i++]);
         this.resolveCells(toResolve, callback);
@@ -33322,7 +33380,7 @@ defineBuiltinFunction('vlookup', false, function () {
     function resolve(args, callback) {
         var toResolve = [], i = 0;
         toResolve.push(args[i++]);
-        toResolve.push(args[i++]);
+        toResolve.push(limitRef(args[i++], 'leftColumn'));
         toResolve.push(args[i++]);
         toResolve.push(args[i++]);
         this.resolveCells(toResolve, callback);

package/dist/index.js

@@ -1405,7 +1405,7 @@
     }
 
     /* eslint-disable max-params */
-     
+
 
     let calc = {
         runtime: {
@@ -1495,11 +1495,10 @@
             function add(a) {
                 for (var i = 0; i < a.length; ++i) {
                     var cell = a[i];
-                    if (cell.formula) {
+                    if (cell.formula && cell.formula !== context.formula) {
                         formulas.push(cell.formula);
                     }
                 }
-                return true;
             }
         }
 
@@ -1729,7 +1728,7 @@
             return new CalcError("N/A");
         }
         set(row, col, data) {
-            if (col === '__proto__' || col === 'constructor' || col === 'prototype' 
+            if (col === '__proto__' || col === 'constructor' || col === 'prototype'
                 || row === '__proto__' || row === 'constructor' || row === 'prototype') {
                 return;
             }
@@ -2041,16 +2040,17 @@
                     this.onReady.push(callback);
                 }
 
-                var ctx = new Context(this.resolve, this, ss, parentContext);
+                let p = parentContext;
+                var ctx = new Context(this.resolve, this, ss, p);
                 var level = 0;
                 // if the call chain leads back to this same formula, we have a circular dependency.
-                while (parentContext) {
-                    if (parentContext.formula === this) {
+                while (p) {
+                    if (p.formula === this) {
                         this.pending = false;
                         ctx.resolve(new CalcError("CIRCULAR"));
                         return;
                     }
-                    parentContext = parentContext.parent;
+                    p = p.parent;
                     ++level;
                 }
 
@@ -2229,11 +2229,13 @@
         var f;
         if (haveForced) {
             resolve += "this.resolveCells(toResolve, callback); } ";
-            f = new Function("kendo", "CalcError", "round", main + resolve + arrayArgs + " return { resolve: resolve, check: check, arrayArgs: arrayArgs };");
+            f = new Function("kendo", "CalcError", "round", "limitRef",
+                             main + resolve + arrayArgs + " return { resolve: resolve, check: check, arrayArgs: arrayArgs };");
         } else {
-            f = new Function("kendo", "CalcError", "round", main + " return { check: check };");
+            f = new Function("kendo", "CalcError", "round", "limitRef",
+                             main + " return { check: check };");
         }
-        f = f(calc.kendo, CalcError, limitPrecision$1);
+        f = f(calc.kendo, CalcError, limitPrecision$1, limitRef$1);
         if (!hasArrayArgs) {
             delete f.arrayArgs;
         }
@@ -2324,6 +2326,26 @@
             return "($" + name + " = this.force($" + name + "))";
         }
 
+        function forceLeftColumn() {
+            if (forced) {
+                return "$" + name + "";
+            }
+            haveForced = true;
+            forced = true;
+            resolve += "toResolve.push(limitRef(args[i++], 'leftColumn')); ";
+            return "($" + name + " = this.force($" + name + "))";
+        }
+
+        function forceTopRow() {
+            if (forced) {
+                return "$" + name + "";
+            }
+            haveForced = true;
+            forced = true;
+            resolve += "toResolve.push(limitRef(args[i++], 'topRow')); ";
+            return "($" + name + " = this.force($" + name + "))";
+        }
+
         function forceNum(round) {
             return "("
                 + (round
@@ -2378,6 +2400,9 @@
                 if (type[0] == "null") {
                     return "(" + cond("null") + " ? (($" + name + " = " + type[1] + "), true) : false)";
                 }
+                if (type[0] == "#null") {
+                    return "(" + cond("#null") + " ? (($" + name + " = " + type[1] + "), true) : false)";
+                }
                 if (type[0] == "between" || type[0] == "[between]") {
                     return "(" + force() + " >= " + type[1] + " && " + "$" + name + " <= " + type[2] + " ? true : ((err = 'NUM'), false))";
                 }
@@ -2436,6 +2461,14 @@
                 force();
                 return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
             }
+            if (type == "vlookup-matrix") {
+                forceLeftColumn();
+                return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
+            }
+            if (type == "hlookup-matrix") {
+                forceTopRow();
+                return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
+            }
             if (type == "#matrix") {
                 return "((m = this.asMatrix($" + name + ")) ? ($" + name + " = m) : false)";
             }
@@ -2451,6 +2484,9 @@
             if (type == "null") {
                 return "(" + force() + " == null)";
             }
+            if (type == "#null") {
+                return "($" + name + " == null)";
+            }
             if (type == "anyvalue") {
                 return "(" + force() + " != null && i <= args.length)";
             }
@@ -2467,6 +2503,18 @@
         }
     }
 
+    function limitRef$1(ref, how) {
+        if (ref instanceof RangeRef) {
+            switch (how) {
+              case "topRow":
+                return ref.topRow();
+              case "leftColumn":
+                return ref.leftColumn();
+            }
+        }
+        return ret;
+    }
+
     function limitPrecision$1(num, digits) {
         return num === parseInt(num, 10) ? num : +num.toPrecision(digits || 16);
     }
@@ -2907,6 +2955,7 @@
     calc.runtime.daysInYear = daysInYear$1;
     calc.runtime.parseDate = parseDate;
     calc.runtime.limitPrecision = limitPrecision$1;
+    calc.runtime.limitRef = limitRef$1;
     calc.runtime.defineBuiltinFunction = defineBuiltinFunction$1;
     calc.runtime.defineAlias = defineAlias$1;
     calc.runtime.InputStream = InputStream;
@@ -23938,6 +23987,7 @@
         FUNCS,
         defineBuiltinFunction,
         limitPrecision,
+        limitRef,
         packDate: packDate$1,
         unpackDate: unpackDate$1,
         daysInMonth,
@@ -29871,8 +29921,11 @@
 
     function fetchSumRange(continuation) {
         return function(callback, range, criteria, sumRange) {
-            var self = this;
-            if (sumRange instanceof Ref) {
+            let self = this;
+            let r = sumRange;
+            criteria = parseCriteria(criteria);
+
+            if (r instanceof Ref) {
                 // make sure it covers the same area as `range`, as the “spec” mentions:
                 //
                 //     The sum_range argument does not have to be the same size and shape as the
@@ -29882,7 +29935,7 @@
                 //
                 // It does make one wonder, since only the top-left cell in `sumRange` matters, why
                 // should it be a range at all?  Oh well, Excel.
-                var r = sumRange.clone().toRangeRef();
+                r = r.clone().toRangeRef();
                 if (r.width() != range.width || r.height() != range.height) {
                     if (!isFinite(r.topLeft.row)) {
                         r.topLeft.row = 0;
@@ -29892,12 +29945,27 @@
                     }
                     r.bottomRight.row = r.topLeft.row + range.height - 1;
                     r.bottomRight.col = r.topLeft.col + range.width - 1;
-                    return self.resolveCells([ r ], function(){
-                        callback(continuation(range, criteria, self.asMatrix(r)));
-                    });
                 }
+                let cells = [];
+                range.each(function(val, row, col){
+                    if (criteria(val)) {
+                        cells.push(r.toCell(row, col));
+                    }
+                });
+                return self.resolveCells(cells, function(){
+                    let data = cells.map(x => self.getRefData(x));
+                    return callback(continuation.call(self, data));
+                });
             }
-            callback(continuation(range, criteria, self.asMatrix(sumRange)));
+
+            // sumRange must be a Matrix if we get here.
+            let data = [];
+            range.each(function(val, row, col){
+                if (criteria(val)) {
+                    data.push(r.get(row, col));
+                }
+            });
+            return callback(continuation.call(self, data));
         };
     }
 
@@ -29930,9 +29998,7 @@
                 var $sumRange = args[i++];
                 if ($sumRange instanceof CalcError)
                     return $sumRange;
-                if (!($sumRange instanceof CellRef || $sumRange instanceof RangeRef || ((m = this.asMatrix($sumRange)) ? $sumRange = m : false) || (($sumRange = this.force($sumRange)) == null ? ($sumRange = $range, true) : false))) {
-                    if ($sumRange instanceof CalcError)
-                        return $sumRange;
+                if (!($sumRange instanceof CellRef || $sumRange instanceof RangeRef || ((m = this.asMatrix($sumRange)) ? $sumRange = m : false) || ($sumRange == null ? ($sumRange = $range, true) : false))) {
                     return new CalcError(err);
                 }
                 xargs.push($sumRange);
@@ -29945,7 +30011,7 @@
             var toResolve = [], i = 0;
             toResolve.push(args[i++]);
             toResolve.push(args[i++]);
-            toResolve.push(args[i++]);
+            i++;
             this.resolveCells(toResolve, callback);
         }
         function arrayArgs(args) {
@@ -29977,15 +30043,11 @@
             resolve: resolve,
             arrayArgs: arrayArgs
         };
-    }(), fetchSumRange(function (range, criteria, sumRange) {
-        var sum = 0;
-        criteria = parseCriteria(criteria);
-        range.each(function (val, row, col) {
-            if (criteria(val)) {
-                var v = sumRange.get(row, col);
-                if (numericPredicate(v)) {
-                    sum += v || 0;
-                }
+    }(), fetchSumRange(function (matchingCellsData) {
+        let sum = 0;
+        matchingCellsData.forEach(v => {
+            if (numericPredicate(v)) {
+                sum += v || 0;
             }
         });
         return sum;
@@ -30067,16 +30129,12 @@
             resolve: resolve,
             arrayArgs: arrayArgs
         };
-    }(), fetchSumRange(function (range, criteria, sumRange) {
-        var sum = 0, count = 0;
-        criteria = parseCriteria(criteria);
-        range.each(function (val, row, col) {
-            if (criteria(val)) {
-                var v = sumRange.get(row, col);
-                if (numericPredicate(v)) {
-                    sum += v || 0;
-                    count++;
-                }
+    }(), fetchSumRange(function (matchingCellsData) {
+        let sum = 0, count = 0;
+        matchingCellsData.forEach(v => {
+            if (numericPredicate(v)) {
+                sum += v || 0;
+                count++;
             }
         });
         return count ? sum / count : new CalcError('DIV/0');
@@ -32790,7 +32848,7 @@
         function resolve(args, callback) {
             var toResolve = [], i = 0;
             toResolve.push(args[i++]);
-            toResolve.push(args[i++]);
+            toResolve.push(limitRef(args[i++], 'topRow'));
             toResolve.push(args[i++]);
             toResolve.push(args[i++]);
             this.resolveCells(toResolve, callback);
@@ -33323,7 +33381,7 @@
         function resolve(args, callback) {
             var toResolve = [], i = 0;
             toResolve.push(args[i++]);
-            toResolve.push(args[i++]);
+            toResolve.push(limitRef(args[i++], 'leftColumn'));
             toResolve.push(args[i++]);
             toResolve.push(args[i++]);
             this.resolveCells(toResolve, callback);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-spreadsheet-common",
   "description": "Kendo UI platform-independent Spreadsheet library",
-  "version": "1.2.10-develop.3",
+  "version": "1.2.11-develop.1",
   "keywords": [
     "Kendo UI"
   ],