hdoc-tools 0.9.17 → 0.9.19

package/README.md

@@ -41,13 +41,15 @@ If the -v switch is provided, then more verbose output is output, which includes
 
 Performs a local build of the book, validates the links and static content are present and correct and outputs as a ZIP file.
 
-If the -v switch is provided, then more verbose output is provided, which includes a list of all HTML files created and checked for embedded links and static content.
+If the -v switch is provided, then a more verbose output is provided, which includes a list of all HTML files created and checked for embedded links and static content.
 
-### build
+Use the --set-version argument to set the version number of the built book.
+
+### validate
 
 Performs a minimum local build of the book, then validates the links and static content are present and correct.
 
-If the -v switch is provided, then more verbose output is provided, which includes a list of all HTML files created and checked for embedded links and static content.
+If the -v switch is provided, then a more verbose output is provided, which includes a list of all HTML files created and checked for embedded links and static content.
 
 Use the --set-version argument to set the version number of the built book.
 

package/hdoc-build-pdf.js

@@ -7,7 +7,6 @@
         fs = require('fs-extra'),
         mime = require('mime-types'),
         path = require('path'),
-        puppeteer = require('puppeteer'),
         hdoc = require(path.join(__dirname, 'hdoc-module.js'));
 
     const dree_options = {
@@ -99,7 +98,7 @@
         return html_source;
     };
 
-    exports.generate_pdf = async function (pdf_template_path, pdf_template_content, book_config, html_source, target_file, verbose = false) {
+    exports.generate_pdf = async function (browser, pdf_template_path, pdf_template_content, book_config, html_source, target_file, verbose = false) {
         if (verbose) console.log(`Generating PDF: ${target_file}`);
         let pdf_size = 0;
         // Cache footer
@@ -120,9 +119,6 @@
 
         html_source = pdf_template_content.replace('{{book_title}}', book_config.title).replace('{{document_content}}', html_source).replace('{{hb_logo}}', hb_logo);
 
-        // Create a browser instance
-        const browser = await puppeteer.launch();
-
         // Create a new page
         const page = await browser.newPage();
 
@@ -166,9 +162,7 @@
         } catch (err) {
             console.log(`Error generating PDF ${target_file} - ${err}`);
         }
-
-        // Close the browser instance
-        await browser.close();
+        await page.close();
         return pdf_size;
     };
 })();

package/hdoc-build.js

@@ -6,6 +6,7 @@
         fs = require('fs-extra'),
         mdfm = require('markdown-it-front-matter'),
         path = require('path'),
+        puppeteer = require('puppeteer'),
         URL = require("url").URL,
         hdoc_validate = require(path.join(__dirname, 'hdoc-validate.js')),
         hdoc = require(path.join(__dirname, 'hdoc-module.js')),
@@ -26,8 +27,9 @@
         regex_version = /^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,6}$/;
 
     let bc = {}, // Breadcrumbs map
-        book_read_time = 0,
         built_file_hashes = [],
+        book_read_time = 0,
+        browser = {},
         conversion_attempted = 0,
         conversion_success = 0,
         conversion_failed = 0,
@@ -238,7 +240,7 @@
 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(browser, pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
 
             html_txt = `${fm_header_content}\n${doc_header}\n${html_txt}`;
@@ -448,7 +450,7 @@
 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(browser, pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
 
             html_txt = `${fm_header}\n${doc_header}\n${html_txt}`;
@@ -572,6 +574,7 @@
         }
         verbose = verbose_output;
 
+        const start_time = Date.now();
         // GERRY: The purpose of this function is to create a zip file containing the hdocbook content, 
         // * Create a _work folder 
         // * copy the hdocbook content to the work folder
@@ -688,6 +691,11 @@
         // Get a list of MD files in work_path
         dree.scan(work_path, dreeOptions, build_file_callback);
 
+        if (pdf_enable) {
+            // Create a Chromium browser instance to generate PDFs with
+            browser = await puppeteer.launch({headless: 'new'});
+        }
+
         // Work through MD files and convert to HTML
         for (let i = 0; i < md_files.length; i++) {
             await transform_markdown_and_save_html(md_files[i]);
@@ -698,6 +706,11 @@
             await transform_static_html(static_html_files[i]);
         }
 
+        if (pdf_enable) {
+            // Close the Chromium browser instance
+            await browser.close();
+        }
+
         // Output to console
         console.log(`                MD files found: ${conversion_attempted}`);
         console.log(`Successfully converted to HTML: ${conversion_success}`);
@@ -710,6 +723,8 @@
         // Validate content
         const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc);
         if (!validation_success) {
+            const end_time = Date.now();
+            console.log(`\nTime Taken: ${get_duration(start_time, end_time)}\n`);
             process.exit(1);
         }
 
@@ -722,9 +737,10 @@
                 console.log(`Error deleting ${md_files_delete[i]}: ${e}`);
             }
         }
-
+    
         // Add book read timing to the hdocbook.json
         hdocbook_config.readingTime = Math.ceil(book_read_time + ((book_read_time / 100) * 10));
+        hdocbook_config.navigation.items = hdoc.strip_drafts(hdocbook_config.navigation.items);
         try {
             fs.writeFileSync(work_hdocbook_path, JSON.stringify(hdocbook_config, null, 2));
             console.log('\nhdocbook.json update success:', work_hdocbook_path);
@@ -761,5 +777,21 @@
         } else {
             console.log('\nValidation Complete\n');
         }
+        const end_time = Date.now();
+        console.log(`Time Taken: ${get_duration(start_time, end_time)}\n`);
     };
+
+    const get_duration = function(start, end) {
+        const total_time = new Date(end - start).toISOString().slice(11,19);
+        const duration_arr = total_time.split(':');
+        let duration = '';
+        if (parseInt(duration_arr[0], 10) > 0) {
+            duration += parseInt(duration_arr[0], 10) + 'h ';
+        }
+        if (duration !== '' || parseInt(duration_arr[1], 10)) {
+            duration += parseInt(duration_arr[1], 10) + 'm ';
+        }
+        duration += parseInt(duration_arr[2], 10) + 's';
+        return duration;
+    }
 })();

package/hdoc-module.js

@@ -290,7 +290,22 @@
         return response;
     };
 
-    
+    exports.strip_drafts = function (nav_items) {
+        let return_nav = nav_items;
+        recurse_nav(return_nav);
+        return return_nav;
+    };
+    const recurse_nav = function(nav_items) {
+        for (const key in nav_items) {
+            if (nav_items[key].draft) {
+                nav_items.splice(key, 1);
+                recurse_nav(nav_items);
+            } else if (nav_items[key].items) {
+                recurse_nav(nav_items[key].items);
+            }
+        }
+    };
+
     exports.build_breadcrumbs = function (nav_items) {
         let bc = {};
         // Steve - need to rework this to use recursion, as it's hard-coded for a maximum of 4 levels deep right now
@@ -379,5 +394,4 @@
         }
         return bc;
     };
-
 })();

package/hdoc-validate.js

@@ -1,3 +1,7 @@
+const {
+    file
+} = require('jszip');
+
 (function () {
     'use strict';
 
@@ -8,17 +12,18 @@
         https = require('https'),
         path = require('path'),
         hdoc = require(path.join(__dirname, 'hdoc-module.js')),
-        translator = require('american-british-english-translator');
-
-    const   agent = new https.Agent({  
-                rejectUnauthorized: false
-            }),
-            spellcheck_options = {
-                british: true,
-                spelling: true
-            },
-            regex_nav_paths = /[a-z0-9-\/]+/g;
-    
+        translator = require('american-british-english-translator'),
+        { trueCasePathSync } = require('true-case-path');
+
+    const agent = new https.Agent({
+            rejectUnauthorized: false
+        }),
+        spellcheck_options = {
+            british: true,
+            spelling: true
+        },
+        regex_nav_paths = /[a-z0-9-\/]+/g;
+
     let prod_families = {},
         prods_supported = [];
 
@@ -31,9 +36,11 @@
         exclude_links = {},
         exclude_spellcheck = {};
 
-    const load_product_families = async function() {
+    const load_product_families = async function () {
         try {
-            const prods = await axios.get('https://docs.hornbill.com/_books/products.json', { httpsAgent: agent });
+            const prods = await axios.get('https://docs.hornbill.com/_books/products.json', {
+                httpsAgent: agent
+            });
             if (prods.status === 200) {
                 prod_families = prods.data;
                 for (let i = 0; i < prod_families.products.length; i++) {
@@ -51,9 +58,9 @@
 
     const spellcheckContent = async function (sourceFile, excludes) {
         const text = fs.readFileSync(sourceFile.path, 'utf8');
-        const source_path = sourceFile.relativePath.replace('.'+sourceFile.extension, '');
+        const source_path = sourceFile.relativePath.replace('.' + sourceFile.extension, '');
         const translate_output = translator.translate(text, spellcheck_options);
-        if(Object.keys(translate_output).length){
+        if (Object.keys(translate_output).length) {
 
             for (const key in translate_output) {
                 if (translate_output.hasOwnProperty(key)) {
@@ -70,11 +77,11 @@
                         }
                     }
                 }
-            }      
+            }
         }
     };
 
-    const checkNavigation = async function (doc_id, flat_nav) {
+    const checkNavigation = async function (source_path, flat_nav) {
         let nav_errors = [];
         for (const key in flat_nav) {
             if (flat_nav.hasOwnProperty(key)) {
@@ -82,15 +89,33 @@
                 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('] [')}]`);
-                } 
-                
-                //Validate path
+                }
+
+                // 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');
+                if (!fs.existsSync(file_name)) {
+                    file_name = path.join(source_path, key + '.htm');
+                    if (!fs.existsSync(file_name)) {
+                        file_exists = false;
+                        nav_errors.push(`Navigation path [${key}] file does not exist.`);
+                    }
+                }
+
+                if (file_exists) {
+                    const true_file = trueCasePathSync(file_name);
+                    if (true_file !== file_name) {
+                        nav_errors.push(`Navigation path [${key}] does not match filename case [${path.basename(true_file)}].`);
+                    }
+                }
+
+                // Validate path
                 const paths = key.split('/');
                 for (let i = 0; i < paths.length; i++) {
                     const path_words = paths[i].split('-');
                     for (let j = 0; j < path_words.length; j++) {
                         const translate_output = translator.translate(path_words[j], spellcheck_options);
-                        if(Object.keys(translate_output).length){
+                        if (Object.keys(translate_output).length) {
                             for (const spell_val in translate_output) {
                                 if (translate_output.hasOwnProperty(spell_val)) {
                                     for (const spelling in translate_output[spell_val][0]) {
@@ -108,7 +133,7 @@
                 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);
-                        if(Object.keys(translate_output).length){
+                        if (Object.keys(translate_output).length) {
                             for (const spell_val in translate_output) {
                                 if (translate_output.hasOwnProperty(spell_val)) {
                                     for (let j = 0; j < translate_output[spell_val].length; j++) {
@@ -163,7 +188,9 @@
                 }
 
                 try {
-                    await axios.get(links[i], { httpsAgent: agent });
+                    await axios.get(links[i], {
+                        httpsAgent: agent
+                    });
                     messages[htmlFile.relativePath].push(`Link is a valid external URL: ${links[i]}`);
                 } catch (e) {
                     // Handle errors
@@ -197,15 +224,17 @@
     const checkTags = async function (htmlFile) {
         const htmlBody = fs.readFileSync(htmlFile.path, 'utf8');
         const $ = cheerio.load(htmlBody);
-        
+
         const h1_tags = $('h1').map(function () {
             return $(this);
         }).get();
+
         if (h1_tags.length && h1_tags.length > 1) {
+            //console.log("PATH: ", htmlFile.path); //hdoc-guide/hdocbook/markdown.html
             let error_msg = `${h1_tags.length} <h1> tags found in content: `;
             for (let i = 0; i < h1_tags.length; i++) {
-                error_msg  += h1_tags[i].text();
-                if (i <  h1_tags.length - 1) error_msg += '; ';
+                error_msg += h1_tags[i].text();
+                if (i < h1_tags.length - 1) error_msg += '; ';
             }
             errors[htmlFile.relativePath].push(error_msg);
         }
@@ -214,7 +243,7 @@
     const dreeOptions = {
         descendants: true,
         depth: 10,
-        extensions: ['htm', 'html','md'],
+        extensions: ['htm', 'html', 'md'],
         hash: false,
         normalize: true,
         size: false,
@@ -324,7 +353,7 @@
         for (let i = 0; i < prod_families.products.length; i++) {
             if (prod_families.products[i].id === hdocbook_config.productFamily) {
                 valid_product = true;
-            } 
+            }
         }
         if (!valid_product) {
             let val_prod_error = `Incorrect productFamily: ${hdocbook_config.productFamily}. Supported values:`;
@@ -332,18 +361,17 @@
                 val_prod_error += `\n  - ${prods_supported[i]}`
             }
             meta_errors.push(val_prod_error)
-            
+
         }
 
         // Check navigation spellings
-        const nav_errors = await checkNavigation(doc_id, nav_items);
+        const nav_errors = await checkNavigation(source_path, nav_items);
         if (nav_errors.length > 0) meta_errors.push(...nav_errors);
 
         if (meta_errors.length > 0) {
             console.log('\r\n-----------------------');
             console.log('   Validation Output   ');
             console.log('-----------------------');
-            console.log()
             console.log(`\r\n${meta_errors.length} Validation Errors Found\r\n`);
             for (let i = 0; i < meta_errors.length; i++) {
                 console.log(`- ${meta_errors[i]}`);
@@ -353,12 +381,12 @@
 
         if (hdocbook_project.validation) {
             if (hdocbook_project.validation.exclude_links && hdocbook_project.validation.exclude_links instanceof Array) {
-                hdocbook_project.validation.exclude_links.forEach(function(excl_link) {
-                   exclude_links[excl_link] = true;
-               });
+                hdocbook_project.validation.exclude_links.forEach(function (excl_link) {
+                    exclude_links[excl_link] = true;
+                });
             }
             if (hdocbook_project.validation.exclude_spellcheck && hdocbook_project.validation.exclude_spellcheck instanceof Array) {
-                hdocbook_project.validation.exclude_spellcheck.forEach(function(excl_sc) {
+                hdocbook_project.validation.exclude_spellcheck.forEach(function (excl_sc) {
                     exclude_spellcheck[excl_sc.document_path] = excl_sc.words;
                 });
             }
@@ -437,21 +465,20 @@
         console.log('\r\n-----------------------');
         console.log('   Validation Output   ');
         console.log('-----------------------');
-
-        for (const key in errors) {
-            if (errors.hasOwnProperty(key) && errors[key].length > 0) {
-                console.log(`\r\n${errors[key].length} error(s) in ${key}`);
-                for (let i = 0; i < errors[key].length; i++) {
-                    console.log(` - ${errors[key][i]}`);
-                    errorcount++;
-                }
-            }
-        }
-
         if (errorcount > 0) {
             console.log(`\r\n${errorcount} Validation Errors Found\r\n`);
+            for (const key in errors) {
+                if (errors.hasOwnProperty(key) && errors[key].length > 0) {
+                    console.log(`\r\n${errors[key].length} error(s) in ${key}`);
+                    for (let i = 0; i < errors[key].length; i++) {
+                        console.log(` - ${errors[key][i]}`);
+                        errorcount++;
+                    }
+                }
+            }
             return false;
         }
+
         console.log(`\r\nNo Validation Errors Found!\r\n`);
         return true;
     };

package/hdoc.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 (async function () {
    'use strict';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.9.17",
+  "version": "0.9.19",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -50,8 +50,9 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
-    "puppeteer": "^19.6.0",
+    "puppeteer": "^19.8.0",
     "stream": "0.0.2",
+    "true-case-path": "^2.2.1",
     "words-count": "^2.0.2",
     "zip-a-folder": "^1.1.5"
   }