mcdev 7.6.1 → 7.6.3

package/@types/lib/util/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../lib/util/config.js"],"names":[],"mappings":";yBASa,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;;;IAStD;;;;;;OAMG;IACH,gCAJW,OAAO,WACP,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CA2D7B;IAED;;;;;;OAMG;IACH,qCAJW,OAAO,WACP,OAAO,GACL,OAAO,CAAE,OAAO,GAAG,MAAM,EAAE,CAAC,CA6LxC;IAED;;;;;OAKG;IACH,iCAFa,OAAO,CAAE,OAAO,CAAC,CAe7B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../lib/util/config.js"],"names":[],"mappings":";yBASa,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;;;IAStD;;;;;;OAMG;IACH,gCAJW,OAAO,WACP,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CA2D7B;IAED;;;;;;OAMG;IACH,qCAJW,OAAO,WACP,OAAO,GACL,OAAO,CAAE,OAAO,GAAG,MAAM,EAAE,CAAC,CAmMxC;IAED;;;;;OAKG;IACH,iCAFa,OAAO,CAAE,OAAO,CAAC,CAe7B"}

package/@types/lib/util/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../lib/util/file.js"],"names":[],"mappings":";yBAWa,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;AA4jB1D;;;IA1iBI;;;;;;OAMG;yBAHQ,MAAM,MACN,MAAM,GACJ,OAAO,CAAE;QAAC,MAAM,EAAC,IAAI,GAAC,SAAS,GAAC,QAAQ,CAAC;QAAC,aAAa,EAAC,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAA;KAAC,CAAC;IAkB1F;;;;;OAKG;iCAFQ,MAAM,GACJ,MAAM;IAiCnB;;;;;OAKG;qCAFQ,MAAM,GACJ,MAAM;IA2BnB;;;;;OAKG;4CAFQ,MAAM,GACJ,MAAM;IAMnB;;;;;OAKG;sCAFQ,MAAM,GAAC,MAAM,EAAE,KACb,MAAM;IAcnB;;;;;;;OAOG;iCAJQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,WACN,MAAM;IAcjB;;;;;;;;;;OAUG;mCANQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,sBACN,WAAW,KACT,OAAO,CAAE,OAAO,CAAC;IAuB9B;;;;;;OAMG;4CAHQ,MAAM,eACN,OAAO,KACL,OAAO,CAAE,MAAM,CAAC;IAW7B;;;;;;OAMG;kCAHQ,MAAM,eACN,OAAO,KACL,OAAO,CAAE,MAAM,CAAC;IAyB7B;;;;;;;;;OASG;oCALQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,KACJ,OAAO,CAAE,MAAM,CAAC;IA2F7B;;;;;;;;;OASG;6BANQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,aACN,MAAM,KACJ,OAAO,CAAE,OAAO,CAAC;IAoB9B;;;;;;;OAOG;8BAJQ,MAAM,GAAG,MAAM,EAAE,YACjB,MAAM,aACN,OAAO,KACL,OAAO,CAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IA0B7C;;;;;;;;OAQG;sCALQ,MAAM,GAAG,MAAM,EAAE,YACjB,MAAM,YACN,MAAM,aACN,MAAM,KACJ,OAAO,CAAE,MAAM,CAAC;IAc7B;;;;;;;;;;OAUG;iCALQ,MAAM,SACN,MAAM,gBACN,OAAO,gBACP,MAAM,KACJ,OAAO,CAAE,MAAM,EAAE,CAAC;IA6C/B;;;;;;;;;;;OAWG;qCALQ,MAAM,UACN,MAAM,gBACN,OAAO,gBACP,MAAM,KACJ,MAAM,EAAE,GAAG,IAAI;IA4C5B;;;;;OAKG;+BAFQ,OAAO,GACL,OAAO,CAAE,IAAI,CAAC;IAU3B;;;;;OAKG;4BAFQ,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC;EAgCK;eAtlBxB,UAAU"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../lib/util/file.js"],"names":[],"mappings":";yBAWa,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;AA+jB1D;;;IA7iBI;;;;;;OAMG;yBAHQ,MAAM,MACN,MAAM,GACJ,OAAO,CAAE;QAAC,MAAM,EAAC,IAAI,GAAC,SAAS,GAAC,QAAQ,CAAC;QAAC,aAAa,EAAC,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAA;KAAC,CAAC;IAkB1F;;;;;OAKG;iCAFQ,MAAM,GACJ,MAAM;IAiCnB;;;;;OAKG;qCAFQ,MAAM,GACJ,MAAM;IA2BnB;;;;;OAKG;4CAFQ,MAAM,GACJ,MAAM;IAMnB;;;;;OAKG;sCAFQ,MAAM,GAAC,MAAM,EAAE,KACb,MAAM;IAcnB;;;;;;;OAOG;iCAJQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,WACN,MAAM;IAcjB;;;;;;;;;;OAUG;mCANQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,sBACN,WAAW,KACT,OAAO,CAAE,OAAO,CAAC;IAuB9B;;;;;;OAMG;4CAHQ,MAAM,eACN,OAAO,KACL,OAAO,CAAE,MAAM,CAAC;IAW7B;;;;;;OAMG;kCAHQ,MAAM,eACN,OAAO,KACL,OAAO,CAAE,MAAM,CAAC;IAyB7B;;;;;;;;;OASG;oCALQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,KACJ,OAAO,CAAE,MAAM,CAAC;IA8F7B;;;;;;;;;OASG;6BANQ,MAAM,GAAC,MAAM,EAAE,YACf,MAAM,YACN,MAAM,WACN,MAAM,aACN,MAAM,KACJ,OAAO,CAAE,OAAO,CAAC;IAoB9B;;;;;;;OAOG;8BAJQ,MAAM,GAAG,MAAM,EAAE,YACjB,MAAM,aACN,OAAO,KACL,OAAO,CAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IA0B7C;;;;;;;;OAQG;sCALQ,MAAM,GAAG,MAAM,EAAE,YACjB,MAAM,YACN,MAAM,aACN,MAAM,KACJ,OAAO,CAAE,MAAM,CAAC;IAc7B;;;;;;;;;;OAUG;iCALQ,MAAM,SACN,MAAM,gBACN,OAAO,gBACP,MAAM,KACJ,OAAO,CAAE,MAAM,EAAE,CAAC;IA6C/B;;;;;;;;;;;OAWG;qCALQ,MAAM,UACN,MAAM,gBACN,OAAO,gBACP,MAAM,KACJ,MAAM,EAAE,GAAG,IAAI;IA4C5B;;;;;OAKG;+BAFQ,OAAO,GACL,OAAO,CAAE,IAAI,CAAC;IAU3B;;;;;OAKG;4BAFQ,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC;EAgCK;eAzlBxB,UAAU"}

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 Accenture
+Copyright (c) 2020-2025 Accenture
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -73,4 +73,4 @@ The people that lead this project:
 
 ## Copyright
 
-Copyright (c) 2020-2024 Accenture. [MIT licensed](https://github.com/Accenture/sfmc-devtools/blob/main/LICENSE).
+Copyright (c) 2020-2025 Accenture. [MIT licensed](https://github.com/Accenture/sfmc-devtools/blob/main/LICENSE).

package/boilerplate/config.json

@@ -7,6 +7,7 @@
     },
     "options": {
         "formatOnSave": true,
+        "formatErrorLog": false,
         "deployment": {
             "commitHistory": 10,
             "sourceTargetMapping": {

package/boilerplate/files/.vscode/extensions.json

@@ -6,6 +6,7 @@
     "recommendations": [
         // collaboration
         "aaron-bond.better-comments",
+        "johnpapa.vscode-peacock",
 
         // Linters
         "dbaeumer.vscode-eslint",

package/boilerplate/forcedUpdates.json

@@ -1,4 +1,8 @@
 [
+    {
+        "version": "7.6.2",
+        "files": [".vscode/extensions.json"]
+    },
     {
         "version": "7.4.3",
         "files": ["eslint.config.js", ".prettierrc"]

package/lib/index.js

@@ -730,7 +730,7 @@ class Mcdev {
      * ensures triggered sends are restarted to ensure they pick up on changes of the underlying emails
      *
      * @param {string} businessUnit references credentials from properties.json
-     * @param {string[] | TypeKeyCombo} [selectedTypes] limit to given metadata types
+     * @param {string[] | TypeKeyCombo} selectedTypes limit to given metadata types
      * @param {string[]} [keys] customerkey of the metadata
      * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
      */
@@ -1412,19 +1412,6 @@ class Mcdev {
         }
     }
 
-    /**
-     * Schedule an item (shortcut for execute --schedule)
-     *
-     * @param {string} businessUnit name of BU
-     * @param {string[] | TypeKeyCombo} [selectedTypes] limit to given metadata types
-     * @param {string[]} [keys] customerkey of the metadata
-     * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
-     */
-    static async schedule(businessUnit, selectedTypes, keys) {
-        this.setOptions({ schedule: true });
-        return this.#runMethod('execute', businessUnit, selectedTypes, keys);
-    }
-
     /**
      * Publish an item
      *
@@ -1452,7 +1439,7 @@ class Mcdev {
      * Start/execute an item
      *
      * @param {string} businessUnit name of BU
-     * @param {string[] | TypeKeyCombo} [selectedTypes] limit to given metadata types
+     * @param {string[] | TypeKeyCombo} selectedTypes limit to given metadata types
      * @param {string[]} [keys] customerkey of the metadata
      * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
      */
@@ -1460,11 +1447,24 @@ class Mcdev {
         return this.#runMethod('execute', businessUnit, selectedTypes, keys);
     }
 
+    /**
+     * Schedule an item (shortcut for execute --schedule)
+     *
+     * @param {string} businessUnit name of BU
+     * @param {string[] | TypeKeyCombo} selectedTypes limit to given metadata types
+     * @param {string[]} [keys] customerkey of the metadata
+     * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
+     */
+    static async schedule(businessUnit, selectedTypes, keys) {
+        this.setOptions({ schedule: true });
+        return this.#runMethod('execute', businessUnit, selectedTypes, keys);
+    }
+
     /**
      * pause an item
      *
      * @param {string} businessUnit name of BU
-     * @param {string[] | TypeKeyCombo} [selectedTypes] limit to given metadata types
+     * @param {string[] | TypeKeyCombo} selectedTypes limit to given metadata types
      * @param {string[]} [keys] customerkey of the metadata
      * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
      */
@@ -1476,7 +1476,7 @@ class Mcdev {
      * stop an item
      *
      * @param {string} businessUnit name of BU
-     * @param {string[] | TypeKeyCombo} [selectedTypes] limit to given metadata types
+     * @param {string[] | TypeKeyCombo} selectedTypes limit to given metadata types
      * @param {string[]} [keys] customerkey of the metadata
      * @returns {Promise.<Object.<string, Object.<string, string[]>>>} key: business unit name, key2: type, value: list of affected item keys
      */
@@ -1671,6 +1671,7 @@ class Mcdev {
         Util.startLogger();
         let lang_past;
         let lang_present;
+        let requireType;
         let requireKeyOrLike;
         let checkMetadataSupport;
         /** @type {Object.<string, Object.<string, string[]>>} */
@@ -1680,6 +1681,7 @@ class Mcdev {
             case 'execute': {
                 lang_past = 'executed';
                 lang_present = 'executing';
+                requireType = true;
                 requireKeyOrLike = true;
                 checkMetadataSupport = true;
                 break;
@@ -1687,6 +1689,7 @@ class Mcdev {
             case 'pause': {
                 lang_past = 'paused';
                 lang_present = 'pausing';
+                requireType = true;
                 requireKeyOrLike = true;
                 checkMetadataSupport = true;
                 break;
@@ -1694,6 +1697,7 @@ class Mcdev {
             case 'stop': {
                 lang_past = 'stopped';
                 lang_present = 'stopping';
+                requireType = true;
                 requireKeyOrLike = true;
                 checkMetadataSupport = true;
                 break;
@@ -1701,6 +1705,7 @@ class Mcdev {
             case 'publish': {
                 lang_past = 'published';
                 lang_present = 'publishing';
+                requireType = true;
                 requireKeyOrLike = true;
                 checkMetadataSupport = true;
                 break;
@@ -1708,6 +1713,7 @@ class Mcdev {
             case 'validate': {
                 lang_past = 'validated';
                 lang_present = 'validating';
+                requireType = true;
                 requireKeyOrLike = true;
                 checkMetadataSupport = true;
                 break;
@@ -1715,6 +1721,7 @@ class Mcdev {
             case 'fixKeys': {
                 lang_past = 'fixed keys';
                 lang_present = 'fixing keys';
+                requireType = false;
                 requireKeyOrLike = false;
                 checkMetadataSupport = false;
                 break;
@@ -1722,6 +1729,7 @@ class Mcdev {
             case 'replaceCbReference': {
                 lang_past = 'replaced references';
                 lang_present = 'replacing references';
+                requireType = false;
                 requireKeyOrLike = false;
                 checkMetadataSupport = true;
                 break;
@@ -1729,6 +1737,7 @@ class Mcdev {
             case 'refresh': {
                 lang_past = 'refreshed';
                 lang_present = 'refreshing';
+                requireType = true;
                 requireKeyOrLike = false;
                 checkMetadataSupport = true;
                 break;
@@ -1767,6 +1776,14 @@ class Mcdev {
                 selectedTypesObj = selectedTypes;
             }
         }
+        if (
+            requireType &&
+            !Array.isArray(selectedTypesArr) &&
+            (!selectedTypesObj || !Object.keys(selectedTypesObj).length)
+        ) {
+            Util.logger.error('At least one metadata type needs to be defined.');
+            return resultObj;
+        }
         const properties = await config.getProperties();
         if (!(await config.checkProperties(properties))) {
             // return null here to avoid seeing 2 error messages for the same issue

package/lib/metadataTypes/Asset.js

@@ -1196,9 +1196,8 @@ class Asset extends MetadataType {
                                 };
                             }
                             if (asset.r__folder_Path) {
-                                // more often than not, folders get replaced but that change is not updated in the snapshot of the content block here in another contentblock
-                                // therefore, if we couldn't resolve the folder during retrieve (and hence no r__folder_Path was set), we would also fail here
-                                this.setFolderId(asset);
+                                // if we convert this into a folder path then renamed folders might end up blocking deployments, therefore, we instead omit this detail from now on
+                                delete asset.r__folder_Path;
                             }
                             await this._preDeployTasksBocks(asset);
                         }
@@ -1886,7 +1885,8 @@ class Asset extends MetadataType {
                             }
                         }
                         if (asset.category?.id) {
-                            this.setFolderPath(asset, true);
+                            // if we convert this into a folder path then renamed folders might end up blocking deployments, therefore, we instead omit this detail from now on
+                            delete asset.category;
                         }
 
                         if (asset.slots) {
@@ -1954,11 +1954,34 @@ class Asset extends MetadataType {
                             subtype,
                             fileName2FileContent
                         );
-                    } else if (fileName.endsWith(fileEnding)) {
+                    } else if (fileName.endsWith('.json')) {
+                        const errorDir = currentdir.split('\\').join('/');
                         const fileContent = await File.readJSONFile(currentdir, fileName, false);
-                        // subtype will change the metadata suffix length
-                        const fileNameWithoutEnding = fileName.slice(0, -fileEndingLength);
-                        fileName2FileContent[fileNameWithoutEnding] = fileContent;
+                        // ! convert numbers to string to allow numeric keys to be checked properly
+                        const key = Number.isInteger(fileContent[this.definition.keyField])
+                            ? fileContent[this.definition.keyField].toString()
+                            : fileContent[this.definition.keyField];
+                        if (fileName.endsWith(fileEnding)) {
+                            // subtype will change the metadata suffix length
+                            const fileNameWithoutEnding = File.reverseFilterIllegalFilenames(
+                                fileName.slice(0, -fileEndingLength)
+                            );
+                            if (key === fileNameWithoutEnding) {
+                                fileName2FileContent[fileNameWithoutEnding] = fileContent;
+                            } else {
+                                Util.logger.error(
+                                    ` ☇ skipping ${this.definition.type} ${key}: Name of the metadata file and the JSON-key (${this.definition.keyField}) must match. Expected: ${key}${fileEnding}. Actual: ` +
+                                        Util.getGrayMsg(`${errorDir}/`) +
+                                        fileName
+                                );
+                            }
+                        } else {
+                            Util.logger.error(
+                                ` ☇ skipping ${this.definition.type} ${key}: Name of the metadata file must end on the extended metadata suffix. Expected: ${key}${fileEnding}. Actual: ` +
+                                    Util.getGrayMsg(`${errorDir}/`) +
+                                    fileName
+                            );
+                        }
                     }
                 } catch (ex) {
                     // by catching this in the loop we gracefully handle the issue and move on to the next file

package/lib/metadataTypes/Automation.js

@@ -485,20 +485,32 @@ class Automation extends MetadataType {
         // folder
         this.setFolderPath(metadata);
         // automations are often skipped due to lack of support.
-        if (
-            metadata.type == 'automationtriggered' &&
-            metadata.automationTrigger?.fileTransferLocationId
-        ) {
-            try {
-                metadata.automationTrigger.r__fileLocation_name = cache.searchForField(
-                    'fileLocation',
-                    metadata.automationTrigger.fileTransferLocationId,
-                    'id',
-                    'name'
-                );
-                delete metadata.automationTrigger.fileTransferLocationId;
-            } catch (ex) {
-                Util.logger.warn(` - automation ${metadata.key}: ${ex.message}`);
+        if (metadata.type == 'automationtriggered' && metadata.automationTrigger) {
+            const automationTrigger = metadata.automationTrigger;
+            if (automationTrigger.fileTransferLocationId) {
+                try {
+                    automationTrigger.r__fileLocation_name = cache.searchForField(
+                        'fileLocation',
+                        automationTrigger.fileTransferLocationId,
+                        'id',
+                        'name'
+                    );
+                    delete automationTrigger.fileTransferLocationId;
+                } catch (ex) {
+                    Util.logger.warn(` - automation ${metadata.key}: ${ex.message}`);
+                }
+            }
+            if (automationTrigger.fileNamePatternType) {
+                try {
+                    automationTrigger.fileNamePatternType = Util.inverseGet(
+                        this.definition.fileNameOperatorMapping,
+                        automationTrigger.fileNamePatternType
+                    );
+                } catch {
+                    Util.logger.warn(
+                        ` - Unknown File naming Pattern '${automationTrigger.fileNamePatternType}' in Automation '${metadata.name}'`
+                    );
+                }
             }
         }
         try {
@@ -921,17 +933,25 @@ class Automation extends MetadataType {
                 this.notificationUpdates[metadata.key] = [];
             }
         }
-        if (
-            metadata.type == 'automationtriggered' &&
-            metadata.automationTrigger?.r__fileLocation_name
-        ) {
-            metadata.automationTrigger.fileTransferLocationId = cache.searchForField(
-                'fileLocation',
-                metadata.automationTrigger.r__fileLocation_name,
-                'name',
-                'id'
-            );
-            delete metadata.automationTrigger.r__fileLocation_name;
+        if (metadata.type == 'automationtriggered' && metadata.automationTrigger) {
+            const automationTrigger = metadata.automationTrigger;
+
+            if (automationTrigger.r__fileLocation_name) {
+                automationTrigger.fileTransferLocationId = cache.searchForField(
+                    'fileLocation',
+                    automationTrigger.r__fileLocation_name,
+                    'name',
+                    'id'
+                );
+                delete automationTrigger.r__fileLocation_name;
+            }
+            if (
+                automationTrigger.fileNamePatternType &&
+                typeof automationTrigger.fileNamePatternType === 'string'
+            ) {
+                automationTrigger.fileNamePatternType =
+                    this.definition.fileNameOperatorMapping[automationTrigger.fileNamePatternType];
+            }
         }
         if (this.validateDeployMetadata(metadata)) {
             // folder

package/lib/metadataTypes/DataExtension.js

@@ -304,7 +304,7 @@ class DataExtension extends MetadataType {
             delete Util.changedKeysMap?.[this.definition.type]?.[key];
 
             const cachedVersion = createdUpdated.updated
-                ? cache.getByKey(this.definition.type, oldKey)
+                ? cache.getByKey(this.definition.type, key)
                 : null;
             if (cachedVersion) {
                 // UPDATE

package/lib/metadataTypes/DataExtract.js

@@ -139,6 +139,26 @@ class DataExtract extends MetadataType {
         return metadata;
     }
 
+    /**
+     * Gets executed after deployment of metadata type
+     *
+     * @param {MetadataTypeMap} upsertResults metadata mapped by their keyField as returned by update/create
+     * @returns {Promise.<void>} -
+     */
+    static async postDeployTasks(upsertResults) {
+        // re-retrieve all upserted items to ensure we have all fields (createdDate and modifiedDate are otherwise not present)
+        Util.logger.debug(
+            `Caching all ${this.definition.type} post-deploy to ensure we have all fields`
+        );
+        const typeCache = await this.retrieveForCache();
+        // update values in upsertResults with retrieved values before saving to disk
+        for (const key of Object.keys(upsertResults)) {
+            if (typeCache.metadata[key]) {
+                upsertResults[key] = typeCache.metadata[key];
+            }
+        }
+    }
+
     /**
      * manages post retrieve steps
      *

package/lib/metadataTypes/Event.js

@@ -327,6 +327,7 @@ class Event extends MetadataType {
                 }
             }
         } else if (createOrUpdateAction === 'create') {
+            let deFound;
             try {
                 if (metadataItem.r__dataExtension_key) {
                     metadataItem.dataExtensionId = cache.searchForField(
@@ -342,16 +343,18 @@ class Event extends MetadataType {
                         'Name'
                     );
                     if (metadataItem.schema) {
-                        delete metadataItem.schema;
                         Util.logger.info(
                             ` - ${this.definition.type} ${metadataItem[this.definition.keyField]}: dataExtension ${metadataItem.r__dataExtension_key} found, ignoring schema-section in ${this.definition.type} json`
                         );
                     }
+                    deFound = true;
+                } else {
+                    deFound = false;
                 }
             } catch {
-                // no action
+                deFound = false;
             }
-            if (metadataItem.schema) {
+            if (!deFound) {
                 if (metadataItem.r__dataExtension_key) {
                     metadataItem.schema.name = metadataItem.r__dataExtension_key;
                 }
@@ -377,7 +380,7 @@ class Event extends MetadataType {
      * @returns {Promise.<void>} -
      */
     static async postDeployTasks(upsertResults, originalMetadata, createdUpdated) {
-        // CREATE ONLY - if dataExtensions were auto-
+        // CREATE ONLY - if dataExtensions were auto-created
         if (this.reCacheDataExtensions.length && createdUpdated.created > 0) {
             Util.logger.warn(' - Re-caching dependent Metadata: dataExtension');
             const deRetrieve = await DataExtension.retrieveForCache();
@@ -443,6 +446,18 @@ class Event extends MetadataType {
                 await retriever.retrieve(['dataExtension'], reDownloadDeKeys);
             }
         }
+
+        // re-retrieve all upserted items to ensure we have all fields (createdDate and modifiedDate are otherwise not present)
+        Util.logger.debug(
+            `Caching all ${this.definition.type} post-deploy to ensure we have all fields`
+        );
+        const typeCache = await this.retrieveForCache();
+        // update values in upsertResults with retrieved values before saving to disk
+        for (const key of Object.keys(upsertResults)) {
+            if (typeCache.metadata[key]) {
+                upsertResults[key] = typeCache.metadata[key];
+            }
+        }
     }
 
     /**
@@ -557,7 +572,7 @@ class Event extends MetadataType {
         try {
             await this.compareSalesforceEntryEvents_dataExtension(
                 metadata.type,
-                metadata.configurationArguments.eventDataSummary,
+                metadata.configurationArguments?.eventDataSummary,
                 metadata.r__dataExtension_key
             );
         } catch (ex) {

package/lib/metadataTypes/FileLocation.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import MetadataType from './MetadataType.js';
+import { Util } from '../util/util.js';
 
 /**
  * @typedef {import('../../types/mcdev.d.js').BuObject} BuObject
@@ -20,10 +21,10 @@ import MetadataType from './MetadataType.js';
  *
  * @augments MetadataType
  */
-class FtpLocation extends MetadataType {
+class FileLocation extends MetadataType {
     /**
-     * Retrieves Metadata of FtpLocation
-     * Endpoint /automation/v1/ftplocations/ return all FtpLocations
+     * Retrieves Metadata of FileLocation
+     * Endpoint /automation/v1/ftplocations/ return all FileLocations
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
      * @param {void | string[]} [_] unused parameter
@@ -43,10 +44,47 @@ class FtpLocation extends MetadataType {
     static async retrieveForCache() {
         return super.retrieveREST(null, '/automation/v1/ftplocations/');
     }
+
+    /**
+     * prepares a import definition for deployment
+     *
+     * @param {MetadataTypeItem} metadata a single importDef
+     * @returns {Promise.<MetadataTypeItem>} Promise
+     */
+    static async preDeployTasks(metadata) {
+        if (metadata.c__locationType) {
+            metadata.locationTypeId = this.definition.locationTypeMapping[metadata.c__locationType];
+        }
+        return metadata;
+    }
+
+    /**
+     * manages post retrieve steps
+     *
+     * @param {MetadataTypeItem} metadata a single item
+     * @returns {MetadataTypeItem} parsed metadata
+     */
+    static postRetrieveTasks(metadata) {
+        if (metadata.locationTypeId) {
+            try {
+                metadata.c__locationType = Util.inverseGet(
+                    this.definition.locationTypeMapping,
+                    metadata.locationTypeId
+                );
+                delete metadata.locationTypeId;
+            } catch {
+                Util.logger.info(
+                    'Please report this new & unknown locationTypeId to the mcdev developer team via github: ' +
+                        metadata.locationTypeId
+                );
+            }
+        }
+        return metadata;
+    }
 }
 
 // Assign definition to static attributes
 import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js';
-FtpLocation.definition = MetadataTypeDefinitions.fileLocation;
+FileLocation.definition = MetadataTypeDefinitions.fileLocation;
 
-export default FtpLocation;
+export default FileLocation;