hdoc-tools 0.47.1 → 0.47.2

package/hdoc-build.js

@@ -1229,7 +1229,7 @@
 		for (let i = 0; i < md_files.length; i++) {
 			mdPromiseArray.push(md_files[i]);
 		}
-		const chunkSize = 8;
+		const chunkSize = 3;
 		for (let i = 0; i < mdPromiseArray.length; i += chunkSize) {
 			const chunk = mdPromiseArray.slice(i, i + chunkSize);
 			// do whatever

package/hdoc-module.js

@@ -3,7 +3,6 @@
 	const crypto = require("node:crypto");
 	const fs = require("node:fs");
 	const os = require("node:os");
-	const { JSDOM } = require("jsdom");
 	const path = require("node:path");
 
 	const includesCache = {};
@@ -245,82 +244,37 @@
 
 	// Processes HTML, wraps h2 and h3 tags and their content in divs with an id matching that of the h text
 	exports.wrapHContent = (htmlContent) => {
-		const dom = new JSDOM(htmlContent);
-		const document = dom.window.document;
-
-		const nodes = Array.from(document.body.childNodes); // Convert NodeList to Array for easier manipulation
-		const newContent = document.createDocumentFragment(); // Create a document fragment to hold the new structure
-
-		let currentH2Div = null;
-		let currentH3Div = null;
-
-		for (const node of nodes) {
-			if (node.nodeType === dom.window.Node.ELEMENT_NODE) {
-				if (node.tagName.toLowerCase() === "h2") {
-					// When an <h2> is found, close the current <h2> div (if any) and start a new one
-					if (currentH2Div) {
-						if (currentH3Div) {
-							currentH2Div.appendChild(currentH3Div);
-							currentH3Div = null;
-						}
-						newContent.appendChild(currentH2Div);
-					}
-					currentH2Div = document.createElement("div");
-					currentH2Div.id = makeAnchorIdFriendly(node.textContent.trim());
-					currentH2Div.appendChild(node);
-				} else if (node.tagName.toLowerCase() === "h3") {
-					// When an <h3> is found, close the current <h3> div (if any) and start a new one
-					if (currentH3Div) {
-						if (currentH2Div) {
-							currentH2Div.appendChild(currentH3Div);
-						} else {
-							newContent.appendChild(currentH3Div);
-						}
-					}
-					currentH3Div = document.createElement("div");
-					currentH3Div.id = makeAnchorIdFriendly(node.textContent.trim());
-					currentH3Div.appendChild(node);
-				} else {
-					if (currentH3Div) {
-						currentH3Div.appendChild(node);
-					} else if (currentH2Div) {
-						currentH2Div.appendChild(node);
-					} else {
-						newContent.appendChild(node);
-					}
-				}
+		const $ = cheerio.load(htmlContent, { decodeEntities: false });
+		let result = '';
+		let inH2 = false;
+		let inH3 = false;
+
+		$('body').contents().each(function() {
+			const tagName = this.type === 'tag' ? this.name?.toLowerCase() : null;
+
+			if (tagName === 'h2') {
+				// Close open h3 (nested inside h2), then close h2
+				if (inH3) { result += '</div>'; inH3 = false; }
+				if (inH2) { result += '</div>'; inH2 = false; }
+				const anchorId = makeAnchorIdFriendly($(this).text().trim());
+				result += `<div id="${anchorId}">${$.html(this)}`;
+				inH2 = true;
+			} else if (tagName === 'h3') {
+				// Close previous h3 (it stays nested inside any open h2)
+				if (inH3) { result += '</div>'; inH3 = false; }
+				const anchorId = makeAnchorIdFriendly($(this).text().trim());
+				result += `<div id="${anchorId}">${$.html(this)}`;
+				inH3 = true;
 			} else {
-				if (currentH3Div) {
-					currentH3Div.appendChild(node);
-				} else if (currentH2Div) {
-					currentH2Div.appendChild(node);
-				} else {
-					newContent.appendChild(node);
-				}
+				result += $.html(this);
 			}
-		}
-
-		// Append the last <h3> div if any
-		if (currentH3Div) {
-			if (currentH2Div) {
-				currentH2Div.appendChild(currentH3Div);
-			} else {
-				newContent.appendChild(currentH3Div);
-			}
-		}
-
-		// Append the last <h2> div if any
-		if (currentH2Div) {
-			newContent.appendChild(currentH2Div);
-		}
+		});
 
-		// Replace the old body content with the new content
-		document.body.innerHTML = "";
-		document.body.appendChild(newContent);
+		// Flush remaining open divs — h3 is nested inside h2 so close inner first
+		if (inH3) result += '</div>';
+		if (inH2) result += '</div>';
 
-		// Serialize the document back to HTML and save it to a new file (for example: 'output.html')
-		const outputHtml = dom.serialize();
-		return outputHtml;
+		return `<html><head></head><body>${result}</body></html>`;
 	};
 
 	exports.getIDDivs = (html_body) => {
@@ -407,14 +361,11 @@
 	};
 
 	exports.html_to_text = (html, { baseElement } = {}) => {
-		const dom = new JSDOM(html);
-		const document = dom.window.document;
+		const $ = cheerio.load(html, { decodeEntities: false });
 		if (baseElement) {
-			return Array.from(document.querySelectorAll(baseElement))
-				.map((el) => el.textContent)
-				.join("\n");
+			return $(baseElement).map((_i, el) => $(el).text()).get().join("\n");
 		}
-		return document.body ? document.body.textContent : "";
+		return $("body").text();
 	};
 
 	exports.get_html_read_time = (html) => {

package/npm-shrinkwrap.json

@@ -16,7 +16,6 @@
 				"better-sqlite3": "12.8.0",
 				"cheerio": "1.2.0",
 				"express": "4.22.1",
-				"jsdom": "25.0.1",
 				"markdown-it": "14.1.1",
 				"markdown-it-container": "4.0.0",
 				"markdown-it-front-matter": "0.2.4",
@@ -3969,46 +3968,6 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"node_modules/jsdom": {
-			"version": "25.0.1",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz",
-			"integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==",
-			"license": "MIT",
-			"dependencies": {
-				"cssstyle": "4.1.0",
-				"data-urls": "5.0.0",
-				"decimal.js": "10.4.3",
-				"form-data": "4.0.0",
-				"html-encoding-sniffer": "4.0.0",
-				"http-proxy-agent": "7.0.2",
-				"https-proxy-agent": "7.0.5",
-				"is-potential-custom-element-name": "1.0.1",
-				"nwsapi": "2.2.12",
-				"parse5": "7.1.2",
-				"rrweb-cssom": "0.7.1",
-				"saxes": "6.0.0",
-				"symbol-tree": "3.2.4",
-				"tough-cookie": "5.0.0",
-				"w3c-xmlserializer": "5.0.0",
-				"webidl-conversions": "7.0.0",
-				"whatwg-encoding": "3.1.1",
-				"whatwg-mimetype": "4.0.0",
-				"whatwg-url": "14.0.0",
-				"ws": "8.18.0",
-				"xml-name-validator": "5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"peerDependencies": {
-				"canvas": "2.11.2"
-			},
-			"peerDependenciesMeta": {
-				"canvas": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.47.1",
+	"version": "0.47.2",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {
@@ -43,7 +43,6 @@
 		"better-sqlite3": "12.8.0",
 		"cheerio": "1.2.0",
 		"express": "4.22.1",
-		"jsdom": "25.0.1",
 		"markdown-it": "14.1.1",
 		"markdown-it-container": "4.0.0",
 		"markdown-it-front-matter": "0.2.4",