@tangelo/tangelo-configuration-toolkit 1.11.2 → 1.12.1

package/src/lib/gulp-batch-replace-with-filter.js

@@ -1,19 +1,19 @@
-// based on gulp-batch-replace
-
-const es = require('event-stream'), minimatch = require("minimatch"), istextorbinary = require('istextorbinary');
-
-const execReplace = (c, s, r) => Buffer.from(s instanceof RegExp ? String(c).replace(s,r) : String(c).split(s).join(r));
-
-module.exports = (arr) => {
-  return es.map((file, callback) => {
-    if(file.contents instanceof Buffer) {
-      arr.forEach(e => {
-        // exec if no glob is passed or if glob matches, and it's a text file
-        if ((!e[2] || minimatch(file.path,e[2])) && istextorbinary.isText(file.path,file)) {
-          file.contents = execReplace(file.contents, e[0], e[1]);
-        }
-      });
-    }
-    callback(null,file);
-  });
-};
+// based on gulp-batch-replace
+
+const es = require('event-stream'), minimatch = require('minimatch'), istextorbinary = require('istextorbinary');
+
+const execReplace = (c, s, r) => Buffer.from(s instanceof RegExp ? String(c).replace(s, r) : String(c).split(s).join(r));
+
+module.exports = (arr) => {
+  return es.map((file, callback) => {
+    if(file.contents instanceof Buffer) {
+      arr.forEach(e => {
+        // exec if no glob is passed or if glob matches, and it's a text file
+        if ((!e[2] || minimatch(file.path, e[2])) && istextorbinary.isText(file.path, file)) {
+          file.contents = execReplace(file.contents, e[0], e[1]);
+        }
+      });
+    }
+    callback(null, file);
+  });
+};

package/src/lib/gulp-resolve-includes.js

@@ -13,17 +13,17 @@ const resolveImports = (fp, file) => {
       const xiPath = g1.includes('cmscustom') ? g1.replace('#{cmscustompath}', cmscustompath) : path.resolve(fp.dir, g1);
       const xiFile =
         fs.readFileSync(xiPath).toString()
-        .replace(/[\s\S]*?<x:config[^>]*>([\s\S]*?)<\/x:config>/, '$1')                 // only return contents of x:config element
-        .replace(/<(\w+)\/>/g, '<$1></$1>')                                             // self-closing html tags can cause problems
-        .replace(/url="(\.\.\/)+pls\//g, 'url="#{plsservlet}')                          // replace relative references to plsservlet by bind (4.1 compatibility)
-        .replace(/url="(\.\.\/)+/g, 'url="#{cmspath}')                                  // replace relative references to cmspath by bind (4.1 compatibility)
-        .replace(/(<x:javascript\s+src=")([^#].*?)("\s*\/>)/g, (match, g1, g2, g3) => { // correct all javascript refs to paths relative to cmscustompath bind
-          const newPath = path.resolve(fp.dir, path.resolve(path.dirname(xiPath), g2))
-            .replace(/.*cmscustom./, '#{cmscustompath}')
-            .replace(/\\/g, '/')
+          .replace(/[\s\S]*?<x:config[^>]*>([\s\S]*?)<\/x:config>/, '$1')                 // only return contents of x:config element
+          .replace(/<(\w+)\/>/g, '<$1></$1>')                                             // self-closing html tags can cause problems
+          .replace(/url="(\.\.\/)+pls\//g, 'url="#{plsservlet}')                          // replace relative references to plsservlet by bind (4.1 compatibility)
+          .replace(/url="(\.\.\/)+/g, 'url="#{cmspath}')                                  // replace relative references to cmspath by bind (4.1 compatibility)
+          .replace(/(<x:javascript\s+src=")([^#].*?)("\s*\/>)/g, (match, g1, g2, g3) => { // correct all javascript refs to paths relative to cmscustompath bind
+            const newPath = path.resolve(fp.dir, path.resolve(path.dirname(xiPath), g2))
+              .replace(/.*cmscustom./, '#{cmscustompath}')
+              .replace(/\\/g, '/')
           ;
-          return [g1, newPath, g3].join('');
-        })
+            return [g1, newPath, g3].join('');
+          })
       ;
       return resolveImports(path.parse(xiPath), xiFile);
     });
@@ -34,7 +34,7 @@ const resolveImports = (fp, file) => {
 
 const resolveIncludes = (fp, file) => {
   const rootEl = fp.ext=='.xsd' ? 'xs:schema' : 'xsl:stylesheet';
-  const rootRe = RegExp('[\\s\\S]*?<'+rootEl+'[^>]*>([\\s\\S]*?)<\/'+rootEl+'>');
+  const rootRe = RegExp('[\\s\\S]*?<'+rootEl+'[^>]*>([\\s\\S]*?)</'+rootEl+'>');
 
   let fileNew = file.replace(/<!--(?:(?!-->)[\s\S])*?-->/g, ''); // first remove all comments (so disabled includes are not resolved)
 
@@ -47,8 +47,8 @@ const resolveIncludes = (fp, file) => {
       const xiPath = path.resolve(fp.dir, g1);
       try {
         const xiFile = fs.readFileSync(xiPath).toString() // get file
-                       .replace(rootRe, '$1')             // return contents of root element
-                       .replace(/<\/?xs:any[^>]*>/g, '')  // remove xs:any(Attribute) elements (causes error in xopus if in root file) (4.1 compatibility)
+          .replace(rootRe, '$1')             // return contents of root element
+          .replace(/<\/?xs:any[^>]*>/g, '')  // remove xs:any(Attribute) elements (causes error in xopus if in root file) (4.1 compatibility)
         ;
         return resolveIncludes(path.parse(xiPath), xiFile);
       }
@@ -61,7 +61,7 @@ const resolveIncludes = (fp, file) => {
   return fileNew;
 };
 
-module.exports = (arr) => {
+module.exports = () => {
   return es.map((file, callback) => {
     const fp = path.parse(file.path);
 

package/src/lib/gulp-sftp.js

@@ -29,33 +29,33 @@ module.exports = function(ftpConfig, remotedir) {
       ;
 
       sftp.connect(ftpConfig)
-      .then(() => Promise.all(paths.map(p => parallel( // check if all directories exist
-        () => sftp.exists(p).then(r => {
-          if (!!r) paths.splice(paths.indexOf(p), 1) // if exists, remove from paths
+        .then(() => Promise.all(paths.map(p => parallel( // check if all directories exist
+          () => sftp.exists(p).then(r => {
+            if (r) paths.splice(paths.indexOf(p), 1); // if exists, remove from paths
+          })
+        ))))
+        .then(() => Promise.all(paths.map(p => serial( // create directories that do not exist, which cannot be done parallel
+          () => {
+            _write(p.replace(remotedir, '').lblack);
+            return sftp.mkdir(p, true).catch(err => _warn(err));
+          }
+        ))))
+        .then(() => Promise.all(files.map(file => parallel( // upload files
+          () => {
+            ftpConfig.eventPut(file);
+            return ( // use fastPut for files larger than 3mb; since it requires a local path we assume these files are not changed in the gulp pipeline
+              file.contents.length > 3000000 ? sftp.fastPut(file.originalRelativePath, file.destination) : sftp.put(file.contents, file.destination)
+            ).catch(err => _warn(`File transfer failed${err ? ': '+err : ''}`));
+          }
+        ))))
+        .then(() => {
+          _info(`${files.length} file(s) transferred`);
+          cb();
+          return sftp.end();
         })
-      ))))
-      .then(() => Promise.all(paths.map(p => serial( // create directories that do not exist, which cannot be done parallel
-        () => {
-          _write(p.replace(remotedir, '').lblack);
-          return sftp.mkdir(p, true).catch(err => _warn(err));
-        }
-      ))))
-      .then(() => Promise.all(files.map(file => parallel( // upload files
-        () => {
-          ftpConfig.eventPut(file);
-          return ( // use fastPut for files larger than 3mb; since it requires a local path we assume these files are not changed in the gulp pipeline
-            file.contents.length > 3000000 ? sftp.fastPut(file.originalRelativePath, file.destination) : sftp.put(file.contents, file.destination)
-          ).catch(err => _warn(`File transfer failed${err ? ': '+err : ''}`));
-        }
-      ))))
-      .then(() => {
-        _info(`${files.length} file(s) transferred`);
-        cb();
-        return sftp.end();
-      })
-      .catch(err => _error(`Could not connect to server${err ? ': '+err.message : ''}`));
+        .catch(err => _error(`Could not connect to server${err ? ': '+err.message : ''}`));
     }
 
   )
-  .resume(); // required for triggering 'end' event
+    .resume(); // required for triggering 'end' event
 };

package/src/lib/gulp-simple-rename.js

@@ -1,11 +1,11 @@
-// replacement for the official (but deprecated) gulp-simple-rename
-// kept same name because of usage in tdi
-
-const through2  = require('through2');
-
-module.exports = (fn) => {
-  return through2.obj((file, enc, cb) => {
-    file.path = fn(file.path);
-    cb(null, file);
-  });
-};
+// replacement for the official (but deprecated) gulp-simple-rename
+// kept same name because of usage in tdi
+
+const through2  = require('through2');
+
+module.exports = (fn) => {
+  return through2.obj((file, enc, cb) => {
+    file.path = fn(file.path);
+    cb(null, file);
+  });
+};

package/src/lib/package-update-check.js

@@ -4,16 +4,16 @@ const exec        = require('util').promisify(require('child_process').exec);
 
 const doUpdateCheck = (package) => (
   exec(`npm view -g ${_packages[package].name} version`)
-  .then(r => {
-    const versionAvailable = r.stdout.match(/([\d/.]+)/)[1];
-    if (!_packages[package].version) _warn(`${package} is not installed! Run ` + `npm i -g ${_packages[package].name}`.white);
-    else if (compare(_packages[package].version, versionAvailable, '<')) {
-      _appdata._update({[`updateCheck${package}`]: {executed: new Date(), versionAvailable}});
-      return versionAvailable;
-    }
-    else _appdata._update({[`updateCheck${package}`]: {executed: new Date()}});
-  })
-  .catch(e => _warn(`Failed checking latest version of ${package}.`))
+    .then(r => {
+      const versionAvailable = r.stdout.match(/([\d/.]+)/)[1];
+      if (!_packages[package].version) _warn(`${package} is not installed! Run ` + `npm i -g ${_packages[package].name}`.white);
+      else if (compare(_packages[package].version, versionAvailable, '<')) {
+        _appdata._update({[`updateCheck${package}`]: {executed: new Date(), versionAvailable}});
+        return versionAvailable;
+      }
+      else _appdata._update({[`updateCheck${package}`]: {executed: new Date()}});
+    })
+    .catch(e => _warn(`Failed checking latest version of ${package}.`))
 );
 
 let checkUpdatesDone = false;
@@ -23,7 +23,7 @@ module.exports = function packageUpdateCheck () {
   if (!checkUpdatesDone) { // check if updatecheck has ran before because async calls below trigger beforeExit again
     checkUpdatesDone = true;
 
-    ['TCT', 'FDT'].forEach(p => {
+    ['TCT'].forEach(p => {
       const updateMsg = (va) => `| Update ${p} to ${va} | ` + `npm i -g ${_packages[p].name}`.white;
       const {versionAvailable} = _appdata[`updateCheck${p}`] || {};
 
@@ -36,4 +36,4 @@ module.exports = function packageUpdateCheck () {
       }
     });
   }
-}
+};

package/src/lib/style-string-getters.js

@@ -1,4 +1,4 @@
-const styles = { bold: 1, underline: 4, black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, cyan: 36, white: 37, lblack: 90, lred: 91, lgreen: 92, lyellow: 93, lblue: 94, lmagenta: 95, lcyan: 96, lwhite: 97 };
+const styles = {bold: 1, underline: 4, black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, cyan: 36, white: 37, lblack: 90, lred: 91, lgreen: 92, lyellow: 93, lblue: 94, lmagenta: 95, lcyan: 96, lwhite: 97};
 
 for (const name in styles ) {
   const style = styles[name];
@@ -9,5 +9,5 @@ for (const name in styles ) {
 }
 
 String.prototype.__defineGetter__('nostyle', function () {
-  return this.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,'');
+  return this.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
 });

package/src/lib/worker-with-spinner.js

@@ -1,5 +1,5 @@
 const {Worker}  = require('worker_threads');
-const {Spinner} = require("cli-spinner")
+const {Spinner} = require('cli-spinner');
 
 
 module.exports = function workerWithSpinner (spinnerTxt, workerFn, postMsg, onMessageFn) {
@@ -13,7 +13,7 @@ module.exports = function workerWithSpinner (spinnerTxt, workerFn, postMsg, onMe
     });
   };
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     const worker = new Worker(`(${wFnWrap.toString()})(${workerFn.toString()})`, {eval: true});
     worker.on('message', msg => {
       spinner.stop(true);
@@ -24,4 +24,4 @@ module.exports = function workerWithSpinner (spinnerTxt, workerFn, postMsg, onMe
     worker.postMessage(postMsg);
   });
 
-}
+};

package/src/modules/build/index.js

@@ -4,7 +4,7 @@ const inquirer  = require('inquirer');
 const oxygen    = require('./oxygen');
 const path      = require('path');
 
-const createSymlink = (t, p, desc) => {
+const createSymlink = (t, p) => {
   const up = p.replace(/[^/]+/g, '..').replace(/^..\//, '');
   fs.symlink(path.join(up, _paths.tdi, t), p, 'dir', err => {
     if (err) {
@@ -18,13 +18,13 @@ const createSymlink = (t, p, desc) => {
 const createSymlinks = () => {
   _info('Creating symlinks:');
   const src = _isPre51 ? 'sources' : 'src';
-  createSymlink(src + '/config/cmscustom/tdi', 'config/cmscustom/tdi', 'TDI');
+  createSymlink(src + '/config/cmscustom/tdi', 'config/cmscustom/tdi');
   globby
-  .sync('config/cmscustom/!(tdi)/**/fonto')
-  .forEach(p => {
-    createSymlink(src + '/config/cmscustom/tdi/fonto/packages-shared', p + '/packages-shared', 'Fonto');
-  });
-}
+    .sync('config/cmscustom/!(tdi)/**/fonto')
+    .forEach(p => {
+      createSymlink(src + '/config/cmscustom/tdi/fonto/packages-shared', p + '/packages-shared');
+    });
+};
 
 
 module.exports = function build (argv) {
@@ -41,23 +41,23 @@ module.exports = function build (argv) {
     const {projectNew, projectCopy} = require(path.join(_paths.repo, _paths.tdi, 'tct/build/project'));
 
     inquirer
-    .prompt([{
-      message: 'Create project: ', name: 'project', type: 'list',
-      choices: [
-        {name: 'New from TDI submodule', value: 'TDI'},
-        ...(
-          _repoconfig.projects
-          ? (_repoconfig.projects || []).map(p => ({name: 'Copy of ' + p.name, value: p})) // when using repoconfig file (old)
-          : (_repoconfig || []).map(p => ({name: `Copy of ${p.customer_name} ${p.project_name}`, value: p}))
-        )
-      ]
-    }])
-    .then(a => {
-      if (a.project=='TDI') projectNew(createSymlinks);
-      else {
-        projectCopy(createSymlinks, a.project);
-      }
-    });
+      .prompt([{
+        message: 'Create project: ', name: 'project', type: 'list',
+        choices: [
+          {name: 'New from TDI submodule', value: 'TDI'},
+          ...(
+            _repoconfig.projects
+              ? (_repoconfig.projects || []).map(p => ({name: 'Copy of ' + p.name, value: p})) // when using repoconfig file (old)
+              : (_repoconfig || []).map(p => ({name: `Copy of ${p.customer_name} ${p.project_name}`, value: p}))
+          )
+        ]
+      }])
+      .then(a => {
+        if (a.project=='TDI') projectNew(createSymlinks);
+        else {
+          projectCopy(createSymlinks, a.project);
+        }
+      });
   }
 
   if (argv.symlinks) {
@@ -74,43 +74,42 @@ module.exports = function build (argv) {
   }
 
   if (argv.config) {
-    if (_git.commitLocalTdi.after(_git.commitLocalTdi.stopUsingRepoconfigFile)) _error('This option only works for older repo\'s using a repoconfig file.');
+    if (_git.commitTdi.after(_git.commitTdi.stopUsingRepoconfigFile)) _error('This option only works for older repo\'s using a repoconfig file.');
 
 
     inquirer
-    .prompt([{message: 'Be sure paths for projects are [customer]/[project]. Continue?', name: 'confirm', type: 'confirm'}])
-    .then(({confirm}) => {
-      if (!confirm) return;
-
-      const customer = {}, projects = [];
-
-      globby
-      .sync('database/config/**/txd_document_types.sql')
-      .forEach(p => {
-        const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from/s)[1];
-        const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from/s)[1];
-
-        const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
-        const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];
-        const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
-
-        customer.name     = dtDisplayName.split(/ (.+)/)[0];
-        customer.abbr     = ntName.split('_')[0];
-        customer.dirname  = xpiDir.split('/')[0];
-
-        projects.push({
-          name: dtDisplayName.split(/ (.+)/)[1],
-          abbr: ntName.split('_')[1],
-          dirname: xpiDir.split('/')[1],
-          idrange: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
-        });
-      });
+      .prompt([{message: 'Be sure paths for projects are [customer]/[project]. Continue?', name: 'confirm', type: 'confirm'}])
+      .then(({confirm}) => {
+        if (!confirm) return;
 
-      _repoconfig.update({customer, projects, applink: 'None'});
+        const customer = {}, projects = [];
 
-      _write(`\nFile '${_paths.repoconfig}' has been created.`);
-      _repoconfig.projects
-    });
+        globby
+          .sync('database/config/**/txd_document_types.sql')
+          .forEach(p => {
+            const dtSqlInsert = fs.readFileSync(p).toString().match(/select(.*?)from/s)[1];
+            const ntSqlInsert = fs.readFileSync(p.replace('txd_document_types', 'txd_node_types')).toString().match(/select(.*?)from/s)[1];
+
+            const dtDisplayName = dtSqlInsert.match(/'([^']+)' display_name/)[1];
+            const ntName        = ntSqlInsert.match(/'([^']+)' name/)[1];
+            const xpiDir        = ntSqlInsert.match(/'([^']+)' xsl_prep_inc/)[1];
+
+            customer.name     = dtDisplayName.split(/ (.+)/)[0];
+            customer.abbr     = ntName.split('_')[0];
+            customer.dirname  = xpiDir.split('/')[0];
+
+            projects.push({
+              name: dtDisplayName.split(/ (.+)/)[1],
+              abbr: ntName.split('_')[1],
+              dirname: xpiDir.split('/')[1],
+              idrange: dtSqlInsert.match(/(\d+)\d{3} id/)[1]
+            });
+          });
+
+        _repoconfig.update({customer, projects, applink: 'None'});
+
+        _write(`\nFile '${_paths.repoconfig}' has been created.`);
+      });
   }
 
   if (argv.oxygen) oxygen();