hdoc-tools 0.11.8 → 0.12.0

package/hdoc-build-db.js

@@ -33,6 +33,11 @@
             'name',
             'avatar UNINDEXED',
             'url UNINDEXED'
+        ],
+        hdoc_redirects: [
+            'resource_url',
+            'location_url',
+            'http_code INTEGER UNINDEXED'
         ]
     };
 
@@ -71,6 +76,31 @@
         return response;
     };
 
+    exports.populate_redirects = function (db, redirect_records, verbose = false) {
+        let response = {
+            success: true,
+            errors: [],
+            index_success_count: 0
+        };
+
+        for (let i = 0; i < redirect_records.length; i++) {
+            const index_vals = [
+                redirect_records[i].url,
+                redirect_records[i].location ? redirect_records[i].location : '',
+                redirect_records[i].code
+            ];
+            const index_response = hdoc_index.insert_record(db, 'hdoc_redirects', db_schema.hdoc_redirects, index_vals);
+            if (!index_response.success) {
+                response.success = false;
+                response.errors.push(`Redirect record creation failed - ${redirect_records[i].url}: ${index_response.error}`);
+            } else {
+                response.index_success_count++
+            }
+        }
+        console.log(`\nRedirect Index Build Complete: ${response.index_success_count} document records created.`);
+        return response;
+    };
+
     exports.populate_index = async function (db, doc_id, book_config, index_records, verbose = false) {
         let response = {
             success: false,
@@ -137,7 +167,7 @@
                             continue;
                         }
                         if (verbose) {
-                            console.log(`Inserted document contributor recordL ${cont_response.row_id}`);
+                            console.log(`Inserted document contributor record ${cont_response.row_id}`);
                         }
                     }
                     response.index_success_count++;

package/hdoc-build.js

@@ -54,6 +54,7 @@
         index_records = [],
         md_files = [],
         md_files_delete = [],
+        redirects = {},
         static_html_files = [],
         work_path_content = '',
         verbose = false;
@@ -528,7 +529,14 @@
         let bc_tags = '\n';
         if (bc_for_path) {
             for (let i = 0; i < bc_for_path.length - 1; i++) {
-                const bc_link = bc_for_path[i].link.startsWith('/') ? bc_for_path[i].link : `/${bc_for_path[i].link}`;
+                let bc_link = '/';
+                if (redirects[bc_for_path[i].link]) {
+                    if (redirects[bc_for_path[i].link].location) {
+                        bc_link += redirects[bc_for_path[i].link].location;
+                    }
+                } else {
+                    bc_link = bc_for_path[i].link.startsWith('/') ? bc_for_path[i].link : `/${bc_for_path[i].link}`;
+                }
                 bc_tags += `\t\t\t\t<li class="mt-0 nav-bar-item"><a href="${bc_link}" class="ps-0 pe-0 text-decoration-none">${bc_for_path[i].text}</a></li>\n`;
             }
         } else {
@@ -622,6 +630,12 @@
             pdf_enable = hdocbook_project.pdfGeneration.enable;
         }
 
+        if (hdocbook_project.redirects && hdocbook_project.redirects instanceof Array) {
+            for (let i = 0; i < hdocbook_project.redirects.length; i++) {
+                redirects[hdocbook_project.redirects[i].url] = hdocbook_project.redirects[i];
+            }
+        }
+
         console.log(`Loading hdocbook config...`);
 
         const book_path = path.join(source_path, doc_id),
@@ -777,7 +791,6 @@
             }));
         }
 
-
         if (pdf_enable) {
             // Close the Chromium browser instance
             await browser.close();
@@ -796,7 +809,7 @@
         }
 
         // Validate content
-        const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc, prod_families, prods_supported, gen_exclude);
+        const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc, prod_families, prods_supported, gen_exclude, redirects);
         if (!validation_success) {
             const end_time = Date.now();
             console.log(`\nTime Taken: ${get_duration(start_time, end_time)}\n`);
@@ -835,14 +848,22 @@
             console.log(db.error);
             process.exit(1);
         }
-
+        // Populate primary index tables
         const index = await hdoc_build_db.populate_index(db.db, doc_id, hdocbook_config, index_records, verbose);
         if (!index.success) {
             console.log(index.error);
             process.exit(1);
         }
-        if (verbose) {
-            console.log(`Index Build Complete`);
+
+        // Populate redirect index table records
+        if (hdocbook_project.redirects && hdocbook_project.redirects instanceof Array && hdocbook_project.redirects.length > 0) {
+            const redirects_index = hdoc_build_db.populate_redirects(db.db, hdocbook_project.redirects, verbose);
+            if (!redirects_index.success) {
+                for (let i = 0; i < index.errors.length; i++) {
+                    console.log(index.errors[i]);
+                }
+                process.exit(1);
+            }
         }
 
         if (!validate) {

package/hdoc-serve.js

@@ -35,7 +35,7 @@
       console.log('    Server Port:', port);
 
       if (fs.existsSync(path.join(source_path, 'hdocbook-project.json')) == false) {
-         console.log("No hdocbook-project.js file found in working folder. Unable to continue.");
+         console.log("No hdocbook-project.json file found in working folder. Unable to continue.");
          return -1;
       }
 
@@ -83,9 +83,9 @@
             md_txt = includes_processed.body;
             if (includes_processed.errors && includes_processed.errors.length > 0) {
                console.error(`Error(s) when processing includes in ${file_path}`);
-                for (let i = 0; i < includes_processed.errors.length; i++) {
-                    console.error(includes_processed.errors[i]);
-                }
+               for (let i = 0; i < includes_processed.errors.length; i++) {
+                  console.error(includes_processed.errors[i]);
+               }
             } else {
                if (includes_processed.found > 0) {
                   console.log(`Includes injected into document: ${includes_processed.success}`);
@@ -93,22 +93,19 @@
             }
 
             const md = require('markdown-it')({
-                // enable everything
-                html: true,
-                linkify: true,
-                typographer: true,
-                //  highlight: function (str, lang) {
-                //      if (lang && hljs.getLanguage(lang)) {
-                //        try {
-                //          return hljs.highlight(lang, str, true).value;
-                //        } catch (__) {}
-                //      }
-                //  }
-                });
-             
+               // enable everything
+               html: true,
+               linkify: true,
+               typographer: true
+            });
+            md.linkify.set({
+               fuzzyEmail: false,
+               fuzzyLink: false,
+               fuzzyIP: false
+            });
             var frontmatter_content = "";
             md.use(mdfm, function (fm) {
-                frontmatter_content = fm;
+               frontmatter_content = fm;
             });
 
             const tips = require(__dirname + '/custom_modules/tips.js');

package/hdoc-validate.js

@@ -27,6 +27,7 @@
         md_to_validate = [],
         exclude_links = {},
         exclude_spellcheck = {},
+        redirects = {},
         exclude_h1_count = {},
         exclude_spellcheck_output = [];
 
@@ -97,6 +98,17 @@
                 const key_split = key.split('#');
                 const key_no_hash = key_split[0];
 
+                // See if there's a redirect in place
+                let redirected = false;
+                let redirect_errored = false;
+                const redir = await checkRedirect(source_path, key_no_hash);
+                if (redir.exists && redir.error !== null) {
+                    nav_errors.push(redir.error);
+                    redirect_errored = true;
+                } else if (redir.exists && redir.error === null) {
+                    redirected = true;
+                }
+
                 // Validate path exists - key should be a html file at this point
                 let file_exists = true;
                 let file_name = path.join(source_path, key_no_hash + '.html');
@@ -108,13 +120,19 @@
                             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_no_hash}] file does not exist.`);
+                                if (!redirected && !redirect_errored)
+                                    nav_errors.push(`Navigation path [${key_no_hash}] file does not exist.`);
                             }
                         }
                     }
                 }
 
                 if (file_exists) {
+                    // File exists - but is there a redirect? If so, we want to flag this as an error
+                    if (redirected)
+                        nav_errors.push(`Navigation path [${key_no_hash}] is redirected, but path still exists.`);
+
+                    // Check file path case match
                     const true_file = trueCasePathSync(file_name).replace(source_path, '').replaceAll('\\', '/');
                     const relative_file = file_name.replace(source_path, '').replaceAll('\\', '/');
                     if (true_file !== relative_file) {
@@ -175,6 +193,33 @@
         return nav_errors;
     };
 
+    const checkRedirect = async function (source_path, nav_path) {
+        let response = {
+            exists: false,
+            error: null
+        }
+        if (redirects[nav_path]) {
+            response.exists = true;
+            if (redirects[nav_path].location) {
+                // We have a redirect, check if it's a valid location
+                let file_path = path.join(source_path, redirects[nav_path].location + '.html');
+                if (!fs.existsSync(file_path)) {
+                    file_path = path.join(source_path, redirects[nav_path].location + '.htm');
+                    if (!fs.existsSync(file_path)) {
+                        file_path = path.join(source_path, redirects[nav_path].location, 'index.html');
+                        if (!fs.existsSync(file_path)) {
+                            file_path = path.join(source_path, redirects[nav_path].location, 'index.htm');
+                            if (!fs.existsSync(file_path)) {
+                                response.error = `Redirect path for [${nav_path}] does not exist: ${redirects[nav_path].location}`;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return response;
+    }
+
     const checkLinks = async function (source_path, htmlFile, links, hdocbook_config) {
         for (let i = 0; i < links.length; i++) {
 
@@ -369,8 +414,9 @@
         return links;
     };
 
-    exports.run = async function (source_path, doc_id, verbose, hdocbook_config, hdocbook_project, nav_items, prod_families, prods_supported, gen_exclude) {
+    exports.run = async function (source_path, doc_id, verbose, hdocbook_config, hdocbook_project, nav_items, prod_families, prods_supported, gen_exclude, gen_redirects) {
         console.log(`Performing Validation and Building SEO Link List...`);
+        redirects = gen_redirects;
 
         // Get a list of HTML files in source_path
         dree.scan(source_path, dreeOptions, fileCallback);

package/package.json

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