hdoc-tools 0.7.5 → 0.7.7

package/hdoc-stats.js

@@ -8,7 +8,6 @@
     const path = require('path');
     const dree = require('dree');
     const html2text = require('html-to-text');
-    const { markdownToTxt } = require('markdown-to-txt');
     const wordsCount = require('words-count').default;  
     
     // Regex to remove Hornbill-specific tags 
@@ -21,32 +20,19 @@
         mdFiles: {},
         staticHTMLFiles: {} 
     };
-    // File callback for scan
+
+    let markdownFiles = [];
+
+    // File callback for scan 
     const fileCallback = function(element) {
         if (element.extension === 'md' ) {
-            
-            // Read markdown file as string
-            const md = fs.readFileSync(element.path, 'utf8');
-            
-            // Strip out standard MD tags
-            let text = markdownToTxt(md);
-            
-            // Strip out any Hornbill Docs specific markdown tags 
-            text = text.replaceAll(hbMDTagRegex, '');
-            
-            // Do the wordcount and add to status
-            const wordCount = wordsCount(text);
-            stats.totalWordCount += wordCount;
-            stats.mdFiles[element.relativePath] = {
-                wordCount: wordCount,
-                sizeInBytes: element.sizeInBytes
-            };
+            markdownFiles.push(element);
             stats.totalMDFiles++;
         } else {
             // file must be html
             const mdFilePath = element.path.slice(0, element.path.lastIndexOf('.')) + '.md';
+            //Do we have a matching MD file - if not, then word count the HTML
             if (!fs.existsSync(mdFilePath)) {
-                //Do we have a matching MD file - if not, then word count the HTML
                 stats.totalStaticHTMLFiles++;
                 const html = fs.readFileSync(element.path, 'utf8');
                 const text = html2text.convert(html, {
@@ -120,7 +106,25 @@
 
             // Scan content path directory, send file info to callback for processing
             dree.scan(bookPath, dreeOptions, fileCallback);
-            
+            markdownFiles.forEach(function(element){
+                // Load markdown file
+                let md_txt = fs.readFileSync(element.path, 'utf8');
+
+                // Render markdown into HTML
+                var html_txt = md.render(md_txt.toString());
+                const text = html2text.convert(html_txt, {
+                    wordwrap: null
+                });
+                
+                // Do the wordcount and add to status
+                const wordCount = wordsCount(text);
+                stats.totalWordCount += wordCount;
+                stats.mdFiles[element.relativePath] = {
+                    wordCount: wordCount,
+                    sizeInBytes: element.sizeInBytes
+                };
+            });
+
             if (verbose) {
                 // Output verbose stats 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -33,11 +33,9 @@
     "highlight.js": "^11.6.0",
     "html-to-text": "^8.2.1",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
     "markdown-it-front-matter": "^0.2.3",
-    "markdown-to-txt": "^2.0.1",
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
     "stream": "0.0.2",

package/ui/index.html

@@ -21,7 +21,7 @@
     <style>
         .hb-hidden
         {
-            visibility:hidden;
+            visibility:hidden !important;
         }
 
     </style>
@@ -155,10 +155,10 @@
         </div>
 
         <!-- 100% horizontal col below toolbar and auto adjust vertical to take rest of avail height -->
-        <div class="main-layout hb-container-horizontal hb-container-expand">
+        <div class="main-layout hb-container-horizontal hb-container-expand hb-hidden">
 
             <!-- the left hand nav col -->
-            <aside class="DocSidebar hb-container-vertical">
+            <aside class="DocSidebar hb-container-vertical hb-hidden">
 
                 <nav class="nav hb-container-expand" id="DocSidebarNav" aria-labelledby="sidebar-aria-label" tabindex="-1">
                     <div v-for="(navSection,index) in docApp.navSections"  v-bind:class="{'group':navSection.items, 'nogrouplink':!navSection.items}">

package/ui/js/doc.hornbill.js

@@ -491,24 +491,29 @@ async function intialiseApp() {
             //-- now render out the nav menu
             view.renderNavigation();
     
-            $("#vDocDevApp").removeClass("hb-hidden");
     
             setTimeout(function()
-            {
+            {               
                 listenForHrefClicks();
     
                 //-- check if url is not root - in which case we need to load content for url
                 var initialLoadContentHref = window.location.href.replace(window.location.origin+"/","");
                 initialLoadContentHref = findFirstClickableBookLink(initialLoadContentHref);
+                
                 if(initialLoadContentHref)
                 {
                     //-- find the link we are going to show and make sure parent/s are set to .expand=true
                     loadContentUrl(initialLoadContentHref,true,false);
+                
+    
                 }
                 else
                 {
                     console.log("initial first view link to laod is not present");
                 }
+
+                $(".hb-hidden").removeClass("hb-hidden");
+                
             },200);
         });
     });