mcdev 7.1.1 → 7.1.2

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

@@ -28,7 +28,6 @@ export default {
             'activities.metaData.highThroughput.r__dataExtension_key',
             'activities.configurationArguments.triggeredSend.r__dataExtension_key.domainExclusions',
         ],
-        triggeredSend: ['activities.configurationArguments.r__triggeredSend_key'],
         list: [
             'activities.configurationArguments.triggeredSend.r__list_PathName.publicationList',
             'activities.configurationArguments.triggeredSend.r__list_PathName.suppressionLists',
@@ -71,6 +70,435 @@ export default {
     },
     fields: {
         activities: {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].id': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].key': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].name': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].description': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].type': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].outcomes': {
+            skipValidation: true,
+        },
+        'activities[].arguments': {
+            skipValidation: true,
+        },
+        'activities[].configurationArguments': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.autoAddSubscribers': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.autoUpdateSubscribers': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.bccEmail': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.categoryId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.ccEmail': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.created': {
+            skipValidation: true,
+        },
+        'activities[].configurationArguments.triggeredSend.description': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.domainExclusions': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.dynamicEmailSubject': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.emailSubject': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.exclusionFilter': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.isSalesforceTracking': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.isMultipart': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.isSendLogging': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.isStoppedOnJobError': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.keyword': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.modified': {
+            skipValidation: true,
+        },
+        'activities[].configurationArguments.triggeredSend.name': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: false,
+        },
+        'activities[].configurationArguments.triggeredSend.preHeader': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.replyToAddress': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.replyToDisplayName': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.suppressTracking': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.triggeredSendStatus': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.version': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.throttleOpens': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.throttleCloses': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.throttleLimit': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.isTrackingClicks': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.emailId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__triggeredSend_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: false,
+        },
+        'activities[].configurationArguments.triggeredSend.senderProfileId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__senderProfile_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        ' activities[].configurationArguments.triggeredSend.sendClassificationId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__sendClassification_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__list_PathName': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.publicationListId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__list_PathName.publicationList': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__list_PathName.suppressionLists': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__dataExtension_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__dataExtension_key.domainExclusions': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.priority': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.c__priority': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.triggeredSend.r__asset_name_readOnly': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: false,
+        },
+        'activities[].configurationArguments.triggeredSend.r__asset_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.applicationExtensionKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.r__transactionalEmail_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.applicationExtensionId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.isModified': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.isSimulation': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.googleAnalyticsCampaignName': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.useLLTS': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.fuelAgentRequested': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.r__triggeredSend_key': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: false,
+        },
+        'activities[].configurationArguments.waitDuration': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.waitUnit': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.specifiedTime': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.timeZone': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.description': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.waitEndDateAttributeExpression': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.specificDate': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.waitForEventKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.schemaVersionId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].configurationArguments.criteria': {
+            skipValidation: true,
+        },
+        'activities[].configurationArguments.eventDataConfig': {
+            skipValidation: true,
+        },
+        'activities[].metaData': {
+            skipValidation: true,
+        },
+        'activities[].schema': {
             skipValidation: true,
         },
         categoryId: {
@@ -182,7 +610,7 @@ export default {
             isCreateable: false,
             isUpdateable: false,
             retrieving: true,
-            template: false,
+            template: true,
         },
         modifiedDate: {
             isCreateable: false,
@@ -342,16 +770,10 @@ export default {
             template: true,
         },
         'triggers[].configurationArguments.primaryObjectFilterCriteria': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            skipValidation: true,
         },
         'triggers[].configurationArguments.relatedObjectFilterCriteria': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            skipValidation: true,
         },
         'triggers[].configurationArguments.salesforceTriggerCriteria': {
             isCreateable: true,
@@ -372,10 +794,7 @@ export default {
             template: true,
         },
         'triggers[].configurationArguments.contactKey': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            skipValidation: true,
         },
         'triggers[].configurationArguments.contactPersonType': {
             isCreateable: true,
@@ -415,10 +834,7 @@ export default {
             template: true,
         },
         'triggers[].configurationArguments.passThroughArgument': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            skipValidation: true,
         },
         'triggers[].configurationArguments.filterDefinitionId': {
             isCreateable: false,
@@ -487,10 +903,10 @@ export default {
             template: true,
         },
         'triggers[].metaData.eventDefinitionId': {
-            isCreateable: false,
-            isUpdateable: false,
-            retrieving: false,
-            template: false,
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
         },
         'triggers[].metaData.eventDefinitionKey': {
             isCreateable: true,

package/lib/util/cache.js

@@ -152,9 +152,10 @@ export default {
      *
      * @param {string} r__folder_Path folder path value
      * @param {number} [overrideMID] ignore currentMID and use alternative (for example parent MID)
+     * @param {boolean} allowOtherBu getting folder from other BU; FALSE for folder parent search
      * @returns {number} folder ID
      */
-    getFolderId(r__folder_Path, overrideMID) {
+    getFolderId(r__folder_Path, overrideMID, allowOtherBu = true) {
         if (!r__folder_Path) {
             throw new Error('r__folder_Path not set');
         }
@@ -166,9 +167,9 @@ export default {
         const potentialFolders = [];
         for (const folder of Object.values(folderMap)) {
             if (folder.Path === r__folder_Path) {
-                if (folder.Client.ID === (overrideMID || currentMID)) {
+                if (folder?.Client?.ID === (overrideMID || currentMID)) {
                     return folder.ID;
-                } else {
+                } else if (allowOtherBu) {
                     potentialFolders.push(folder);
                 }
             }

package/lib/util/util.js

@@ -407,13 +407,18 @@ export const Util = {
                 if (message) {
                     // ! this method only sets exitCode=1 if message-param was set
                     // if not, then this method purely outputs debug information and should not change the exitCode
-                    winstonError(message + ':');
-                    winstonError(`    ${ex.message} (${ex.code})`);
+                    winstonError(`${message}: ${ex.message}${ex.code ? ' (' + ex.code + ')' : ''}`);
                     if (ex.endpoint) {
                         // ex.endpoint is only available if 'ex' is of type RestError
                         winstonError('    endpoint: ' + ex.endpoint);
                     }
                     Util.signalFatalError();
+                } else {
+                    myWinston.debug(`${ex.message}${ex.code ? ' (' + ex.code + ')' : ''}`);
+                    if (ex.endpoint) {
+                        // ex.endpoint is only available if 'ex' is of type RestError
+                        myWinston.debug('    endpoint: ' + ex.endpoint);
+                    }
                 }
                 let stack;
                 /* eslint-disable unicorn/prefer-ternary */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "7.1.1",
+    "version": "7.1.2",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -104,7 +104,7 @@
         "eslint-plugin-mocha": "10.4.3",
         "eslint-plugin-prettier": "5.2.1",
         "eslint-plugin-unicorn": "54.0.0",
-        "fast-xml-parser": "4.4.0",
+        "fast-xml-parser": "4.4.1",
         "globals": "15.8.0",
         "husky": "9.0.11",
         "lint-staged": "15.2.7",

package/test/mockRoot/.mcdevrc.json

@@ -100,5 +100,5 @@
             "verification"
         ]
     },
-    "version": "7.1.1"
+    "version": "7.1.2"
 }

package/test/mockRoot/deploy/testInstance/testBU/asset/block/testExisting_asset_htmlblock-matchName-create.asset-block-meta.html

@@ -0,0 +1,23 @@
+<table
+    cellpadding="0"
+    cellspacing="0"
+    width="100%"
+    role="presentation"
+    style="min-width: 100%; "
+    class="stylingblock-content-wrapper"
+>
+    <tr>
+        <td class="stylingblock-content-wrapper camarker-inner">
+            <div>my 1st html</div>
+%%[
+    /* my ampscript */
+]%%
+<script runat="server">
+    // my ssjs
+</script>
+
+            <div>my 2nd html</div>
+            <div>%%=ContentBlockById(1295065)=%%</div>
+        </td>
+    </tr>
+</table>

package/test/mockRoot/deploy/testInstance/testBU/asset/block/testExisting_asset_htmlblock-matchName-create.asset-block-meta.json

@@ -0,0 +1,41 @@
+{
+    "customerKey": "testExisting_asset_htmlblock-matchName-create",
+    "assetType": {
+        "name": "htmlblock",
+        "displayName": "HTML Block"
+    },
+    "fileProperties": {
+        "fileName": "testExisting_htmlblock_matchName-create"
+    },
+    "name": "testExisting_htmlblock_matchName-create",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld (ASGR)"
+    },
+    "createdDate": "2024-01-08T08:26:58.277-06:00",
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld (ASGR)"
+    },
+    "modifiedDate": "2024-01-08T08:28:01.6-06:00",
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld (ASGR)"
+    },
+    "memberId": 9999999,
+    "status": {
+        "name": "Draft"
+    },
+    "design": "",
+    "meta": {
+        "wrapperStyles": {
+            "mobile": {
+                "visible": true
+            },
+            "styling": {}
+        }
+    },
+    "availableViews": [],
+    "modelVersion": 2,
+    "r__folder_Path": "Content Builder"
+}

package/test/mockRoot/deploy/testInstance/testBU/asset/block/testExisting_asset_htmlblock-matchName-fail.asset-block-meta.html

@@ -0,0 +1,23 @@
+<table
+    cellpadding="0"
+    cellspacing="0"
+    width="100%"
+    role="presentation"
+    style="min-width: 100%; "
+    class="stylingblock-content-wrapper"
+>
+    <tr>
+        <td class="stylingblock-content-wrapper camarker-inner">
+            <div>my 1st html</div>
+%%[
+    /* my ampscript */
+]%%
+<script runat="server">
+    // my ssjs
+</script>
+
+            <div>my 2nd html</div>
+            <div>%%=ContentBlockById(1295065)=%%</div>
+        </td>
+    </tr>
+</table>