mcdev 4.0.0 → 4.0.2

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -1,76 +1,78 @@
 name: 🐞 Bug
 description: File a bug/issue
-title: "[BUG] <title>"
+title: '[BUG] <title>'
 labels: [bug, NEW]
 body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please [search here](https://github.com/Accenture/sfmc-devtools/issues) to see if an issue already exists for your problem.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A clear & concise description of what you're experiencing.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A clear & concise description of what you expected to happen.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    value: |
-      1. Go to '...'
-      2. Click on '....'
-      3. Run '...'
-      4. See error...
-  validations:
-    required: false
-- type: dropdown
-  id: version
-  attributes:
-    label: Version
-    description: What version of our software are you running? (mcdev --version)
-    options:
-      - 4.0.0
-      - 3.1.3
-      - 3.1.2
-      - 3.1.1
-      - 3.1.0
-      - 3.0.3
-      - 3.0.2
-      - 3.0.1
-      - develop-branch
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **Operating system (Windows/Mac/Linux/...)**: Windows 10
-        - **Node (node --version)**: 13.14.0
-        - **npm (npm --version)**: 7.6.3
-    value: |
-        - OS:
-        - Node:
-        - npm:
-  validations:
-    required: false
-- type: checkboxes
-  attributes:
-    label: Participation
-    options:
-      - label: I am willing to submit a pull request for this issue.
-        required: false
-- type: textarea
-  attributes:
-    label: Additional comments
-    description: Is there anything else that's important for the team to know?
+    - type: checkboxes
+      attributes:
+          label: Is there an existing issue for this?
+          description: Please [search here](https://github.com/Accenture/sfmc-devtools/issues) to see if an issue already exists for your problem.
+          options:
+              - label: I have searched the existing issues
+                required: true
+    - type: textarea
+      attributes:
+          label: Current Behavior
+          description: A clear & concise description of what you're experiencing.
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Expected Behavior
+          description: A clear & concise description of what you expected to happen.
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Steps To Reproduce
+          description: Steps to reproduce the behavior.
+          value: |
+              1. Go to '...'
+              2. Click on '....'
+              3. Run '...'
+              4. See error...
+      validations:
+          required: false
+    - type: dropdown
+      id: version
+      attributes:
+          label: Version
+          description: What version of our software are you running? (mcdev --version)
+          options:
+              - 4.0.2
+              - 4.0.1
+              - 4.0.0
+              - 3.1.3
+              - 3.1.2
+              - 3.1.1
+              - 3.1.0
+              - 3.0.3
+              - 3.0.2
+              - 3.0.1
+              - develop-branch
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Environment
+          description: |
+              examples:
+                - **Operating system (Windows/Mac/Linux/...)**: Windows 10
+                - **Node (node --version)**: 13.14.0
+                - **npm (npm --version)**: 7.6.3
+          value: |
+              - OS:
+              - Node:
+              - npm:
+      validations:
+          required: false
+    - type: checkboxes
+      attributes:
+          label: Participation
+          options:
+              - label: I am willing to submit a pull request for this issue.
+                required: false
+    - type: textarea
+      attributes:
+          label: Additional comments
+          description: Is there anything else that's important for the team to know?

package/.github/dependabot.yml

@@ -11,4 +11,4 @@ updates:
           interval: 'daily'
       target-branch: 'develop'
       labels:
-          - 'chore'
+          - 'dependencies'

package/README.md

@@ -123,7 +123,7 @@ If you experience issues installing Accenture SFMC DevTools, please check out th
 1. Install Accenture SFMC DevTools by running `npm install -g mcdev` (prefix with `sudo` on MacOS)
    - If you get an error, please see the below troubleshooting section.
 
-When completed you will see `+ mcdev@3.2.0` printed to your screen (or the current version of it respectively).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.0.2`).
 
 > **_Side note for proud nerds_:**
 >
@@ -272,13 +272,15 @@ To work with our **developer-version** or to install a **specific older version*
 npm install -g accenture/sfmc-devtools#develop
 ```
 
+_Note: Regardless of which tag or branch you install_
+
 **Install specific version (using a version tag on npm):**
 
 ```bash
-npm install -g mcdev@3.2.0
+npm install -g mcdev@4.0.2
 ```
 
-**Warning**: When you used the above method to install Accenture SFMC DevTools for a specific version or tag, trying to [update Accenture SFMC DevTools](#updating-mcdev) might not download the most recently published official version but instead stay on the version or branch you previously selected (in the above examples: develop, 3.2.0)!
+**Warning**: When you used the above method to install Accenture SFMC DevTools for a specific version or tag, trying to [update Accenture SFMC DevTools](#updating-mcdev) might not download the most recently published official version but instead stay on the version or branch you previously selected (in the above examples: develop, 4.0.2)!
 
 > **Note**: The version is currently _not_ updated on the developer branch until a new release is published. Hence, you will not see a change if you run `mcdev --version`.
 
@@ -1509,7 +1511,7 @@ If you use Accenture SFMC DevTools in your team it is recommended to install you
 
 If you do need to install it locally, make sure you don't commit your project's package.json with this change or you might break mcdev for other developers in your team that either didn't clone the Accenture SFMC DevTools repo or stored in a different directory.
 
-To test your new **global** developer setup, run `mcdev --version` in CLI which should return the current version (e.g. `3.2.0`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `3.2.0-dev` and then run `mcdev --version` again to verify that your change propagates instantly.
+To test your new **global** developer setup, run `mcdev --version` in CLI which should return the current version (e.g. `4.0.2`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `4.0.2-dev` and then run `mcdev --version` again to verify that your change propagates instantly.
 
 <a name="local-install"></a>
 
@@ -1536,7 +1538,7 @@ The following explains how you _could_ install it locally for certain edge cases
 4. Afterwards, install Accenture SFMC DevTools by running `npm install --save-dev mcdev`
    - If you get an error, please see the below troubleshooting section.
 
-When completed you will see `+ mcdev@3.2.0` printed to your screen (or the current version of it respectively).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.0.2`).
 
 ### 9.3. NPM Scripts
 

package/boilerplate/files/.vscode/settings.json

@@ -17,8 +17,10 @@
         "*.ics": "${capture}.asset-document-meta.json",
         "*.pdf": "${capture}.asset-document-meta.json",
         "*.jpg": "${capture}.asset-image-meta.json",
+        "*.jpeg": "${capture}.asset-image-meta.json",
         "*.png": "${capture}.asset-image-meta.json",
         "*.gif": "${capture}.asset-image-meta.json",
+        "*.eps": "${capture}.asset-image-meta.json",
         "*-meta.sql": "${capture}-meta.json",
         "*-meta.ssjs": "${capture}-meta.json",
         "*-meta.amp": "${capture}-meta.json",

package/docs/dist/documentation.md

@@ -244,7 +244,7 @@ Builds metadata from a template using market specific customisation
     * _static_
         * [.buildTemplate(businessUnit, selectedType, keyArr, market)](#Builder.buildTemplate) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeList&gt;</code>
         * [.buildDefinition(businessUnit, selectedType, name, market)](#Builder.buildDefinition) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeList&gt;</code>
-        * [.buildDefinitionBulk(listName, type, name)](#Builder.buildDefinitionBulk) ⇒ <code>Promise.&lt;void&gt;</code>
+        * [.buildDefinitionBulk(listName, type, name)](#Builder.buildDefinitionBulk) ⇒ <code>Promise.&lt;Array.&lt;TYPE.MultiMetadataTypeList&gt;&gt;</code>
 
 <a name="new_Builder_new"></a>
 
@@ -321,11 +321,11 @@ Build a specific metadata file based on a template.
 
 <a name="Builder.buildDefinitionBulk"></a>
 
-### Builder.buildDefinitionBulk(listName, type, name) ⇒ <code>Promise.&lt;void&gt;</code>
+### Builder.buildDefinitionBulk(listName, type, name) ⇒ <code>Promise.&lt;Array.&lt;TYPE.MultiMetadataTypeList&gt;&gt;</code>
 Build a specific metadata file based on a template using a list of bu-market combos
 
 **Kind**: static method of [<code>Builder</code>](#Builder)  
-**Returns**: <code>Promise.&lt;void&gt;</code> - -  
+**Returns**: <code>Promise.&lt;Array.&lt;TYPE.MultiMetadataTypeList&gt;&gt;</code> - -  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -4448,7 +4448,7 @@ CLI entry for SFMC DevTools
     * [.inverseGet(objs, val)](#Util.inverseGet) ⇒ <code>string</code>
     * [.getMetadataHierachy(metadataTypes)](#Util.getMetadataHierachy) ⇒ <code>Array.&lt;string&gt;</code>
     * [.resolveObjPath(path, obj)](#Util.resolveObjPath) ⇒ <code>any</code>
-    * [.execSync(cmd, [args])](#Util.execSync) ⇒ <code>undefined</code>
+    * [.execSync(cmd, [args], [hideOutput])](#Util.execSync) ⇒ <code>undefined</code>
     * [.templateSearchResult(results, keyToSearch, searchValue)](#Util.templateSearchResult) ⇒ <code>TYPE.MetadataTypeItem</code>
     * [.setLoggingLevel(argv)](#Util.setLoggingLevel) ⇒ <code>void</code>
 
@@ -4645,7 +4645,7 @@ let's you dynamically walk down an object and get a value
 
 <a name="Util.execSync"></a>
 
-### Util.execSync(cmd, [args]) ⇒ <code>undefined</code>
+### Util.execSync(cmd, [args], [hideOutput]) ⇒ <code>undefined</code>
 helper to run other commands as if run manually by user
 
 **Kind**: static method of [<code>Util</code>](#Util)  
@@ -4654,6 +4654,7 @@ helper to run other commands as if run manually by user
 | --- | --- | --- |
 | cmd | <code>string</code> | to be executed command |
 | [args] | <code>Array.&lt;string&gt;</code> | list of arguments |
+| [hideOutput] | <code>boolean</code> | if true, output of command will be hidden from CLI |
 
 <a name="Util.templateSearchResult"></a>
 
@@ -4942,7 +4943,8 @@ DevOps helper class
     * [.getDeltaList(properties, [range], [saveToDeployDir], [filterPaths])](#DevOps.getDeltaList) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
         * [~delta](#DevOps.getDeltaList..delta) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
         * [~copied](#DevOps.getDeltaList..copied) : <code>TYPE.DeltaPkgItem</code>
-    * [.buildDeltaDefinitions(properties, range, [skipInteraction])](#DevOps.buildDeltaDefinitions)
+    * [.buildDeltaDefinitions(properties, range, [skipInteraction])](#DevOps.buildDeltaDefinitions) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
+        * [~deltaDeployAll](#DevOps.buildDeltaDefinitions..deltaDeployAll) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
     * [.document(directory, jsonReport)](#DevOps.document) ⇒ <code>void</code>
     * [.getFilesToCommit(properties, buObject, metadataType, keyArr)](#DevOps.getFilesToCommit) ⇒ <code>Promise.&lt;Array.&lt;string&gt;&gt;</code>
 
@@ -4977,10 +4979,11 @@ Interactive commit selection if no commits are passed.
 **Kind**: inner constant of [<code>getDeltaList</code>](#DevOps.getDeltaList)  
 <a name="DevOps.buildDeltaDefinitions"></a>
 
-### DevOps.buildDeltaDefinitions(properties, range, [skipInteraction])
+### DevOps.buildDeltaDefinitions(properties, range, [skipInteraction]) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
 wrapper around DevOps.getDeltaList, Builder.buildTemplate and M
 
 **Kind**: static method of [<code>DevOps</code>](#DevOps)  
+**Returns**: <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code> - -  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -4988,6 +4991,10 @@ wrapper around DevOps.getDeltaList, Builder.buildTemplate and M
 | range | <code>string</code> | git commit range |
 | [skipInteraction] | <code>TYPE.SkipInteraction</code> | allows to skip interactive wizard |
 
+<a name="DevOps.buildDeltaDefinitions..deltaDeployAll"></a>
+
+#### buildDeltaDefinitions~deltaDeployAll : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
+**Kind**: inner constant of [<code>buildDeltaDefinitions</code>](#DevOps.buildDeltaDefinitions)  
 <a name="DevOps.document"></a>
 
 ### DevOps.document(directory, jsonReport) ⇒ <code>void</code>
@@ -6200,7 +6207,7 @@ Util that contains logger and simple util methods
     * [.inverseGet(objs, val)](#Util.inverseGet) ⇒ <code>string</code>
     * [.getMetadataHierachy(metadataTypes)](#Util.getMetadataHierachy) ⇒ <code>Array.&lt;string&gt;</code>
     * [.resolveObjPath(path, obj)](#Util.resolveObjPath) ⇒ <code>any</code>
-    * [.execSync(cmd, [args])](#Util.execSync) ⇒ <code>undefined</code>
+    * [.execSync(cmd, [args], [hideOutput])](#Util.execSync) ⇒ <code>undefined</code>
     * [.templateSearchResult(results, keyToSearch, searchValue)](#Util.templateSearchResult) ⇒ <code>TYPE.MetadataTypeItem</code>
     * [.setLoggingLevel(argv)](#Util.setLoggingLevel) ⇒ <code>void</code>
 
@@ -6397,7 +6404,7 @@ let's you dynamically walk down an object and get a value
 
 <a name="Util.execSync"></a>
 
-### Util.execSync(cmd, [args]) ⇒ <code>undefined</code>
+### Util.execSync(cmd, [args], [hideOutput]) ⇒ <code>undefined</code>
 helper to run other commands as if run manually by user
 
 **Kind**: static method of [<code>Util</code>](#Util)  
@@ -6406,6 +6413,7 @@ helper to run other commands as if run manually by user
 | --- | --- | --- |
 | cmd | <code>string</code> | to be executed command |
 | [args] | <code>Array.&lt;string&gt;</code> | list of arguments |
+| [hideOutput] | <code>boolean</code> | if true, output of command will be hidden from CLI |
 
 <a name="Util.templateSearchResult"></a>
 

package/lib/Builder.js

@@ -199,7 +199,7 @@ saved
      * @param {string} listName name of list of BU-market combos
      * @param {string} type supported metadata type
      * @param {string} name name of the metadata
-     * @returns {Promise.<void>} -
+     * @returns {Promise.<TYPE.MultiMetadataTypeList[]>} -
      */
     static async buildDefinitionBulk(listName, type, name) {
         const properties = await config.getProperties();
@@ -212,6 +212,8 @@ saved
             return;
         }
         let i = 0;
+        const bdPromises = [];
+
         for (const businessUnit in properties.marketList[listName]) {
             if (businessUnit === 'description') {
                 // skip, it's just a metadata on this list and not a BU
@@ -228,13 +230,17 @@ saved
             for (const market of marketList) {
                 if (Util.checkMarket(market, properties)) {
                     Util.logger.info(`Executing for '${businessUnit}': '${market}'`);
-                    this.buildDefinition(businessUnit, type, name, market);
+                    // omitting "await" to speed up creation
+                    bdPromises.push(this.buildDefinition(businessUnit, type, name, market));
                 }
             }
         }
+        const response = await Promise.all(bdPromises);
+
         if (!i) {
             Util.logger.error('Please define properties.marketList in your config');
         }
+        return response;
     }
 }
 

package/lib/metadataTypes/AccountUser.js

@@ -135,32 +135,40 @@ class AccountUser extends MetadataType {
         }
         let result;
         switch (interval) {
-            case 'years':
+            case 'years': {
                 result = now.getFullYear() - date.getFullYear();
                 break;
-            case 'months':
+            }
+            case 'months': {
                 result =
                     now.getFullYear() * 12 +
                     now.getMonth() -
                     (date.getFullYear() * 12 + date.getMonth());
                 break;
-            case 'weeks':
+            }
+            case 'weeks': {
                 result = Math.floor(timediff / week);
                 break;
-            case 'days':
+            }
+            case 'days': {
                 result = Math.floor(timediff / day);
                 break;
-            case 'hours':
+            }
+            case 'hours': {
                 result = Math.floor(timediff / hour);
                 break;
-            case 'minutes':
+            }
+            case 'minutes': {
                 result = Math.floor(timediff / minute);
                 break;
-            case 'seconds':
+            }
+            case 'seconds': {
                 result = Math.floor(timediff / second);
                 break;
-            default:
+            }
+            default: {
                 return;
+            }
         }
         return result + ' ' + interval;
     }

package/lib/metadataTypes/Asset.js

@@ -375,17 +375,21 @@ class Asset extends MetadataType {
             // reset logging level
             let obj;
             switch (loggerLevelBak) {
-                case 'info':
+                case 'info': {
                     obj = {};
                     break;
-                case 'verbose':
+                }
+                case 'verbose': {
                     obj = { verbose: true };
                     break;
-                case 'debug':
+                }
+                case 'debug': {
                     obj = { debug: true };
                     break;
-                case 'error':
+                }
+                case 'error': {
                     obj = { silent: true };
+                }
             }
             Util.setLoggingLevel(obj);
         }
@@ -708,7 +712,7 @@ class Asset extends MetadataType {
             );
             fileList.push({
                 subFolder: [this.definition.type, subType],
-                fileName: metadata.customerKey,
+                fileName: templateName,
                 fileExt: fileExt,
                 content: filecontent,
                 encoding: 'base64',
@@ -774,7 +778,8 @@ class Asset extends MetadataType {
         let readDirArr;
         switch (metadata.assetType.name) {
             case 'templatebasedemail': // message
-            case 'htmlemail': // message
+            case 'htmlemail': {
+                // message
                 // this complex type always creates its own subdir per asset
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr, templateName || metadata.customerKey];
@@ -821,7 +826,9 @@ class Asset extends MetadataType {
                     );
                 }
                 break;
-            case 'textonlyemail': // message
+            }
+            case 'textonlyemail': {
+                // message
                 // metadata.views.text.content
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr];
@@ -854,7 +861,9 @@ class Asset extends MetadataType {
                     }
                 }
                 break;
-            case 'webpage': // asset
+            }
+            case 'webpage': {
+                // asset
                 // this complex type always creates its own subdir per asset
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr, templateName || metadata.customerKey];
@@ -930,6 +939,7 @@ class Asset extends MetadataType {
                 }
 
                 break;
+            }
             case 'buttonblock': // block - Button Block
             case 'freeformblock': // block
             case 'htmlblock': // block
@@ -937,7 +947,8 @@ class Asset extends MetadataType {
             case 'imageblock': // block - Image Block
             case 'textblock': // block
             case 'smartcaptureblock': // other
-            case 'codesnippetblock': // other
+            case 'codesnippetblock': {
+                // other
                 // metadata.content
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr];
@@ -968,7 +979,7 @@ class Asset extends MetadataType {
                             // to use this method in templating, store a copy of the info in fileList
                             fileList.push({
                                 subFolder: subDirArr,
-                                fileName: metadata.customerKey + subtypeExtension,
+                                fileName: (templateName || metadata.customerKey) + subtypeExtension,
                                 fileExt: ext,
                                 content: metadata.content,
                             });
@@ -978,6 +989,7 @@ class Asset extends MetadataType {
                     }
                 }
                 break;
+            }
         }
         return fileList;
     }
@@ -1073,7 +1085,8 @@ class Asset extends MetadataType {
         let subType;
         switch (metadata.assetType.name) {
             case 'templatebasedemail': // message
-            case 'htmlemail': // message
+            case 'htmlemail': {
+                // message
                 // metadata.views.html.content (mandatory)
                 if (metadata.views?.html?.content?.length) {
                     codeArr.push({
@@ -1091,7 +1104,9 @@ class Asset extends MetadataType {
                 }
 
                 return { json: metadata, codeArr: codeArr, subFolder: [metadata.customerKey] };
-            case 'textonlyemail': // message
+            }
+            case 'textonlyemail': {
+                // message
                 // metadata.views.text.content
                 if (metadata.views?.text?.content?.length) {
                     codeArr.push({
@@ -1103,7 +1118,9 @@ class Asset extends MetadataType {
                     delete metadata.views.text.content;
                 }
                 return { json: metadata, codeArr: codeArr, subFolder: null };
-            case 'webpage': // asset
+            }
+            case 'webpage': {
+                // asset
                 // metadata.views.html.content (pre & post 20222)
                 if (metadata.views?.html?.content?.length) {
                     codeArr.push({
@@ -1133,6 +1150,7 @@ class Asset extends MetadataType {
                     delete metadata.content;
                 }
                 return { json: metadata, codeArr: codeArr, subFolder: [metadata.customerKey] };
+            }
             case 'buttonblock': // block - Button Block
             case 'freeformblock': // block
             case 'htmlblock': // block
@@ -1140,7 +1158,8 @@ class Asset extends MetadataType {
             case 'imageblock': // block - Image Block
             case 'textblock': // block
             case 'smartcaptureblock': // other
-            case 'codesnippetblock': // other
+            case 'codesnippetblock': {
+                // other
                 // metadata.content
                 let fileExt = 'html'; // eslint-disable-line no-case-declarations
                 if (
@@ -1160,7 +1179,8 @@ class Asset extends MetadataType {
                     delete metadata.content;
                 }
                 return { json: metadata, codeArr: codeArr, subFolder: null };
-            default:
+            }
+            default: {
                 subType = this._getSubtype(metadata);
                 if (!this.definition.binarySubtypes.includes(subType)) {
                     Util.logger.debug(
@@ -1168,6 +1188,7 @@ class Asset extends MetadataType {
                     );
                 }
                 return { json: metadata, codeArr: codeArr, subFolder: null };
+            }
         }
     }
     /**

package/lib/metadataTypes/Automation.js

@@ -112,12 +112,14 @@ class Automation extends MetadataType {
             'Name',
         ]);
         const resultsConverted = {};
-        for (const m of results.Results) {
-            resultsConverted[m.CustomerKey] = {
-                id: m.ObjectID,
-                key: m.CustomerKey,
-                name: m.Name,
-            };
+        if (Array.isArray(results?.Results)) {
+            for (const m of results.Results) {
+                resultsConverted[m.CustomerKey] = {
+                    id: m.ObjectID,
+                    key: m.CustomerKey,
+                    name: m.Name,
+                };
+            }
         }
         return { metadata: resultsConverted, type: this.definition.type };
     }
@@ -520,6 +522,10 @@ class Automation extends MetadataType {
             }
             if (metadata.steps) {
                 for (const step of metadata.steps) {
+                    const stepNumber = step.stepNumber || step.step;
+                    delete step.stepNumber;
+                    delete step.step;
+
                     for (const activity of step.activities) {
                         try {
                             // get metadata type of activity
@@ -528,58 +534,52 @@ class Automation extends MetadataType {
                                 activity.objectTypeId
                             );
                             delete activity.objectTypeId;
-                            // if no activityObjectId then either serialized activity
-                            // (config in Automation ) or unconfigured so no further action to be taken
-                            if (
-                                activity.activityObjectId ===
-                                    '00000000-0000-0000-0000-000000000000' ||
-                                activity.activityObjectId == null ||
-                                !this.definition.dependencies.includes(activity.r__type)
-                            ) {
-                                // empty if block
-                            }
-                            // / if managed by cache we can update references to support deployment
-                            else if (
-                                Definitions[activity.r__type]?.['idField'] &&
-                                cache.getCache(this.buObject.mid)[activity.r__type]
-                            ) {
-                                try {
-                                    activity.activityObjectId = cache.searchForField(
-                                        activity.r__type,
-                                        activity.activityObjectId,
-                                        Definitions[activity.r__type].idField,
-                                        Definitions[activity.r__type].nameField
-                                    );
-                                } catch (ex) {
-                                    // getFromCache throws error where the dependent metadata is not found
-                                    Util.logger.warn(
-                                        ` - Missing ${activity.r__type} activity '${activity.name}'` +
-                                            ` in step ${step.stepNumber || step.step}.${
-                                                activity.displayOrder
-                                            }` +
-                                            ` of Automation '${metadata.name}' (${ex.message})`
-                                    );
-                                    return null;
-                                }
-                            } else {
+                        } catch {
+                            Util.logger.warn(
+                                ` - Unknown activity type '${activity.objectTypeId}'` +
+                                    ` in step ${stepNumber}.${activity.displayOrder}` +
+                                    ` of Automation '${metadata.name}'`
+                            );
+                            continue;
+                        }
+
+                        // if no activityObjectId then either serialized activity
+                        // (config in Automation ) or unconfigured so no further action to be taken
+                        if (
+                            activity.activityObjectId === '00000000-0000-0000-0000-000000000000' ||
+                            activity.activityObjectId == null ||
+                            !this.definition.dependencies.includes(activity.r__type)
+                        ) {
+                            // empty if block
+                        }
+                        // / if managed by cache we can update references to support deployment
+                        else if (
+                            Definitions[activity.r__type]?.['idField'] &&
+                            cache.getCache(this.buObject.mid)[activity.r__type]
+                        ) {
+                            try {
+                                activity.activityObjectId = cache.searchForField(
+                                    activity.r__type,
+                                    activity.activityObjectId,
+                                    Definitions[activity.r__type].idField,
+                                    Definitions[activity.r__type].nameField
+                                );
+                            } catch (ex) {
+                                // getFromCache throws error where the dependent metadata is not found
                                 Util.logger.warn(
                                     ` - Missing ${activity.r__type} activity '${activity.name}'` +
-                                        ` in step ${step.stepNumber || step.step}.${
-                                            activity.displayOrder
-                                        }` +
-                                        ` of Automation '${metadata.name}' (Not Found in Cache)`
+                                        ` in step ${stepNumber}.${activity.displayOrder}` +
+                                        ` of Automation '${metadata.name}' (${ex.message})`
                                 );
-                                return null;
                             }
-                        } catch {
+                        } else {
                             Util.logger.warn(
-                                ` - Excluding automation '${metadata.name}' from retrieve (ObjectType ${activity.objectTypeId} is unknown)`
+                                ` - Missing ${activity.r__type} activity '${activity.name}'` +
+                                    ` in step ${stepNumber}.${activity.displayOrder}` +
+                                    ` of Automation '${metadata.name}' (Not Found in Cache)`
                             );
-                            return null;
                         }
                     }
-                    delete step.stepNumber;
-                    delete step.step;
                 }
             }
             return JSON.parse(JSON.stringify(metadata));
@@ -792,9 +792,8 @@ class Automation extends MetadataType {
                 output += `* Recurrance: every ${ical.INTERVAL > 1 ? ical.INTERVAL : ''} ${
                     frequency === 'dai' ? 'day' : frequency
                 }${ical.INTERVAL > 1 ? 's' : ''} ${ical.COUNT ? `for ${ical.COUNT} times` : ''}\n`;
-                output += '\n';
             } else if (json.schedule) {
-                output += `**Schedule:** Not defined\n\n`;
+                output += `**Schedule:** Not defined\n`;
             }
         } else if (json.type === 'triggered' && json.fileTrigger) {
             output += `**File Trigger:**\n\n`;
@@ -803,12 +802,19 @@ class Automation extends MetadataType {
             output += `* Pattern: ${json.fileTrigger.fileNamingPattern}\n`;
             output += `* Folder:  ${json.fileTrigger.folderLocationText}\n`;
         }
+        // show table with automation steps
         if (tabled && tabled.length) {
+            // add empty line to ensure the following table is rendered properly
+            output += '\n';
             let tableSeparator = '';
             const row1 = [];
             for (const column of tabled[0]) {
                 row1.push(
-                    `| ${column.title}${column.description ? `<br>_${column.description}_` : ''} `
+                    `| ${column.title}${
+                        column.description
+                            ? `<br>_<small>${column.description.replace(/\n/g, '<br>')}</small>_`
+                            : ''
+                    } `
                 );
                 tableSeparator += '| --- ';
             }

package/lib/metadataTypes/MetadataType.js

@@ -259,11 +259,7 @@ class MetadataType {
 
         try {
             // write to file
-            await File.writeJSONToFile(
-                [templateDir, ...typeDirArr],
-                key + '.' + this.definition.type + suffix,
-                metadata
-            );
+            await File.writeJSONToFile([templateDir, ...typeDirArr], fileName, metadata);
             Util.logger.info(
                 `- templated ${this.definition.type}: ${key} (${
                     metadata[this.definition.nameField]

package/lib/metadataTypes/Query.js

@@ -251,7 +251,7 @@ class Query extends MetadataType {
         } catch {
             throw new Error(
                 `${this.definition.type}:: Error applying template variables on ${
-                    metadata[this.definition.keyField] + '.' + this.definition.type
+                    templateName + '.' + this.definition.type
                 }-meta.sql.`
             );
         }
@@ -263,14 +263,14 @@ class Query extends MetadataType {
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                metadata[this.definition.keyField] + '.' + this.definition.type + '-meta',
+                templateName + '.' + this.definition.type + '-meta',
                 'sql',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                metadata[this.definition.keyField] + '.' + this.definition.type + '-meta.sql',
+                templateName + '.' + this.definition.type + '-meta.sql',
             ]);
         }
         return nestedFilePaths;

package/lib/metadataTypes/Script.js

@@ -225,7 +225,7 @@ class Script extends MetadataType {
         } catch {
             throw new Error(
                 `${this.definition.type}:: Error applying template variables on ${
-                    metadata[this.definition.keyField] + '.' + this.definition.type
+                    templateName + '.' + this.definition.type
                 }-meta.ssjs.`
             );
         }
@@ -237,14 +237,14 @@ class Script extends MetadataType {
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                metadata[this.definition.keyField] + '.' + this.definition.type + '-meta',
+                templateName + '.' + this.definition.type + '-meta',
                 'ssjs',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                metadata[this.definition.keyField] + '.' + this.definition.type + '-meta.ssjs',
+                templateName + '.' + this.definition.type + '-meta.ssjs',
             ]);
         }
         return nestedFilePaths;

package/lib/util/devops.js

@@ -249,6 +249,7 @@ const DevOps = {
      * @param {TYPE.Mcdevrc} properties project config file
      * @param {string} range git commit range
      * @param {TYPE.SkipInteraction} [skipInteraction] allows to skip interactive wizard
+     * @returns {Promise.<TYPE.DeltaPkgItem[]>} -
      */
     async buildDeltaDefinitions(properties, range, skipInteraction) {
         // check if sourceTargetMapping is valid
@@ -260,7 +261,8 @@ const DevOps = {
             return;
         }
         const sourceMarketListArr = Object.keys(properties.options.deployment.sourceTargetMapping);
-
+        /** @type {TYPE.DeltaPkgItem[]} */
+        const deltaDeployAll = [];
         for (const sourceML of sourceMarketListArr) {
             // check if sourceTargetMapping has valid values
             // #1 check source marketlist
@@ -315,10 +317,12 @@ const DevOps = {
             const buTypeDelta = {}; // for bt, with BU info
             const typeDelta = {}; // for bdb, without BU info - thats taken from the marketList
             let deltaCounter = 0;
-            for (const file of delta
+            const deltaDeploy = delta
                 // Only template/build files that were added/updated/moved. no deletions
                 // ! doesn't work for folder, because their name parsing doesnt work at the moment
-                .filter((file) => file.gitAction !== 'delete' && file.name)) {
+                .filter((file) => file.gitAction !== 'delete' && file.name);
+            deltaDeployAll.push(...deltaDeploy);
+            for (const file of deltaDeploy) {
                 const buPath = `${file._credential}/${file._businessUnit}`;
                 if (!buTypeDelta[buPath]) {
                     // init object
@@ -356,10 +360,10 @@ const DevOps = {
             if (deltaCounter) {
                 Util.logger.info(`- ✔️  Templates created: ${deltaCounter}`);
             } else {
-                Util.logger.error(
-                    '- ❌ No Templates or Deploy Definitions created. Check if you expected no changes.'
+                Util.logger.warn(
+                    `-  No Templates or Deploy Definitions created for ${sourceMlName}`
                 );
-                return;
+                continue;
             }
 
             // Run build definitions bulk for each type
@@ -413,6 +417,12 @@ const DevOps = {
                 );
             }
         }
+        if (!deltaDeployAll.length) {
+            Util.logger.error(
+                '- ❌ No Templates or Deploy Definitions created. Check if you expected no changes.'
+            );
+        }
+        return deltaDeployAll;
     },
 
     /**

package/lib/util/file.js

@@ -192,41 +192,52 @@ const File = {
             // load the right prettier config relative to our file
             switch (filetype) {
                 case 'htm':
-                case 'html':
+                case 'html': {
                     FileFs.prettierConfig.parser = 'html';
                     break;
+                }
                 case 'ssjs':
-                case 'js':
+                case 'js': {
                     FileFs.prettierConfig.parser = 'babel';
                     break;
-                case 'json':
+                }
+                case 'json': {
                     FileFs.prettierConfig.parser = 'json';
                     break;
+                }
                 case 'yaml':
-                case 'yml':
+                case 'yml': {
                     FileFs.prettierConfig.parser = 'yaml';
                     break;
-                case 'ts':
+                }
+                case 'ts': {
                     FileFs.prettierConfig.parser = 'babel-ts';
                     break;
-                case 'css':
+                }
+                case 'css': {
                     FileFs.prettierConfig.parser = 'css';
                     break;
-                case 'less':
+                }
+                case 'less': {
                     FileFs.prettierConfig.parser = 'less';
                     break;
+                }
                 case 'sass':
-                case 'scss':
+                case 'scss': {
                     FileFs.prettierConfig.parser = 'scss';
                     break;
-                case 'md':
+                }
+                case 'md': {
                     FileFs.prettierConfig.parser = 'markdown';
                     break;
-                case 'sql':
+                }
+                case 'sql': {
                     FileFs.prettierConfig.parser = 'sql';
                     break;
-                default:
+                }
+                default: {
                     FileFs.prettierConfig.parser = 'babel';
+                }
             }
             formatted = prettier.format(content, FileFs.prettierConfig);
         } catch (ex) {

package/lib/util/init.config.js

@@ -35,7 +35,7 @@ const Init = {
         if (missingFields.length) {
             for (const fieldName of missingFields) {
                 switch (fieldName) {
-                    case 'marketList':
+                    case 'marketList': {
                         if (properties.marketBulk) {
                             upgradeMsgs.push(`- ✔️  converted 'marketBulk' to '${fieldName}'`);
                             properties[fieldName] = properties.marketBulk;
@@ -45,7 +45,8 @@ const Init = {
                             this._updateLeaf(properties, defaultProps, fieldName);
                         }
                         break;
-                    case 'directories.docs':
+                    }
+                    case 'directories.docs': {
                         if (properties.directories.badKeys) {
                             delete properties.directories.badKeys;
                             upgradeMsgs.push(`- ✋ removed 'directories.badKeys'`);
@@ -75,7 +76,8 @@ const Init = {
                         this._updateLeaf(properties, defaultProps, fieldName);
                         upgradeMsgs.push(`- ✔️  added '${fieldName}'`);
                         break;
-                    case 'metaDataTypes.documentOnRetrieve':
+                    }
+                    case 'metaDataTypes.documentOnRetrieve': {
                         if (!properties.options.documentOnRetrieve) {
                             properties.metaDataTypes.documentOnRetrieve = [];
                         } else {
@@ -86,7 +88,8 @@ const Init = {
                             `- ✔️  converted 'options.documentOnRetrieve' to '${fieldName}'`
                         );
                         break;
-                    case 'options.deployment.commitHistory':
+                    }
+                    case 'options.deployment.commitHistory': {
                         if (properties.options.commitHistory) {
                             upgradeMsgs.push(
                                 `- ✔️  converted 'options.commitHistory' to '${fieldName}'`
@@ -99,7 +102,8 @@ const Init = {
                             this._updateLeaf(properties, defaultProps, fieldName);
                         }
                         break;
-                    case 'options.exclude':
+                    }
+                    case 'options.exclude': {
                         if (properties.options.filter) {
                             upgradeMsgs.push(`- ✔️  converted 'options.filter' to '${fieldName}'`);
                             properties.options.exclude = properties.options.filter;
@@ -109,13 +113,16 @@ const Init = {
                             this._updateLeaf(properties, defaultProps, fieldName);
                         }
                         break;
-                    case 'version':
+                    }
+                    case 'version': {
                         // do nothing other than ensure we re-save the config (with the new version)
                         upgradeMsgs.push(`- ✔️  version updated`);
                         break;
-                    default:
+                    }
+                    default: {
                         this._updateLeaf(properties, defaultProps, fieldName);
                         upgradeMsgs.push(`- ✔️  added '${fieldName}'`);
+                    }
                 }
             }
             updateConfigNeeded = true;

package/lib/util/init.js

@@ -161,7 +161,7 @@ const Init = {
             if (initGit.status === 'init') {
                 Util.logger.info(`Committing initial setup to Git:`);
                 Util.execSync('git', ['add', '.']);
-                Util.execSync('git', ['commit', '-m', '"Initial commit"', '--quiet']);
+                Util.execSync('git', ['commit', '-n', '-m', '"Initial commit"', '--quiet']);
                 Util.logger.info(`✔️  Configuration committed`);
             }
 
@@ -204,7 +204,7 @@ const Init = {
             if (gitStatus === 'init') {
                 Util.logger.info(`Committing first backup of your SFMC instance:`);
                 Util.execSync('git', ['add', '.']);
-                Util.execSync('git', ['commit', '-m', '"First instance backup"', '--quiet']);
+                Util.execSync('git', ['commit', '-n', '-m', '"First instance backup"', '--quiet']);
                 Util.logger.info(`✔️  SFMC instance backed up`);
             } else if (gitStatus === 'update') {
                 Util.logger.warn(

package/lib/util/init.npm.js

@@ -49,7 +49,7 @@ const Init = {
             this._getDefaultPackageJson(projectPackageJson);
             await File.writeToFile('./', 'package', 'json', JSON.stringify(projectPackageJson));
             // execute "no questions asked" npm init
-            Util.execSync('npm', ['init', '--yes']);
+            Util.execSync('npm', ['init', '--yes'], true);
             try {
                 fileContent = File.readFileSync('package.json', 'utf8');
                 if (fileContent) {

package/lib/util/util.js

@@ -353,15 +353,16 @@ const Util = {
      *
      * @param {string} cmd to be executed command
      * @param {string[]} [args] list of arguments
+     * @param {boolean} [hideOutput] if true, output of command will be hidden from CLI
      * @returns {undefined}
      */
-    execSync(cmd, args) {
+    execSync(cmd, args, hideOutput) {
         args = args || [];
         Util.logger.info('⚡ ' + cmd + ' ' + args.join(' '));
 
         // the following options ensure the user sees the same output and
         // interaction options as if the command was manually run
-        const options = { stdio: [0, 1, 2] };
+        const options = hideOutput ? {} : { stdio: [0, 1, 2] };
         return child_process.execSync(cmd + ' ' + args.join(' '), options);
     },
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -42,7 +42,7 @@
     "dependencies": {
         "cli-progress": "3.11.2",
         "command-exists": "1.2.9",
-        "conf": "10.1.2",
+        "conf": "10.2.0",
         "console.table": "0.10.0",
         "deep-equal": "2.0.5",
         "fs-extra": "10.1.0",
@@ -51,32 +51,32 @@
         "mustache": "4.2.0",
         "p-limit": "3.1.0",
         "prettier": "2.7.1",
-        "prettier-plugin-sql": "0.8.3",
-        "semver": "7.3.7",
+        "prettier-plugin-sql": "0.12.1",
+        "semver": "7.3.8",
         "sfmc-sdk": "0.6.1",
-        "simple-git": "3.10.0",
+        "simple-git": "3.14.1",
         "toposort": "2.0.2",
         "update-notifier": "5.1.0",
-        "winston": "3.8.1",
-        "yargs": "17.5.1"
+        "winston": "3.8.2",
+        "yargs": "17.6.0"
     },
     "devDependencies": {
         "assert": "2.0.0",
-        "axios-mock-adapter": "1.21.1",
+        "axios-mock-adapter": "1.21.2",
         "chai": "4.3.6",
-        "eslint": "8.19.0",
+        "eslint": "8.25.0",
         "eslint-config-prettier": "8.5.0",
         "eslint-config-ssjs": "1.1.11",
-        "eslint-plugin-jsdoc": "39.3.3",
-        "eslint-plugin-mocha": "10.0.5",
+        "eslint-plugin-jsdoc": "39.3.6",
+        "eslint-plugin-mocha": "10.1.0",
         "eslint-plugin-prettier": "4.2.1",
-        "eslint-plugin-unicorn": "43.0.0",
+        "eslint-plugin-unicorn": "44.0.2",
         "husky": "8.0.1",
         "jsdoc-to-markdown": "7.1.1",
         "lint-staged": "13.0.3",
         "mocha": "10.0.0",
-        "mock-fs": "5.1.2",
-        "npm-check": "5.9.2",
+        "mock-fs": "5.1.4",
+        "npm-check": "6.0.1",
         "npm-run-all": "4.1.5",
         "prettier-eslint": "15.0.1"
     },