Merge pull request #787 from koalyptus/dependabot/npm_and_yarn/codecov-3.7.1

Bump codecov from 3.7.0 to 3.7.1
prepare dist
2024-05-15 21:06:44 +02:00 · 2020-07-22 19:51:17 +10:00 · 2020-07-22 19:45:07 +10:00 · 2020-07-21 12:35:35 +00:00 · 2020-06-16 13:03:27 +10:00 · 2020-06-16 12:28:12 +10:00
7 changed files with 35 additions and 34 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -14,7 +14,7 @@
    "keyword-spacing": ["error", { "after": true, "before": true }],
    "max-depth": [2, 7],
    "max-statements": [2, 133],
-    "complexity": [2, 42],
+    "complexity": [2, 45],
    "no-unused-vars": 2,
    "no-eval": 2,
    "no-underscore-dangle": 0,
--- a/dist/starter.html
+++ b/dist/starter.html
@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>tablefilter v0.7.1 - Starter</title>
+    <title>tablefilter v0.7.3 - Starter</title>
 </head>
 <body>
-<h1>tablefilter v0.7.1</h1>
+<h1>tablefilter v0.7.3</h1>



--- a/dist/tablefilter/tablefilter.js
+++ b/dist/tablefilter/tablefilter.js
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "tablefilter",
-  "version": "0.7.1",
+  "version": "0.7.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -54,7 +54,7 @@
          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
          "dev": true,
          "requires": {
-            "@babel/highlight": "^7.8.3"
+            "@babel/highlight": "7.9.0"
          }
        },
        "@babel/generator": {
@ -75,9 +75,9 @@
          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
          "dev": true,
          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
+            "@babel/helper-validator-identifier": "7.9.5",
+            "chalk": "2.4.2",
+            "js-tokens": "4.0.0"
          }
        },
        "@babel/parser": {
@ -131,7 +131,7 @@
          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
          "dev": true,
          "requires": {
-            "safe-buffer": "~5.1.1"
+            "safe-buffer": "5.1.2"
          }
        }
      }
@ -1609,9 +1609,9 @@
      "dev": true
    },
    "agent-base": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
-      "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+      "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
      "dev": true,
      "requires": {
        "debug": "4.1.1"
@ -3352,9 +3352,9 @@
      "dev": true
    },
    "codecov": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz",
-      "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.1.tgz",
+      "integrity": "sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw==",
      "dev": true,
      "requires": {
        "argv": "0.0.2",
@ -5601,7 +5601,6 @@
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "1.0.0",
            "concat-map": "0.0.1"
@ -5626,8 +5625,7 @@
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -5744,8 +5742,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@ -5771,7 +5768,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "1.1.11"
          }
@ -5779,8 +5775,7 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.3.5",
@ -5804,7 +5799,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -6882,7 +6876,7 @@
      "dev": true,
      "requires": {
        "@tootallnate/once": "1.1.2",
-        "agent-base": "6.0.0",
+        "agent-base": "6.0.1",
        "debug": "4.1.1"
      }
    },
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "tablefilter",
-  "version": "0.7.1",
+  "version": "0.7.3",
  "description": "A Javascript library making HTML tables filterable and a bit more",
  "license": "MIT",
  "author": {
@ -46,7 +46,7 @@
    "babel-loader": "^8.0.2",
    "babel-preset-env": "1.7.0",
    "clean-webpack-plugin": "^3.0.0",
-    "codecov": "3.7.0",
+    "codecov": "3.7.1",
    "diacritics": "1.3.0",
    "esdoc": "1.1.0",
    "esdoc-standard-plugin": "1.0.0",
--- a/src/tablefilter.js
+++ b/src/tablefilter.js
@ -1785,11 +1785,11 @@ export class TableFilter {
            }
            //empty
            else if (hasEM) {
-                occurence = !cell.hasChildNodes();
+                occurence = !cell.hasChildNodes() || isEmpty(cellValue);
            }
            //non-empty
            else if (hasNM) {
-                occurence = cell.hasChildNodes();
+                occurence = cell.hasChildNodes() && !isEmpty(cellValue);
            } else {
                occurence = contains(term, cellValue,
                    this.isExactMatch(colIdx), this.caseSensitive);
@ -1875,11 +1875,11 @@ export class TableFilter {
            }
            //empty
            else if (hasEM) {
-                occurence = !cell.hasChildNodes();
+                occurence = !cell.hasChildNodes() || isEmpty(cellValue);
            }
            //non-empty
            else if (hasNM) {
-                occurence = cell.hasChildNodes();
+                occurence = cell.hasChildNodes() && !isEmpty(cellValue);
            } else {
                // If numeric type data, perform a strict equality test and
                // fallback to unformatted number string comparison
--- a/test/test-filter-operators.js
+++ b/test/test-filter-operators.js
@ -72,7 +72,14 @@
        tf.clearFilters();
        tf.setFilterValue(4, '[empty]');
        tf.filter();
-        deepEqual(tf.getValidRows().length, 0, 'No matches expected');
+        var filteredData = tf.getFilteredData();
+
+        deepEqual(tf.getValidRows().length, 1, 'Expected match');
+        deepEqual(
+            filteredData[0],
+            [6, ['Adelaide', 'Perth', '2781', '3.1', '']],
+            'Expected row data'
+        );
    });

    test('Non-empty operator - [nonempty]', function() {
@ -96,7 +103,7 @@
        tf.setFilterValue(4, '[nonempty]');
        tf.filter();

-        deepEqual(tf.getValidRows().length, 7, 'Expected number of matches');
+        deepEqual(tf.getValidRows().length, 6, 'Expected number of matches');
    });

    test('Or operator - ||', function() {
Author	SHA1	Message	Date
koalyptus	7afe45f1e6	Merge pull request #787 from koalyptus/dependabot/npm_and_yarn/codecov-3.7.1 Bump codecov from 3.7.0 to 3.7.1	2020-07-22 19:51:17 +10:00
koalyptus	6e01e45dfb	prepare dist	2020-07-22 19:45:07 +10:00
dependabot[bot]	12c30629af	Bump codecov from 3.7.0 to 3.7.1 Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/codecov/codecov-node/releases) - [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-21 12:35:35 +00:00
koalyptus	3e763efac9	Merge pull request #784 from koalyptus/769-refine-empty-cell-logic 769 refine empty nonempty operators logic	2020-06-16 13:03:27 +10:00
koalyptus	825b915ae8	769 refine empty nonempty operators logic	2020-06-16 12:28:12 +10:00