hdoc-tools 0.17.15 → 0.17.17

package/README.md

@@ -37,6 +37,8 @@ Returns statistics regarding the book you are working on:
 
 If the -v switch is provided, then more verbose output is output, which includes a list of each MD and HTML file found, the file sizes, and file-specific word count.
 
+The book statistics do not include counts for any externally hosted content injected into the book content using the [[INCLUDE]] tags.
+
 ### build
 
 Performs a local build of the book, validates the links and static content are present and correct and outputs as a ZIP file.

package/hdoc-build.js

@@ -307,7 +307,7 @@
             let md_txt = hdoc.expand_variables(fs.readFileSync(file_path.path, 'utf8'));
 
             // Pull in external includes
-            const includes_processed = await hdoc.process_includes(file_path.path, md_txt);
+            const includes_processed = await hdoc.process_includes(file_path.path, md_txt, global_source_path);
             md_txt = includes_processed.body.toString();
             includes_found += includes_processed.found;
             includes_success += includes_processed.success;

package/hdoc-help.js

@@ -27,7 +27,8 @@ Commands
     Starts a local web server on port 3000, serving the content. Supports a -port N to use a different port
 
  - stats
-    Returns statistics regarding the book you are working on. Supports a -v switch for verbose output
+    Returns statistics regarding the book you are working on. Supports a -v switch for verbose output.
+    The book statistics do not include counts for any externally hosted content injected into the book content using the [[INCLUDE]] tags.
 
  - validate
     Validates the book content

package/hdoc-module.js

@@ -102,7 +102,7 @@
     };
 
 
-    exports.process_includes = async function (file_path, body) {
+    exports.process_includes = async function (file_path, body, source_path) {
         let response = {
             body: '',
             found: 0,
@@ -171,7 +171,7 @@
             } else {
                 // Local content to include
                 try {
-                    file_content = fs.readFileSync(path.join(process.cwd(), link), 'utf8');
+                    file_content = fs.readFileSync(path.join(source_path, link), 'utf8');
                 } catch (e) {
                     response.failed++;
                     response.errors.push(`Error getting INCLUDE file [${link}] from [${file_path}]: ${e}`);

package/hdoc-serve.js

@@ -14,10 +14,12 @@
    let docId;
    let hdocbook_config,
       hdocbook_project,
-      inline_content = {};
+      inline_content = {},
+      global_source_path = '';
 
    exports.run = async function (ui_path, source_path) {
 
+      global_source_path = source_path;
       for (let x = 0; x < process.argv.length; x++) {
          // First two arguments are command, and script
          if (x == 0 || x == 1)
@@ -100,7 +102,7 @@
             let md_txt = hdoc.expand_variables(fs.readFileSync(file_path).toString(), docId);
 
             // Pull in external includes
-            const includes_processed = await hdoc.process_includes(file_path, md_txt);
+            const includes_processed = await hdoc.process_includes(file_path, md_txt, global_source_path);
             md_txt = includes_processed.body;
             if (includes_processed.errors && includes_processed.errors.length > 0) {
                console.error(`Error(s) when processing includes in ${file_path}`);

package/package.json

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