node-html-parser 6.1.4 → 6.1.6

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [6.1.6](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.5...v6.1.6) (2023-08-17)
+
+
+### Bug Fixes
+
+* [#203](https://github.com/taoqf/node-fast-html-parser/issues/203) ([6006c52](https://github.com/taoqf/node-fast-html-parser/commit/6006c52c20e6c3c07405c808c8d81fa78425e794))
+* [#218](https://github.com/taoqf/node-fast-html-parser/issues/218) ([6f6c824](https://github.com/taoqf/node-fast-html-parser/commit/6f6c824df54fa53af47956048b42ea47cd3b53bf))
+* add tests for issue [#242](https://github.com/taoqf/node-fast-html-parser/issues/242) ([7615e27](https://github.com/taoqf/node-fast-html-parser/commit/7615e27e3eea47142beff11101d293c4f93cb6ce))
+* do not decode special chractors [#240](https://github.com/taoqf/node-fast-html-parser/issues/240) ([cdadb13](https://github.com/taoqf/node-fast-html-parser/commit/cdadb132f681ca587d17df991d09ff8d22997f4e))
+* improve constructor types [#230](https://github.com/taoqf/node-fast-html-parser/issues/230) ([24fd055](https://github.com/taoqf/node-fast-html-parser/commit/24fd055913125a964cb5aa61330376274c938035))
+* more change about types [#230](https://github.com/taoqf/node-fast-html-parser/issues/230) ([2852d20](https://github.com/taoqf/node-fast-html-parser/commit/2852d20f865dc18a8dc6727d5b5e586282e7d50d))
+* remove test code ([f0b176e](https://github.com/taoqf/node-fast-html-parser/commit/f0b176eb1ba5b5bc162744a37adcd18d3d64a515))
+
+### [6.1.5](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.4...v6.1.5) (2023-02-21)
+
 ### [6.1.4](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.3...v6.1.4) (2022-11-15)
 
 

package/dist/main.js

@@ -256,6 +256,7 @@ define("nodes/text", ["require", "exports", "he", "nodes/node", "nodes/type"], f
     var TextNode = /** @class */ (function (_super) {
         __extends(TextNode, _super);
         function TextNode(rawText, parentNode, range) {
+            if (parentNode === void 0) { parentNode = null; }
             var _this = _super.call(this, parentNode, range) || this;
             /**
              * Node Type declaration.
@@ -489,6 +490,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
          */
         function HTMLElement(tagName, keyAttrs, rawAttrs, parentNode, range, voidTag, _parseOptions) {
             if (rawAttrs === void 0) { rawAttrs = ''; }
+            if (parentNode === void 0) { parentNode = null; }
             if (voidTag === void 0) { voidTag = new void_tag_1.default(); }
             if (_parseOptions === void 0) { _parseOptions = {}; }
             var _this = _super.call(this, parentNode, range) || this;
@@ -532,7 +534,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             if (attr == null) {
                 return 'null';
             }
-            return JSON.stringify(attr.replace(/"/g, '"'));
+            return JSON.stringify(attr.replace(/"/g, '"')).replace(/\\t/g, '\t').replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\/g, '');
         };
         /**
          * Remove Child element from childNodes array
@@ -1044,14 +1046,14 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 }
                 var attrs = {};
                 if (this.rawAttrs) {
-                    var re = /([a-zA-Z()[\]#@$.?][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
+                    var re = /([a-zA-Z()[\]#@$.?:][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
                     var match = void 0;
                     while ((match = re.exec(this.rawAttrs))) {
                         var key = match[1];
                         var val = match[2] || null;
                         if (val && (val[0] === "'" || val[0] === "\""))
                             val = val.slice(1, val.length - 1);
-                        attrs[key] = val;
+                        attrs[key] = attrs[key] || val;
                     }
                 }
                 this._rawAttrs = attrs;
@@ -1061,6 +1063,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             configurable: true
         });
         HTMLElement.prototype.removeAttribute = function (key) {
+            var _this = this;
             var attrs = this.rawAttributes;
             delete attrs[key];
             // Update this.attribute
@@ -1070,7 +1073,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             // Update rawString
             this.rawAttrs = Object.keys(attrs)
                 .map(function (name) {
-                var val = JSON.stringify(attrs[name]);
+                var val = _this.quoteAttribute(attrs[name]);
                 if (val === undefined || val === 'null') {
                     return name;
                 }
@@ -1581,6 +1584,7 @@ define("nodes/comment", ["require", "exports", "nodes/node", "nodes/type"], func
     var CommentNode = /** @class */ (function (_super) {
         __extends(CommentNode, _super);
         function CommentNode(rawText, parentNode, range) {
+            if (parentNode === void 0) { parentNode = null; }
             var _this = _super.call(this, parentNode, range) || this;
             _this.rawText = rawText;
             /**

package/dist/nodes/comment.d.ts

@@ -4,7 +4,7 @@ import NodeType from './type';
 export default class CommentNode extends Node {
     rawText: string;
     clone(): CommentNode;
-    constructor(rawText: string, parentNode: HTMLElement, range?: [number, number]);
+    constructor(rawText: string, parentNode?: HTMLElement, range?: [number, number]);
     /**
      * Node Type declaration.
      * @type {Number}

package/dist/nodes/comment.js

@@ -23,6 +23,7 @@ var type_1 = __importDefault(require("./type"));
 var CommentNode = /** @class */ (function (_super) {
     __extends(CommentNode, _super);
     function CommentNode(rawText, parentNode, range) {
+        if (parentNode === void 0) { parentNode = null; }
         var _this = _super.call(this, parentNode, range) || this;
         _this.rawText = rawText;
         /**

package/dist/nodes/html.d.ts

@@ -62,7 +62,7 @@ export default class HTMLElement extends Node {
      *
      * @memberof HTMLElement
      */
-    constructor(tagName: string, keyAttrs: KeyAttributes, rawAttrs: string, parentNode: HTMLElement | null, range: [number, number], voidTag?: VoidTag, _parseOptions?: Partial<Options>);
+    constructor(tagName: string, keyAttrs: KeyAttributes, rawAttrs?: string, parentNode?: HTMLElement, range?: [number, number], voidTag?: VoidTag, _parseOptions?: Partial<Options>);
     /**
      * Remove Child element from childNodes array
      * @param {HTMLElement} node     node to remove

package/dist/nodes/html.js

@@ -156,6 +156,7 @@ var HTMLElement = /** @class */ (function (_super) {
      */
     function HTMLElement(tagName, keyAttrs, rawAttrs, parentNode, range, voidTag, _parseOptions) {
         if (rawAttrs === void 0) { rawAttrs = ''; }
+        if (parentNode === void 0) { parentNode = null; }
         if (voidTag === void 0) { voidTag = new void_tag_1.default(); }
         if (_parseOptions === void 0) { _parseOptions = {}; }
         var _this = _super.call(this, parentNode, range) || this;
@@ -199,7 +200,7 @@ var HTMLElement = /** @class */ (function (_super) {
         if (attr == null) {
             return 'null';
         }
-        return JSON.stringify(attr.replace(/"/g, '"'));
+        return JSON.stringify(attr.replace(/"/g, '"')).replace(/\\t/g, '\t').replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\/g, '');
     };
     /**
      * Remove Child element from childNodes array
@@ -711,14 +712,14 @@ var HTMLElement = /** @class */ (function (_super) {
             }
             var attrs = {};
             if (this.rawAttrs) {
-                var re = /([a-zA-Z()[\]#@$.?][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
+                var re = /([a-zA-Z()[\]#@$.?:][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
                 var match = void 0;
                 while ((match = re.exec(this.rawAttrs))) {
                     var key = match[1];
                     var val = match[2] || null;
                     if (val && (val[0] === "'" || val[0] === "\""))
                         val = val.slice(1, val.length - 1);
-                    attrs[key] = val;
+                    attrs[key] = attrs[key] || val;
                 }
             }
             this._rawAttrs = attrs;
@@ -728,6 +729,7 @@ var HTMLElement = /** @class */ (function (_super) {
         configurable: true
     });
     HTMLElement.prototype.removeAttribute = function (key) {
+        var _this = this;
         var attrs = this.rawAttributes;
         delete attrs[key];
         // Update this.attribute
@@ -737,7 +739,7 @@ var HTMLElement = /** @class */ (function (_super) {
         // Update rawString
         this.rawAttrs = Object.keys(attrs)
             .map(function (name) {
-            var val = JSON.stringify(attrs[name]);
+            var val = _this.quoteAttribute(attrs[name]);
             if (val === undefined || val === 'null') {
                 return name;
             }

package/dist/nodes/text.d.ts

@@ -7,7 +7,7 @@ import NodeType from './type';
  */
 export default class TextNode extends Node {
     clone(): TextNode;
-    constructor(rawText: string, parentNode: HTMLElement, range?: [number, number]);
+    constructor(rawText: string, parentNode?: HTMLElement, range?: [number, number]);
     /**
      * Node Type declaration.
      * @type {Number}

package/dist/nodes/text.js

@@ -28,6 +28,7 @@ var type_1 = __importDefault(require("./type"));
 var TextNode = /** @class */ (function (_super) {
     __extends(TextNode, _super);
     function TextNode(rawText, parentNode, range) {
+        if (parentNode === void 0) { parentNode = null; }
         var _this = _super.call(this, parentNode, range) || this;
         /**
          * Node Type declaration.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "6.1.4",
+	"version": "6.1.6",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",