mcdev 4.3.1 → 4.3.3

package/.fork/custom-commands.json

@@ -0,0 +1,14 @@
+[
+  {
+    "name": "Create PR to develop branch",
+    "target": "ref",
+    "refTargets": [
+      "localbranch",
+      "remotebranch"
+    ],
+    "action": {
+      "type": "url",
+      "url": "https://github.com/Accenture/sfmc-devtools/compare/develop...$shortname?expand=1"
+    }
+  }
+]

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,8 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 4.3.3
+              - 4.3.2
               - 4.3.1
               - 4.3.0
               - 4.2.1

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,5 @@
 # PR details
 
-## What is the purpose of this pull request? (put an "X" next to an item)
-
-_Please delete options that are not relevant._
-
-- [ ] Documentation update
-- [ ] Bugfix
-- [ ] New metadata support
-- [ ] Enhanced metadata
-- [ ] Add a CLI option
-- [ ] Add something to the core
-- [ ] Technical debt removed
-- [ ] Dependencies added / updated
-- [ ] Other, please explain:
-
 ## What changes did you make? (Give an overview)
 
 ...

package/.github/pr-labeler.yml

@@ -1,3 +1,3 @@
 enhancement: ['feature/*', 'feat/*']
-bug: ['bugfix/*', 'bug/*', 'fix/*']
+bug: ['bugfix/*', 'bug/*', 'fix/*', 'hotfix/*']
 chore: ['chore/*', 'task/*']

package/.github/workflows/close_issues_on_merge.yml

@@ -5,6 +5,7 @@ on:
     types: [closed]
     branches:
       - develop
+      - hotfix
 
 jobs:
   closeIssueOnPrMergeTrigger:

package/.github/workflows/code-analysis.yml

@@ -13,10 +13,10 @@ name: 'CodeAnalysis'
 
 on:
     push:
-        branches: [main, develop]
+        branches: [main, develop, hotfix]
     pull_request:
         # The branches below must be a subset of the branches above
-        branches: [main, develop]
+        branches: [main, develop, hotfix]
 
 jobs:
     analyzeAndTest:

package/boilerplate/gitignore-template

@@ -7,3 +7,4 @@ node_modules/
 /template/
 **/QueryStudioResults at*
 .mcdev-auth.json
+*.error.log

package/docs/dist/documentation.md

@@ -736,10 +736,7 @@ MessageSendActivity MetadataType
 * [AccountUser](#AccountUser) ⇐ [<code>MetadataType</code>](#MetadataType)
     * [.retrieve(retrieveDir, _, [__], [key])](#AccountUser.retrieve) ⇒ <code>Promise.&lt;TYPE.MetadataTypeMapObj&gt;</code>
     * [.retrieveChangelog()](#AccountUser.retrieveChangelog) ⇒ <code>Promise.&lt;TYPE.MetadataTypeMapObj&gt;</code>
-    * [.timeSinceDate(date)](#AccountUser.timeSinceDate) ⇒ <code>number</code>
-    * [.getBuName(id)](#AccountUser.getBuName) ⇒ <code>string</code>
     * [.document([metadata])](#AccountUser.document) ⇒ <code>Promise.&lt;void&gt;</code>
-    * [._generateDocMd(users, type, columnsToPrint)](#AccountUser._generateDocMd) ⇒ <code>string</code>
     * [.postRetrieveTasks(metadata)](#AccountUser.postRetrieveTasks) ⇒ <code>TYPE.MetadataTypeItem</code>
     * [.parseMetadata(metadata)](#AccountUser.parseMetadata) ⇒ <code>TYPE.MetadataTypeItem</code>
 
@@ -765,28 +762,6 @@ Retrieves SOAP based metadata of metadata type into local filesystem. executes c
 
 **Kind**: static method of [<code>AccountUser</code>](#AccountUser)  
 **Returns**: <code>Promise.&lt;TYPE.MetadataTypeMapObj&gt;</code> - Promise of metadata  
-<a name="AccountUser.timeSinceDate"></a>
-
-### AccountUser.timeSinceDate(date) ⇒ <code>number</code>
-**Kind**: static method of [<code>AccountUser</code>](#AccountUser)  
-**Returns**: <code>number</code> - time difference  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| date | <code>string</code> | first date |
-
-<a name="AccountUser.getBuName"></a>
-
-### AccountUser.getBuName(id) ⇒ <code>string</code>
-helper to print bu names
-
-**Kind**: static method of [<code>AccountUser</code>](#AccountUser)  
-**Returns**: <code>string</code> - "bu name (bu id)""  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| id | <code>number</code> | bu id |
-
 <a name="AccountUser.document"></a>
 
 ### AccountUser.document([metadata]) ⇒ <code>Promise.&lt;void&gt;</code>
@@ -799,18 +774,6 @@ Creates markdown documentation of all roles
 | --- | --- | --- |
 | [metadata] | <code>TYPE.MetadataTypeMap</code> | user list |
 
-<a name="AccountUser._generateDocMd"></a>
-
-### AccountUser.\_generateDocMd(users, type, columnsToPrint) ⇒ <code>string</code>
-**Kind**: static method of [<code>AccountUser</code>](#AccountUser)  
-**Returns**: <code>string</code> - markdown  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| users | <code>Array.&lt;object&gt;</code> | list of users and installed package |
-| type | <code>&#x27;Installed Package&#x27;</code> \| <code>&#x27;User&#x27;</code> | choose what sub type to print |
-| columnsToPrint | <code>Array.&lt;Array&gt;</code> | helper array |
-
 <a name="AccountUser.postRetrieveTasks"></a>
 
 ### AccountUser.postRetrieveTasks(metadata) ⇒ <code>TYPE.MetadataTypeItem</code>

package/lib/Deployer.js

@@ -333,7 +333,13 @@ class Deployer {
         const folderMetadata = {};
         const allowedDeFolderContentTypes = ['dataextension', 'shared_dataextension'];
         for (const metadataType of metadataTypeArr) {
-            if (!MetadataTypeInfo[metadataType].definition.dependencies.includes('folder')) {
+            // check if folder or folder-like metadata type is in dependencies
+            if (
+                !MetadataTypeInfo[metadataType].definition.dependencies.includes('folder') &&
+                !MetadataTypeInfo[metadataType].definition.dependencies.some((dep) =>
+                    dep.startsWith('folder-')
+                )
+            ) {
                 Util.logger.debug(` ☇ skipping ${metadataType} folders: folder not a dependency`);
                 continue;
             }

package/lib/metadataTypes/AccountUser.js

@@ -60,10 +60,17 @@ class AccountUser extends MetadataType {
         for (const item of resultsBatch) {
             this.userIdBuMap[item.AccountUser.AccountUserID] =
                 this.userIdBuMap[item.AccountUser.AccountUserID] || [];
-            this.userIdBuMap[item.AccountUser.AccountUserID].push({
-                ID: item.Account.ID,
-                Name: item.Account.Name,
-            });
+            // push to array if not already in array
+            if (
+                !this.userIdBuMap[item.AccountUser.AccountUserID].some(
+                    (bu) => bu.ID === item.Account.ID
+                )
+            ) {
+                this.userIdBuMap[item.AccountUser.AccountUserID].push({
+                    ID: item.Account.ID,
+                    Name: item.Account.Name,
+                });
+            }
         }
         // get actual user details
         /** @type {TYPE.SoapRequestParams} */
@@ -114,10 +121,11 @@ class AccountUser extends MetadataType {
     }
     /**
      *
+     * @private
      * @param {string} date first date
      * @returns {number} time difference
      */
-    static timeSinceDate(date) {
+    static _timeSinceDate(date) {
         const interval = 'days';
         const second = 1000,
             minute = second * 60,
@@ -172,13 +180,28 @@ class AccountUser extends MetadataType {
     /**
      * helper to print bu names
      *
+     * @private
      * @param {number} id bu id
      * @returns {string} "bu name (bu id)""
      */
-    static getBuName(id) {
+    static _getBuName(id) {
         const name = this.buObject.eid == id ? '_ParentBU_' : this.buIdName[id];
         return `<nobr>${name} (${id})</nobr>`;
     }
+
+    /**
+     * helper that gets BU names from config
+     *
+     * @private
+     */
+    static _getBuNames() {
+        this.buIdName = {};
+        for (const cred in this.properties.credentials) {
+            for (const buName in this.properties.credentials[cred].businessUnits) {
+                this.buIdName[this.properties.credentials[cred].businessUnits[buName]] = buName;
+            }
+        }
+    }
     /**
      * Creates markdown documentation of all roles
      *
@@ -209,7 +232,7 @@ class AccountUser extends MetadataType {
             }
         }
         // init map of BU Ids > BU Name
-        this.buIdName = {};
+        this._getBuNames();
 
         // initialize permission object
         this.allPermissions = {};
@@ -244,14 +267,19 @@ class AccountUser extends MetadataType {
             }
             let associatedBus = '';
             if (user.AssociatedBusinessUnits__c) {
-                associatedBus = user.AssociatedBusinessUnits__c.map((item) => {
-                    this.buIdName[item.ID] = item.Name;
-                    return this.getBuName(item.ID);
-                })
+                user.AssociatedBusinessUnits__c.push({
+                    ID: user.DefaultBusinessUnit,
+                });
+                // ensure associatedBus have no duplicates
+                associatedBus = [
+                    ...new Set(
+                        user.AssociatedBusinessUnits__c.map((item) => this._getBuName(item.ID))
+                    ),
+                ]
                     .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))
                     .join(',<br> ');
             }
-            const defaultBUName = this.getBuName(user.DefaultBusinessUnit);
+            const defaultBUName = this._getBuName(user.DefaultBusinessUnit);
             users.push({
                 TYPE: user.type__c,
                 UserID: user.UserID,
@@ -267,7 +295,7 @@ class AccountUser extends MetadataType {
                 AssociatedBusinessUnits__c: associatedBus,
                 Roles: roles,
                 UserPermissions: userPermissions,
-                LastSuccessfulLogin: this.timeSinceDate(user.LastSuccessfulLogin),
+                LastSuccessfulLogin: this._timeSinceDate(user.LastSuccessfulLogin),
                 CreatedDate: user.CreatedDate.split('T').join(' '),
                 ModifiedDate: user.ModifiedDate.split('T').join(' '),
             });
@@ -325,6 +353,7 @@ class AccountUser extends MetadataType {
     }
     /**
      *
+     * @private
      * @param {object[]} users list of users and installed package
      * @param {'Installed Package'|'User'} type choose what sub type to print
      * @param {Array[]} columnsToPrint helper array

package/lib/metadataTypes/Asset.js

@@ -317,22 +317,30 @@ class Asset extends MetadataType {
                                 } catch (ex) {
                                     failed.push({ item: item, error: ex });
                                 }
+                                // even if the extended file failed, still save the metadata
                                 metadata[item.customerKey] = item;
                             }
                             // this is a complex type which stores data in the asset itself
                             else if (!completed.includes(item.id)) {
-                                const extendedItem = await this.client.rest.get(
-                                    'asset/v1/content/assets/' + item.id
-                                );
-                                metadata[item.customerKey] = extendedItem;
+                                try {
+                                    const extendedItem = await this.client.rest.get(
+                                        'asset/v1/content/assets/' + item.id
+                                    );
+                                    // only save the metadata if we have extended content
+                                    metadata[item.customerKey] = extendedItem;
+                                } catch (ex) {
+                                    failed.push({ item: item, error: ex });
+                                }
                             }
                             completed.push(item.id);
-                            await this.saveResults(
-                                metadata,
-                                retrieveDir,
-                                'asset-' + subType,
-                                templateVariables
-                            );
+                            if (metadata[item.customerKey]) {
+                                await this.saveResults(
+                                    metadata,
+                                    retrieveDir,
+                                    'asset-' + subType,
+                                    templateVariables
+                                );
+                            }
                             // update the current value in your application..
                             extendedBar.increment();
                         })
@@ -346,7 +354,7 @@ class Asset extends MetadataType {
             } catch (ex) {
                 extendedBar.stop();
                 Asset._resetLogLevel(loggerLevelBak, failed);
-                // timeouts should be retried, others can be retried
+                // timeouts should be retried, others can be exited
                 if (ex.code !== 'ETIMEDOUT') {
                     throw ex;
                 }
@@ -394,11 +402,17 @@ class Asset extends MetadataType {
             );
             for (const fail of failed) {
                 Util.logger.warn(
-                    `   -  "${fail.item.name}" (${fail.item.customerKey}) in ${fail.item.r__folder_Path}: ${fail.error.message}`
+                    `   - "${fail.item.name}" (${fail.item.customerKey}): ${fail.error.message} (${
+                        fail.error.code
+                    })${
+                        fail.error.endpoint
+                            ? Util.getGrayMsg(
+                                  ' - ' +
+                                      fail.error.endpoint.split('rest.marketingcloudapis.com')[1]
+                              )
+                            : ''
+                    }`
                 );
-                Util.logger.debug(`-- Error: ${fail.error.message}`);
-                Util.logger.debug(`-- AssetType: ${fail.item.assetType.name}`);
-                Util.logger.debug(`-- fileProperties: ${JSON.stringify(fail.item.fileProperties)}`);
             }
             Util.logger.info(
                 ' - You will still find a JSON file for each of these in the download directory.'

package/lib/metadataTypes/Automation.js

@@ -419,6 +419,14 @@ class Automation extends MetadataType {
                     }
                     if (schedule !== null) {
                         try {
+                            // remove the fields that are not needed for the schedule but only for CLI output
+                            const schedule_StartDateTime = schedule._StartDateTime;
+                            delete schedule._StartDateTime;
+                            const schedule_interval = schedule._interval;
+                            delete schedule._interval;
+                            const schedule_timezoneString = schedule._timezoneString;
+                            delete schedule._timezoneString;
+                            // start the automation
                             await this.client.soap.schedule(
                                 'Automation',
                                 schedule,
@@ -431,17 +439,17 @@ class Automation extends MetadataType {
                                 {}
                             );
                             const intervalString =
-                                (schedule._interval > 1 ? `${schedule._interval} ` : '') +
+                                (schedule_interval > 1 ? `${schedule_interval} ` : '') +
                                 (schedule.RecurrenceType === 'Daily'
                                     ? 'Day'
                                     : schedule.RecurrenceType.slice(0, -2) +
-                                      (schedule._interval > 1 ? 's' : ''));
+                                      (schedule_interval > 1 ? 's' : ''));
                             Util.logger.warn(
                                 ` - scheduled automation '${
                                     originalMetadata[key].name
                                 }' deployed Active: runs every ${intervalString} starting ${
-                                    schedule._StartDateTime.split('T').join(' ').split('.')[0]
-                                } ${schedule._timezoneString}`
+                                    schedule_StartDateTime.split('T').join(' ').split('.')[0]
+                                } ${schedule_timezoneString}`
                             );
                         } catch (ex) {
                             Util.logger.error(
@@ -673,9 +681,7 @@ class Automation extends MetadataType {
             ? 'ByDay'
             : 'Interval';
         schedule.Recurrence[keyStem + 'lyRecurrencePatternType'] = patternType;
-        schedule.Recurrence['$'] = {
-            'xsi:type': keyStem + 'lyRecurrence',
-        };
+        schedule.Recurrence['@_xsi:type'] = keyStem + 'lyRecurrence';
         schedule.RecurrenceType = keyStem + 'ly';
         if (keyStem === 'Dai') {
             schedule.Recurrence['DayInterval'] = recurHelper.INTERVAL;

package/lib/metadataTypes/DataExtensionField.js

@@ -242,9 +242,11 @@ class DataExtensionField extends MetadataType {
         }
 
         Util.logger.info(
-            ` - Found ${deployColumns.length} added/updated Fields for ${deKey}${
-                deployColumns.length ? ': ' : ''
-            }` + deployColumns.map((item) => item.Name).join(', ')
+            Util.getGrayMsg(
+                ` - Found ${deployColumns.length} added/updated Fields for ${deKey}${
+                    deployColumns.length ? ': ' : ''
+                }` + deployColumns.map((item) => item.Name).join(', ')
+            )
         );
         return existingFieldByName;
     }

package/lib/metadataTypes/EmailSendDefinition.js

@@ -104,15 +104,33 @@ class EmailSendDefinition extends MetadataType {
             delete metadata.r__email_Name;
         } else if (metadata.r__assetMessage_Key) {
             // content builder
-            // * this ignores r__assetMessage_Name on purpose as that is only unique per parent folder but useful during PR reviews
-            metadata.Email.ID = cache.searchForField(
-                'asset',
-                metadata.r__assetMessage_Key,
-                'customerKey',
-                'legacyData.legacyId'
-            );
-            delete metadata.r__assetMessage_Key;
-            delete metadata.r__assetMessage_Name;
+            // * this ignores r__assetMessage_Name on purpose\ as that is only unique per parent folder but useful during PR reviews
+            // will try to find the key with the bu mid at the end, if unable, will try to find the key without it
+            try {
+                // check asset key as provided
+                metadata.Email.ID = cache.searchForField(
+                    'asset',
+                    metadata.r__assetMessage_Key,
+                    'customerKey',
+                    'legacyData.legacyId'
+                );
+                delete metadata.r__assetMessage_Key;
+                delete metadata.r__assetMessage_Name;
+            } catch {
+                // if we deploy to another BU, try applying the BU's MID to the end, which we do in preDeployTasks for assets
+
+                // get suffix to update customer key at the end
+                const suffix = '-' + this.buObject.mid;
+
+                metadata.Email.ID = cache.searchForField(
+                    'asset',
+                    metadata.r__assetMessage_Key.slice(0, Math.max(0, 36 - suffix.length)) + suffix,
+                    'customerKey',
+                    'legacyData.legacyId'
+                );
+                delete metadata.r__assetMessage_Key;
+                delete metadata.r__assetMessage_Name;
+            }
         }
         // Target Audience DataExtension
         // normalize first because this can be an array
@@ -129,7 +147,7 @@ class EmailSendDefinition extends MetadataType {
             if (sdl.r__dataExtension_Key) {
                 if (sdl.DataSourceTypeID !== 'CustomObject') {
                     throw new Error(
-                        `Skipping ${metadata.Name} (${metadata.CustomerKey}): Expecting DataSourceTypeID to equal 'CustomObject' when r__dataExtension_Key is defined; Found '${sdl.DataSourceTypeID}'`
+                        ` ☇ skipping ${this.definition.type} ${metadata.Name} (${metadata.CustomerKey}): Expecting DataSourceTypeID to equal 'CustomObject' when r__dataExtension_Key is defined; Found '${sdl.DataSourceTypeID}'`
                     );
                 }
                 sdl.CustomObjectID = cache.searchForField(
@@ -141,9 +159,13 @@ class EmailSendDefinition extends MetadataType {
                 delete sdl.r__dataExtension_Key;
             } else if (sdl.DataSourceTypeID === 'CustomObject') {
                 throw new Error(
-                    `Skipping ${metadata.Name} (${metadata.CustomerKey}): Expecting r__dataExtension_Key to be defined if DataSourceTypeID='CustomObject'`
+                    ` ☇ skipping ${this.definition.type} ${metadata.Name} (${metadata.CustomerKey}): Expecting r__dataExtension_Key to be defined if DataSourceTypeID='CustomObject'`
                 );
             }
+            if (!sdl.SalesForceObjectID || sdl.SalesForceObjectID === '') {
+                // otherwise this causes error 42117 / invalid ObjectID
+                delete sdl.SalesForceObjectID;
+            }
             // get List (required)
             if (sdl.r__list_PathName) {
                 sdl.List = {
@@ -152,7 +174,7 @@ class EmailSendDefinition extends MetadataType {
                 delete sdl.r__list_PathName;
             } else {
                 throw new Error(
-                    `Field SendDefinitionList.r__list_PathName was not defined. Please try re-retrieving this ESD from your source BU.`
+                    ` ☇ skipping ${this.definition.type} ${metadata.Name} (${metadata.CustomerKey}) Field SendDefinitionList.r__list_PathName was not defined. Please try re-retrieving this ESD from your source BU.`
                 );
             }
         }
@@ -208,7 +230,11 @@ class EmailSendDefinition extends MetadataType {
                     delete metadata.Email;
                 } catch {
                     Util.logger.warn(
-                        ` - ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find email with ID ${metadata.Email.ID} in Classic nor in Content Builder.`
+                        ` - ${this.definition.type} ${metadata[this.definition.nameField]} (${
+                            metadata[this.definition.keyField]
+                        }): Could not find email with ID ${
+                            metadata.Email.ID
+                        } in Classic nor in Content Builder.`
                     );
                 }
             }
@@ -234,7 +260,11 @@ class EmailSendDefinition extends MetadataType {
                     delete sdl.CustomObjectID;
                 } catch {
                     Util.logger.warn(
-                        ` - ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find Target Audience (DataExtension) with ObjectID ${sdl.CustomObjectID}.`
+                        ` - ${this.definition.type} ${metadata[this.definition.nameField]} (${
+                            metadata[this.definition.keyField]
+                        }): Could not find Target Audience (DataExtension) with ObjectID ${
+                            sdl.CustomObjectID
+                        }.`
                     );
                 }
             }
@@ -245,10 +275,16 @@ class EmailSendDefinition extends MetadataType {
                     delete sdl.List;
                 } catch (ex) {
                     Util.logger.warn(
-                        ` - ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': ${ex.message}`
+                        ` - ${this.definition.type} ${metadata[this.definition.nameField]} (${
+                            metadata[this.definition.keyField]
+                        }): ${ex.message}`
                     );
                 }
             }
+            if (!sdl.SalesForceObjectID) {
+                // otherwise this causes error 42117 / invalid ObjectID
+                delete sdl.SalesForceObjectID;
+            }
         }
 
         return metadata;

package/lib/metadataTypes/List.js

@@ -53,21 +53,23 @@ class List extends MetadataType {
      */
     static async retrieveForCache() {
         const results = await this.retrieve();
-        if (!cache.getCache()?.folder) {
-            const subTypeArr = [
-                'list',
-                'mysubs',
-                'suppression_list',
-                'publication',
-                'contextual_suppression_list',
-            ];
-            Util.logger.debug('folders not cached but required for list');
-            Util.logger.info(' - Caching dependent Metadata: folder');
-            Util.logSubtypes(subTypeArr);
-            Folder.client = this.client;
-            Folder.buObject = this.buObject;
-            Folder.properties = this.properties;
-            const result = await Folder.retrieveForCache(null, subTypeArr);
+        const subTypeArr = [
+            'list',
+            'mysubs',
+            'suppression_list',
+            'publication',
+            'contextual_suppression_list',
+        ];
+        Util.logger.debug('folders not cached but required for list');
+        Util.logger.info(' - Caching dependent Metadata: folder');
+        Util.logSubtypes(subTypeArr);
+        Folder.client = this.client;
+        Folder.buObject = this.buObject;
+        Folder.properties = this.properties;
+        const result = await Folder.retrieveForCache(null, subTypeArr);
+        if (cache.getCache()?.folder) {
+            cache.mergeMetadata('folder', result.metadata);
+        } else {
             cache.setMetadata('folder', result.metadata);
         }
         for (const metadataEntry in results.metadata) {

package/lib/metadataTypes/MetadataType.js

@@ -725,7 +725,7 @@ class MetadataType {
                 Util.logger.info(
                     ` - updated ${this.definition.type}: ${
                         metadataEntry[this.definition.keyField]
-                    } /  ${metadataEntry[this.definition.nameField]}`
+                    } / ${metadataEntry[this.definition.nameField]}`
                 );
             }
             return response;

package/lib/metadataTypes/TriggeredSendDefinition.js

@@ -132,8 +132,9 @@ class TriggeredSendDefinition extends MetadataType {
             this.setFolderPath(metadata);
         } catch {
             Util.logger.verbose(
-                ` - skipping ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find folder.`
+                ` ☇ skipping ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find folder.`
             );
+            // do not save this TSD because it would not be visible in the user interface
             return;
         }
 
@@ -163,9 +164,9 @@ class TriggeredSendDefinition extends MetadataType {
                 delete metadata.Email;
             } catch {
                 Util.logger.verbose(
-                    ` - skipping ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find email with ID ${metadata.Email.ID} in Classic nor in Content Builder.`
+                    ` - ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': Could not find email with ID ${metadata.Email.ID} in Classic nor in Content Builder. This TSD cannot be replublished but potentially restarted with its cached version of the email.`
                 );
-                return;
+                // save this TSD because it could be fixed by the user or potentially restarted without a fix; also, it might be used by a journey
             }
         }
         // List (optional)
@@ -175,9 +176,9 @@ class TriggeredSendDefinition extends MetadataType {
                 delete metadata.List;
             } catch (ex) {
                 Util.logger.verbose(
-                    ` - skipping ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': ${ex.message}`
+                    ` - ${this.definition.typeName} '${metadata.Name}'/'${metadata.CustomerKey}': ${ex.message}`
                 );
-                return;
+                // save this TSD because it could be fixed by the user
             }
         }
 

package/lib/metadataTypes/definitions/EmailSendDefinition.definition.js

@@ -1,6 +1,6 @@
 module.exports = {
     bodyIteratorField: 'Results',
-    dependencies: ['folder-userinitiatedsends', 'email', 'asset-message', 'dataExtension', 'list'], // filter, SendClassification, SenderProfile, DeliveryProfile
+    dependencies: ['folder-userinitiatedsends', 'email', 'asset-message', 'dataExtension', 'list'], // filter(+), sendClassification(+), SenderProfile(n/a), DeliveryProfile(n/a)
     folderType: 'userinitiatedsends',
     hasExtended: false,
     idField: 'ObjectID',
@@ -22,31 +22,31 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         AutoBccEmail: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         BccEmail: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         CategoryID: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         CCEmail: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'Client.ID': {
             isCreateable: false,
@@ -61,8 +61,8 @@ module.exports = {
             templating: false,
         },
         CreatedDate: {
-            isCreateable: true,
-            isUpdateable: true,
+            isCreateable: false,
+            isUpdateable: false,
             retrieving: true,
             templating: false,
         },
@@ -70,19 +70,19 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         DeduplicateByEmail: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'DeliveryProfile.CustomerKey': {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'DeliveryProfile.DomainType': {
             isCreateable: false,
@@ -130,13 +130,13 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'DeliveryProfile.PrivateIP': {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'DeliveryProfile.SourceAddressType': {
             isCreateable: false,
@@ -154,7 +154,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         DomainType: {
             isCreateable: false,
@@ -166,13 +166,13 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'Email.ID': {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'Email.ObjectID': {
             isCreateable: false,
@@ -186,17 +186,35 @@ module.exports = {
             retrieving: false,
             templating: false,
         },
+        'Email.Name': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: false,
+            templating: false,
+        },
+        'Email.Subject': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: false,
+            templating: false,
+        },
+        'Email.Status': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: false,
+            templating: false,
+        },
         EmailSubject: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         ExclusionFilter: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         FooterContentArea: {
             isCreateable: false,
@@ -256,7 +274,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         IsPlatformObject: {
             isCreateable: true,
@@ -280,7 +298,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         Keyword: {
             isCreateable: false,
@@ -295,8 +313,8 @@ module.exports = {
             templating: false,
         },
         ModifiedDate: {
-            isCreateable: true,
-            isUpdateable: true,
+            isCreateable: false,
+            isUpdateable: false,
             retrieving: true,
             templating: false,
         },
@@ -304,7 +322,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         ObjectID: {
             isCreateable: false,
@@ -376,7 +394,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'SendClassification.ObjectID': {
             isCreateable: false,
@@ -400,7 +418,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'SendDefinitionList[].ObjectID': {
             isCreateable: false,
@@ -414,6 +432,9 @@ module.exports = {
             retrieving: false,
             templating: false,
         },
+        'SendDefinitionList[].CustomObjectID': {
+            skipValidation: true, // cannot be asked for but will be retrieved
+        },
         'SendDefinitionList[].SendDefinitionListType': {
             skipValidation: true, // cannot be asked for but will be retrieved
         },
@@ -448,7 +469,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         'SenderProfile.FromAddress': {
             isCreateable: false,
@@ -478,13 +499,13 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         SendWindowClose: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         SendWindowDelete: {
             isCreateable: false,
@@ -496,7 +517,7 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         SourceAddressType: {
             isCreateable: false,
@@ -508,13 +529,13 @@ module.exports = {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         TestEmailAddr: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
-            templating: false,
+            templating: true,
         },
         TimeZone: {
             isCreateable: false,

package/lib/util/auth.js

@@ -101,7 +101,7 @@ function setupSDK(sessionKey, authObject) {
                 credentialStore.set(sessionKey, authObject);
             },
             onConnectionError: (ex, remainingAttempts) => {
-                Util.logger.warn(
+                Util.logger.info(
                     ` - Connection problem (Code: ${ex.code}). Retrying ${remainingAttempts} time${
                         remainingAttempts > 1 ? 's' : ''
                     }${

package/lib/util/devops.js

@@ -111,6 +111,8 @@ const DevOps = {
             // Filter to only handle files that start with at least one of the passed filterPaths.
             // ! Filter happens after initial parse, because if file was moved its new path has to be calculated
             .filter((file) => filterPaths.some((path) => file.file.startsWith(path)))
+            .filter((file) => !file.file.endsWith('.error.log'))
+            .filter((file) => !file.file.endsWith('.md'))
             // ensure badly named files on unsupported metadata types are not in our subset
             .filter((/** @type {TYPE.DeltaPkgItem} */ file) => {
                 if (MetadataType[file.type]) {
@@ -210,10 +212,12 @@ const DevOps = {
             const copied = delta.map((file) =>
                 File.copyFile(
                     file.file,
-                    file.file.replace(
-                        path.normalize(properties.directories.retrieve),
-                        path.normalize(properties.directories.deploy)
-                    )
+                    path
+                        .normalize(file.file)
+                        .replace(
+                            path.normalize(properties.directories.retrieve),
+                            path.normalize(properties.directories.deploy)
+                        )
                 )
             );
             const results = await Promise.all(copied);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "4.3.1",
+    "version": "4.3.3",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",

package/test/mockRoot/.mcdevrc.json

@@ -74,5 +74,5 @@
             "triggeredSendDefinition"
         ]
     },
-    "version": "4.3.1"
+    "version": "4.3.3"
 }