mcdev 4.1.0 → 4.1.2

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,9 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 4.1.2
+              - 4.1.1
+              - 4.1.0
               - 4.0.2
               - 4.0.1
               - 4.0.0

package/.github/workflows/npm-publish.yml

@@ -4,30 +4,30 @@
 name: Publish NPM on Release
 
 on:
-  release:
-    types: [created]
+    release:
+        types: [published]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14
-      - run: npm ci
-      - run: npm test
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 16
+            - run: npm ci
+            - run: npm test
 
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+    publish-npm:
+        needs: build
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 16
+                  registry-url: https://registry.npmjs.org/
+            - run: npm ci
+            - run: npm publish
+              env:
+                  NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/.vscode/settings.json

@@ -31,7 +31,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[markdown]": {
-        "editor.defaultFormatter": "yzhang.markdown-all-in-one"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

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 run `mcdev --version` and it will show you which version you installed (e.g. `4.1.0`).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.2`).
 
 > **_Side note for proud nerds_:**
 >
@@ -146,7 +146,7 @@ After the successful installation, you will now need to setup the connection to
    5. Make sure you grant all available rights.
    6. Go to the access tab and grant it access to all Business Units that you want to use it for, but ensure that the Parent/Global Business Unit is among these.
       - _Why?_ Shared Data Extensions, roles, users, Business Unit info and some other metadata is internally stored solely on the parent Business Unit and hence can only be retrieved and updated via that BU.
-   7. Note down _EID_ (Parent MID),  _Client Id_, _Client Secret_ and _Authentication Base URI_.
+   7. Note down _EID_ (Parent MID), _Client Id_, _Client Secret_ and _Authentication Base URI_.
 2. In your project folder
    1. Open a CLI in your project folder (e.g. `C:\repos\MyProject\` on Windows or `~/repos/MyProject/` on Mac)
    2. Run `mcdev init` to start the interactive setup wizard.
@@ -277,10 +277,10 @@ _Note: Regardless of which tag or branch you install_
 **Install specific version (using a version tag on npm):**
 
 ```bash
-npm install -g mcdev@4.1.0
+npm install -g mcdev@4.1.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, 4.1.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.1.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`.
 
@@ -407,7 +407,7 @@ The following metadata types are currently supported:
 | List                               | `list`                    | Yes      | in backlog | -          | Yes                  | Old way of storing data. Still used for central Email Subscriber DB.                                               |
 | Mobile Connect Code                | `mobileCode`              | Yes      | No         | No         | -                    | Mobile Connect Shore or Long Codes used for sending. First 50 per BU are retrieved                                 |
 | Mobile Connect Keyword             | `mobileKeyword`           | Yes      | Yes        | Yes        | -                    | Mobile Connect keywords configured within the Business UNit. First 50 per BU are retrieved                         |
-| Role                               | `role`                    | Yes      | Yes        | yes (`bt`)          | Yes                  | User Roles define groups that are used to grant users access to SFMC systems.                                      |
+| Role                               | `role`                    | Yes      | Yes        | yes (`bt`) | Yes                  | User Roles define groups that are used to grant users access to SFMC systems.                                      |
 | Triggered Send                     | `triggeredSendDefinition` | Yes      | Yes        | -          | Yes                  | **DEPRECATED**: Sends emails via API or DataExtension Event.                                                       |
 | User                               | `accountUser`             | Yes      | in backlog | -          | -                    | Users and Installed Packages including their assigned Roles, BUs and personal permissions                          |
 
@@ -478,7 +478,6 @@ Example url: `https://mcg123abcysykllg-0321cbs8bbt64.auth.marketingcloudapis.com
 > ```bash
 > mcdev init --y.credentialsName "yourCustomCredentialName" --y.client_id "yourClientIdHere" --y.client_secret "yourClientSecretHere" --y.auth_url "https://yourTenantSubdomainHere.auth.marketingcloudapis.com/" --y.gitRemoteUrl "https://my.git.server.com/myrepo.git" --y.account_id 00000000
 > ```
->
 
 #### 6.1.2. upgrade
 
@@ -753,13 +752,13 @@ Deletes the given metadata from your server. This needs to be run with care as a
 
 Currently supported types:
 
-| Name           | CLI Argument    |
-| -------------- | --------------- |
-| Data Extension | `dataExtension` |
-| Data Extension Field | `dataExtensionField` |
-| Email Send Definition | `Email Send Definition` |
-| List | `list` |
-| Triggered Send | `triggeredSendDefinition` |
+| Name                  | CLI Argument              |
+| --------------------- | ------------------------- |
+| Data Extension        | `dataExtension`           |
+| Data Extension Field  | `dataExtensionField`      |
+| Email Send Definition | `Email Send Definition`   |
+| List                  | `list`                    |
+| Triggered Send        | `triggeredSendDefinition` |
 
 _Example:_
 
@@ -1103,13 +1102,13 @@ The central config in `.mcdevrc.json` holds multiple adjustable settings:
 | options.deployment.sourceTargetMapping   | `{"deployment-source": "deployment-target"}` | Configuration of 1 or many source-target marketList combos for `mcdev createDeltaPkg`                                       |
 | options.deployment.targetBranchBuMapping | `{"release/*": "...","master": ["..."]}`     | Can be used by CI/CD pipelines to know what BUs shall be deployed to upon a merge into one of the specified branches        |
 | options.documentType                     | 'md'                                         | Defines the format for documentation ('md', 'html', 'both')                                                                 |
-| options.documentStandardRoles            | false                                         | Optionally skip standard role documentation by setting to false                                                         |
+| options.documentStandardRoles            | false                                        | Optionally skip standard role documentation by setting to false                                                             |
 | options.exclude.`type`.`field`           | []                                           | Allows you to filter out metadata on retrieve based on their field values, e.g. CustomerKey (previously `options.filter`)   |
 | options.include.`type`.`field`           | []                                           | Allows you to filter out metadata on retrieve based on their field values, e.g. CustomerKey                                 |
 | options.serverTimeOffset                 | -6                                           | Used to work around quirks in how SFMC handles timezones; For stack4: set to -7 (US Mountain time); others: -6 (US Central) |
 | directories.businessUnits                | 'businessUnits/'                             | Directory to save BU base details in                                                                                        |
 | directories.deploy                       | 'deploy/'                                    | Where `deploy` searches for files to deploy                                                                                 |
-| directories.docs                        | 'docs/'                                | Directory for `document` output                                                                                        |
+| directories.docs                         | 'docs/'                                      | Directory for `document` output                                                                                             |
 | directories.retrieve                     | 'retrieve/'                                  | Where `retrieve` stores downloaded files                                                                                    |
 | directories.template                     | 'template/'                                  | Where `rt` stores downloaded templates & `bd` retrieves them from                                                           |
 | directories.templateBuilds               | ['retrieve/','deploy/']                      | Where `bd` saves final deployment versions in. This can hold multiple directories, e.g. ['retrieve/','deploy/']             |
@@ -1126,8 +1125,8 @@ The central config in `.mcdevrc.json` holds multiple adjustable settings:
 
 The way retention policy is saved is a bit misleading and hence we wanted to provide a bit of guidance if you ever need to do a deep dive here.
 
-| Field | Description | Values |
-| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| Field                                | Description                                                                                                                                                                                                                                                                                                                        | Values                                                                 |
+| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | ------------ |
 | **DataRetentionPeriod**              | this field should print the value of the unit of measure but it unfortunately is off by one (e.g. showing "weeks" instead of "months"). Also, it seems to have no impact on what's stored.<br> We therefore excluded it from retrieve/deploy                                                                                       | -                                                                      |
 | **DataRetentionPeriodUnitOfMeasure** | represents drop down for "period after" selection                                                                                                                                                                                                                                                                                  | 6: years<br>5: months<br>4: weeks<br>2: days                           |
 | **DataRetentionPeriodLength**        | represents number field for "period after" selection                                                                                                                                                                                                                                                                               | min: 1<br>max: 999                                                     |
@@ -1494,7 +1493,7 @@ Assuming you cloned Accenture SFMC DevTools into `C:\repos\sfmc-devtools\` (or `
 
 This should tell npm to create a symlink to your cloned local directoty, allowing you to see updates you make in your mcdev repo instantly.
 
-To test your new **global** developer setup, run `mcdev --version` in CLI which should return the current version (e.g. `4.1.0`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `4.1.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.1.2`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `4.1.2-dev` and then run `mcdev --version` again to verify that your change propagates instantly.
 
 > **Not recommended:** Alternatively, you can install it locally only by opening a terminal in your project directory and executing `npm install --save-dev "C:\repos\sfmc-devtools"`
 > To run the local version you need to prepend "npx" before your commands, e.g. `npx mcdev --version`
@@ -1532,7 +1531,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 run `mcdev --version` and it will show you which version you installed (e.g. `4.1.0`).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.2`).
 
 ### 9.3. NPM Scripts
 

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

@@ -1,4 +1,7 @@
 {
+    "workbench.editorAssociations": {
+        "*.md": "vscode.markdown.preview.editor"
+    },
     "explorer.fileNesting.enabled": true,
     "explorer.fileNesting.expand": false,
     "explorer.fileNesting.patterns": {

package/boilerplate/forcedUpdates.json

@@ -1,4 +1,8 @@
 [
+    {
+        "version": "4.1.1",
+        "files": [".vscode/settings.json"]
+    },
     {
         "version": "4.0.0",
         "files": [".vscode/settings.json", ".vscode/extensions.json", ".prettierrc"]

package/docs/dist/documentation.md

@@ -346,10 +346,10 @@ Source and target business units are also compared before the deployment to appl
     * [new Deployer(properties, buObject)](#new_Deployer_new)
     * _instance_
         * [.metadata](#Deployer+metadata) : <code>TYPE.MultiMetadataTypeMap</code>
-        * [._deploy([typeArr], [keyArr], [fromRetrieve])](#Deployer+_deploy) ⇒ <code>Promise</code>
+        * [._deploy([typeArr], [keyArr], [fromRetrieve])](#Deployer+_deploy) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code>
     * _static_
-        * [.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve])](#Deployer.deploy) ⇒ <code>Promise.&lt;void&gt;</code>
-        * [._deployBU(cred, bu, properties, [typeArr], [keyArr], [fromRetrieve])](#Deployer._deployBU) ⇒ <code>Promise</code>
+        * [.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve])](#Deployer.deploy) ⇒ <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code>
+        * [._deployBU(cred, bu, properties, [typeArr], [keyArr], [fromRetrieve])](#Deployer._deployBU) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code>
         * [.readBUMetadata(deployDir, [typeArr], [listBadKeys])](#Deployer.readBUMetadata) ⇒ <code>TYPE.MultiMetadataTypeMap</code>
         * [.createFolderDefinitions(deployDir, metadata, metadataTypeArr)](#Deployer.createFolderDefinitions) ⇒ <code>void</code>
 
@@ -370,11 +370,11 @@ Creates a Deployer, uses v2 auth if v2AuthOptions are passed.
 **Kind**: instance property of [<code>Deployer</code>](#Deployer)  
 <a name="Deployer+_deploy"></a>
 
-### deployer.\_deploy([typeArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise</code>
+### deployer.\_deploy([typeArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code>
 Deploy all metadata that is located in the deployDir
 
 **Kind**: instance method of [<code>Deployer</code>](#Deployer)  
-**Returns**: <code>Promise</code> - Promise  
+**Returns**: <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code> - Promise of all deployed metadata  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -384,11 +384,11 @@ Deploy all metadata that is located in the deployDir
 
 <a name="Deployer.deploy"></a>
 
-### Deployer.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;void&gt;</code>
+### Deployer.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code>
 Deploys all metadata located in the 'deploy' directory to the specified business unit
 
 **Kind**: static method of [<code>Deployer</code>](#Deployer)  
-**Returns**: <code>Promise.&lt;void&gt;</code> - -  
+**Returns**: <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code> - deployed metadata per BU (first key: bu name, second key: metadata type)  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -399,11 +399,11 @@ Deploys all metadata located in the 'deploy' directory to the specified business
 
 <a name="Deployer._deployBU"></a>
 
-### Deployer.\_deployBU(cred, bu, properties, [typeArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise</code>
+### Deployer.\_deployBU(cred, bu, properties, [typeArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code>
 helper for deploy()
 
 **Kind**: static method of [<code>Deployer</code>](#Deployer)  
-**Returns**: <code>Promise</code> - ensure that BUs are worked on sequentially  
+**Returns**: <code>Promise.&lt;TYPE.MultiMetadataTypeMap&gt;</code> - ensure that BUs are worked on sequentially  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -456,7 +456,7 @@ main class
     * [.explainTypes()](#Mcdev.explainTypes) ⇒ <code>void</code>
     * [.upgrade([skipInteraction])](#Mcdev.upgrade) ⇒ <code>Promise.&lt;boolean&gt;</code>
     * [.retrieve(businessUnit, [selectedTypesArr], [keys], [changelogOnly])](#Mcdev.retrieve) ⇒ <code>Promise.&lt;object&gt;</code>
-    * [.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve])](#Mcdev.deploy) ⇒ <code>Promise.&lt;void&gt;</code>
+    * [.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve])](#Mcdev.deploy) ⇒ <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code>
     * [.initProject([credentialsName], [skipInteraction])](#Mcdev.initProject) ⇒ <code>Promise.&lt;void&gt;</code>
     * [.findBUs(credentialsName)](#Mcdev.findBUs) ⇒ <code>Promise.&lt;void&gt;</code>
     * [.document(businessUnit, type)](#Mcdev.document) ⇒ <code>Promise.&lt;void&gt;</code>
@@ -545,11 +545,11 @@ Retrieve all metadata from the specified business unit into the local file syste
 
 <a name="Mcdev.deploy"></a>
 
-### Mcdev.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;void&gt;</code>
+### Mcdev.deploy(businessUnit, [selectedTypesArr], [keyArr], [fromRetrieve]) ⇒ <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code>
 Deploys all metadata located in the 'deploy' directory to the specified business unit
 
 **Kind**: static method of [<code>Mcdev</code>](#Mcdev)  
-**Returns**: <code>Promise.&lt;void&gt;</code> - -  
+**Returns**: <code>Promise.&lt;Object.&lt;string, TYPE.MultiMetadataTypeMap&gt;&gt;</code> - deployed metadata per BU (first key: bu name, second key: metadata type)  
 
 | Param | Type | Default | Description |
 | --- | --- | --- | --- |
@@ -2943,7 +2943,7 @@ Provides default functionality that can be overwritten by child metadata type cl
     * [.buObject](#MetadataType.buObject) : <code>TYPE.BuObject</code>
     * [.getJsonFromFS(dir, [listBadKeys])](#MetadataType.getJsonFromFS) ⇒ <code>TYPE.MetadataTypeMap</code>
     * [.getFieldNamesToRetrieve([additionalFields])](#MetadataType.getFieldNamesToRetrieve) ⇒ <code>Array.&lt;string&gt;</code>
-    * [.deploy(metadata, deployDir, retrieveDir, buObject)](#MetadataType.deploy) ⇒ <code>Promise.&lt;object&gt;</code>
+    * [.deploy(metadata, deployDir, retrieveDir, buObject)](#MetadataType.deploy) ⇒ <code>Promise.&lt;TYPE.MetadataTypeMap&gt;</code>
     * [.postDeployTasks(metadata, originalMetadata)](#MetadataType.postDeployTasks) ⇒ <code>void</code>
     * [.postRetrieveTasks(metadata, targetDir, [isTemplating])](#MetadataType.postRetrieveTasks) ⇒ <code>TYPE.MetadataTypeItem</code>
     * [.retrieve(retrieveDir, [additionalFields], buObject, [subType], [key])](#MetadataType.retrieve) ⇒ <code>Promise.&lt;TYPE.MetadataTypeMapObj&gt;</code>
@@ -3030,11 +3030,11 @@ Returns fieldnames of Metadata Type. 'this.definition.fields' variable only set
 
 <a name="MetadataType.deploy"></a>
 
-### MetadataType.deploy(metadata, deployDir, retrieveDir, buObject) ⇒ <code>Promise.&lt;object&gt;</code>
+### MetadataType.deploy(metadata, deployDir, retrieveDir, buObject) ⇒ <code>Promise.&lt;TYPE.MetadataTypeMap&gt;</code>
 Deploys metadata
 
 **Kind**: static method of [<code>MetadataType</code>](#MetadataType)  
-**Returns**: <code>Promise.&lt;object&gt;</code> - Promise of keyField => metadata map  
+**Returns**: <code>Promise.&lt;TYPE.MetadataTypeMap&gt;</code> - Promise of keyField => metadata map  
 
 | Param | Type | Description |
 | --- | --- | --- |

package/lib/Deployer.js

@@ -48,10 +48,11 @@ class Deployer {
      * @param {TYPE.SupportedMetadataTypes[]} [selectedTypesArr] limit deployment to given metadata type
      * @param {string[]} [keyArr] limit deployment to given metadata keys
      * @param {boolean} [fromRetrieve] optionally deploy whats defined via selectedTypesArr + keyArr directly from retrieve folder instead of from deploy folder
-     * @returns {Promise.<void>} -
+     * @returns {Promise.<Object.<string,TYPE.MultiMetadataTypeMap>>} deployed metadata per BU (first key: bu name, second key: metadata type)
      */
     static async deploy(businessUnit, selectedTypesArr, keyArr, fromRetrieve) {
         Util.logger.info('mcdev:: Deploy');
+        const buMultiMetadataTypeMap = {};
         const properties = await config.getProperties();
         if (!(await config.checkProperties(properties))) {
             return null;
@@ -87,9 +88,18 @@ class Deployer {
                 2,
                 false
             );
+
             for (const buPath of deployFolders.filter((r) => r.includes(path.sep))) {
                 const [cred, bu] = buPath.split(path.sep);
-                await this._deployBU(cred, bu, properties, selectedTypesArr, keyArr, fromRetrieve);
+                const multiMetadataTypeMap = await this._deployBU(
+                    cred,
+                    bu,
+                    properties,
+                    selectedTypesArr,
+                    keyArr,
+                    fromRetrieve
+                );
+                buMultiMetadataTypeMap[cred + '/' + bu] = multiMetadataTypeMap;
                 counter_credBu++;
                 Util.logger.info('');
                 Util.restartLogger();
@@ -129,7 +139,7 @@ class Deployer {
                     false
                 );
                 for (const buPath of deployFolders) {
-                    await this._deployBU(
+                    const multiMetadataTypeMap = await this._deployBU(
                         cred,
                         buPath,
                         properties,
@@ -137,6 +147,7 @@ class Deployer {
                         keyArr,
                         fromRetrieve
                     );
+                    buMultiMetadataTypeMap[cred + '/' + buPath] = multiMetadataTypeMap;
                     counter_credBu++;
                     Util.logger.info('');
                     Util.restartLogger();
@@ -144,13 +155,22 @@ class Deployer {
                 Util.logger.info(`\n               :: ${counter_credBu} BUs for ${cred}\n`);
             } else {
                 // either bad credential or specific BU or no BU given
-                await this._deployBU(cred, bu, properties, selectedTypesArr, keyArr, fromRetrieve);
+                const multiMetadataTypeMap = await this._deployBU(
+                    cred,
+                    bu,
+                    properties,
+                    selectedTypesArr,
+                    keyArr,
+                    fromRetrieve
+                );
                 counter_credBu++;
+                buMultiMetadataTypeMap[cred + '/' + bu] = multiMetadataTypeMap;
             }
         }
         if (counter_credBu !== 0) {
             Util.logger.info(`\n               :: Deployed ${counter_credBu} BUs\n`);
         }
+        return buMultiMetadataTypeMap;
     }
     /**
      * helper for deploy()
@@ -161,22 +181,25 @@ class Deployer {
      * @param {TYPE.SupportedMetadataTypes[]} [typeArr] limit deployment to given metadata type
      * @param {string[]} [keyArr] limit deployment to given metadata keys
      * @param {boolean} [fromRetrieve] optionally deploy whats defined via selectedTypesArr + keyArr directly from retrieve folder instead of from deploy folder
-     * @returns {Promise} ensure that BUs are worked on sequentially
+     * @returns {Promise.<TYPE.MultiMetadataTypeMap>} ensure that BUs are worked on sequentially
      */
     static async _deployBU(cred, bu, properties, typeArr, keyArr, fromRetrieve) {
         const buPath = `${cred}/${bu}`;
         Util.logger.info(`::Deploying ${buPath}`);
         const buObject = await Cli.getCredentialObject(properties, buPath, null, true);
+        let multiMetadataTypeMap;
+
         if (buObject !== null) {
             cache.initCache(buObject);
             const deployer = new Deployer(properties, buObject);
             try {
                 // await is required or the calls end up conflicting
-                await deployer._deploy(typeArr, keyArr, fromRetrieve);
+                multiMetadataTypeMap = await deployer._deploy(typeArr, keyArr, fromRetrieve);
             } catch (ex) {
                 Util.logger.errorStack(ex, 'mcdev.deploy failed');
             }
         }
+        return multiMetadataTypeMap;
     }
 
     /**
@@ -185,7 +208,7 @@ class Deployer {
      * @param {TYPE.SupportedMetadataTypes[]} [typeArr] limit deployment to given metadata type (can include subtype)
      * @param {string[]} [keyArr] limit deployment to given metadata keys
      * @param {boolean} [fromRetrieve] if true, no folders will be updated/created
-     * @returns {Promise} Promise
+     * @returns {Promise.<TYPE.MultiMetadataTypeMap>} Promise of all deployed metadata
      */
     async _deploy(typeArr, keyArr, fromRetrieve) {
         if (await File.pathExists(this.deployDir)) {
@@ -232,6 +255,8 @@ class Deployer {
             const result = await MetadataTypeInfo[type].retrieveForCache(this.buObject, subType);
             cache.setMetadata(type, result.metadata);
         }
+        /** @type {TYPE.MultiMetadataTypeMap} */
+        const multiMetadataTypeMap = {};
         // deploy metadata files, extending cache once deploys
         for (const metadataType of deployOrder) {
             // TODO rewrite to allow deploying only a specific sub-type
@@ -246,9 +271,11 @@ class Deployer {
                     this.retrieveDir,
                     this.buObject
                 );
+                multiMetadataTypeMap[type] = result;
                 cache.mergeMetadata(type, result);
             }
         }
+        return multiMetadataTypeMap;
     }
 
     /**

package/lib/index.js

@@ -285,7 +285,7 @@ class Mcdev {
      * @param {TYPE.SupportedMetadataTypes[]} [selectedTypesArr] limit deployment to given metadata type
      * @param {string[]} [keyArr] limit deployment to given metadata keys
      * @param {boolean} [fromRetrieve] optionally deploy whats defined via selectedTypesArr + keyArr directly from retrieve folder instead of from deploy folder
-     * @returns {Promise.<void>} -
+     * @returns {Promise.<Object.<string,TYPE.MultiMetadataTypeMap>>} deployed metadata per BU (first key: bu name, second key: metadata type)
      */
     static async deploy(businessUnit, selectedTypesArr, keyArr, fromRetrieve = false) {
         return Deployer.deploy(businessUnit, selectedTypesArr, keyArr, fromRetrieve);

package/lib/metadataTypes/Asset.js

@@ -527,7 +527,7 @@ class Asset extends MetadataType {
         if (
             buObject.mid &&
             metadata.memberId !== buObject.mid &&
-            !metadata[this.definition.keyField].startsWith(buObject.mid)
+            !metadata[this.definition.keyField].endsWith(buObject.mid)
         ) {
             // #3 make sure customer key is unique by suffixing it with target MID (unless we are deploying to the same MID)
             // check if this suffixed with the source MID

package/lib/metadataTypes/ImportFile.js

@@ -134,23 +134,37 @@ class ImportFile extends MetadataType {
         delete metadata.r__ftpLocation_name;
 
         if (metadata.c__destinationType === 'DataExtension') {
-            metadata.destinationObjectId = cache.searchForField(
-                'dataExtension',
-                metadata.r__dataExtension_CustomerKey,
-                'CustomerKey',
-                'ObjectID'
-            );
-            delete metadata.r__dataExtension_CustomerKey;
+            if (metadata.r__dataExtension_CustomerKey) {
+                metadata.destinationObjectId = cache.searchForField(
+                    'dataExtension',
+                    metadata.r__dataExtension_CustomerKey,
+                    'CustomerKey',
+                    'ObjectID'
+                );
+                delete metadata.r__dataExtension_CustomerKey;
+            } else {
+                throw new Error('Import Destination DataExtension not defined');
+            }
         } else if (metadata.c__destinationType === 'List') {
-            metadata.destinationObjectId = cache.getListObjectId(
-                metadata.r__list_PathName,
-                'ObjectID'
+            if (metadata.r__list_PathName) {
+                metadata.destinationObjectId = cache.getListObjectId(
+                    metadata.r__list_PathName,
+                    'ObjectID'
+                );
+                // destinationId is also needed for List types
+                metadata.destinationId = cache.getListObjectId(metadata.r__list_PathName, 'ID');
+                delete metadata.r__list_PathName;
+            } else {
+                throw new Error('Import Destination List not defined');
+            }
+        } else {
+            Util.logger.debug(
+                ` - importFile ${metadata[this.definition.keyField]}: Import Destination Type ${
+                    metadata.c__destinationType
+                } not fully supported. Deploy might fail.`
             );
-            // destinationId is also needed for List types
-            metadata.destinationId = cache.getListObjectId(metadata.r__list_PathName, 'ID');
-            delete metadata.r__list_PathName;
         }
-        // When the destinationObjectTypeId is 584 is refers to Mobile Connect which is not supported as an Import Type
+        // When the destinationObjectTypeId is 584 it refers to Mobile Connect which is not supported as an Import Type
         metadata.destinationObjectTypeId =
             this.definition.destinationObjectTypeMapping[metadata.c__destinationType];
         metadata.subscriberImportTypeId =

package/lib/metadataTypes/MetadataType.js

@@ -104,7 +104,7 @@ class MetadataType {
      * @param {string} deployDir directory where deploy metadata are saved
      * @param {string} retrieveDir directory where metadata after deploy should be saved
      * @param {TYPE.BuObject} buObject properties for auth
-     * @returns {Promise.<object>} Promise of keyField => metadata map
+     * @returns {Promise.<TYPE.MetadataTypeMap>} Promise of keyField => metadata map
      */
     static async deploy(metadata, deployDir, retrieveDir, buObject) {
         const upsertResults = await this.upsert(metadata, deployDir, buObject);

package/lib/metadataTypes/Query.js

@@ -260,17 +260,20 @@ class Query extends MetadataType {
         const targetDirArr = Array.isArray(targetDir) ? targetDir : [targetDir];
         const nestedFilePaths = [];
 
+        // keep old name if creating templates, otherwise use new name
+        const fileName = mode === 'definition' ? metadata[this.definition.keyField] : templateName;
+
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                templateName + '.' + this.definition.type + '-meta',
+                fileName + '.' + this.definition.type + '-meta',
                 'sql',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                templateName + '.' + this.definition.type + '-meta.sql',
+                fileName + '.' + this.definition.type + '-meta.sql',
             ]);
         }
         return nestedFilePaths;

package/lib/metadataTypes/Script.js

@@ -234,17 +234,20 @@ class Script extends MetadataType {
         const targetDirArr = Array.isArray(targetDir) ? targetDir : [targetDir];
         const nestedFilePaths = [];
 
+        // keep old name if creating templates, otherwise use new name
+        const fileName = mode === 'definition' ? metadata[this.definition.keyField] : templateName;
+
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                templateName + '.' + this.definition.type + '-meta',
+                fileName + '.' + this.definition.type + '-meta',
                 'ssjs',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                templateName + '.' + this.definition.type + '-meta.ssjs',
+                fileName + '.' + this.definition.type + '-meta.ssjs',
             ]);
         }
         return nestedFilePaths;

package/lib/util/devops.js

@@ -407,7 +407,7 @@ const DevOps = {
                 );
             }
             await Promise.all(bdPromises);
-            Util.logger.info(`- ✔️  Deploy defintions created`);
+            Util.logger.info(`- ✔️  Deploy definitions created`);
             if (
                 properties.directories.templateBuilds == properties.directories.deploy ||
                 (Array.isArray(properties.directories.templateBuilds) &&

package/lib/util/util.js

@@ -428,10 +428,20 @@ const Util = {
  * @returns {object} initiated logger for console and file
  */
 function createNewLoggerTransport() {
+    // {
+    //   error: 0,
+    //   warn: 1,
+    //   info: 2,
+    //   http: 3,
+    //   verbose: 4,
+    //   debug: 5,
+    //   silly: 6
+    // }
+    const logFileName = new Date().toISOString().split(':').join('.');
     return {
         console: new winston.transports.Console({
             // Write logs to Console
-            level: 'info',
+            level: 'info', // log error, warn, info
             format: winston.format.combine(
                 winston.format.colorize(),
                 winston.format.timestamp({ format: 'HH:mm:ss' }),
@@ -441,9 +451,18 @@ function createNewLoggerTransport() {
         }),
         file: new winston.transports.File({
             // Write logs to logfile
-            filename: 'logs/' + new Date().toISOString().split(':').join('.') + '.log',
-            // filename: 'logs/' + Math.floor(Date.now() / 1000) + '.log',
-            level: 'debug',
+            filename: 'logs/' + logFileName + '.log',
+            level: 'debug', // log everything
+            format: winston.format.combine(
+                winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
+                winston.format.simple(),
+                winston.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`)
+            ),
+        }),
+        fileError: new winston.transports.File({
+            // Write logs to additional error-logfile for better visibility of errors
+            filename: 'logs/' + logFileName + '-errors.log',
+            level: 'error', // only log errors
             format: winston.format.combine(
                 winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
                 winston.format.simple(),
@@ -461,7 +480,11 @@ function startLogger() {
     Util.loggerTransports = createNewLoggerTransport();
     const myWinston = winston.createLogger({
         levels: winston.config.npm.levels,
-        transports: [Util.loggerTransports.console, Util.loggerTransports.file],
+        transports: [
+            Util.loggerTransports.console,
+            Util.loggerTransports.file,
+            Util.loggerTransports.fileError,
+        ],
     });
     const winstonError = myWinston.error;
     const winstonExtension = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "4.1.0",
+    "version": "4.1.2",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -64,10 +64,10 @@
         "assert": "2.0.0",
         "axios-mock-adapter": "1.21.2",
         "chai": "4.3.6",
-        "eslint": "8.25.0",
+        "eslint": "8.26.0",
         "eslint-config-prettier": "8.5.0",
         "eslint-config-ssjs": "1.1.11",
-        "eslint-plugin-jsdoc": "39.3.13",
+        "eslint-plugin-jsdoc": "39.3.25",
         "eslint-plugin-mocha": "10.1.0",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-unicorn": "44.0.2",
@@ -80,6 +80,9 @@
         "npm-run-all": "4.1.5",
         "prettier-eslint": "15.0.1"
     },
+    "optionalDependencies": {
+        "fsevents": "*"
+    },
     "lint-staged": {
         "*.{js,jsx,ts,tsx}": [
             "eslint --fix"

package/test/mockRoot/.mcdevrc.json

@@ -63,5 +63,5 @@
             "triggeredSendDefinition"
         ]
     },
-    "version": "4.0.0"
+    "version": "4.1.2"
 }