hdoc-tools 0.9.33 → 0.9.35

package/hdoc-build-pdf.js

@@ -3,7 +3,6 @@
 
     const axios = require('axios'),
         cheerio = require('cheerio'),
-        dree = require('dree'),
         fs = require('fs-extra'),
         mime = require('mime-types'),
         path = require('path'),
@@ -102,8 +101,6 @@
     exports.generate_pdf = async function (browser, pdf_template_path, pdf_template_content, book_config, html_source, target_file, css_templates, verbose = false) {
         let pdf_size = 0;
     
-        //dree.scan(pdf_template_path, dree_options_css, file_callback_css);
-
         // Cache footer
         if (footer === '') footer = get_footer(pdf_template_path);
 

package/hdoc-build.js

@@ -41,6 +41,8 @@
         pdf_header_template = '',
         pdf_header_template_non_git = '',
         pdf_template = '',
+        prod_families = {},
+        prods_supported = [],
         doc_id = '',
         git_token = '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', // Github fine-grained personal access token that has minimum read-only access to Hornbill Docs org repo content
         hdocbook_config = {},
@@ -628,6 +630,16 @@
 
         if (hdocbook_config.publicSource.endsWith('.git')) hdocbook_config.publicSource = hdocbook_config.publicSource.substring(0, hdocbook_config.publicSource.length - 4);
 
+        console.log(`Loading product families...`);
+        const prods = await hdoc.load_product_families();
+        if (!prods.success) {
+            console.log(`ERROR: Failed to load product families: ${prods.errors}\n`);
+            process.exit(1);
+        } else {
+            prod_families = prods.prod_families;
+            prods_supported = prods.prods_supported;
+        }
+
         console.log('Caching CSS for PDF generation...');
         const css_files = [
             path.join(pdf_template_path, 'css', 'custom-block.css'),
@@ -725,7 +737,7 @@
         for (let i = 0; i < md_files.length; i++) {
             mdPromiseArray.push(md_files[i]);
         }
-        const chunkSize = 10;
+        const chunkSize = 4;
         for (let i = 0; i < mdPromiseArray.length; i += chunkSize) {
             const chunk = mdPromiseArray.slice(i, i + chunkSize);
             // do whatever
@@ -767,7 +779,7 @@
         }
 
         // Validate content
-        const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc);
+        const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc, prod_families, prods_supported);
         if (!validation_success) {
             const end_time = Date.now();
             console.log(`\nTime Taken: ${get_duration(start_time, end_time)}\n`);

package/hdoc-module.js

@@ -4,9 +4,13 @@
     const axios = require('axios'),
         cheerio = require('cheerio'),
         html2text = require('html-to-text'),
+        https = require('https'),
         wordsCount = require('words-count').default;
 
-    let includesCache = {};
+    let includesCache = {},
+        agent = new https.Agent({
+            rejectUnauthorized: false
+        });
 
     exports.content_type_for_ext = function (ext) {
         switch (ext) {
@@ -394,4 +398,32 @@
         }
         return bc;
     };
+
+    exports.load_product_families = async function () {
+        let response = {
+            success: false,
+            prod_families: {},
+            prods_supported: [],
+            errors: ''
+        };
+        
+        try {
+            const prods = await axios.get('https://docs.hornbill.com/_books/products.json', {
+                httpsAgent: agent
+            });
+            if (prods.status === 200) {
+                response.prod_families = prods.data;
+                response.prods_supported = [];
+                for (let i = 0; i < response.prod_families.products.length; i++) {
+                    response.prods_supported.push(response.prod_families.products[i].id);
+                }
+                response.success = true;
+            } else {
+                throw `Unexpected Status ${prods.status}`;
+            }
+        } catch (e) {
+            response.errors = (`Error returning product families: ${e}`);
+        }
+        return response;
+    };
 })();

package/hdoc-validate.js

@@ -5,24 +5,17 @@
         cheerio = require('cheerio'),
         dree = require('dree'),
         fs = require('fs'),
-        https = require('https'),
         path = require('path'),
         hdoc = require(path.join(__dirname, 'hdoc-module.js')),
         translator = require('american-british-english-translator'),
         { trueCasePathSync } = require('true-case-path');
 
-    const agent = new https.Agent({
-            rejectUnauthorized: false
-        }),
-        spellcheck_options = {
+    const spellcheck_options = {
             british: true,
             spelling: true
         },
         regex_nav_paths = /[a-z0-9-\/]+/g;
 
-    let prod_families = {},
-        prods_supported = [];
-
     let errors = {},
         messages = {},
         warnings = {},
@@ -32,26 +25,6 @@
         exclude_spellcheck = {},
         exclude_h1_count = {};
 
-    const load_product_families = async function () {
-        try {
-            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++) {
-                    prods_supported.push(prod_families.products[i].id);
-                }
-            } else {
-                throw `Unexpected Status ${prods.status}`;
-            }
-        } catch (e) {
-            console.log(`Error returning product families: ${e}`);
-            return false;
-        }
-        return true;
-    };
-
     const spellcheckContent = async function (sourceFile, excludes) {
         const text = fs.readFileSync(sourceFile.path, 'utf8');
         const source_path = sourceFile.relativePath.replace('.' + sourceFile.extension, '');
@@ -344,12 +317,9 @@
         return links;
     };
 
-    exports.run = async function (source_path, doc_id, verbose, hdocbook_config, hdocbook_project, nav_items) {
+    exports.run = async function (source_path, doc_id, verbose, hdocbook_config, hdocbook_project, nav_items, prod_families, prods_supported) {
         console.log(`Performing Validation and Building SEO Link List...`);
-
-        // Load product families
-        await load_product_families();
-
+        
         // 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.9.33",
+  "version": "0.9.35",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {