unified merge functionality in a single function

ForkPoint · Nov 10, 2017 · 5882da6 · 5882da6
1 parent c010e07
commit 5882da6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "mergexml": "^1.1.2",
     "moment": "^2.18.1",
     "multimatch": "^2.1.0",
+    "pretty-data": "^0.40.0",
     "progress": "^1.1.8",
     "request": "^2.79.0",
     "request-debug": "^0.2.0",

diff --git a/src/davos.js b/src/davos.js
@@ -2,7 +2,7 @@
   'use strict';
 
   // Constants
-  const SITES_META_FOLDER = '/sites';
+  let SITES_META_FOLDER = '/sites';
   const META_FOLDER = "/meta";
 
   // Imports
@@ -29,6 +29,9 @@
       this.config = (Object.keys(this.ConfigManager.config).length === 0)
         ? this.ConfigManager.loadConfiguration().getActiveProfile(config)
         : this.ConfigManager.mergeConfiguration(config);
+
+      SITES_META_FOLDER = "/" + (this.config.metaDir || "sites");
+
       return this;
     }
 
@@ -578,7 +581,7 @@
           }
 
           let clone = node.cloneNode();
-          
+
           Array.from(node.childNodes).forEach(child => {
             let childClone;
 
@@ -624,15 +627,13 @@
       });
     }
 
-    mergeLibraries(pattern) {
-      const xdom = require("xmldom");
-      const x = require("xpath");
+    merge(pattern, out) {
       const xmlm = require("xmlappend");
 
       let currentRoot = (this.config.basePath || process.cwd()) + SITES_META_FOLDER;
       let dir;
 
-      return globby(currentRoot + pattern + "/*.xml").then(files => {
+      return globby(currentRoot + pattern).then(files => {
 
         return Promise.all(files.map(file => {
           dir = path.dirname(file);
@@ -643,28 +644,14 @@
                 return e(err);
               }
 
-              let document = new xdom.DOMParser().parseFromString(xml.toString().replace('xmlns="http://www.demandware.com/xml/impex/library/2006-10-31"', ''));
-              let nodes = x.select("//content", document);
-              let library = document.getElementsByTagName("library")[0];
-
-              if (!library) {
-                return e(new Error("Not a library"));
-              }
-
-              if (nodes.length > 1) {
-                Log.warn(chalk.yellow("Library " + file + " contains more than 1 content tag thus is considered a bundle and will be skipped"));
-
-                return r("");
-              }
-
               r(xml.toString());
             });
           });
         })).then(contents => {
 
           if (dir) {
             return new Promise((r, e) => {
-              fs.writeFile(dir + "/library.bundle.xml", xmlm(...contents.filter(c => !!c)), function (err) {
+              fs.writeFile(out || (dir + "/bundle.xml"), xmlm(...contents.filter(c => !!c)), function (err) {
                 err ? e(err) : r();
               });
             });