hdoc-tools 0.9.47 → 0.9.48

package/hdoc-validate.js

@@ -12,10 +12,10 @@
         { trueCasePathSync } = require('true-case-path');
 
     const spellcheck_options = {
-            british: true,
-            spelling: true
-        },
-        regex_nav_paths = /[a-z0-9-\/]+/g,
+        british: true,
+        spelling: true
+    },
+        regex_nav_paths = /[a-z0-9-\/]+[a-z0-9]+#{0,1}[a-z0-9-\/]+/,
         agent = new https.Agent({
             rejectUnauthorized: false
         });
@@ -67,26 +67,28 @@
 
     const checkNavigation = async function (source_path, flat_nav) {
         let nav_errors = [];
-        for (const key in flat_nav) {
+        for (let key in flat_nav) {
             if (flat_nav.hasOwnProperty(key)) {
                 // doc paths should only contain a-z - characters
                 const invalid_chars = key.replace(regex_nav_paths, '');
                 if (invalid_chars !== '') {
                     nav_errors.push(`Navigation path [${key}] contains the following invalid characters: [${[...invalid_chars].join('] [')}]`);
                 }
+                const key_split = key.split('#');
+                const key_no_hash = key_split[0];
 
                 // Validate path exists - key should be a html file at this point
                 let file_exists = true;
-                let file_name = path.join(source_path, key + '.html');
+                let file_name = path.join(source_path, key_no_hash + '.html');
                 if (!fs.existsSync(file_name)) {
-                    file_name = path.join(source_path, key + '.htm');
+                    file_name = path.join(source_path, key_no_hash + '.htm');
                     if (!fs.existsSync(file_name)) {
-                        file_name = path.join(source_path, key, 'index.html');
+                        file_name = path.join(source_path, key_no_hash, 'index.html');
                         if (!fs.existsSync(file_name)) {
-                            file_name = path.join(source_path, key, 'index.htm');
+                            file_name = path.join(source_path, key_no_hash, 'index.htm');
                             if (!fs.existsSync(file_name)) {
                                 file_exists = false;
-                                nav_errors.push(`Navigation path [${key}] file does not exist.`);
+                                nav_errors.push(`Navigation path [${key_no_hash}] file does not exist.`);
                             }
                         }
                     }
@@ -121,6 +123,7 @@
                 }
 
                 // Validate display names/bookmarks
+                console.log(key)
                 for (let i = 0; i < flat_nav[key].length; i++) {
                     if (flat_nav[key][i].link === key) {
                         const translate_output = translator.translate(flat_nav[key][i].text, spellcheck_options);
@@ -334,7 +337,7 @@
 
     exports.run = async function (source_path, doc_id, verbose, hdocbook_config, hdocbook_project, nav_items, prod_families, prods_supported, gen_exclude) {
         console.log(`Performing Validation and Building SEO Link List...`);
-        
+
         // Get a list of HTML files in source_path
         dree.scan(source_path, dreeOptions, fileCallback);
 
@@ -389,7 +392,7 @@
         }
 
         let excl_output = [];
-        
+
         // Do spellchecking on markdown files
         let md_files_spellchecked = {};
         let mdPromiseArray = [];
@@ -402,7 +405,7 @@
         await Promise.all(mdPromiseArray.map(async (file) => {
             // Initiate maps for errors and verbose messages for markdown file
             const exclusions = await spellcheckContent(file, exclude_spellcheck);
-            if (gen_exclude && exclusions.length > 0) excl_output.push({document_path: file.relativePath.replace('.' + file.extension, ''), words: exclusions});
+            if (gen_exclude && exclusions.length > 0) excl_output.push({ document_path: file.relativePath.replace('.' + file.extension, ''), words: exclusions });
             md_files_spellchecked[file.relativePath.replace('.' + file.extension, '')] = true;
         }));
 
@@ -419,7 +422,7 @@
             // Check for British spellings in static HTML content
             if (!md_files_spellchecked[file.relativePath.replace('.' + file.extension, '')]) {
                 const exclusions = await spellcheckContent(file, exclude_spellcheck);
-                if (gen_exclude && exclusions.length > 0) excl_output.push({document_path: file.relativePath.replace('.' + file.extension, ''), words: exclusions});
+                if (gen_exclude && exclusions.length > 0) excl_output.push({ document_path: file.relativePath.replace('.' + file.extension, ''), words: exclusions });
             }
 
             const links = getLinks(file);
@@ -436,7 +439,7 @@
 
             // Check for multiple H1 tags
             await checkTags(file);
-            
+
             // Build list content for Google 
             listContent += `/${file.relativePath.replace(path.extname(file.relativePath), '')}`;
             listContent += '\r\n';

package/package.json

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