hdoc-tools 0.32.1 → 0.33.1

package/hdoc-build.js

@@ -40,7 +40,8 @@
 	const pdf_template_file_path = path.join(pdf_template_path, "template.html");
 	const regex_version = /^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,6}$/;
 	const h1_pattern = /(<h1.*?>)\s*.*\s*(.*<\/h1>)/;
-	const regex_filename = /^[a-z]+-{0,1}([-a-z0-9]+)*$/;
+	const regex_filename = /^[a-z]+[-a-z0-9]+$/;
+	const regex_filename_img = /^[a-z]+[_\-a-z0-9]+[a-z0-9]$/;
 
 	const built_file_hashes = [];
 	const css_templates = [];
@@ -1044,15 +1045,18 @@
 	const filename_validation_callback = (element) => {
 		if (element.relativePath.startsWith("_inline/")) return;
 		if (element.name.toLowerCase() === ".ds_store") return;
-		if (
-			element.name === "article_ext.md" ||
-			element.name === "description_ext.md"
-		)
-			return;
-		if (image_extensions.includes(element.extension)) return;
+		if (element.name === "article_ext.md" || element.name === "description_ext.md" ) return;
+
 		const file_no_ext = element.name.replace(`.${element.extension}`, "");
-		if (!file_no_ext.match(regex_filename))
-			errors_filename.push(element.relativePath);
+		
+		if (image_extensions.includes(element.extension)) {
+			if (!file_no_ext.match(regex_filename_img)) {
+				errors_filename.push(element.relativePath);
+			} 
+			return;
+		} 
+		
+		if (!file_no_ext.match(regex_filename)) errors_filename.push(element.relativePath);
 	};
 
 	const dreeOptions = {
@@ -1186,16 +1190,18 @@
 			prods_supported = prods.prods_supported;
 		}
 
-		const clean_repo = hdocbook_config.publicSource.endsWith("/") ? hdocbook_config.publicSource.slice(0, -1) : hdocbook_config.publicSource;
-		const api_path = clean_repo.replace(
-			"https://github.com/",
-			"https://api.github.com/repos/",
-		);
-
-		// Get github repo details
-		github_repo_details = await hdoc.get_github_repo_details( api_path, git_token ); 
-		if (github_repo_details.success) {
-			console.warn(`Unable to retrieve GitHub Repository details: ${github_repo_details.error}`);
+		if (hdocbook_config.publicSource && hdocbook_config.publicSource.includes('github')) {
+			const clean_repo = hdocbook_config.publicSource.endsWith("/") ? hdocbook_config.publicSource.slice(0, -1) : hdocbook_config.publicSource;
+			const api_path = clean_repo.replace(
+				"https://github.com/",
+				"https://api.github.com/repos/",
+			);
+	
+			// Get github repo details
+			github_repo_details = await hdoc.get_github_repo_details( api_path, git_token ); 
+			if (github_repo_details.success) {
+				console.warn(`Unable to retrieve GitHub Repository details: ${github_repo_details.error}`);
+			}
 		}
 		
 		if (!validate) {
@@ -1408,7 +1414,7 @@
 			gen_exclude,
 			redirects,
 			draft_links,
-			github_repo_details.data.private,
+			github_repo_details && github_repo_details.data && github_repo_details.data.private ? github_repo_details.data.private : false,
 		);
 		if (!validation_success) {
 			const end_time = Date.now();

package/package.json

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