hdoc-tools 0.17.24 → 0.17.26

package/hdoc-build.js

@@ -13,9 +13,7 @@
         hdoc_build_db = require(path.join(__dirname, 'hdoc-build-db.js')),
         hdoc_build_pdf = require(path.join(__dirname, 'hdoc-build-pdf.js')),
         hdoc_index = require(path.join(__dirname, 'hdoc-db.js')),
-        {
-            zip
-        } = require('zip-a-folder'),
+        archiver = require('archiver'),
         xmlFormat = require('xml-formatter');
 
     const h_tags_to_search = ['h1', 'h2', 'h3'],
@@ -1049,7 +1047,19 @@
         if (!validate) {
             try {
                 const zip_path = path.join(work_path, doc_id + '.zip');
-                await zip(work_path_content, zip_path);
+
+                var output = fs.createWriteStream(zip_path);
+                var archive = archiver('zip');
+                archive.on('error', function(err){
+                    throw err;
+                });
+                archive.pipe(output);
+
+                // append files from a sub-directory, putting its contents at the root of archive
+                archive.directory(work_path_content, false);
+                archive.finalize();
+
+                //await zip(work_path_content, zip_path);
                 console.log(`\nZIP Creation Success: ${zip_path}\n`);
                 console.log('  Build Started:', build_start_dt);
                 console.log(`Build Completed: ${new Date().toLocaleString()}\n`);

package/hdoc-create.js

@@ -44,10 +44,14 @@
         let nav_paths = hdoc.build_breadcrumbs(hdocbook.navigation.items);
         for (const key in nav_paths) {
             if (nav_paths.hasOwnProperty(key)) {
-                for (let i = 0; i < nav_paths[key].length; i++) {
-                    if (!processed_links[nav_paths[key][i].link]) {
-                        nav_paths[key][i].path = path.join(source_path, nav_paths[key][i].link);
-                        await add_doc(nav_paths[key][i]);
+                for (const navkey in nav_paths[key]) {
+                    if (nav_paths[key].hasOwnProperty(navkey)) {
+                        for (let i = 0; i < nav_paths[key][navkey].length; i++) {
+                            if (!processed_links[nav_paths[key][navkey][i].link]) {
+                                nav_paths[key][navkey][i].path = path.join(source_path, nav_paths[key][navkey][i].link);
+                                await add_doc(nav_paths[key][navkey][i]);
+                            }
+                        }
                     }
                 }
             }

package/hdoc-init.js

@@ -86,6 +86,7 @@
             hdocbookFile.title = docProps.title;
             hdocbookFile.description = docProps.description;
             hdocbookFile.version = docProps.version;
+            hdocbookFile.publicSource = `https://github.com/Hornbill-Docs/${docProps.id}`;
             hdocbookFile.navigation.items[0].items = [{
                 "text": "Welcome",
                 "link": docProps.id + '/index'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.17.24",
+  "version": "0.17.26",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -36,6 +36,7 @@
   "license": "ISC",
   "dependencies": {
     "american-british-english-translator": "^0.2.1",
+    "archiver": "7.0.1",
     "axios": "^1.3.2",
     "axios-retry": "^3.5.0",
     "better-sqlite3": "^9.4.0",
@@ -59,7 +60,6 @@
     "stream": "0.0.2",
     "true-case-path": "^2.2.1",
     "words-count": "^2.0.2",
-    "xml-formatter": "^3.6.0",
-    "zip-a-folder": "^1.1.5"
+    "xml-formatter": "^3.6.0"
   }
 }