@tangelo/tangelo-configuration-toolkit 1.20.0 → 1.20.2

package/index.js

@@ -110,7 +110,10 @@ global._modulesTdi = {
       return require(path.join(this.absolutePathTdi, 'tct', module));
     }
     catch (e) {
-      if (throws) _error('Module could not be loaded: ' + module);
+      if (throws) {
+        _debug(`${e}`);
+        _error('Module could not be loaded: ' + module);
+      }
       else return undefined;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "engines": {
     "node": ">=14.0.0"
   },

package/src/lib/get-repoconfig.js

@@ -17,12 +17,15 @@ module.exports = function getRepoconfig(repoPath) {
       const path_cmscustom  = xpiDir.replace(/\/[^/]+$/, '').split(/\//);
       const path_dbconfig   = p.replace(/.*\/database\/config\/(.*)\/[^/]+/, '$1').split(/[/\\]/);
       const dnRegex         = [path_cmscustom[0].replace(/[_'"]/g, '.'), path_dbconfig[0].replace(/[_'"]/g, '.')].sort((a, b) => b.length - a.length).join('|');
-      const customer_name   = (dtDisplayName.match(RegExp(dnRegex, 'i')) || dtDisplayName.split(/ (.+)/))[0];
+      /* Get customer name based on txd_document_types.display_name; if that match fails fallback to customername defined in path */
+      const customer_name   = (dtDisplayName.match(RegExp(dnRegex, 'i')) || [path_cmscustom[0].split(/[\s_]/g).map(s => s[0].toUpperCase() + s.substring(1)).join(' ')])[0];
+      const customer_name_regex = RegExp(customer_name.replace(/(\W)/g, '\\$1?'), 'gi'); // match customer name; allow differences in special characters / match case insensitive
 
       return {
         customer_name,
         customer_abbr: ntName.split('_')[0],
-        project_name: dtDisplayName.split(RegExp(customer_name.replace(/(\W)/g, '\\$1')))[1].trim() || '',
+        /* if display name matches the customer name; strip customer name from display name to get the project name; otherwise use the complete display name as projectname  */
+        project_name: dtDisplayName.match(customer_name_regex) ? dtDisplayName.replace(customer_name_regex, '').trim() : dtDisplayName,
         project_abbr: ntName.split('_')[1],
         path_cmscustom,
         path_dbconfig,

package/src/lib/set-global-functions.js

@@ -10,6 +10,9 @@ global._info = (msg, time = false) => {
   }
   console.log(msg.lgreen);
 };
+global._debug = msg => {
+  if (global._devmode) console.log(`[DEBUG]: ${msg}`.yellow);
+};
 global._warn = msg => {
   console.log(msg.lyellow);
 };

package/src/modules/deploy/execute.js

@@ -120,13 +120,13 @@ const createDeliveryPack = () => { // create install scripts if necessary, zip o
 };
 
 
-const transfer = (paths, lrServer) => {
+const transfer = (paths, {watch, lrServer} = {}) => {
   const jsFGlob = _settingsTdi().transpileToES5 ? ['**/*.js', '!**/hce/**/template_*', '!**/fonto/**', '!**/vendor/**', '!**/*.min.js'] : [];
   const jsF     = g_filter(jsFGlob, {restore: true});
   const xpsF    = g_filter(['**/xopus/**/*.x*'], {restore: true});
   const sassF   = g_filter(['**/*.scss'], {restore: true});
   const shF     = g_filter(['**/*.sh'], {restore: true});
-  const srcset  = s.create(paths);
+  const srcset  = s.create(paths, {watch});
   const files   = [];
 
   // local git repo must be on latest commit containing fonto changes, and fonto build files must be newer than that commit, unless that commit belongs to the current user

package/src/modules/deploy/index.js

@@ -33,7 +33,7 @@ module.exports = function deploy (argv) {
   // execute chosen option
 
   if (argv.test) {
-    s.create([...c.transferPatterns, '!**/fonto/{*.*,!(dist)/**}'], true);
+    s.create([...c.transferPatterns, '!**/fonto/{*.*,!(dist)/**}'], {test: true});
   }
 
   if (argv.copy) {
@@ -52,7 +52,7 @@ module.exports = function deploy (argv) {
         this.queue = this.queue.map(p => p.replace(/fonto(.)(?:dist|dev).assets.schemas(.sx-shell-.*?).json/, 'fonto$1packages$2$1src$1assets$1schemas$2.json')); // fonto schema changes can be detected in different paths at the same time, rewrite paths to original package-path because files in build folders can be removed before transfer starts
         this.queue = [...new Set(this.queue)]; // remove duplicates
         this.queue.forEach(v => s.addToCache(v));
-        transfer(this.queue, lrServer);
+        transfer(this.queue, {watch: true, lrServer});
         this.queue = [];
       },
       add (fp) {

package/src/modules/deploy/srcset.js

@@ -9,12 +9,12 @@ const resolveBind = (d, p) => p.replace('#{cmscustompath}', 'cmscustom/').replac
 
 module.exports = {
 
-  create (pattern, test) {
+  create (paths, {test, watch} = {}) {
     const startTime = new Date();
 
-    this.filesToTransfer          = globby.sync(pattern, {nodir: true});                                    // get list of files to transfer
-    this.potentialBaseFilesCache  = this.potentialBaseFilesCache || globby.sync('**/*.{xml,xsd,xsl,scss}'); // get list of potential base files, if not previously done
-    this.potentialBaseFiles       = this.potentialBaseFilesCache
+    this.filesToTransfer            = watch ? paths : globby.sync(paths, {nodir: true});  // get list of files to transfer
+    this.potentialBaseFilesCache  ??= globby.sync('**/*.{xml,xsd,xsl,scss}');             // get list of potential base files, if not previously done
+    this.potentialBaseFiles         = this.potentialBaseFilesCache
       .filter(p => !this.filesToTransfer.includes(p)) // subtract files to transfer from list of potential base files
       .map(path => [path]);                           // make array so file contents can be added later