hdoc-tools 0.13.0 → 0.14.1

package/hdoc-build.js

@@ -268,15 +268,17 @@
             else
                 html_txt = `${fm_header_content}\n${doc_header}\n${html_txt}`;
 
-            index_records.push({
-                relative_path: file_path.relativePath,
-                index_html: hdoc_index.transform_html_for_index(html_txt),
-                metadata: metadata,
-                contributors: contribs,
-                pdf_size: pdf_size,
-                md5: file_path.hash,
-                lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
-            });
+            if (!inline_content) {
+                index_records.push({
+                    relative_path: file_path.relativePath,
+                    index_html: hdoc_index.transform_html_for_index(html_txt),
+                    metadata: metadata,
+                    contributors: contribs,
+                    pdf_size: pdf_size,
+                    md5: file_path.hash,
+                    lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
+                });
+            }
             // Save HTML into HTML file
             try {
                 fs.writeFileSync(file_path.path, html_txt);
@@ -508,16 +510,18 @@
                 console.log('Error writing:', target_file, '\n', err);
             }
 
-            const index_details = hdoc_index.transform_html_for_index(html_txt);
-            index_records.push({
-                relative_path: relative_path,
-                index_html: index_details,
-                metadata: metadata,
-                contributors: contribs,
-                pdf_size: pdf_size,
-                md5: file_path.hash,
-                lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
-            });
+            if (!inline_content) {
+                const index_details = hdoc_index.transform_html_for_index(html_txt);
+                index_records.push({
+                    relative_path: relative_path,
+                    index_html: index_details,
+                    metadata: metadata,
+                    contributors: contribs,
+                    pdf_size: pdf_size,
+                    md5: file_path.hash,
+                    lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
+                });
+            }
 
             // Add MD file to delete queue
             md_files_delete.push(file_path.path)

package/hdoc-serve.js

@@ -13,9 +13,10 @@
    let port = 3000;
    let docId;
    let hdocbook_config,
-      hdocbook_project;
+      hdocbook_project,
+      inline_content = {};
 
-   exports.run = async function (ui_path, source_path, md) {
+   exports.run = async function (ui_path, source_path) {
 
       for (let x = 0; x < process.argv.length; x++) {
          // First two arguments are command, and script
@@ -40,9 +41,6 @@
          return -1;
       }
 
-      // Get an express server instance   
-      var app = express();
-
       // In the root of the project there is a hdocbook.json file which includes
       // the id of the hdocbook we are working with
       const hdocbook_project_config_path = path.join(source_path, 'hdocbook-project.json');
@@ -53,6 +51,27 @@
       // Get the ID of the hdocbook we are serving
       docId = hdocbook_project.docId;
 
+      // Get inline content for nav
+      const inline_path = path.join(source_path, docId, '_inline');
+      let nav_inline = {};
+      if (fs.existsSync(inline_path)) {
+         const inline_files = fs.readdirSync(inline_path);
+         nav_inline = {
+            text: 'Inline Help Items',
+            expand: true,
+            inline: true,
+            items: []
+         };
+         inline_files.forEach(file => {
+            nav_inline.items.push({
+               text: file.replace(path.extname(file), ''),
+               link: `${docId}/_inline/${file.replace(path.extname(file), '')}`
+            });
+         });
+      }
+      // Get an express server instance   
+      var app = express();
+
       // Get the path of the book.json file
       const hdocbook_path = path.join(source_path, docId, 'hdocbook.json');
 
@@ -63,7 +82,8 @@
          let library = {
             books: [{
                docId: hdocbook_config.docId,
-               title: hdocbook_config.title
+               title: hdocbook_config.title,
+               nav_inline: nav_inline
             }]
          };
          res.setHeader('Content-Type', 'application/json');
@@ -222,7 +242,6 @@
                send_file(req, res, file_path);
                return true;
             }
-
             if (fs.existsSync(file_path.replace('.html', '.md'))) {
                if (transform_markdown_and_send_html(req, res, file_path.replace('.html', '.md'))) {
                   return;
@@ -258,6 +277,14 @@
                res.setHeader('Content-Type', 'text/html');
                send_content_file(req, res, path.join(file_path + '/index.html'));
                return;
+            } else if (fs.existsSync(path.join(file_path + '.html'))) {
+               res.setHeader('Content-Type', 'text/html');
+               send_content_file(req, res, path.join(file_path + '.html'));
+               return;
+            } else if (fs.existsSync(path.join(file_path + '.htm'))) {
+               res.setHeader('Content-Type', 'text/html');
+               send_content_file(req, res, path.join(file_path + '.htm'));
+               return;
             }
          } else if (fs.existsSync(file_path)) {
             send_file(req, res, file_path);

package/package.json

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