@progress/kendo-spreadsheet-common 1.1.3-develop.2 → 1.1.3-develop.3

package/dist/index-esm.js

@@ -1165,66 +1165,36 @@ function withExit(f, obj) {
     }
 }
 
-const wrapExpression = function(members, paramName) {
-    let result = paramName || "d",
-        index,
-        idx,
-        length,
-        member,
-        count = 1;
-
-    for (idx = 0, length = members.length; idx < length; idx++) {
-        member = members[idx];
-        if (member !== "") {
-            index = member.indexOf("[");
-
-            if (index !== 0) {
-                if (index === -1) {
-                    member = "." + member;
-                } else {
-                    count++;
-                    member = "." + member.substring(0, index) + " || {})" + member.substring(index);
-                }
-            }
-
-            count++;
-            result += member + ((idx < length - 1) ? " || {})" : ")");
-        }
-    }
-    return new Array(count).join("(") + result;
-};
-
 const getterCache = {};
 
-function expr(expression, safe, paramName) {
-    expression = expression || "";
-
-    if (typeof safe == 'string') {
-        paramName = safe;
-        safe = false;
-    }
+getterCache["undefined"] = (obj) => obj;
 
-    paramName = paramName || "d";
+const FIELD_REGEX = /\[(?:(\d+)|['"](.*?)['"])\]|((?:(?!\[.*?\]|\.).)+)/g;
+function getter(field, safe) {
+    const key = field + safe;
 
-    if (expression && expression.charAt(0) !== "[") {
-        expression = "." + expression;
+    if (getterCache[key]) {
+        return getterCache[key];
     }
 
-    if (safe) {
-        expression = expression.replace(/"([^.]*)\.([^"]*)"/g,'"$1_$DOT$_$2"');
-        expression = expression.replace(/'([^.]*)\.([^']*)'/g,"'$1_$DOT$_$2'");
-        expression = wrapExpression(expression.split("."), paramName);
-        expression = expression.replace(/_\$DOT\$_/g, ".");
-    } else {
-        expression = paramName + expression;
-    }
+    const fields = [];
+    field.replace(FIELD_REGEX, (_, index, indexAccessor, field) => {
+        fields.push(isPresent(index) ? index : indexAccessor || field);
+        return undefined;
+    });
 
-    return expression;
-}
+    getterCache[key] = (obj) => {
+        let result = obj;
+        for (let idx = 0; idx < fields.length; idx++) {
+            result = result[fields[idx]];
+            if (!isPresent(result) && safe) {
+                return result;
+            }
+        }
+
+        return result;
+    };
 
-function getter(expression, safe) {
-    let key = expression + safe;
-    getterCache[key] = getterCache[key] || new Function("d", "return " + expr(expression, safe));
     return getterCache[key];
 }
 
@@ -1239,10 +1209,6 @@ function deepExtend(destination) {
     return destination;
 }
 
-function isFunction(fn) {
-    return typeof fn === "function";
-}
-
 function deepExtendOne(destination, source) {
     let property,
         propValue,
@@ -1316,7 +1282,12 @@ const scrollbar = function(refresh) {
     let div = document.createElement("div"),
         result;
 
-    div.style.cssText = "overflow:scroll;overflow-x:hidden;zoom:1;clear:both;display:block";
+    div.style.overflow = "scroll";
+    div.style.overflowX = "hidden";
+    div.style.zoom = "1";
+    div.style.clear = "both";
+    div.style.display = "block";
+
     div.innerHTML = "&nbsp;";
     document.body.appendChild(div);
 
@@ -1391,6 +1362,13 @@ const _activeElement$1 = function() {
     }
 };
 
+const isPresent = (value) => value !== null && value !== undefined;
+const isBlank = (value) => !isPresent(value);
+const isDate = (value) => value && value.getTime;
+const isString = (value) => typeof value === "string";
+const isNumeric = (value) => !isNaN(value - parseFloat(value));
+const isFunction = (fn) => typeof fn === "function";
+
 class CalcError {
 
     constructor(code) {
@@ -9406,13 +9384,18 @@ function looksLikeANumber(str) {
 
 function getTextHeight(text, width, fontFamily, fontSize, wrap) {
     const measureBox = document.createElement("div");
-    measureBox.setAttribute(
-        "style",
-        "position: absolute !important; top: -4000px !important; height: auto !important;" +
-            "padding: 1px 3px !important; box-sizing: border-box; margin: 0 !important; border: 1px solid black !important;" +
-            "line-height: normal !important; visibility: hidden !important;" +
-            "white-space: pre-wrap;"
-    );
+
+    measureBox.style.setProperty('position', 'absolute', 'important');
+    measureBox.style.setProperty('top', '-4000px', 'important');
+    measureBox.style.setProperty('height', 'auto', 'important');
+    measureBox.style.setProperty('padding', '1px 3px', 'important');
+    measureBox.style.setProperty('box-sizing', 'border-box', 'important');
+    measureBox.style.setProperty('margin', '0', 'important');
+    measureBox.style.setProperty('border', '1px solid black', 'important');
+    measureBox.style.setProperty('line-height', 'normal', 'important');
+    measureBox.style.setProperty('visibility', 'hidden', 'important');
+    measureBox.style.setProperty('white-space', 'pre-wrap');
+
     let styles = {
         "baselineMarkerSize" : 0,
         "width" : (wrap === true) ? width + "px" : "auto",
@@ -12127,210 +12110,131 @@ const kendoDate = (function() {
 
 /* eslint-disable no-var */
 
-const dateRegExp = /^\/Date\((.*?)\)\/$/;
+const logic = {
+    or: {
+        concat: (acc, fn) => (a) => acc(a) || fn(a),
+        identity: () => false,
+    },
+    and: {
+        concat: (acc, fn) => (a) => acc(a) && fn(a),
+        identity: () => true,
+    },
+};
 
-var operators = (function() {
+const operatorsMap = {
+    contains: (a, b) => (a || "").indexOf(b) >= 0,
+    doesnotcontain: (a, b) => (a || "").indexOf(b) === -1,
+    doesnotendwith: (a, b) =>
+        (a || "").indexOf(b, (a || "").length - (b || "").length) < 0,
+    doesnotstartwith: (a, b) => (a || "").lastIndexOf(b, 0) === -1,
+    endswith: (a, b) =>
+        (a || "").indexOf(b, (a || "").length - (b || "").length) >= 0,
+    eq: (a, b) => a === b,
+    gt: (a, b) => a > b,
+    gte: (a, b) => a >= b,
+    isempty: (a) => a === "",
+    isnotempty: (a) => a !== "",
+    isnotnull: (a) => isPresent(a),
+    isnull: (a) => isBlank(a),
+    lt: (a, b) => a < b,
+    lte: (a, b) => a <= b,
+    neq: (a, b) => a != b, // tslint:disable-line:triple-equals
+    startswith: (a, b) => (a || "").lastIndexOf(b, 0) === 0,
+};
+
+const dateRegExp = /^\/Date\((.*?)\)\/$/;
 
-    function quote(str) {
-        if (typeof str == "string") {
-            str = str.replace(/[\r\n]+/g, "");
+const convertValue = (value, ignoreCase, accentFoldingFiltering) => {
+    if (value != null && isString(value)) {
+        const date = dateRegExp.exec(value);
+        if (date) {
+            return new Date(+date[1]).getTime();
+        } else if (ignoreCase) {
+            return accentFoldingFiltering
+                ? value.toLocaleLowerCase(accentFoldingFiltering)
+                : value.toLowerCase();
         }
-        return JSON.stringify(str);
+    } else if (value != null && isDate(value)) {
+        return value.getTime();
     }
+    return value;
+};
 
-    function textOp(impl) {
-        return function(a, b, ignore, accentFoldingFiltering) {
-            b += "";
-            if (ignore) {
-                a = "(" + a + " + '').toString()" + ((accentFoldingFiltering) ? ".toLocaleLowerCase('" + accentFoldingFiltering + "')" : ".toLowerCase()");
-                b = ((accentFoldingFiltering) ? b.toLocaleLowerCase(accentFoldingFiltering) : b.toLowerCase());
-            }
-            return impl(a, quote(b), ignore);
-        };
-    }
+const transformFilter = ({
+    field,
+    ignoreCase,
+    value,
+    operator,
+    accentFoldingFiltering,
+}) => {
+    field = !isPresent(field) ? (a) => a : field;
+
+    ignoreCase = isPresent(ignoreCase) ? ignoreCase : true;
+
+    const itemProp = typedGetter(
+        isFunction(field) ? field : getter(field, true),
+        value,
+        ignoreCase,
+        accentFoldingFiltering
+    );
 
-    function operator(op, a, b, ignore, accentFoldingFiltering) {
-        if (b != null) {
-            if (typeof b === 'string') {
-                var date = dateRegExp.exec(b);
-                if (date) {
-                    b = new Date(+date[1]);
-                } else if (ignore) {
-                    b = quote(((accentFoldingFiltering) ? b.toLocaleLowerCase(accentFoldingFiltering) : b.toLowerCase()));
-                    a = "((" + a + " || '')+'')" + ((accentFoldingFiltering) ? ".toLocaleLowerCase('" + accentFoldingFiltering + "')" : ".toLowerCase()");
-                } else {
-                    b = quote(b);
-                }
-            }
+    value = convertValue(value, ignoreCase, accentFoldingFiltering);
 
-            if (b.getTime) {
-                //b looks like a Date
-                a = "(" + a + "&&" + a + ".getTime?" + a + ".getTime():" + a + ")";
-                b = b.getTime();
-            }
-        }
+    const op = isFunction(operator) ? operator : operatorsMap[operator];
 
-        return a + " " + op + " " + b;
-    }
+    return (a) => op(itemProp(a), value, ignoreCase);
+};
 
-    function getMatchRegexp(pattern) {
-        // take a pattern, as supported by Excel match filter, and
-        // convert it to the equivalent JS regular expression.
-        // Excel patterns support:
-        //
-        //   * - match any sequence of characters
-        //   ? - match a single character
-        //
-        // to match a literal * or ?, they must be prefixed by a tilde (~)
-        var rx = "/^";
-        for (var esc = false, i = 0; i < pattern.length; ++i) {
-            var ch = pattern.charAt(i);
-            if (esc) {
-                rx += "\\" + ch;
-            } else if (ch === "~") {
-                esc = true;
-                continue;
-            } else if (ch === "*") {
-                rx += ".*";
-            } else if (ch === "?") {
-                rx += ".";
-            } else if (".+^$()[]{}|\\/\n\r\u2028\u2029\xA0".indexOf(ch) >= 0) {
-                rx += "\\" + ch;
-            } else {
-                rx += ch;
-            }
-            esc = false;
-        }
-        return rx + "$/";
+const typedGetter = (prop, value, ignoreCase, accentFoldingFiltering) => {
+    if (!isPresent(value)) {
+        return prop;
     }
 
-    return {
-        quote: function(value) {
-            if (value && value.getTime) {
-                return "new Date(" + value.getTime() + ")";
-            }
-            return quote(value);
-        },
-        eq: function(a, b, ignore, accentFoldingFiltering) {
-            return operator("==", a, b, ignore, accentFoldingFiltering);
-        },
-        neq: function(a, b, ignore, accentFoldingFiltering) {
-            return operator("!=", a, b, ignore, accentFoldingFiltering);
-        },
-        gt: function(a, b, ignore) {
-            return operator(">", a, b, ignore);
-        },
-        gte: function(a, b, ignore) {
-            return operator(">=", a, b, ignore);
-        },
-        lt: function(a, b, ignore) {
-            return operator("<", a, b, ignore);
-        },
-        lte: function(a, b, ignore) {
-            return operator("<=", a, b, ignore);
-        },
-        startswith: textOp(function(a, b) {
-            return a + ".lastIndexOf(" + b + ", 0) == 0";
-        }),
-        doesnotstartwith: textOp(function(a, b) {
-            return a + ".lastIndexOf(" + b + ", 0) == -1";
-        }),
-        endswith: textOp(function(a, b) {
-            var n = b ? b.length - 2 : 0;
-            return a + ".indexOf(" + b + ", " + a + ".length - " + n + ") >= 0";
-        }),
-        doesnotendwith: textOp(function(a, b) {
-            var n = b ? b.length - 2 : 0;
-            return a + ".indexOf(" + b + ", " + a + ".length - " + n + ") < 0";
-        }),
-        contains: textOp(function(a, b) {
-            return a + ".indexOf(" + b + ") >= 0";
-        }),
-        doesnotcontain: textOp(function(a, b) {
-            return a + ".indexOf(" + b + ") == -1";
-        }),
-        matches: textOp(function(a, b) {
-            b = b.substring(1, b.length - 1);
-            return getMatchRegexp(b) + ".test(" + a + ")";
-        }),
-        doesnotmatch: textOp(function(a, b) {
-            b = b.substring(1, b.length - 1);
-            return "!" + getMatchRegexp(b) + ".test(" + a + ")";
-        }),
-        isempty: function(a) {
-            return a + " === ''";
-        },
-        isnotempty: function(a) {
-            return a + " !== ''";
-        },
-        isnull: function(a) {
-            return "(" + a + " == null)";
-        },
-        isnotnull: function(a) {
-            return "(" + a + " != null)";
-        },
-        isnullorempty: function(a) {
-            return "(" + a + " === null) || (" + a + " === '')";
-        },
-        isnotnullorempty: function(a) {
-            return "(" + a + " !== null) && (" + a + " !== '')";
-        }
-    };
-})();
-
-const filterExpr = function(expression) {
-    var expressions = [],
-        logic = { and: " && ", or: " || " },
-        idx,
-        length,
-        filter,
-        expr$1,
-        fieldFunctions = [],
-        operatorFunctions = [],
-        field,
-        operator,
-        filters = expression.filters;
-
-    for (idx = 0, length = filters.length; idx < length; idx++) {
-        filter = filters[idx];
-        field = filter.field;
-        operator = filter.operator;
-
-        if (filter.filters) {
-            expr$1 = filterExpr(filter);
-            //Nested function fields or operators - update their index e.g. __o[0] -> __o[1]
-            filter = expr$1.expression
-            .replace(/__o\[(\d+)\]/g, function(match, index) {
-                index = +index;
-                return "__o[" + (operatorFunctions.length + index) + "]";
-            })
-            .replace(/__f\[(\d+)\]/g, function(match, index) {
-                index = +index;
-                return "__f[" + (fieldFunctions.length + index) + "]";
-            });
+    let acc = prop;
 
-            operatorFunctions.push.apply(operatorFunctions, expr$1.operators);
-            fieldFunctions.push.apply(fieldFunctions, expr$1.fields);
+    if (isString(value)) {
+        const date = dateRegExp.exec(value);
+        if (date) {
+            value = new Date(+date[1]);
         } else {
-            if (typeof field === 'function') {
-                expr$1 = "__f[" + fieldFunctions.length + "](d)";
-                fieldFunctions.push(field);
-            } else {
-                expr$1 = expr(field);
-            }
-
-            if (typeof operator === 'function') {
-                filter = "__o[" + operatorFunctions.length + "](" + expr$1 + ", " + operators.quote(filter.value) + ")";
-                operatorFunctions.push(operator);
-            } else {
-                filter = operators[(operator || "eq").toLowerCase()](expr$1, filter.value, filter.ignoreCase !== undefined ? filter.ignoreCase : true, expression.accentFoldingFiltering);
-            }
+            acc = (a) => {
+                const x = prop(a);
+                if (typeof x === "string" && ignoreCase) {
+                    return accentFoldingFiltering
+                        ? x.toLocaleLowerCase(accentFoldingFiltering)
+                        : x.toLowerCase();
+                } else {
+                    return isNumeric(x) ? x + "" : x;
+                }
+            };
         }
+    }
 
-        expressions.push(filter);
+    if (isDate(value)) {
+        return (a) => {
+            const x = acc(a);
+            return isDate(x) ? x.getTime() : x;
+        };
     }
+    return acc;
+};
 
-    return { expression: "(" + expressions.join(logic[expression.logic]) + ")", fields: fieldFunctions, operators: operatorFunctions };
+const transformCompositeFilter = function (filter) {
+    const accentFoldingFiltering = filter.accentFoldingFiltering;
+    const combiner = logic[filter.logic || "and"];
+
+    return filter.filters
+        .filter(isPresent)
+        .map((x) => {
+            const extendedFilter = isPresent(accentFoldingFiltering)
+                ? deepExtend({}, x, { accentFoldingFiltering })
+                : x;
+
+            return isPresent(x.filters)
+                ? transformCompositeFilter(extendedFilter)
+                : transformFilter(extendedFilter);
+        })
+        .reduce(combiner.concat, combiner.identity);
 };
 
 /* eslint-disable max-params */
@@ -12445,13 +12349,11 @@ class CustomFilter extends Filter {
 
         this._criteria = options.criteria;
 
-        var expression = filterExpr({
+        this._matches = transformCompositeFilter({
             logic: this._logic,
             filters: this._criteria,
-            accentFoldingFiltering: culture().name
-        }).expression;
-
-        this._matches = new Function("d", "return " + expression);
+            accentFoldingFiltering: culture().name,
+        });
     }
     matches(value) {
         if (value === null) {
@@ -17027,24 +16929,9 @@ class FormulaInput extends Widget {
             end = begin;
         }
         if (begin && end) {
-            let range = document.createRange();
-            range.setStart(begin.node, begin.pos);
-            range.setEnd(end.node, end.pos);
-            let sel = window.getSelection();
-            let currentRange = sel.getRangeAt(0);
-            if (differ(range, currentRange))  {
-                sel.removeAllRanges();
-                sel.addRange(range);
-            }
-        }
-        function differ(a, b) {
-            return (
-                a.startOffset !== b.startOffset ||
-                a.endOffset !== b.endOffset ||
-                a.startContainer !== b.endContainer ||
-                a.endContainer !== b.endContainer
-            );
+            this._setRange(begin, end);
         }
+
         function lookup(node, pos) {
             try {
                 (function loop(node) {
@@ -17082,6 +16969,27 @@ class FormulaInput extends Widget {
         return this.value().length;
     }
 
+    _setRange(begin, end) {
+        let range = document.createRange();
+        range.setStart(begin.node, begin.pos);
+        range.setEnd(end.node, end.pos);
+        let sel = window.getSelection();
+        let currentRange = sel.getRangeAt(0);
+        if (differ(range, currentRange))  {
+            sel.removeAllRanges();
+            sel.addRange(range);
+        }
+
+        function differ(a, b) {
+            return (
+                a.startOffset !== b.startOffset ||
+                a.endOffset !== b.endOffset ||
+                a.startContainer !== b.endContainer ||
+                a.endContainer !== b.endContainer
+            );
+        }
+    }
+
     _formulaSource() {
         let result = [];
         let value;
@@ -22974,12 +22882,16 @@ class Workbook extends Observable {
 
         if (file && !this.trigger("excelImport", { file, deferred })) {
             this._clearSheets();
-            readExcel(file, this, deferred);
+            this._readExcel(file, this, deferred);
         }
 
         return deferred.promise;
     }
 
+    _readExcel(file, workbook, deferred) {
+        readExcel(file, workbook, deferred);
+    }
+
     saveAsExcel(options) {
         let self = this;
         options = deepExtend({}, self.options.excel, options);

package/dist/index.js

@@ -1166,66 +1166,36 @@
         }
     }
 
-    const wrapExpression = function(members, paramName) {
-        let result = paramName || "d",
-            index,
-            idx,
-            length,
-            member,
-            count = 1;
-
-        for (idx = 0, length = members.length; idx < length; idx++) {
-            member = members[idx];
-            if (member !== "") {
-                index = member.indexOf("[");
-
-                if (index !== 0) {
-                    if (index === -1) {
-                        member = "." + member;
-                    } else {
-                        count++;
-                        member = "." + member.substring(0, index) + " || {})" + member.substring(index);
-                    }
-                }
-
-                count++;
-                result += member + ((idx < length - 1) ? " || {})" : ")");
-            }
-        }
-        return new Array(count).join("(") + result;
-    };
-
     const getterCache = {};
 
-    function expr(expression, safe, paramName) {
-        expression = expression || "";
-
-        if (typeof safe == 'string') {
-            paramName = safe;
-            safe = false;
-        }
+    getterCache["undefined"] = (obj) => obj;
 
-        paramName = paramName || "d";
+    const FIELD_REGEX = /\[(?:(\d+)|['"](.*?)['"])\]|((?:(?!\[.*?\]|\.).)+)/g;
+    function getter(field, safe) {
+        const key = field + safe;
 
-        if (expression && expression.charAt(0) !== "[") {
-            expression = "." + expression;
+        if (getterCache[key]) {
+            return getterCache[key];
         }
 
-        if (safe) {
-            expression = expression.replace(/"([^.]*)\.([^"]*)"/g,'"$1_$DOT$_$2"');
-            expression = expression.replace(/'([^.]*)\.([^']*)'/g,"'$1_$DOT$_$2'");
-            expression = wrapExpression(expression.split("."), paramName);
-            expression = expression.replace(/_\$DOT\$_/g, ".");
-        } else {
-            expression = paramName + expression;
-        }
+        const fields = [];
+        field.replace(FIELD_REGEX, (_, index, indexAccessor, field) => {
+            fields.push(isPresent(index) ? index : indexAccessor || field);
+            return undefined;
+        });
 
-        return expression;
-    }
+        getterCache[key] = (obj) => {
+            let result = obj;
+            for (let idx = 0; idx < fields.length; idx++) {
+                result = result[fields[idx]];
+                if (!isPresent(result) && safe) {
+                    return result;
+                }
+            }
+
+            return result;
+        };
 
-    function getter(expression, safe) {
-        let key = expression + safe;
-        getterCache[key] = getterCache[key] || new Function("d", "return " + expr(expression, safe));
         return getterCache[key];
     }
 
@@ -1240,10 +1210,6 @@
         return destination;
     }
 
-    function isFunction(fn) {
-        return typeof fn === "function";
-    }
-
     function deepExtendOne(destination, source) {
         let property,
             propValue,
@@ -1317,7 +1283,12 @@
         let div = document.createElement("div"),
             result;
 
-        div.style.cssText = "overflow:scroll;overflow-x:hidden;zoom:1;clear:both;display:block";
+        div.style.overflow = "scroll";
+        div.style.overflowX = "hidden";
+        div.style.zoom = "1";
+        div.style.clear = "both";
+        div.style.display = "block";
+
         div.innerHTML = "&nbsp;";
         document.body.appendChild(div);
 
@@ -1392,6 +1363,13 @@
         }
     };
 
+    const isPresent = (value) => value !== null && value !== undefined;
+    const isBlank = (value) => !isPresent(value);
+    const isDate = (value) => value && value.getTime;
+    const isString = (value) => typeof value === "string";
+    const isNumeric = (value) => !isNaN(value - parseFloat(value));
+    const isFunction = (fn) => typeof fn === "function";
+
     class CalcError {
 
         constructor(code) {
@@ -9407,13 +9385,18 @@
 
     function getTextHeight(text, width, fontFamily, fontSize, wrap) {
         const measureBox = document.createElement("div");
-        measureBox.setAttribute(
-            "style",
-            "position: absolute !important; top: -4000px !important; height: auto !important;" +
-                "padding: 1px 3px !important; box-sizing: border-box; margin: 0 !important; border: 1px solid black !important;" +
-                "line-height: normal !important; visibility: hidden !important;" +
-                "white-space: pre-wrap;"
-        );
+
+        measureBox.style.setProperty('position', 'absolute', 'important');
+        measureBox.style.setProperty('top', '-4000px', 'important');
+        measureBox.style.setProperty('height', 'auto', 'important');
+        measureBox.style.setProperty('padding', '1px 3px', 'important');
+        measureBox.style.setProperty('box-sizing', 'border-box', 'important');
+        measureBox.style.setProperty('margin', '0', 'important');
+        measureBox.style.setProperty('border', '1px solid black', 'important');
+        measureBox.style.setProperty('line-height', 'normal', 'important');
+        measureBox.style.setProperty('visibility', 'hidden', 'important');
+        measureBox.style.setProperty('white-space', 'pre-wrap');
+
         let styles = {
             "baselineMarkerSize" : 0,
             "width" : (wrap === true) ? width + "px" : "auto",
@@ -12128,210 +12111,131 @@
 
     /* eslint-disable no-var */
 
-    const dateRegExp = /^\/Date\((.*?)\)\/$/;
+    const logic = {
+        or: {
+            concat: (acc, fn) => (a) => acc(a) || fn(a),
+            identity: () => false,
+        },
+        and: {
+            concat: (acc, fn) => (a) => acc(a) && fn(a),
+            identity: () => true,
+        },
+    };
 
-    var operators = (function() {
+    const operatorsMap = {
+        contains: (a, b) => (a || "").indexOf(b) >= 0,
+        doesnotcontain: (a, b) => (a || "").indexOf(b) === -1,
+        doesnotendwith: (a, b) =>
+            (a || "").indexOf(b, (a || "").length - (b || "").length) < 0,
+        doesnotstartwith: (a, b) => (a || "").lastIndexOf(b, 0) === -1,
+        endswith: (a, b) =>
+            (a || "").indexOf(b, (a || "").length - (b || "").length) >= 0,
+        eq: (a, b) => a === b,
+        gt: (a, b) => a > b,
+        gte: (a, b) => a >= b,
+        isempty: (a) => a === "",
+        isnotempty: (a) => a !== "",
+        isnotnull: (a) => isPresent(a),
+        isnull: (a) => isBlank(a),
+        lt: (a, b) => a < b,
+        lte: (a, b) => a <= b,
+        neq: (a, b) => a != b, // tslint:disable-line:triple-equals
+        startswith: (a, b) => (a || "").lastIndexOf(b, 0) === 0,
+    };
+
+    const dateRegExp = /^\/Date\((.*?)\)\/$/;
 
-        function quote(str) {
-            if (typeof str == "string") {
-                str = str.replace(/[\r\n]+/g, "");
+    const convertValue = (value, ignoreCase, accentFoldingFiltering) => {
+        if (value != null && isString(value)) {
+            const date = dateRegExp.exec(value);
+            if (date) {
+                return new Date(+date[1]).getTime();
+            } else if (ignoreCase) {
+                return accentFoldingFiltering
+                    ? value.toLocaleLowerCase(accentFoldingFiltering)
+                    : value.toLowerCase();
             }
-            return JSON.stringify(str);
+        } else if (value != null && isDate(value)) {
+            return value.getTime();
         }
+        return value;
+    };
 
-        function textOp(impl) {
-            return function(a, b, ignore, accentFoldingFiltering) {
-                b += "";
-                if (ignore) {
-                    a = "(" + a + " + '').toString()" + ((accentFoldingFiltering) ? ".toLocaleLowerCase('" + accentFoldingFiltering + "')" : ".toLowerCase()");
-                    b = ((accentFoldingFiltering) ? b.toLocaleLowerCase(accentFoldingFiltering) : b.toLowerCase());
-                }
-                return impl(a, quote(b), ignore);
-            };
-        }
+    const transformFilter = ({
+        field,
+        ignoreCase,
+        value,
+        operator,
+        accentFoldingFiltering,
+    }) => {
+        field = !isPresent(field) ? (a) => a : field;
+
+        ignoreCase = isPresent(ignoreCase) ? ignoreCase : true;
+
+        const itemProp = typedGetter(
+            isFunction(field) ? field : getter(field, true),
+            value,
+            ignoreCase,
+            accentFoldingFiltering
+        );
 
-        function operator(op, a, b, ignore, accentFoldingFiltering) {
-            if (b != null) {
-                if (typeof b === 'string') {
-                    var date = dateRegExp.exec(b);
-                    if (date) {
-                        b = new Date(+date[1]);
-                    } else if (ignore) {
-                        b = quote(((accentFoldingFiltering) ? b.toLocaleLowerCase(accentFoldingFiltering) : b.toLowerCase()));
-                        a = "((" + a + " || '')+'')" + ((accentFoldingFiltering) ? ".toLocaleLowerCase('" + accentFoldingFiltering + "')" : ".toLowerCase()");
-                    } else {
-                        b = quote(b);
-                    }
-                }
+        value = convertValue(value, ignoreCase, accentFoldingFiltering);
 
-                if (b.getTime) {
-                    //b looks like a Date
-                    a = "(" + a + "&&" + a + ".getTime?" + a + ".getTime():" + a + ")";
-                    b = b.getTime();
-                }
-            }
+        const op = isFunction(operator) ? operator : operatorsMap[operator];
 
-            return a + " " + op + " " + b;
-        }
+        return (a) => op(itemProp(a), value, ignoreCase);
+    };
 
-        function getMatchRegexp(pattern) {
-            // take a pattern, as supported by Excel match filter, and
-            // convert it to the equivalent JS regular expression.
-            // Excel patterns support:
-            //
-            //   * - match any sequence of characters
-            //   ? - match a single character
-            //
-            // to match a literal * or ?, they must be prefixed by a tilde (~)
-            var rx = "/^";
-            for (var esc = false, i = 0; i < pattern.length; ++i) {
-                var ch = pattern.charAt(i);
-                if (esc) {
-                    rx += "\\" + ch;
-                } else if (ch === "~") {
-                    esc = true;
-                    continue;
-                } else if (ch === "*") {
-                    rx += ".*";
-                } else if (ch === "?") {
-                    rx += ".";
-                } else if (".+^$()[]{}|\\/\n\r\u2028\u2029\xA0".indexOf(ch) >= 0) {
-                    rx += "\\" + ch;
-                } else {
-                    rx += ch;
-                }
-                esc = false;
-            }
-            return rx + "$/";
+    const typedGetter = (prop, value, ignoreCase, accentFoldingFiltering) => {
+        if (!isPresent(value)) {
+            return prop;
         }
 
-        return {
-            quote: function(value) {
-                if (value && value.getTime) {
-                    return "new Date(" + value.getTime() + ")";
-                }
-                return quote(value);
-            },
-            eq: function(a, b, ignore, accentFoldingFiltering) {
-                return operator("==", a, b, ignore, accentFoldingFiltering);
-            },
-            neq: function(a, b, ignore, accentFoldingFiltering) {
-                return operator("!=", a, b, ignore, accentFoldingFiltering);
-            },
-            gt: function(a, b, ignore) {
-                return operator(">", a, b, ignore);
-            },
-            gte: function(a, b, ignore) {
-                return operator(">=", a, b, ignore);
-            },
-            lt: function(a, b, ignore) {
-                return operator("<", a, b, ignore);
-            },
-            lte: function(a, b, ignore) {
-                return operator("<=", a, b, ignore);
-            },
-            startswith: textOp(function(a, b) {
-                return a + ".lastIndexOf(" + b + ", 0) == 0";
-            }),
-            doesnotstartwith: textOp(function(a, b) {
-                return a + ".lastIndexOf(" + b + ", 0) == -1";
-            }),
-            endswith: textOp(function(a, b) {
-                var n = b ? b.length - 2 : 0;
-                return a + ".indexOf(" + b + ", " + a + ".length - " + n + ") >= 0";
-            }),
-            doesnotendwith: textOp(function(a, b) {
-                var n = b ? b.length - 2 : 0;
-                return a + ".indexOf(" + b + ", " + a + ".length - " + n + ") < 0";
-            }),
-            contains: textOp(function(a, b) {
-                return a + ".indexOf(" + b + ") >= 0";
-            }),
-            doesnotcontain: textOp(function(a, b) {
-                return a + ".indexOf(" + b + ") == -1";
-            }),
-            matches: textOp(function(a, b) {
-                b = b.substring(1, b.length - 1);
-                return getMatchRegexp(b) + ".test(" + a + ")";
-            }),
-            doesnotmatch: textOp(function(a, b) {
-                b = b.substring(1, b.length - 1);
-                return "!" + getMatchRegexp(b) + ".test(" + a + ")";
-            }),
-            isempty: function(a) {
-                return a + " === ''";
-            },
-            isnotempty: function(a) {
-                return a + " !== ''";
-            },
-            isnull: function(a) {
-                return "(" + a + " == null)";
-            },
-            isnotnull: function(a) {
-                return "(" + a + " != null)";
-            },
-            isnullorempty: function(a) {
-                return "(" + a + " === null) || (" + a + " === '')";
-            },
-            isnotnullorempty: function(a) {
-                return "(" + a + " !== null) && (" + a + " !== '')";
-            }
-        };
-    })();
-
-    const filterExpr = function(expression) {
-        var expressions = [],
-            logic = { and: " && ", or: " || " },
-            idx,
-            length,
-            filter,
-            expr$1,
-            fieldFunctions = [],
-            operatorFunctions = [],
-            field,
-            operator,
-            filters = expression.filters;
-
-        for (idx = 0, length = filters.length; idx < length; idx++) {
-            filter = filters[idx];
-            field = filter.field;
-            operator = filter.operator;
-
-            if (filter.filters) {
-                expr$1 = filterExpr(filter);
-                //Nested function fields or operators - update their index e.g. __o[0] -> __o[1]
-                filter = expr$1.expression
-                .replace(/__o\[(\d+)\]/g, function(match, index) {
-                    index = +index;
-                    return "__o[" + (operatorFunctions.length + index) + "]";
-                })
-                .replace(/__f\[(\d+)\]/g, function(match, index) {
-                    index = +index;
-                    return "__f[" + (fieldFunctions.length + index) + "]";
-                });
+        let acc = prop;
 
-                operatorFunctions.push.apply(operatorFunctions, expr$1.operators);
-                fieldFunctions.push.apply(fieldFunctions, expr$1.fields);
+        if (isString(value)) {
+            const date = dateRegExp.exec(value);
+            if (date) {
+                value = new Date(+date[1]);
             } else {
-                if (typeof field === 'function') {
-                    expr$1 = "__f[" + fieldFunctions.length + "](d)";
-                    fieldFunctions.push(field);
-                } else {
-                    expr$1 = expr(field);
-                }
-
-                if (typeof operator === 'function') {
-                    filter = "__o[" + operatorFunctions.length + "](" + expr$1 + ", " + operators.quote(filter.value) + ")";
-                    operatorFunctions.push(operator);
-                } else {
-                    filter = operators[(operator || "eq").toLowerCase()](expr$1, filter.value, filter.ignoreCase !== undefined ? filter.ignoreCase : true, expression.accentFoldingFiltering);
-                }
+                acc = (a) => {
+                    const x = prop(a);
+                    if (typeof x === "string" && ignoreCase) {
+                        return accentFoldingFiltering
+                            ? x.toLocaleLowerCase(accentFoldingFiltering)
+                            : x.toLowerCase();
+                    } else {
+                        return isNumeric(x) ? x + "" : x;
+                    }
+                };
             }
+        }
 
-            expressions.push(filter);
+        if (isDate(value)) {
+            return (a) => {
+                const x = acc(a);
+                return isDate(x) ? x.getTime() : x;
+            };
         }
+        return acc;
+    };
 
-        return { expression: "(" + expressions.join(logic[expression.logic]) + ")", fields: fieldFunctions, operators: operatorFunctions };
+    const transformCompositeFilter = function (filter) {
+        const accentFoldingFiltering = filter.accentFoldingFiltering;
+        const combiner = logic[filter.logic || "and"];
+
+        return filter.filters
+            .filter(isPresent)
+            .map((x) => {
+                const extendedFilter = isPresent(accentFoldingFiltering)
+                    ? deepExtend({}, x, { accentFoldingFiltering })
+                    : x;
+
+                return isPresent(x.filters)
+                    ? transformCompositeFilter(extendedFilter)
+                    : transformFilter(extendedFilter);
+            })
+            .reduce(combiner.concat, combiner.identity);
     };
 
     /* eslint-disable max-params */
@@ -12446,13 +12350,11 @@
 
             this._criteria = options.criteria;
 
-            var expression = filterExpr({
+            this._matches = transformCompositeFilter({
                 logic: this._logic,
                 filters: this._criteria,
-                accentFoldingFiltering: culture().name
-            }).expression;
-
-            this._matches = new Function("d", "return " + expression);
+                accentFoldingFiltering: culture().name,
+            });
         }
         matches(value) {
             if (value === null) {
@@ -17028,24 +16930,9 @@
                 end = begin;
             }
             if (begin && end) {
-                let range = document.createRange();
-                range.setStart(begin.node, begin.pos);
-                range.setEnd(end.node, end.pos);
-                let sel = window.getSelection();
-                let currentRange = sel.getRangeAt(0);
-                if (differ(range, currentRange))  {
-                    sel.removeAllRanges();
-                    sel.addRange(range);
-                }
-            }
-            function differ(a, b) {
-                return (
-                    a.startOffset !== b.startOffset ||
-                    a.endOffset !== b.endOffset ||
-                    a.startContainer !== b.endContainer ||
-                    a.endContainer !== b.endContainer
-                );
+                this._setRange(begin, end);
             }
+
             function lookup(node, pos) {
                 try {
                     (function loop(node) {
@@ -17083,6 +16970,27 @@
             return this.value().length;
         }
 
+        _setRange(begin, end) {
+            let range = document.createRange();
+            range.setStart(begin.node, begin.pos);
+            range.setEnd(end.node, end.pos);
+            let sel = window.getSelection();
+            let currentRange = sel.getRangeAt(0);
+            if (differ(range, currentRange))  {
+                sel.removeAllRanges();
+                sel.addRange(range);
+            }
+
+            function differ(a, b) {
+                return (
+                    a.startOffset !== b.startOffset ||
+                    a.endOffset !== b.endOffset ||
+                    a.startContainer !== b.endContainer ||
+                    a.endContainer !== b.endContainer
+                );
+            }
+        }
+
         _formulaSource() {
             let result = [];
             let value;
@@ -22975,12 +22883,16 @@
 
             if (file && !this.trigger("excelImport", { file, deferred })) {
                 this._clearSheets();
-                readExcel(file, this, deferred);
+                this._readExcel(file, this, deferred);
             }
 
             return deferred.promise;
         }
 
+        _readExcel(file, workbook, deferred) {
+            readExcel(file, workbook, deferred);
+        }
+
         saveAsExcel(options) {
             let self = this;
             options = deepExtend({}, self.options.excel, options);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-spreadsheet-common",
   "description": "Kendo UI platform-independent Spreadsheet library",
-  "version": "1.1.3-develop.2",
+  "version": "1.1.3-develop.3",
   "keywords": [
     "Kendo UI"
   ],
@@ -29,19 +29,20 @@
   "devDependencies": {
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
-    "@progress/kendo-e2e": "^3.0.1",
+    "@progress/kendo-e2e": "^4.0.0",
     "@progress/kendo-intl": "^3.1.1",
+    "@telerik/dx-metrics": "^2.1.8",
     "@types/jest": "^29.0.0",
+    "acorn": "^8.12.0",
     "es-jest": "^2.1.0",
+    "escodegen": "^2.1.0",
     "eslint": "^8.28.0",
     "husky": "^8.0.2",
     "jest-cli": "^29.0.0",
     "jest-environment-jsdom": "^29.5.0",
     "rollup": "^3.5.1",
     "rollup-plugin-watch": "^1.0.4",
-    "semantic-release": "^24.0.0",
-    "acorn": "^8.12.0",
-    "escodegen": "^2.1.0"
+    "semantic-release": "^24.0.0"
   },
   "repository": {
     "type": "git",