hdoc-tools 0.33.1 → 0.33.3

package/hdoc-serve.js

@@ -351,7 +351,6 @@
 
 		// Catch all
 		app.get("/*", (req, res) => {
-			const segs = req.url.split("/");
 
 			const ui_file_path = path.join(ui_path, req.url);
 

package/hdoc-validate.js

@@ -449,7 +449,7 @@ const e = require("express");
 		return returnPaths;
 	}
 
-	const checkLinks = async (source_path, htmlFile, links, hdocbook_config) => {
+	const checkLinks = async (source_path, htmlFile, links, hdocbook_config, hdocbook_project) => {
 		const markdown_paths = getMDPathFromHtmlPath(htmlFile);
 		const markdown_content = fs.readFileSync(markdown_paths.markdownPath, 'utf8');
 
@@ -571,8 +571,17 @@ const e = require("express");
 						`Link is a valid external URL: ${links[i]}`,
 					);
 				} catch (e) {
-					const error_message = processErrorMessage(`Issue with external link: ${e} - ${links[i]}`, markdown_paths.relativePath, markdown_content, links[i]);
-					errors[htmlFile.relativePath].push(error_message);
+					let error_message;
+					if (e instanceof AggregateError) {
+						error_message = processErrorMessage(`Issue with external link [${links[i]}]: ${e.message} - ${JSON.stringify(e.errors)}`, markdown_paths.relativePath, markdown_content, links[i]);
+					} else {
+						error_message = processErrorMessage(`Issue with external link [${links[i]}]: ${e}`, markdown_paths.relativePath, markdown_content, links[i]);
+					}
+					if (hdocbook_project.validation.external_link_warnings)
+						warnings[htmlFile.relativePath].push(error_message);
+					else
+						errors[htmlFile.relativePath].push(error_message);
+					
 				}
 			}
 		}
@@ -993,7 +1002,7 @@ const e = require("express");
 				if (links.href.length === 0) {
 					messages[file.relativePath].push("No links found in file");
 				} else {
-					await checkLinks(source_path, file, links.href, hdocbook_config);
+					await checkLinks(source_path, file, links.href, hdocbook_config, hdocbook_project);
 				}
 				if (links.img.length === 0) {
 					messages[file.relativePath].push("No images found in file");

package/package.json

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

package/ui/js/doc.hornbill.js

@@ -258,6 +258,8 @@ function loadContentUrl(
 	fromPopState,
 	fromBook = true,
 ) {
+	
+	
 	//-- clear table of contents
 	view.docApp.tableOfContents = [];
 	let clean_linkRef = linkRef;
@@ -686,17 +688,16 @@ async function intialiseApp() {
 							`${window.location.origin}/`,
 							"",
 						);
-						initialLoadContentHref = findFirstClickableBookLink(
+						const newInitialLoadContentHref = findFirstClickableBookLink(
 							initialLoadContentHref,
 						);
-
+						if (newInitialLoadContentHref !== undefined) initialLoadContentHref = newInitialLoadContentHref;
 						if (initialLoadContentHref) {
 							//-- find the link we are going to show and make sure parent/s are set to .expand=true
 							loadContentUrl(initialLoadContentHref, true, false);
 						} else {
 							hslDocLog.log("initial first view link to load is not present");
 						}
-
 						$(".hb-hidden").removeClass("hb-hidden");
 					}, 200);
 				})