domutils - npm Package Compare versions

Comparing version 2.5.2 to 2.6.0

lib/helpers.d.ts

@@ -1,2 +0,2 @@
-import type { Node } from "domhandler";
+import { Node } from "domhandler";
 /**
@@ -50,3 +50,3 @@ * Given an array of nodes, remove any member that is contained by another.
  */
-export declare function uniqueSort(nodes: Node[]): Node[];
+export declare function uniqueSort<T extends Node>(nodes: T[]): T[];
 //# sourceMappingURL=helpers.d.ts.map

lib/helpers.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uniqueSort = exports.compareDocumentPosition = exports.removeSubsets = void 0;
-var tagtypes_1 = require("./tagtypes");
+var domhandler_1 = require("domhandler");
 /**
@@ -69,3 +69,3 @@ * Given an array of nodes, remove any member that is contained by another.
     }
-    var current = tagtypes_1.hasChildren(nodeA) ? nodeA : nodeA.parent;
+    var current = domhandler_1.hasChildren(nodeA) ? nodeA : nodeA.parent;
     while (current) {
@@ -75,3 +75,3 @@ aParents.unshift(current);
     }
-    current = tagtypes_1.hasChildren(nodeB) ? nodeB : nodeB.parent;
+    current = domhandler_1.hasChildren(nodeB) ? nodeB : nodeB.parent;
     while (current) {
@@ -78,0 +78,0 @@ bParents.unshift(current);

lib/index.d.ts

@@ -7,3 +7,3 @@ export * from "./stringify";
 export * from "./helpers";
-export * from "./tagtypes";
+export { isTag, isCDATA, isText, isComment, isDocument, hasChildren, } from "domhandler";
 //# sourceMappingURL=index.d.ts.map

lib/index.js

@@ -13,2 +13,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasChildren = exports.isDocument = exports.isComment = exports.isText = exports.isCDATA = exports.isTag = void 0;
 __exportStar(require("./stringify"), exports);
@@ -20,2 +21,8 @@ __exportStar(require("./traversal"), exports);
 __exportStar(require("./helpers"), exports);
-__exportStar(require("./tagtypes"), exports);
+var domhandler_1 = require("domhandler");
+Object.defineProperty(exports, "isTag", { enumerable: true, get: function () { return domhandler_1.isTag; } });
+Object.defineProperty(exports, "isCDATA", { enumerable: true, get: function () { return domhandler_1.isCDATA; } });
+Object.defineProperty(exports, "isText", { enumerable: true, get: function () { return domhandler_1.isText; } });
+Object.defineProperty(exports, "isComment", { enumerable: true, get: function () { return domhandler_1.isComment; } });
+Object.defineProperty(exports, "isDocument", { enumerable: true, get: function () { return domhandler_1.isDocument; } });
+Object.defineProperty(exports, "hasChildren", { enumerable: true, get: function () { return domhandler_1.hasChildren; } });

lib/legacy.d.ts

@@ -1,2 +0,2 @@
-import type { Node, Element } from "domhandler";
+import { Node, Element } from "domhandler";
 import { ElementType } from "domelementtype";
@@ -3,0 +3,0 @@ interface TestElementOpts {

lib/legacy.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementsByTagType = exports.getElementsByTagName = exports.getElementById = exports.getElements = exports.testElement = void 0;
+var domhandler_1 = require("domhandler");
 var querying_1 = require("./querying");
-var tagtypes_1 = require("./tagtypes");
 var Checks = {
     tag_name: function (name) {
         if (typeof name === "function") {
-            return function (elem) { return tagtypes_1.isTag(elem) && name(elem.name); };
+            return function (elem) { return domhandler_1.isTag(elem) && name(elem.name); };
         }
         else if (name === "*") {
-            return tagtypes_1.isTag;
+            return domhandler_1.isTag;
         }
-        return function (elem) { return tagtypes_1.isTag(elem) && elem.name === name; };
+        return function (elem) { return domhandler_1.isTag(elem) && elem.name === name; };
     },
@@ -24,5 +24,5 @@ tag_type: function (type) {
         if (typeof data === "function") {
-            return function (elem) { return tagtypes_1.isText(elem) && data(elem.data); };
+            return function (elem) { return domhandler_1.isText(elem) && data(elem.data); };
         }
-        return function (elem) { return tagtypes_1.isText(elem) && elem.data === data; };
+        return function (elem) { return domhandler_1.isText(elem) && elem.data === data; };
     },
@@ -37,5 +37,5 @@ };
     if (typeof value === "function") {
-        return function (elem) { return tagtypes_1.isTag(elem) && value(elem.attribs[attrib]); };
+        return function (elem) { return domhandler_1.isTag(elem) && value(elem.attribs[attrib]); };
     }
-    return function (elem) { return tagtypes_1.isTag(elem) && elem.attribs[attrib] === value; };
+    return function (elem) { return domhandler_1.isTag(elem) && elem.attribs[attrib] === value; };
 }
@@ -42,0 +42,0 @@ /**

lib/querying.d.ts

@@ -1,2 +0,2 @@
-import type { Node, Element } from "domhandler";
+import { Node, Element } from "domhandler";
 /**
@@ -3,0 +3,0 @@ * Search a node and its children for nodes passing a test function.

lib/querying.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAll = exports.existsOne = exports.findOne = exports.findOneChild = exports.find = exports.filter = void 0;
-var tagtypes_1 = require("./tagtypes");
+var domhandler_1 = require("domhandler");
 /**
@@ -40,3 +40,3 @@ * Search a node and its children for nodes passing a test function.
         }
-        if (recurse && tagtypes_1.hasChildren(elem) && elem.children.length > 0) {
+        if (recurse && 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 (!tagtypes_1.isTag(checked)) {
+        if (!domhandler_1.isTag(checked)) {
             continue;
@@ -97,3 +97,3 @@ }
     return nodes.some(function (checked) {
-        return tagtypes_1.isTag(checked) &&
+        return domhandler_1.isTag(checked) &&
             (test(checked) ||
@@ -117,6 +117,6 @@ (checked.children.length > 0 &&
     var result = [];
-    var stack = nodes.filter(tagtypes_1.isTag);
+    var stack = nodes.filter(domhandler_1.isTag);
     var elem;
     while ((elem = stack.shift())) {
-        var children = (_a = elem.children) === null || _a === void 0 ? void 0 : _a.filter(tagtypes_1.isTag);
+        var children = (_a = elem.children) === null || _a === void 0 ? void 0 : _a.filter(domhandler_1.isTag);
         if (children && children.length > 0) {
@@ -123,0 +123,0 @@ stack.unshift.apply(stack, children);

lib/stringify.d.ts

@@ -1,2 +0,2 @@
-import type { Node } from "domhandler";
+import { Node } from "domhandler";
 import { DomSerializerOptions } from "dom-serializer";
@@ -3,0 +3,0 @@ /**

lib/stringify.js

@@ -7,3 +7,3 @@ "use strict";
 exports.getText = exports.getInnerHTML = exports.getOuterHTML = void 0;
-var tagtypes_1 = require("./tagtypes");
+var domhandler_1 = require("domhandler");
 var dom_serializer_1 = __importDefault(require("dom-serializer"));
@@ -27,3 +27,3 @@ /**
 function getInnerHTML(node, options) {
-    return tagtypes_1.hasChildren(node)
+    return domhandler_1.hasChildren(node)
         ? node.children.map(function (node) { return getOuterHTML(node, options); }).join("")
@@ -42,7 +42,7 @@ : "";
         return node.map(getText).join("");
-    if (tagtypes_1.isTag(node))
+    if (domhandler_1.isTag(node))
         return node.name === "br" ? "\n" : getText(node.children);
-    if (tagtypes_1.isCDATA(node))
+    if (domhandler_1.isCDATA(node))
         return getText(node.children);
-    if (tagtypes_1.isText(node))
+    if (domhandler_1.isText(node))
         return node.data;
@@ -49,0 +49,0 @@ return "";

lib/traversal.d.ts

@@ -1,2 +0,2 @@
-import type { Node, Element, NodeWithChildren } from "domhandler";
+import { Node, Element, NodeWithChildren } from "domhandler";
 /**
@@ -3,0 +3,0 @@ * Get a node's children.

lib/traversal.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prevElementSibling = exports.nextElementSibling = exports.getName = exports.hasAttrib = exports.getAttributeValue = exports.getSiblings = exports.getParent = exports.getChildren = void 0;
-var tagtypes_1 = require("./tagtypes");
+var domhandler_1 = require("domhandler");
 var emptyArray = [];
@@ -99,3 +99,3 @@ /**
     var next = elem.next;
-    while (next !== null && !tagtypes_1.isTag(next))
+    while (next !== null && !domhandler_1.isTag(next))
         (_a = next, next = _a.next);
@@ -114,3 +114,3 @@ return next;
     var prev = elem.prev;
-    while (prev !== null && !tagtypes_1.isTag(prev))
+    while (prev !== null && !domhandler_1.isTag(prev))
         (_a = prev, prev = _a.prev);
@@ -117,0 +117,0 @@ return prev;

package.json

 {
     "name": "domutils",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Utilities for working with htmlparser2's dom",
@@ -41,3 +41,3 @@ "author": "Felix Boehm <[e-mail]>",
         "domelementtype": "^2.2.0",
-        "domhandler": "^4.1.0"
+        "domhandler": "^4.2.0"
     },
@@ -53,3 +53,3 @@ "devDependencies": {
         "eslint-plugin-jsdoc": "^32.0.2",
-        "htmlparser2": "~6.0.0",
+        "htmlparser2": "~6.1.0",
         "jest": "^26.0.1",
@@ -56,0 +56,0 @@ "prettier": "^2.0.5",

No alert changes

Worsened metrics

Total package byte prevSize

45328

decreased by-4.12%

Number of package files

24

decreased by-11.11%

Lines of code

975

decreased by-6.07%

Dependency changes

• Updateddomhandler@^4.2.0