hdoc-tools 0.17.12 → 0.17.14

package/hdoc-build.js

@@ -533,7 +533,7 @@
             if (!bc[relative_path.replace('.html', '')] && bc[relative_path.replace('/index.html', '')]) {
                 relative_path = relative_path.replace('/index.html', '');
             }
-            
+
             index_records.push({
                 relative_path: relative_path,
                 index_html: hdoc_index.transform_html_for_index(html_txt),
@@ -624,7 +624,7 @@
                     let last_commit_date = fm_headers[i].value;
                     if (last_commit_date !== 'No Commit Date Available') {
                         last_commit_date = new Date(fm_headers[i].value).toDateString();
-                    } 
+                    }
                     wip_doc_header = wip_doc_header.replaceAll('{{last-update}}', last_commit_date);
                     break;
             }

package/hdoc-module.js

@@ -4,9 +4,11 @@
     const axios = require('axios'),
         axiosRetry = require('axios-retry'),
         cheerio = require('cheerio'),
+        fs = require('fs'),
         html2text = require('html-to-text'),
         https = require('https'),
         htmlentities = require('html-entities'),
+        path = require('path'),
         wordsCount = require('words-count').default;
 
     let includesCache = {},
@@ -106,6 +108,7 @@
             found: 0,
             success: 0,
             failed: 0,
+            included: [],
             errors: []
         };
 
@@ -129,37 +132,52 @@
                 continue;
             }
 
-            if (includesCache[link] !== undefined) {
+            if ((link.startsWith('http://') || link.startsWith('https://')) && includesCache[link] !== undefined) {
                 console.log(`Serving From Cache: ${link}`);
                 body = body.replace(include_value, includesCache[link]);
+                response.success++;
                 continue;
             }
 
             // Validate link in INCLUDE
-            try {
-                new URL(link);
-            } catch (err) {
-                response.failed++;
-                response.errors.push(`Error validating INCLUDE link [${link}] from [${file_path}]: ${e}`);
-                continue;
-            }
-
             let file_content;
-            try {
-                const file_response = await axios.get(link);
-                if (retried) {
-                    retried = false;
-                    console.log(`API call retry success!`);
+            if (link.startsWith('http://') || link.startsWith('https://')) {
+                // Remote content to include
+                try {
+                    new URL(link);
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error validating INCLUDE link [${link}] from [${file_path}]: ${e}`);
+                    continue;
                 }
-                if (file_response.status === 200) {
-                    file_content = file_response.data;
-                } else {
-                    throw `Unexpected Status ${file_response.status}`;
+    
+                try {
+                    const file_response = await axios.get(link);
+                    if (retried) {
+                        retried = false;
+                        console.log(`API call retry success!`);
+                    }
+                    if (file_response.status === 200) {
+                        file_content = file_response.data;
+                    } else {
+                        throw `Unexpected Status ${file_response.status}`;
+                    }
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error getting INCLUDE link content [${link}] from [${file_path}]: ${e}`);
+                    continue;
                 }
-            } catch (e) {
-                response.failed++;
-                response.errors.push(`Error getting INCLUDE link content [${link}] from [${file_path}]: ${e}`);
-                continue;
+                console.log(`Included From Remote Source: ${link}`);
+            } else {
+                // Local content to include
+                try {
+                    file_content = fs.readFileSync(path.join(process.cwd(), link), 'utf8');
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error getting INCLUDE file [${link}] from [${file_path}]: ${e}`);
+                    continue;
+                }
+                console.log(`Included From Local Source: ${link}`);
             }
             response.success++;
             includesCache[link] = file_content;

package/hdoc-serve.js

@@ -108,7 +108,7 @@
                   console.error(includes_processed.errors[i]);
                }
             } else {
-               if (includes_processed.found > 0) {
+               if (includes_processed.success > 0) {
                   console.log(`Includes injected into document: ${includes_processed.success}`);
                }
             }

package/package.json

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