mcdev 7.6.1 → 7.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "7.6.1",
+    "version": "7.6.3",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -60,9 +60,8 @@
         "test": "mocha --reporter-option maxDiffSize=25000",
         "coverage": "c8 npm run test",
         "prepare-release:audit-fix": "npm audit fix",
-        "prepare-release:git-stage": "git add .",
-        "prepare-release:git-commit": "git commit -n -m \"prepare-release changes\"",
-        "prepare-release": "run-s prepare-release:audit-fix lint-ts lint:fix prepare-release:git-stage prepare-release:git-commit",
+        "prepare-release:git": "node prepare-release.js",
+        "prepare-release": "run-s prepare-release:audit-fix lint-ts lint:fix prepare-release:git",
         "version:major": "npm version --no-commit-hooks major",
         "version:minor": "npm version --no-commit-hooks minor",
         "version:patch": "npm version --no-commit-hooks patch"
@@ -74,11 +73,11 @@
         "conf": "13.1.0",
         "console.table": "0.10.0",
         "deep-equal": "2.2.3",
-        "fs-extra": "11.2.0",
-        "inquirer": "12.1.0",
+        "fs-extra": "11.3.0",
+        "inquirer": "12.3.2",
         "json-to-table": "4.2.1",
         "mustache": "4.2.0",
-        "p-limit": "6.1.0",
+        "p-limit": "6.2.0",
         "prettier": "3.4.2",
         "prettier-plugin-sql": "0.18.1",
         "semver": "7.6.3",
@@ -88,36 +87,36 @@
         "update-notifier": "7.3.1",
         "winston": "3.17.0",
         "yargs": "17.7.2",
-        "yocto-spinner": "0.1.1"
+        "yocto-spinner": "0.2.0"
     },
     "devDependencies": {
-        "@eslint/js": "9.17.0",
+        "@eslint/js": "9.18.0",
         "@types/fs-extra": "11.0.4",
         "@types/inquirer": "9.0.7",
         "@types/mocha": "10.0.8",
-        "@types/node": "22.10.2",
+        "@types/node": "22.10.7",
         "@types/yargs": "17.0.33",
         "assert": "2.1.0",
         "axios-mock-adapter": "2.0.0",
-        "c8": "10.0.0",
+        "c8": "10.1.3",
         "chai": "5.1.2",
         "chai-files": "1.4.0",
-        "eslint": "9.17.0",
-        "eslint-config-prettier": "9.1.0",
+        "eslint": "9.18.0",
+        "eslint-config-prettier": "10.0.1",
         "eslint-config-ssjs": "2.0.0",
-        "eslint-plugin-jsdoc": "50.6.1",
+        "eslint-plugin-jsdoc": "50.6.2",
         "eslint-plugin-mocha": "10.5.0",
-        "eslint-plugin-prettier": "5.2.1",
+        "eslint-plugin-prettier": "5.2.3",
         "eslint-plugin-unicorn": "56.0.1",
-        "fast-xml-parser": "4.4.1",
+        "fast-xml-parser": "4.5.1",
         "globals": "15.14.0",
         "husky": "9.1.7",
-        "lint-staged": "15.2.10",
+        "lint-staged": "15.4.1",
         "mocha": "11.0.1",
         "mock-fs": "5.3.0",
         "npm-run-all": "4.1.5",
         "prettier-eslint": "16.3.0",
-        "typescript": "5.7.2"
+        "typescript": "5.7.3"
     },
     "optionalDependencies": {
         "fsevents": "*"

package/prepare-release.js

@@ -0,0 +1,37 @@
+/* eslint-disable no-console */
+import { exec } from 'node:child_process';
+
+console.log('> git status --porcelain');
+exec('git status --porcelain', (err, stdout, stderr) => {
+    if (err) {
+        console.error(`Error executing git status: ${stderr}`);
+        return;
+    }
+
+    if (stdout) {
+        console.log(
+            '    Found changes:',
+            '\n     - ' + stdout.split('\n').filter(Boolean).join('\n     - ')
+        );
+        console.log('> git add .');
+        exec('git add .', (err, stdout, stderr) => {
+            if (err) {
+                console.error(`Error executing git add: ${stderr}`);
+                return;
+            }
+
+            console.log('> git commit -n -m "prepare-release changes"');
+            exec('git commit -n -m "prepare-release changes"', (err, stdout, stderr) => {
+                if (err) {
+                    console.error(`Error executing git commit: ${stderr}`);
+                    return;
+                } else {
+                    console.log('✅ Changes committed successfully.');
+                }
+            });
+        });
+    } else {
+        console.log('✅ No untracked files to commit.');
+    }
+});
+/* eslint-enable no-console */

package/test/general.test.js

@@ -527,7 +527,7 @@ describe('GENERAL', () => {
                 assert.equal(deployedTypes[0], 'dataExtract', 'deploy should have returned 1 type');
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    8,
+                    10,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -569,7 +569,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    16,
+                    17,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -632,7 +632,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    17,
+                    18,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -697,7 +697,47 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    14,
+                    15,
+                    'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+                );
+            });
+
+            it('skip deploy event with bad filename or bad extension', async () => {
+                testUtils.copyToDeploy('event-deploy', 'event');
+
+                const argvMetadata = [
+                    'event:testNew_event_badExtension',
+                    'event:testNew_event_badName',
+                ];
+                const typeKeyCombo = handler.metadataToTypeKey(argvMetadata);
+                const buName = 'testInstance/testBU';
+                await handler.deploy(buName, typeKeyCombo);
+                // THEN
+                assert.equal(process.exitCode, 1, 'deploy should not have thrown an error');
+
+                assert.equal(
+                    testUtils.getAPIHistoryLength(),
+                    0,
+                    'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+                );
+            });
+
+            it('skip deploy asset with bad filename or bad extension', async () => {
+                testUtils.copyToDeploy('asset-deploy', 'asset');
+                const argvMetadata = [
+                    'asset:testNew_asset_badExtension',
+                    'asset:testNew_asset_badName',
+                ];
+                const typeKeyCombo = handler.metadataToTypeKey(argvMetadata);
+                const buName = 'testInstance/testBU';
+                await handler.deploy(buName, typeKeyCombo);
+
+                // THEN
+                assert.equal(process.exitCode, 1, 'deploy should not have thrown an error');
+
+                assert.equal(
+                    testUtils.getAPIHistoryLength(),
+                    0,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -2249,7 +2289,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    16,
+                    17,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -2298,9 +2338,32 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    11,
+                    12,
+                    'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+                );
+            });
+        });
+
+        describe('Refresh ================', () => {
+            it('Should not refresh anything due to missing type', async () => {
+                // WHEN
+                const replace = await handler.refresh('testInstance/testBU', null);
+                // THEN
+                assert.equal(process.exitCode, 1, 'refresh should have thrown an error');
+                // retrieve result
+
+                assert.deepEqual(
+                    Object.keys(replace).length,
+                    0,
+                    'should not have replaced anything'
+                );
+
+                assert.equal(
+                    testUtils.getAPIHistoryLength(),
+                    0,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
+                return;
             });
         });
     });

package/test/mockRoot/.mcdevrc.json

@@ -10,6 +10,7 @@
     },
     "options": {
         "formatOnSave": true,
+        "formatErrorLog": false,
         "deployment": {
             "commitHistory": 10,
             "sourceTargetMapping": {
@@ -126,5 +127,5 @@
             "verification"
         ]
     },
-    "version": "7.6.1"
+    "version": "7.6.3"
 }

package/test/mockRoot/deploy/testInstance/testBU/journey/testExisting_journey_Multistep.journey-meta.json

@@ -0,0 +1,418 @@
+{
+    "key": "testExisting_journey_Multistep",
+    "name": "testExisting_journey_Multistep",
+    "lastPublishedDate": "0001-01-01T00:00:00",
+    "description": "",
+    "version": 1,
+    "workflowApiVersion": 1,
+    "createdDate": "2024-05-04T05:54:48.027",
+    "modifiedDate": "2024-05-04T17:25:57.9",
+    "activities": [
+        {
+            "id": "7ba1e59a-6be4-46c7-b76f-4c06feb1268a",
+            "key": "EMAILV2-1",
+            "name": "my custom activity name",
+            "description": "",
+            "type": "EMAILV2",
+            "outcomes": [
+                {
+                    "key": "ff60a294-3804-4165-85cd-c7c19c8e3a6d",
+                    "next": "WAITBYDURATION-1",
+                    "arguments": {},
+                    "metaData": { "invalid": false }
+                }
+            ],
+            "arguments": {},
+            "configurationArguments": {
+                "applicationExtensionKey": "jb-email-activity",
+                "isModified": true,
+                "googleAnalyticsCampaignName": "",
+                "r__triggeredSend_key": "testExisting_triggeredSend",
+                "triggeredSend": {
+                    "autoAddSubscribers": false,
+                    "autoUpdateSubscribers": false,
+                    "bccEmail": [],
+                    "ccEmail": [],
+                    "created": { "name": "", "date": "" },
+                    "description": "my custom description",
+                    "domainExclusions": [],
+                    "dynamicEmailSubject": "You are successfully unsubscribed",
+                    "emailSubject": "You are successfully unsubscribed",
+                    "exclusionFilter": "",
+                    "isSalesforceTracking": false,
+                    "isMultipart": false,
+                    "isSendLogging": true,
+                    "isStoppedOnJobError": false,
+                    "modified": { "name": "", "date": "" },
+                    "preHeader": "testExisting_ email preheader",
+                    "throttleOpens": "1/1/0001 12:00:00 AM",
+                    "throttleCloses": "1/1/0001 12:00:00 AM",
+                    "isTrackingClicks": true,
+                    "suppressTracking": false,
+                    "triggeredSendStatus": "New",
+                    "r__list_PathName": { "publicationList": "my subscribers/All Subscribers" },
+                    "r__deliveryProfile_key": "Default",
+                    "r__senderProfile_key": "testExisting_senderProfile",
+                    "r__sendClassification_key": "testExisting_sendClassification",
+                    "c__priority": "Medium",
+                    "r__asset_name_readOnly": "testExisting_asset_message",
+                    "r__asset_key": "testExisting_asset_message",
+                    "r__triggeredSend_key": "testExisting_triggeredSend"
+                }
+            },
+            "metaData": {
+                "category": "message",
+                "version": "1.0",
+                "icon": "https://jb-email-activity.s7.marketingcloudapps.com/img/email-icon.svg",
+                "iconSmall": "https://jb-email-activity.s7.marketingcloudapps.com/img/email-icon.svg",
+                "statsContactIcon": null,
+                "original_icon": "/img/email-icon.svg",
+                "original_iconSmall": "/img/email-icon.svg",
+                "sections": {},
+                "isConfigured": true
+            },
+            "schema": {
+                "arguments": {
+                    "requestID": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "Out",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "messageKey": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "Out",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "activityId": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "definitionId": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": true,
+                        "access": "Hidden"
+                    },
+                    "emailSubjectDataBound": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": true,
+                        "access": "Hidden"
+                    },
+                    "contactId": {
+                        "dataType": "Number",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "contactKey": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "emailAddress": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "sourceCustomObjectId": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "sourceCustomObjectKey": {
+                        "dataType": "LongNumber",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "fieldType": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "eventData": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "obfuscationProperties": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "customObjectKey": {
+                        "dataType": "LongNumber",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": true,
+                        "access": "Hidden"
+                    },
+                    "definitionInstanceId": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    }
+                }
+            }
+        },
+        {
+            "id": "342dd0aa-a6be-401e-8614-3538800bfd7c",
+            "key": "MULTICRITERIADECISIONV2-1",
+            "name": "",
+            "description": "",
+            "type": "MULTICRITERIADECISION",
+            "outcomes": [
+                {
+                    "key": "default_path_1",
+                    "next": "EMAILV2-1",
+                    "arguments": {},
+                    "metaData": {
+                        "label": "send message",
+                        "skipI18n": true,
+                        "isLabelFromConversion": false,
+                        "criteriaDescription": "Email is not null"
+                    }
+                },
+                {
+                    "key": "remainder_path",
+                    "next": "WAITBYDURATION-2",
+                    "arguments": {},
+                    "metaData": { "label": null }
+                }
+            ],
+            "arguments": {},
+            "configurationArguments": {
+                "criteria": {
+                    "default_path_1": "<FilterDefinition><ConditionSet Operator=\"AND\" ConditionSetName=\"Individual Filter Grouping\"><Condition IsEphemeralAttribute=\"true\" Key=\"Event.DEAudience-2e3c73b6-48cc-2ec0-5522-48636e1a236e.Email\" Operator=\"IsNotNull\" UiMetaData=\"{}\"><Value><![CDATA[]]></Value></Condition></ConditionSet></FilterDefinition>"
+                },
+                "schemaVersionId": "252"
+            },
+            "metaData": { "isConfigured": true },
+            "schema": {
+                "arguments": {
+                    "actualChoice": {
+                        "dataType": "Number",
+                        "isNullable": false,
+                        "direction": "Out",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "filterResult": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": true,
+                        "access": "Hidden"
+                    }
+                }
+            }
+        },
+        {
+            "id": "e2a486cf-c85f-4543-88a2-d579cac1e0de",
+            "key": "WAITBYDURATION-1",
+            "name": "1 day",
+            "description": "",
+            "type": "WAIT",
+            "outcomes": [
+                {
+                    "key": "97af222a-450a-429e-8925-649b72f01ccf",
+                    "arguments": {},
+                    "metaData": { "invalid": false }
+                }
+            ],
+            "arguments": {},
+            "configurationArguments": { "waitDuration": 1, "waitUnit": "DAYS" },
+            "metaData": { "isConfigured": true, "uiType": "WAITBYDURATION" },
+            "schema": {
+                "arguments": {
+                    "endDate": {
+                        "dataType": "Date",
+                        "isNullable": false,
+                        "direction": "Out",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitEndDateAttributeDataBound": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitDefinitionId": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitForEventId": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "executionMode": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "startActivityKey": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitQueueId": {
+                        "dataType": "LongNumber",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    }
+                }
+            }
+        },
+        {
+            "id": "70572b1a-e274-4f09-a3fa-6fc0732ec52b",
+            "key": "WAITBYDURATION-2",
+            "name": "",
+            "description": "",
+            "type": "WAIT",
+            "outcomes": [
+                {
+                    "key": "a0908f9f-bc3c-47f7-9489-7fef5af25ce3",
+                    "arguments": {},
+                    "metaData": { "invalid": false }
+                }
+            ],
+            "arguments": {},
+            "configurationArguments": { "waitDuration": 1, "waitUnit": "DAYS" },
+            "metaData": { "isConfigured": true, "uiType": "WAITBYDURATION" },
+            "schema": {
+                "arguments": {
+                    "endDate": {
+                        "dataType": "Date",
+                        "isNullable": false,
+                        "direction": "Out",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitEndDateAttributeDataBound": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitDefinitionId": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitForEventId": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "executionMode": {
+                        "dataType": "Text",
+                        "isNullable": false,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "startActivityKey": {
+                        "dataType": "Text",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    },
+                    "waitQueueId": {
+                        "dataType": "LongNumber",
+                        "isNullable": true,
+                        "direction": "In",
+                        "readOnly": false,
+                        "access": "Hidden"
+                    }
+                }
+            }
+        }
+    ],
+    "triggers": [
+        {
+            "key": "TRIGGER",
+            "name": "TRIGGER",
+            "description": "",
+            "type": "EmailAudience",
+            "outcomes": [],
+            "arguments": {},
+            "configurationArguments": {},
+            "metaData": {
+                "r__event_key": "DEAudience-2e3c73b6-48cc-2ec0-5522-48636e1a236e",
+                "chainType": "None",
+                "configurationRequired": false,
+                "iconUrl": "/images/icon-data-extension.svg",
+                "title": "Data Extension",
+                "entrySourceGroupConfigUrl": "jb:///data/entry/audience/entrysourcegroupconfig.json",
+                "sourceInteractionId": "00000000-0000-0000-0000-000000000000"
+            }
+        }
+    ],
+    "goals": [],
+    "exits": [],
+    "notifiers": [],
+    "entryMode": "NotSet",
+    "definitionType": "Multistep",
+    "channel": "",
+    "defaults": {
+        "email": ["{{Event.DEAudience-2e3c73b6-48cc-2ec0-5522-48636e1a236e.\"Email\"}}"],
+        "properties": {
+            "analyticsTracking": {
+                "enabled": true,
+                "analyticsType": "google",
+                "urlDomainsToTrack": []
+            }
+        }
+    },
+    "metaData": { "dataSource": "ContactsModel", "highThroughputSending": { "email": false } },
+    "executionMode": "Production",
+    "status": "Draft",
+    "scheduledStatus": "Draft",
+    "r__folder_Path": "my journeys"
+}