hdoc-tools 0.28.0 → 0.29.1

package/hdoc-validate.js

@@ -458,15 +458,14 @@ const e = require("express");
 			if (!valid_url) {
 				// Could be a relative path, check
 				if (links[i].startsWith("/") && !links[i].startsWith("/#")) {
-					let link_root = links[i].split("/");
-					if (link_root[0] === "") link_root.shift();
-					link_root = link_root[0] === "_books" ? link_root[1] : link_root[0];
+					let link_segments = links[i].split("/");
+					if (link_segments[0] === "") link_segments.shift();
+					const link_root = link_segments[0] === "_books" ? link_segments[1] : link_segments[0];
 
 					// Checking for internal links in other books - can't easily validate those here, returning
-					if (link_root !== hdocbook_config.docId) {
+					if (link_segments.length > 1 && link_root !== hdocbook_config.docId) {
 						continue;
 					}
-
 					isRelativePath(source_path, htmlFile, links[i]);
 				} else if (links[i].startsWith("#") || links[i].startsWith("/#")) {
 					//Flat Anchor - validate we have a same-file hit
@@ -543,7 +542,7 @@ const e = require("express");
 						url: links[i],
 						method: 'get',
 						timeout: 10000,
-						maxRedirects: 0,
+						maxRedirects: 5,
 						validateStatus: (status) =>
 						  status >= 200 && status < 400,
 					  })
@@ -577,6 +576,12 @@ const e = require("express");
 		for (let i = 0; i < links.length; i++) {
 			// Validate that image is a valid URL first
 			if (!hdoc.valid_url(links[i])) {
+
+				if (!links[i].startsWith("/")) {
+					const error_message = processErrorMessage(`Root relative image links should start with a forward-slash: ${links[i]}`, markdown_paths.relativePath, markdown_content, links[i]);
+					errors[htmlFile.relativePath].push(error_message);
+				}
+
 				// Could be a relative path, check image exists
 				doesFileExist(source_path, htmlFile, links[i], markdown_paths.relativePath, markdown_content);
 			} else {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.28.0",
+	"version": "0.29.1",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {