domutils - npm Package Compare versions

Comparing version 2.7.0 to 2.8.0

lib/helpers.js

@@ -69,3 +69,3 @@ "use strict";
     }
-    var current = domhandler_1.hasChildren(nodeA) ? nodeA : nodeA.parent;
+    var current = (0, domhandler_1.hasChildren)(nodeA) ? nodeA : nodeA.parent;
     while (current) {
@@ -75,3 +75,3 @@ aParents.unshift(current);
     }
-    current = domhandler_1.hasChildren(nodeB) ? nodeB : nodeB.parent;
+    current = (0, domhandler_1.hasChildren)(nodeB) ? nodeB : nodeB.parent;
     while (current) {
@@ -78,0 +78,0 @@ bParents.unshift(current);

lib/index.d.ts

@@ -7,3 +7,5 @@ export * from "./stringify";
 export * from "./helpers";
+export * from "./feeds";
+/** @deprecated Use these methods from `domhandler` directly. */
 export { isTag, isCDATA, isText, isComment, isDocument, hasChildren, } from "domhandler";
 //# sourceMappingURL=index.d.ts.map

lib/index.js

@@ -20,2 +20,4 @@ "use strict";
 __exportStar(require("./helpers"), exports);
+__exportStar(require("./feeds"), exports);
+/** @deprecated Use these methods from `domhandler` directly. */
 var domhandler_1 = require("domhandler");
@@ -22,0 +24,0 @@ Object.defineProperty(exports, "isTag", { enumerable: true, get: function () { return domhandler_1.isTag; } });

lib/legacy.js

@@ -9,3 +9,3 @@ "use strict";
         if (typeof name === "function") {
-            return function (elem) { return domhandler_1.isTag(elem) && name(elem.name); };
+            return function (elem) { return (0, domhandler_1.isTag)(elem) && name(elem.name); };
         }
@@ -15,3 +15,3 @@ else if (name === "*") {
         }
-        return function (elem) { return domhandler_1.isTag(elem) && elem.name === name; };
+        return function (elem) { return (0, domhandler_1.isTag)(elem) && elem.name === name; };
     },
@@ -26,5 +26,5 @@ tag_type: function (type) {
         if (typeof data === "function") {
-            return function (elem) { return domhandler_1.isText(elem) && data(elem.data); };
+            return function (elem) { return (0, domhandler_1.isText)(elem) && data(elem.data); };
         }
-        return function (elem) { return domhandler_1.isText(elem) && elem.data === data; };
+        return function (elem) { return (0, domhandler_1.isText)(elem) && elem.data === data; };
     },
@@ -39,5 +39,5 @@ };
     if (typeof value === "function") {
-        return function (elem) { return domhandler_1.isTag(elem) && value(elem.attribs[attrib]); };
+        return function (elem) { return (0, domhandler_1.isTag)(elem) && value(elem.attribs[attrib]); };
     }
-    return function (elem) { return domhandler_1.isTag(elem) && elem.attribs[attrib] === value; };
+    return function (elem) { return (0, domhandler_1.isTag)(elem) && elem.attribs[attrib] === value; };
 }
@@ -61,3 +61,3 @@ /**
         var value = options[key];
-        return key in Checks
+        return Object.prototype.hasOwnProperty.call(Checks, key)
             ? Checks[key](value)
@@ -88,3 +88,3 @@ : getAttribCheck(key, value);
     var test = compileTest(options);
-    return test ? querying_1.filter(test, nodes, recurse, limit) : [];
+    return test ? (0, querying_1.filter)(test, nodes, recurse, limit) : [];
 }
@@ -102,3 +102,3 @@ exports.getElements = getElements;
         nodes = [nodes];
-    return querying_1.findOne(getAttribCheck("id", id), nodes, recurse);
+    return (0, querying_1.findOne)(getAttribCheck("id", id), nodes, recurse);
 }
@@ -116,3 +116,3 @@ exports.getElementById = getElementById;
     if (limit === void 0) { limit = Infinity; }
-    return querying_1.filter(Checks.tag_name(tagName), nodes, recurse, limit);
+    return (0, querying_1.filter)(Checks.tag_name(tagName), nodes, recurse, limit);
 }
@@ -130,4 +130,4 @@ exports.getElementsByTagName = getElementsByTagName;
     if (limit === void 0) { limit = Infinity; }
-    return querying_1.filter(Checks.tag_type(type), nodes, recurse, limit);
+    return (0, querying_1.filter)(Checks.tag_type(type), nodes, recurse, limit);
 }
 exports.getElementsByTagType = getElementsByTagType;

lib/querying.js

@@ -40,3 +40,3 @@ "use strict";
         }
-        if (recurse && domhandler_1.hasChildren(elem) && elem.children.length > 0) {
+        if (recurse && (0, domhandler_1.hasChildren)(elem) && elem.children.length > 0) {
             var children = find(test, elem.children, recurse, limit);
@@ -76,3 +76,3 @@ result.push.apply(result, children);
         var checked = nodes[i];
-        if (!domhandler_1.isTag(checked)) {
+        if (!(0, domhandler_1.isTag)(checked)) {
             continue;
@@ -97,3 +97,3 @@ }
     return nodes.some(function (checked) {
-        return domhandler_1.isTag(checked) &&
+        return (0, domhandler_1.isTag)(checked) &&
             (test(checked) ||
@@ -100,0 +100,0 @@ (checked.children.length > 0 &&

lib/stringify.js

@@ -17,3 +17,3 @@ "use strict";
 function getOuterHTML(node, options) {
-    return dom_serializer_1.default(node, options);
+    return (0, dom_serializer_1.default)(node, options);
 }
@@ -28,3 +28,3 @@ exports.getOuterHTML = getOuterHTML;
 function getInnerHTML(node, options) {
-    return domhandler_1.hasChildren(node)
+    return (0, domhandler_1.hasChildren)(node)
         ? node.children.map(function (node) { return getOuterHTML(node, options); }).join("")
@@ -44,7 +44,7 @@ : "";
         return node.map(getText).join("");
-    if (domhandler_1.isTag(node))
+    if ((0, domhandler_1.isTag)(node))
         return node.name === "br" ? "\n" : getText(node.children);
-    if (domhandler_1.isCDATA(node))
+    if ((0, domhandler_1.isCDATA)(node))
         return getText(node.children);
-    if (domhandler_1.isText(node))
+    if ((0, domhandler_1.isText)(node))
         return node.data;
@@ -64,7 +64,6 @@ return "";
         return node.map(textContent).join("");
-    if (domhandler_1.isTag(node))
+    if ((0, domhandler_1.hasChildren)(node) && !(0, domhandler_1.isComment)(node)) {
         return textContent(node.children);
-    if (domhandler_1.isCDATA(node))
-        return textContent(node.children);
-    if (domhandler_1.isText(node))
+    }
+    if ((0, domhandler_1.isText)(node))
         return node.data;
@@ -84,8 +83,6 @@ return "";
         return node.map(innerText).join("");
-    if (domhandler_1.hasChildren(node) && node.type === domelementtype_1.ElementType.Tag) {
+    if ((0, domhandler_1.hasChildren)(node) && (node.type === domelementtype_1.ElementType.Tag || (0, domhandler_1.isCDATA)(node))) {
         return innerText(node.children);
     }
-    if (domhandler_1.isCDATA(node))
-        return innerText(node.children);
-    if (domhandler_1.isText(node))
+    if ((0, domhandler_1.isText)(node))
         return node.data;
@@ -92,0 +89,0 @@ return "";

lib/traversal.js

@@ -99,3 +99,3 @@ "use strict";
     var next = elem.next;
-    while (next !== null && !domhandler_1.isTag(next))
+    while (next !== null && !(0, domhandler_1.isTag)(next))
         (_a = next, next = _a.next);
@@ -114,3 +114,3 @@ return next;
     var prev = elem.prev;
-    while (prev !== null && !domhandler_1.isTag(prev))
+    while (prev !== null && !(0, domhandler_1.isTag)(prev))
         (_a = prev, prev = _a.prev);
@@ -117,0 +117,0 @@ return prev;

package.json

 {
     "name": "domutils",
-    "version": "2.7.0",
+    "version": "2.8.0",
     "description": "Utilities for working with htmlparser2's dom",
@@ -17,4 +17,4 @@ "author": "Felix Boehm <[e-mail]>",
     "scripts": {
-        "test": "jest --coverage && npm run lint",
-        "coverage": "cat coverage/lcov.info | coveralls",
+        "test": "npm run test:jest && npm run lint",
+        "test:jest": "jest",
         "lint": "npm run lint:es && npm run lint:prettier",
@@ -45,16 +45,15 @@ "lint:es": "eslint --ignore-path .gitignore .",
     "devDependencies": {
-        "@types/jest": "^26.0.0",
-        "@types/node": "^15.0.1",
-        "@typescript-eslint/eslint-plugin": "^4.1.0",
-        "@typescript-eslint/parser": "^4.1.0",
-        "coveralls": "^3.0.5",
-        "eslint": "^7.0.0",
+        "@types/jest": "^27.0.1",
+        "@types/node": "^16.7.2",
+        "@typescript-eslint/eslint-plugin": "^4.29.3",
+        "@typescript-eslint/parser": "^4.29.3",
+        "eslint": "^7.32.0",
         "eslint-config-prettier": "^8.1.0",
-        "eslint-plugin-jsdoc": "^35.1.0",
-        "htmlparser2": "~6.1.0",
-        "jest": "^27.0.1",
+        "eslint-plugin-jsdoc": "^36.0.8",
+        "htmlparser2": "~7.0.0",
+        "jest": "^27.1.0",
         "prettier": "^2.0.5",
-        "ts-jest": "^27.0.1",
-        "typedoc": "^0.20.5",
-        "typescript": "^4.0.2"
+        "ts-jest": "^27.0.5",
+        "typedoc": "^0.21.6",
+        "typescript": "^4.4.2"
     },
@@ -61,0 +60,0 @@ "jest": {

New alerts

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

56647

increased by19.18%

Dev dependency count

13

decreased by-7.14%

Number of package files

27

increased by12.5%

Lines of code

1268

increased by22.75%

Worsened metrics

Number of medium supply chain risk alerts

7

increased byInfinity%

No dependency changes