node-html-parser 3.2.0 → 3.3.0

package/README.md

@@ -1,7 +1,7 @@
 # Fast HTML Parser [![NPM version](https://badge.fury.io/js/node-html-parser.png)](http://badge.fury.io/js/node-html-parser) [![Build Status](https://travis-ci.org/taoqf/node-html-parser.svg?branch=master)](https://travis-ci.org/taoqf/node-html-parser)
 
 Fast HTML Parser is a _very fast_ HTML parser. Which will generate a simplified
-DOM tree, with basic element query support.
+DOM tree, with element query support.
 
 Per the design, it intends to parse massive HTML files in lowest price, thus the
 performance is the top priority.  For this reason, some malformatted HTML may not
@@ -112,6 +112,10 @@ Note: Full css3 selector supported since v3.0.0.
 
 Query CSS Selector to find matching node.
 
+### HTMLElement#closest(selector)
+
+Query closest element by css selector.
+
 ### HTMLElement#appendChild(node)
 
 Append a child node to childNodes

package/dist/esm/nodes/html.js

@@ -478,6 +478,61 @@ export default class HTMLElement extends Node {
         // }
         // return null;
     }
+    /**
+     * traverses the Element and its parents (heading toward the document root) until it finds a node that matches the provided selector string. Will return itself or the matching ancestor. If no such element exists, it returns null.
+     * @param selector a DOMString containing a selector list
+     */
+    closest(selector) {
+        const mapChild = new Map();
+        let el = this;
+        let old = null;
+        function findOne(test, elems) {
+            let elem = null;
+            for (let i = 0, l = elems.length; i < l && !elem; i++) {
+                const el = elems[i];
+                if (test(el)) {
+                    elem = el;
+                }
+                else {
+                    const child = mapChild.get(el);
+                    if (child) {
+                        elem = findOne(test, [child]);
+                    }
+                }
+            }
+            return elem;
+        }
+        while (el) {
+            mapChild.set(el, old);
+            old = el;
+            el = el.parentNode;
+        }
+        el = this;
+        while (el) {
+            const e = selectOne(selector, el, {
+                xmlMode: true,
+                adapter: {
+                    ...Matcher,
+                    getChildren(node) {
+                        const child = mapChild.get(node);
+                        return child && [child];
+                    },
+                    getSiblings(node) {
+                        return [node];
+                    },
+                    findOne,
+                    findAll() {
+                        return [];
+                    }
+                }
+            });
+            if (e) {
+                return e;
+            }
+            el = el.parentNode;
+        }
+        return null;
+    }
     /**
      * Append a child node to childNodes
      * @param  {Node} node node to append

package/dist/main.js

@@ -16,6 +16,17 @@ var __extends = (this && this.__extends) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         to[j] = from[i];
@@ -732,6 +743,58 @@ define("nodes/html", ["require", "exports", "he", "css-select", "nodes/node", "n
             // }
             // return null;
         };
+        /**
+         * traverses the Element and its parents (heading toward the document root) until it finds a node that matches the provided selector string. Will return itself or the matching ancestor. If no such element exists, it returns null.
+         * @param selector a DOMString containing a selector list
+         */
+        HTMLElement.prototype.closest = function (selector) {
+            var mapChild = new Map();
+            var el = this;
+            var old = null;
+            function findOne(test, elems) {
+                var elem = null;
+                for (var i = 0, l = elems.length; i < l && !elem; i++) {
+                    var el_1 = elems[i];
+                    if (test(el_1)) {
+                        elem = el_1;
+                    }
+                    else {
+                        var child = mapChild.get(el_1);
+                        if (child) {
+                            elem = findOne(test, [child]);
+                        }
+                    }
+                }
+                return elem;
+            }
+            while (el) {
+                mapChild.set(el, old);
+                old = el;
+                el = el.parentNode;
+            }
+            el = this;
+            while (el) {
+                var e = css_select_1.selectOne(selector, el, {
+                    xmlMode: true,
+                    adapter: __assign(__assign({}, matcher_1.default), { getChildren: function (node) {
+                            var child = mapChild.get(node);
+                            return child && [child];
+                        },
+                        getSiblings: function (node) {
+                            return [node];
+                        },
+                        findOne: findOne,
+                        findAll: function () {
+                            return [];
+                        } })
+                });
+                if (e) {
+                    return e;
+                }
+                el = el.parentNode;
+            }
+            return null;
+        };
         /**
          * Append a child node to childNodes
          * @param  {Node} node node to append

package/dist/nodes/html.d.ts

@@ -122,6 +122,11 @@ export default class HTMLElement extends Node {
      * @return {HTMLElement}    matching node
      */
     querySelector(selector: string): HTMLElement;
+    /**
+     * traverses the Element and its parents (heading toward the document root) until it finds a node that matches the provided selector string. Will return itself or the matching ancestor. If no such element exists, it returns null.
+     * @param selector a DOMString containing a selector list
+     */
+    closest(selector: string): Node;
     /**
      * Append a child node to childNodes
      * @param  {Node} node node to append

package/dist/nodes/html.js

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         to[j] = from[i];
@@ -558,6 +569,58 @@ var HTMLElement = /** @class */ (function (_super) {
         // }
         // return null;
     };
+    /**
+     * traverses the Element and its parents (heading toward the document root) until it finds a node that matches the provided selector string. Will return itself or the matching ancestor. If no such element exists, it returns null.
+     * @param selector a DOMString containing a selector list
+     */
+    HTMLElement.prototype.closest = function (selector) {
+        var mapChild = new Map();
+        var el = this;
+        var old = null;
+        function findOne(test, elems) {
+            var elem = null;
+            for (var i = 0, l = elems.length; i < l && !elem; i++) {
+                var el_1 = elems[i];
+                if (test(el_1)) {
+                    elem = el_1;
+                }
+                else {
+                    var child = mapChild.get(el_1);
+                    if (child) {
+                        elem = findOne(test, [child]);
+                    }
+                }
+            }
+            return elem;
+        }
+        while (el) {
+            mapChild.set(el, old);
+            old = el;
+            el = el.parentNode;
+        }
+        el = this;
+        while (el) {
+            var e = css_select_1.selectOne(selector, el, {
+                xmlMode: true,
+                adapter: __assign(__assign({}, matcher_1.default), { getChildren: function (node) {
+                        var child = mapChild.get(node);
+                        return child && [child];
+                    },
+                    getSiblings: function (node) {
+                        return [node];
+                    },
+                    findOne: findOne,
+                    findAll: function () {
+                        return [];
+                    } })
+            });
+            if (e) {
+                return e;
+            }
+            el = el.parentNode;
+        }
+        return null;
+    };
     /**
      * Append a child node to childNodes
      * @param  {Node} node node to append

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"module": "dist/esm/index.js",
@@ -15,7 +15,7 @@
 		"build": "npm run lint && npm run clean && npm run ts:cjs && npm run ts:amd && npm run ts:esm",
 		"dev": "tsc -w & mocha -w ./test/*.js",
 		"pretest": "tsc -m commonjs",
-		"release": "np"
+		"release": "yarn build && np"
 	},
 	"keywords": [
 		"parser",