@tangelo/tangelo-configuration-toolkit 1.10.0 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.10.0",
+  "version": "1.10.3",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",

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

@@ -20,6 +20,7 @@ module.exports = function workerWithSpinner (spinnerTxt, workerFn, postMsg, onMe
       onMessageFn(msg);
       resolve();
     });
+    worker.on('error', err => _error('\n' + err.stdout));
     worker.postMessage(postMsg);
   });
 

package/src/modules/deploy/config.js

@@ -91,7 +91,7 @@ module.exports = {
     let transferPattern = path.join(_paths.apply, filter).toFws();
 
     // test if 'cmscustom/tdi' would be included, then add specifically, because following symlinks doesnt work with glob stars
-    const tdiIncRegex = /^(({\w*,?)?cmscustom(,?\w*})?\/|\*\/)?\*\*/;
+    const tdiIncRegex = /^(config\/)?(({\w*,?)?cmscustom(,?\w*})?\/|\*\/)?\*\*/;
     const tdiPattern  = tdiIncRegex.test(transferPattern) ? transferPattern.replace(tdiIncRegex, `${this.deliveryPack ? 'config/' : ''}cmscustom/tdi/**`) : 'nomatch';
 
     if (!transferPattern)

package/src/modules/deploy/execute.js

@@ -171,7 +171,7 @@ const transfer = (paths, lrServer) => {
   .pipe(g_replace(c.replaceStrings))
   .pipe(through2.obj((file, enc, cb) => {
     file.originalRelativePath = file.relative; // original path needed for sftp.fastPut
-    file.path = file.path.replace(/(fonto)[\\\/](dev|dist)/, '$1'); // change destination path for fonto build
+    file.path = file.path.replace(/(fonto).(?:dev|dist|packages.sx-shell-.+src)(.+)/, '$1$2'); // change destination path for fonto build files
     if (!file.relative.endsWith('.map')) files.push(file.relative); // collect all file paths in array for livereload
     cb(null, file);
   }))

package/src/modules/deploy/index.js

@@ -49,7 +49,7 @@ module.exports = function deploy (argv) {
     const transfers = {
       queue: [],
       do () {
-        this.queue = this.queue.map(p => p.replace(/(fonto.)(dist|dev|packages.sx-shell-.*.src)(.assets.schemas)/, '$1dist$3')) // fonto schema changes can be detected in different paths at the same time
+        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);
@@ -75,9 +75,9 @@ module.exports = function deploy (argv) {
       if ((event=='add' || event=='change') && (
             // within fonto, transfer build files only, but also schema files, because
             // the "dist" folder isn't watched properly: it does not detect "assets" anymore after building once
-            !/fonto[\\\/]/.test(filepath) ||
-            /fonto[\\\/]dist/.test(filepath) ||
-            (/fonto[\\\/]dev/.test(filepath) && c.envDev) ||
+            !/cmscustom.+fonto[\\\/]/.test(filepath) ||
+            /fonto[\\\/]dist[\\\/]/.test(filepath) ||
+            (/fonto[\\\/]dev[\\\/]/.test(filepath) && c.envDev) ||
             /fonto[\\\/]packages[\\\/]sx-shell-.*?[\\\/]assets[\\\/]schemas[\\\/]/.test(filepath)
           )
       ) {

package/src/modules/fonto/commands.js

@@ -149,7 +149,7 @@ module.exports = {
       // execute "fdt elements" for each schema package, ignore default elements, and combine results
       const schemasPerElement = {};
       Object.entries(rootSchemas).forEach(([path, obj]) => {
-        const data            = execSync(`fdt elements --schema ${obj.packageName} -C name`, {encoding: 'UTF-8'});
+        const data            = execSync(`fdt elements --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json -C name`, {encoding: 'UTF-8'});
         const elements        = data.replace(/^.*?Name\*|Printed name\*.*$/gs, '').split(/\s+/);
         const customElements  = [...new Set(elements)].filter(e => e && !ignoreElements.includes(e));
 
@@ -195,7 +195,7 @@ module.exports = {
       // execute "fdt attributes" for each schema package, ignore default attributes, and combine results
       const schemasPerAttribute = {};
       Object.entries(rootSchemas).forEach(([path, obj]) => {
-        const data              = execSync(`fdt attributes --schema ${obj.packageName}`, {encoding: 'UTF-8'});
+        const data              = execSync(`fdt attributes --schema packages/${obj.packageName}/src/assets/schemas/${obj.packageName}.json`, {encoding: 'UTF-8'});
         const attributes        = data.replace(/^.*?Default value\s+|\s+Printed name\*.*$/gs, '').split(/\n\s+/).map(a => a.split(/\s+/)).map(a =>
           a[0] + (a[2]=='required' ? ' (required)' : '') + (a[3]=='-' ? ' (no default)' : '')
         );