mcdev 7.10.1 → 8.0.1

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

@@ -79,10 +79,10 @@ export default {
             template: true,
         },
         'activities[].id': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: false,
+            template: false,
         },
         'activities[].key': {
             isCreateable: true,
@@ -112,6 +112,147 @@ export default {
             skipValidation: true,
         },
         'activities[].arguments': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.waitEndDateAttributeDataBound': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.waitDefinitionId': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: false,
+            template: false,
+        },
+        'activities[].arguments.waitForEventId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.executionMode': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.startActivityKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.waitQueueId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.activityId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.definitionId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.emailSubjectDataBound': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.contactId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.contactKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.emailAddress': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.sourceCustomObjectId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.sourceCustomObjectKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.fieldType': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.eventData': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.obfuscationProperties': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.customObjectKey': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.definitionInstanceId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.filterResult': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.version': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.requestObjectId': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
+        'activities[].arguments.activityData': {
+            skipValidation: true,
+        },
+        'activities[].arguments.objectMap': {
             skipValidation: true,
         },
         'activities[].configurationArguments': {
@@ -120,6 +261,12 @@ export default {
             retrieving: true,
             template: true,
         },
+        'activities[].configurationArguments.isActivityBatchValidated': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
         'activities[].configurationArguments.triggeredSendKey': {
             // if used during create then we are stuck with old data
             isCreateable: false,
@@ -437,6 +584,12 @@ export default {
             retrieving: true,
             template: true,
         },
+        'activities[].configurationArguments.triggeredSend.updateSubscriber': {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
         'activities[].configurationArguments.applicationExtensionKey': {
             isCreateable: true,
             isUpdateable: true,
@@ -752,7 +905,6 @@ export default {
             retrieving: true,
             template: true,
         },
-
         'triggers[].arguments.dequeueReason': {
             isCreateable: true,
             isUpdateable: true,
@@ -834,7 +986,15 @@ export default {
             retrieving: true,
             template: true,
         },
+        'triggers[].configurationArguments.objectApiName': {
+            // journey capitalization; rewritten to event way of writing it by mcdev
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
         'triggers[].configurationArguments.objectAPIName': {
+            // capitalization like on event, customly created by mcdev in journey
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
@@ -913,12 +1073,6 @@ export default {
             retrieving: true,
             template: true,
         },
-        'triggers[].configurationArguments.objectApiName': {
-            isCreateable: true,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
-        },
         'triggers[].configurationArguments.additionalObjectFilterCriteria': {
             isCreateable: true,
             isUpdateable: true,

package/lib/util/cache.js

@@ -122,15 +122,34 @@ export default {
      * @param {string} searchField field name (key in object) which contains the unique identifer
      * @param {string} returnField field which should be returned
      * @param {number} [overrideMID] ignore currentMID and use alternative (for example parent MID)
+     * @param {boolean} caseInsensitive optional; if true, search is case insensitive
      * @returns {string} value of specified field. Error is thrown if not found
      */
-    searchForField(metadataType, searchValue, searchField, returnField, overrideMID) {
+    searchForField(
+        metadataType,
+        searchValue,
+        searchField,
+        returnField,
+        overrideMID,
+        caseInsensitive = false
+    ) {
+        if (caseInsensitive) {
+            searchValue = (searchValue + '').toLowerCase();
+        }
         for (const key in dataStore[overrideMID || currentMID]?.[metadataType]) {
             if (
-                Util.resolveObjPath(
-                    searchField,
-                    dataStore[overrideMID || currentMID][metadataType][key]
-                ) == searchValue
+                (caseInsensitive &&
+                    (
+                        Util.resolveObjPath(
+                            searchField,
+                            dataStore[overrideMID || currentMID][metadataType][key]
+                        ) + ''
+                    ).toLowerCase() == searchValue) ||
+                (!caseInsensitive &&
+                    Util.resolveObjPath(
+                        searchField,
+                        dataStore[overrideMID || currentMID][metadataType][key]
+                    ) == searchValue)
             ) {
                 try {
                     if (
@@ -167,6 +186,19 @@ export default {
      * @returns {number} folder ID
      */
     getFolderId(r__folder_Path, overrideMID, allowOtherBu = true) {
+        const folder = this.getFolderByPath(r__folder_Path, overrideMID, allowOtherBu);
+        return folder?.ID;
+    },
+
+    /**
+     * helper for setFolderId
+     *
+     * @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 {object} folder item
+     */
+    getFolderByPath(r__folder_Path, overrideMID, allowOtherBu = true) {
         if (!r__folder_Path) {
             throw new Error('r__folder_Path not set');
         }
@@ -175,18 +207,19 @@ export default {
         if (!folderMap) {
             throw new Error('No folders found in cache');
         }
+        const folderPath_lower = r__folder_Path.toLowerCase();
         const potentialFolders = [];
         for (const folder of Object.values(folderMap)) {
-            if (folder.Path === r__folder_Path) {
+            if (folder.Path.toLowerCase() === folderPath_lower) {
                 if (folder?.Client?.ID === (overrideMID || currentMID)) {
-                    return folder.ID;
+                    return folder;
                 } else if (allowOtherBu) {
                     potentialFolders.push(folder);
                 }
             }
         }
         if (potentialFolders.length >= 1) {
-            return potentialFolders[0].ID;
+            return potentialFolders[0];
         } else {
             throw new Error(`No folders found with path ${r__folder_Path}`);
         }

package/lib/util/devops.js

@@ -100,7 +100,17 @@ const DevOps = {
             'add/update': 0,
             move: 0,
         };
-        const diffSummary = await git.diffSummary([range]);
+        let diffSummary;
+        try {
+            diffSummary = await git.diffSummary([range]);
+        } catch (ex) {
+            const error = ex.message.startsWith('fatal: ambiguous argument')
+                ? new Error(
+                      `Make sure you checked out the branches mentioned in your git range (${rangeUserInput})`
+                  )
+                : ex;
+            throw error;
+        }
         Util.logger.info(`Found ${diffSummary.files.length} changed files in the commit range`);
         /**
          * @type {DeltaPkgItem[]}
@@ -486,10 +496,15 @@ const DevOps = {
                 // skip this source-target mapping
                 continue;
             }
-
-            const delta = Array.isArray(diffArr)
-                ? diffArr
-                : await DevOps.getDeltaList(properties, range, false, sourceBU, commitHistory);
+            let delta;
+            try {
+                delta = Array.isArray(diffArr)
+                    ? diffArr
+                    : await DevOps.getDeltaList(properties, range, false, sourceBU, commitHistory);
+            } catch (ex) {
+                Util.logger.error(ex.message);
+                return;
+            }
             // If only chaing templating and buildDefinition if required
             if (!delta || delta.length === 0) {
                 // skip this source-target mapping

package/lib/util/file.js

@@ -571,6 +571,15 @@ const File = {
      * @returns {Promise.<boolean>} success of config load
      */
     async initPrettier(filetype = 'html') {
+        if (Util.OPTIONS.format === false) {
+            // auto-formatting was disabled via CLI option
+            return;
+        }
+        const properties = await config.getProperties();
+        if (Util.OPTIONS.format !== true && properties.options.formatOnSave === false) {
+            // auto-formatting was disabled via config file
+            return;
+        }
         if (FileFs.prettierConfig === null || FileFs.prettierConfigFileType !== filetype) {
             // run this if no config was yet found or if the filetype previously used to initialize it differs (because it results in a potentially different config!)
             FileFs.prettierConfigFileType = filetype;
@@ -591,7 +600,7 @@ const File = {
                 return true;
             } catch (ex) {
                 FileFs.prettierConfig = false;
-                Util.logger.error('Cannot apply auto-formatting to your code:' + ex.message);
+                Util.logger.error('Cannot apply auto-formatting to your code: ' + ex.message);
                 return false;
             }
         } else {

package/lib/util/util.js

@@ -904,6 +904,32 @@ export const Util = {
             ` - 🚧 ${type} support is currently still in beta. Please report any issues here: https://github.com/Accenture/sfmc-devtools/issues/new/choose`
         );
     },
+
+    /**
+     * outputs a warning that the given method is deprecated
+     *
+     * @param {string} method name of the method
+     * @param {string} [useInstead] optionally specify which method to use instead
+     */
+    logDeprecated(method, useInstead = '') {
+        Util.logger.warn(
+            ` 💥 '${method}' is deprecated and will be sunset in a future version. ${useInstead ? `Please use ${useInstead} instead.` : ''}`
+        );
+    },
+
+    /**
+     * helper for MetadataType class to issue a similar error message for unsupported methods
+     *
+     * @param {any} definition type definition object
+     * @param {string} method name of the method thats not supported
+     * @param {MetadataTypeItem} [item] metadata item
+     */
+    logNotSupported: function (definition, method, item) {
+        Util.logger.error(
+            ` ☇ skipping ${item ? Util.getTypeKeyName(definition, item) : definition.type}: ${method} is not supported for ${definition.type}`
+        );
+    },
+
     // defined colors for logging things in different colors
     color: {
         reset: '\x1B[0m',
@@ -1317,18 +1343,6 @@ export const Util = {
                 return acc;
             }, {});
     },
-    /**
-     * helper for MetadataType class to issue a similar error message for unsupported methods
-     *
-     * @param {any} definition type definition object
-     * @param {string} method name of the method thats not supported
-     * @param {MetadataTypeItem} [item] metadata item
-     */
-    notSupportedError: function (definition, method, item) {
-        Util.logger.error(
-            ` ☇ skipping ${item ? Util.getTypeKeyName(definition, item) : definition.type}: ${method} is not supported yet for ${definition.type}`
-        );
-    },
 };
 
 Util.startLogger(false, true);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "7.10.1",
+    "version": "8.0.1",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -45,7 +45,7 @@
         "mcdev": "./lib/cli.js"
     },
     "engines": {
-        "node": ">=18.18.2"
+        "node": "^18.20.0 || ^20.10.0 || >=21.0.0"
     },
     "scripts": {
         "start": "node lib/cli.js",
@@ -74,12 +74,12 @@
         "console.table": "0.10.0",
         "deep-equal": "2.2.3",
         "fs-extra": "11.3.0",
-        "inquirer": "12.4.2",
+        "inquirer": "12.6.0",
         "json-to-table": "4.2.1",
         "mustache": "4.2.0",
         "p-limit": "6.2.0",
         "prettier": "3.5.3",
-        "prettier-plugin-sql": "0.18.1",
+        "prettier-plugin-sql": "0.19.0",
         "semver": "7.7.1",
         "sfmc-sdk": "2.1.2",
         "simple-git": "3.27.0",
@@ -87,36 +87,35 @@
         "update-notifier": "7.3.1",
         "winston": "3.17.0",
         "yargs": "17.7.2",
-        "yocto-spinner": "0.2.0"
+        "yocto-spinner": "0.2.2"
     },
     "devDependencies": {
-        "@eslint/js": "9.21.0",
+        "@eslint/js": "9.28.0",
         "@types/fs-extra": "11.0.4",
         "@types/inquirer": "9.0.7",
         "@types/mocha": "10.0.8",
-        "@types/node": "22.13.9",
+        "@types/node": "22.15.29",
         "@types/yargs": "17.0.33",
         "assert": "2.1.0",
         "axios-mock-adapter": "2.0.0",
         "c8": "10.1.3",
         "chai": "5.2.0",
         "chai-files": "1.4.0",
-        "eslint": "9.21.0",
-        "eslint-config-prettier": "10.0.1",
+        "eslint": "9.28.0",
         "eslint-config-ssjs": "2.0.0",
-        "eslint-plugin-jsdoc": "50.6.3",
-        "eslint-plugin-mocha": "10.5.0",
-        "eslint-plugin-prettier": "5.2.3",
-        "eslint-plugin-unicorn": "56.0.1",
-        "fast-xml-parser": "5.0.8",
-        "globals": "16.0.0",
+        "eslint-plugin-jsdoc": "50.7.1",
+        "eslint-plugin-mocha": "11.0.0",
+        "eslint-plugin-prettier": "5.4.1",
+        "eslint-plugin-unicorn": "59.0.1",
+        "fast-xml-parser": "5.2.3",
+        "globals": "16.2.0",
         "husky": "9.1.7",
-        "lint-staged": "15.4.3",
-        "mocha": "11.1.0",
+        "lint-staged": "15.5.1",
+        "mocha": "11.5.0",
         "mock-fs": "5.3.0",
         "npm-run-all": "4.1.5",
-        "prettier-eslint": "16.3.0",
-        "typescript": "5.7.3"
+        "prettier-eslint": "16.4.1",
+        "typescript": "5.8.3"
     },
     "optionalDependencies": {
         "fsevents": "*"

package/test/general.test.js

@@ -226,7 +226,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -286,7 +286,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -346,7 +346,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -987,7 +987,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1229,7 +1229,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 101;
+                const expectedApiCallsRetrieve = 105;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1603,7 +1603,7 @@ describe('GENERAL', () => {
                 // download everything before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1814,7 +1814,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 101;
+                const expectedApiCallsRetrieve = 105;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2005,7 +2005,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,

package/test/mockRoot/.mcdev-validations.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 'use strict';
 /**
  * @typedef {Object.<string, any>} MetadataTypeItem generic metadata item
@@ -39,13 +40,11 @@ const buPrefixBlacklistMap = {
  * @returns {validationRuleList} MetadataItem
  */
 export function validation(definition, item, targetDir, codeExtractItemArr, Util) {
-    Util.logger.verbose('just here to not get a warning about the unused property Util');
-
     const bu =
         (targetDir.includes('/') ? targetDir.split('/').pop() : targetDir.split('\\').pop()) ||
         'not-found';
     const prefixBlacklist = buPrefixBlacklistMap[bu] || [];
-    // eslint-disable-next-line no-unused-vars -- codeExtractItemArr is not used in this example
+
     const temp = codeExtractItemArr;
 
     return {

package/test/mockRoot/.mcdevrc.json

@@ -175,5 +175,5 @@
             "verification"
         ]
     },
-    "version": "7.10.1"
+    "version": "8.0.1"
 }

package/test/mockRoot/deploy/testInstance/testBU/importFile/testExisting_importFile.importFile-meta.json

@@ -26,10 +26,11 @@
     "c__dataAction": "AddUpdate",
     "c__subscriberImportType": "DataExtension",
     "destination": {
-        "c__destinationType": "DataExtension",
+        "c__type": "DataExtension",
         "r__dataExtension_key": "testExisting_dataExtension"
     },
     "source": {
+        "c__type": "File Location",
         "r__fileLocation_name": "ExactTarget Enhanced FTP"
     }
 }

package/test/mockRoot/deploy/testInstance/testBU/importFile/testNew_importFile.importFile-meta.json

@@ -24,10 +24,11 @@
     "c__subscriberImportType": "DataExtension",
     "c__dataAction": "AddUpdate",
     "destination": {
-        "c__destinationType": "DataExtension",
+        "c__type": "DataExtension",
         "r__dataExtension_key": "testExisting_dataExtension"
     },
     "source": {
+        "c__type": "File Location",
         "r__fileLocation_name": "ExactTarget Enhanced FTP"
     }
 }