mcdev 6.0.2 → 7.0.0

package/lib/metadataTypes/User.js

@@ -1,25 +1,46 @@
 'use strict';
 
-import TYPE from '../../types/mcdev.d.js';
 import MetadataType from './MetadataType.js';
 import { Util } from '../util/util.js';
 import File from '../util/file.js';
 import cache from '../util/cache.js';
 
+/**
+ * @typedef {import('../../types/mcdev.d.js').BuObject} BuObject
+ * @typedef {import('../../types/mcdev.d.js').CodeExtract} CodeExtract
+ * @typedef {import('../../types/mcdev.d.js').CodeExtractItem} CodeExtractItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItem} MetadataTypeItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItemDiff} MetadataTypeItemDiff
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItemObj} MetadataTypeItemObj
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMap} MetadataTypeMap
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMapObj} MetadataTypeMapObj
+ * @typedef {import('../../types/mcdev.d.js').SoapRequestParams} SoapRequestParams
+ * @typedef {import('../../types/mcdev.d.js').TemplateMap} TemplateMap
+ */
+
+/**
+ * @typedef {import('../../types/mcdev.d.js').UserDocument} UserDocument
+ * @typedef {import('../../types/mcdev.d.js').UserDocumentDocument} UserDocumentDocument
+ * @typedef {import('../../types/mcdev.d.js').UserDocumentDiff} UserDocumentDiff
+ * @typedef {import('../../types/mcdev.d.js').UserDocumentMap} UserDocumentMap
+ * @typedef {import('../../types/mcdev.d.js').AccountUserConfiguration} AccountUserConfiguration
+ */
+
 /**
  * MetadataType
  *
  * @augments MetadataType
  */
 class User extends MetadataType {
+    static userBUassignments;
     /**
      * Retrieves SOAP based metadata of metadata type into local filesystem. executes callback with retrieved metadata
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
-     * @param {void} _ unused parameter
-     * @param {void} [__] unused parameter
+     * @param {void | string[]} _ unused parameter
+     * @param {void | string[]} [__] unused parameter
      * @param {string} [key] customer key of single item to retrieve
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieve(retrieveDir, _, __, key) {
         if (this.buObject.eid !== this.buObject.mid) {
@@ -31,7 +52,7 @@ class User extends MetadataType {
     /**
      * Retrieves import definition metadata for caching
      *
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise
+     * @returns {Promise.<MetadataTypeMapObj>} Promise
      */
     static async retrieveForCache() {
         return this.retrieve(null);
@@ -40,7 +61,7 @@ class User extends MetadataType {
     /**
      * Create a single item.
      *
-     * @param {TYPE.MetadataTypeItem} metadata single metadata entry
+     * @param {MetadataTypeItem} metadata single metadata entry
      * @returns {Promise} Promise
      */
     static async create(metadata) {
@@ -54,7 +75,7 @@ class User extends MetadataType {
     /**
      * Updates a single item.
      *
-     * @param {TYPE.MetadataTypeItem} metadata single metadata entry
+     * @param {MetadataTypeItem} metadata single metadata entry
      * @returns {Promise} Promise
      */
     static async update(metadata) {
@@ -67,8 +88,8 @@ class User extends MetadataType {
     /**
      * prepares a item for deployment
      *
-     * @param {TYPE.UserDocument} metadata of a single item
-     * @returns {TYPE.UserDocument} metadata object
+     * @param {UserDocument} metadata of a single item
+     * @returns {Promise.<UserDocument>} metadata object
      */
     static async preDeployTasks(metadata) {
         metadata.Client = {
@@ -92,7 +113,7 @@ class User extends MetadataType {
                                 'Name',
                                 'CustomerKey'
                             );
-                            roleCache = cache.getByKey('role', roleKey);
+                            roleCache = cache.getByKey('role', roleKey + '');
                         } catch {
                             // skip this role in case of errors
                             return;
@@ -130,12 +151,9 @@ class User extends MetadataType {
         if (metadata.c__TimeZoneName) {
             // find the ID of the timezone
             metadata.TimeZone = { Name: metadata.c__TimeZoneName };
-            metadata.TimeZone.ID = cache.searchForField(
-                '_timezone',
-                metadata.c__TimeZoneName,
-                'description',
-                'id'
-            );
+            metadata.TimeZone.ID =
+                '' +
+                cache.searchForField('_timezone', metadata.c__TimeZoneName, 'description', 'id');
             delete metadata.c__TimeZoneName;
         }
 
@@ -198,15 +216,21 @@ class User extends MetadataType {
     /**
      * helper for {@link MetadataType.upsert}
      *
-     * @param {TYPE.MetadataTypeMap} metadata list of metadata
+     * @param {MetadataTypeMap} metadata list of metadata
      * @param {string} metadataKey key of item we are looking at
      * @param {boolean} hasError error flag from previous code
-     * @param {TYPE.UserDocumentDiff[]} metadataToUpdate list of items to update
-     * @param {TYPE.UserDocument[]} metadataToCreate list of items to create
-     * @returns {void}
+     * @param {UserDocumentDiff[]} metadataToUpdate list of items to update
+     * @param {UserDocument[]} metadataToCreate list of items to create
+     * @returns {Promise.<'create'|'update'|'skip'>} action to take
      */
-    static createOrUpdate(metadata, metadataKey, hasError, metadataToUpdate, metadataToCreate) {
-        const action = super.createOrUpdate(
+    static async createOrUpdate(
+        metadata,
+        metadataKey,
+        hasError,
+        metadataToUpdate,
+        metadataToCreate
+    ) {
+        const action = await super.createOrUpdate(
             metadata,
             metadataKey,
             hasError,
@@ -217,21 +241,22 @@ class User extends MetadataType {
         if (action === 'create') {
             const createItem = metadataToCreate.at(-1);
             User._setPasswordForNewUser(createItem);
-            User._prepareRoleAssignments({ after: createItem });
+            User._prepareRoleAssignments({ before: null, after: createItem });
             User._prepareBuAssignments(metadata[metadataKey], null, createItem);
         } else if (action === 'update') {
             const updateItem = metadataToUpdate.at(-1);
             User._prepareRoleAssignments(updateItem);
             User._prepareBuAssignments(metadata[metadataKey], updateItem, null);
         }
+        return action;
     }
 
     /**
      *
      * @private
-     * @param {TYPE.MetadataTypeItem} metadata single metadata itme
-     * @param {TYPE.UserDocumentDiff} [updateItem] item to update
-     * @param {TYPE.UserDocument} [createItem] item to create
+     * @param {MetadataTypeItem} metadata single metadata itme
+     * @param {UserDocumentDiff} [updateItem] item to update
+     * @param {UserDocument} [createItem] item to create
      */
     static _prepareBuAssignments(metadata, updateItem, createItem) {
         this.userBUassignments ||= { add: {}, delete: {} };
@@ -274,7 +299,7 @@ class User extends MetadataType {
     /**
      * Gets executed after deployment of metadata type
      *
-     * @param {TYPE.UserDocumentMap} upsertResults metadata mapped by their keyField
+     * @param {UserDocumentMap} upsertResults metadata mapped by their keyField
      * @returns {Promise.<void>} promise
      */
     static async postDeployTasks(upsertResults) {
@@ -286,11 +311,11 @@ class User extends MetadataType {
      * create/update business unit assignments
      *
      * @private
-     * @param {TYPE.UserDocumentMap} upsertResults metadata mapped by their keyField
-     * @returns {void}
+     * @param {UserDocumentMap} upsertResults metadata mapped by their keyField
+     * @returns {Promise.<void>} -
      */
     static async _handleBuAssignments(upsertResults) {
-        /** @type {TYPE.UserConfiguration[]} */
+        /** @type {AccountUserConfiguration[]} */
         const configs = [];
         for (const action in this.userBUassignments) {
             for (const data of Object.entries(this.userBUassignments[action])) {
@@ -301,7 +326,7 @@ class User extends MetadataType {
                 }
                 userId = userId.startsWith('key:') ? upsertResults[userId.slice(4)].ID : userId;
                 configs.push(
-                    /** @type {TYPE.UserConfiguration} */ {
+                    /** @type {AccountUserConfiguration} */ {
                         Client: { ID: this.buObject.eid },
                         ID: userId,
                         BusinessUnitAssignmentConfiguration: {
@@ -315,6 +340,7 @@ class User extends MetadataType {
         if (configs.length > 0) {
             Util.logger.info('Deploying: BU assignment changes');
             // run update
+            // @ts-expect-error bad jsodc in SFMC-SDK
             const buResponse = await this.client.soap.configure('AccountUser', configs);
             // process response
             if (buResponse.OverallStatus === 'OK') {
@@ -337,7 +363,7 @@ class User extends MetadataType {
                 const userBUresults = {};
                 for (const result of configureResults) {
                     if (result.StatusCode === 'OK') {
-                        /** @type {TYPE.UserConfiguration} */
+                        /** @type {AccountUserConfiguration} */
                         const config = result.Object;
                         const buArr =
                             config.BusinessUnitAssignmentConfiguration.BusinessUnitIds
@@ -395,7 +421,7 @@ class User extends MetadataType {
      * helper for {@link User.createOrUpdate}
      *
      * @private
-     * @param {TYPE.UserDocument} metadata single created user
+     * @param {UserDocument} metadata single created user
      * @returns {void}
      */
     static _setPasswordForNewUser(metadata) {
@@ -418,7 +444,7 @@ class User extends MetadataType {
      * Adding roles works automatically for roles listed on the user
      *
      * @private
-     * @param {TYPE.UserDocumentDiff} item updated user with before and after state
+     * @param {UserDocumentDiff} item updated user with before and after state
      * @returns {void}
      */
     static _prepareRoleAssignments(item) {
@@ -544,7 +570,7 @@ class User extends MetadataType {
     /**
      * Retrieves SOAP based metadata of metadata type into local filesystem. executes callback with retrieved metadata
      *
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieveChangelog() {
         return this._retrieve();
@@ -553,13 +579,13 @@ class User extends MetadataType {
      * Retrieves SOAP based metadata of metadata type into local filesystem. executes callback with retrieved metadata
      *
      * @private
-     * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
+     * @param {string} [retrieveDir] Directory where retrieved metadata directory will be saved
      * @param {string} [key] customer key of single item to retrieve
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async _retrieve(retrieveDir, key) {
         this.userIdBuMap = {};
-        /** @type {TYPE.SoapRequestParams} */
+        /** @type {SoapRequestParams} */
         const requestParams = {
             QueryAllAccounts: true,
 
@@ -594,10 +620,10 @@ class User extends MetadataType {
      * Retrieves SOAP via generic fuel-soap wrapper based metadata of metadata type into local filesystem. executes callback with retrieved metadata
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
-     * @param {TYPE.SoapRequestParams} [requestParams] required for the specific request (filter for example)
-     * @param {string|number} [singleRetrieve] key of single item to filter by
+     * @param {SoapRequestParams} [requestParams] required for the specific request (filter for example)
+     * @param {string} [singleRetrieve] key of single item to filter by
      * @param {string[]} [additionalFields] Returns specified fields even if their retrieve definition is not set to true
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of item map
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of item map
      */
     static async retrieveSOAP(retrieveDir, requestParams, singleRetrieve, additionalFields) {
         // to avoid not retrieving roles and userPermissions for users above the 2500 records limit we need to retrieve users twice, once with ActiveFlag=true and once with ActiveFlag=false
@@ -646,7 +672,7 @@ class User extends MetadataType {
                 }
             } catch (ex) {
                 this._handleSOAPErrors(ex, 'retrieving');
-                return {};
+                return;
             }
         }
         if (
@@ -658,7 +684,7 @@ class User extends MetadataType {
                 resultsBulk
             ))
         ) {
-            return {};
+            return;
         }
 
         const metadata = this.parseResponseBody(resultsBulk);
@@ -743,13 +769,14 @@ class User extends MetadataType {
      * helper for {@link User.retrieveSOAP}
      *
      * @private
-     * @param {TYPE.SoapRequestParams} [requestParams] required for the specific request (filter for example)
+     * @param {SoapRequestParams} requestParams required for the specific request (filter for example)
      * @param {string} soapType e.g. AccountUser
      * @param {string[]} fields list of fields to retrieve
      * @param {object} resultsBulk actual return value of this method
      * @returns {Promise.<boolean>} success flag
      */
     static async _retrieveSOAP_installedPackage(requestParams, soapType, fields, resultsBulk) {
+        /** @type {SoapRequestParams} */
         const requestParamsInstalledPackage = {
             QueryAllAccounts: true,
 
@@ -785,7 +812,10 @@ class User extends MetadataType {
                 },
             },
         };
-        if (requestParams?.filter?.leftOperand?.leftOperand === 'CustomerKey') {
+        if (
+            'object' === typeof requestParams?.filter?.leftOperand &&
+            requestParams?.filter?.leftOperand?.leftOperand === 'CustomerKey'
+        ) {
             requestParamsInstalledPackage.filter = {
                 leftOperand: requestParams?.filter?.leftOperand,
                 operator: 'AND',
@@ -818,22 +848,22 @@ class User extends MetadataType {
 
     /**
      *
-     * @private
-     * @param {string} date first date
-     * @returns {number} time difference
+     * @param {string} dateStr first date
+     * @param {string} interval defaults to 'days'
+     * @returns {string} time difference
      */
-    static _timeSinceDate(date) {
-        const interval = 'days';
+    static #timeSinceDate(dateStr, interval = 'days') {
         const second = 1000,
             minute = second * 60,
             hour = minute * 60,
             day = hour * 24,
             week = day * 7;
-        date = new Date(date);
+        const date = new Date(dateStr);
         const now = new Date();
-        const timediff = now - date;
+        // get difference in miliseconds
+        const timediff = now.valueOf() - date.valueOf();
         if (Number.isNaN(timediff)) {
-            return Number.NaN;
+            return '';
         }
         let result;
         switch (interval) {
@@ -930,7 +960,7 @@ class User extends MetadataType {
     /**
      * Creates markdown documentation of all roles
      *
-     * @param {TYPE.MetadataTypeMap} [metadata] user list
+     * @param {UserDocumentMap} [metadata] user list
      * @returns {Promise.<void>} -
      */
     static async document(metadata) {
@@ -944,7 +974,7 @@ class User extends MetadataType {
         if (!metadata) {
             // load users from disk if document was called directly and not part of a retrieve
             try {
-                metadata = this.readBUMetadataForType(
+                metadata = await this.readBUMetadataForType(
                     File.normalizePath([
                         this.properties.directories.retrieve,
                         this.buObject.credential,
@@ -961,9 +991,7 @@ class User extends MetadataType {
         // init map of BU Ids > BU Name
         this._getBuNames();
 
-        /**
-         * @type {TYPE.UserDocument[]}
-         */
+        /** @type {UserDocumentDocument[]} */
         const users = [];
 
         for (const id in metadata) {
@@ -1007,7 +1035,7 @@ class User extends MetadataType {
                       LastSuccessfulLogin === user.CreatedDate.split('.')[0] ||
                       LastSuccessfulLogin === user.ModifiedDate.split('.')[0]
                         ? 'unknown'
-                        : this._timeSinceDate(user.LastSuccessfulLogin)
+                        : this.#timeSinceDate(user.LastSuccessfulLogin)
                     : 'never',
                 CreatedDate: user.CreatedDate ? user.CreatedDate.split('T').join(' ') : 'n/a',
                 ModifiedDate: user.ModifiedDate ? user.ModifiedDate.split('T').join(' ') : 'n/a',
@@ -1072,7 +1100,7 @@ class User extends MetadataType {
      *
      * @private
      * @param {object[]} users list of users and installed package
-     * @param {'Installed Package'|'User'} type choose what sub type to print
+     * @param {'Installed Package'|'User'|'Inactivated User'} type choose what sub type to print
      * @param {Array[]} columnsToPrint helper array
      * @returns {string} markdown
      */
@@ -1096,8 +1124,8 @@ class User extends MetadataType {
     /**
      * manages post retrieve steps
      *
-     * @param {TYPE.MetadataTypeItem} metadata a single item
-     * @returns {TYPE.MetadataTypeItem | void} a single item
+     * @param {MetadataTypeItem} metadata a single item
+     * @returns {MetadataTypeItem | void} a single item
      */
     static postRetrieveTasks(metadata) {
         metadata.c__type = 'Installed Package';

package/lib/metadataTypes/Verification.js

@@ -2,9 +2,27 @@
 
 import Automation from './Automation.js';
 import MetadataType from './MetadataType.js';
-import TYPE from '../../types/mcdev.d.js';
 import { Util } from '../util/util.js';
 import cache from '../util/cache.js';
+
+/**
+ * @typedef {import('../../types/mcdev.d.js').BuObject} BuObject
+ * @typedef {import('../../types/mcdev.d.js').CodeExtract} CodeExtract
+ * @typedef {import('../../types/mcdev.d.js').CodeExtractItem} CodeExtractItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItem} MetadataTypeItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItemDiff} MetadataTypeItemDiff
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItemObj} MetadataTypeItemObj
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMap} MetadataTypeMap
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMapObj} MetadataTypeMapObj
+ * @typedef {import('../../types/mcdev.d.js').SoapRequestParams} SoapRequestParams
+ * @typedef {import('../../types/mcdev.d.js').TemplateMap} TemplateMap
+ * @typedef {import('../../types/mcdev.d.js').RestError} RestError
+ */
+
+/**
+ * @typedef {import('../../types/mcdev.d.js').VerificationItem} VerificationItem
+ */
+
 /**
  * Verification MetadataType
  *
@@ -14,11 +32,11 @@ class Verification extends MetadataType {
     /**
      * Retrieves Metadata of Data Verification Activity.
      *
-     * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
-     * @param {void} [_] unused parameter
-     * @param {void} [__] unused parameter
-     * @param {string} key customer key of single item to retrieve
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @param {string} [retrieveDir] Directory where retrieved metadata directory will be saved
+     * @param {void | string[]} [_] unused parameter
+     * @param {void | string[]} [__] unused parameter
+     * @param {string} [key] customer key of single item to retrieve
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieve(retrieveDir, _, __, key) {
         let paramArr = [];
@@ -92,7 +110,7 @@ class Verification extends MetadataType {
     /**
      * helper for {@link this.retrieveRESTcollection}
      *
-     * @param {Error} ex exception
+     * @param {RestError} ex exception
      * @param {string} id id or key of item
      * @returns {null} -
      */
@@ -114,7 +132,7 @@ class Verification extends MetadataType {
     /**
      * Retrieves Metadata of  Data Extract Activity for caching
      *
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieveForCache() {
         return this.retrieve();
@@ -123,7 +141,7 @@ class Verification extends MetadataType {
     /**
      * Creates a single Data Extract
      *
-     * @param {TYPE.VerificationItem} metadata a single Data Extract
+     * @param {VerificationItem} metadata a single Data Extract
      * @returns {Promise} Promise
      */
     static create(metadata) {
@@ -133,10 +151,10 @@ class Verification extends MetadataType {
     /**
      * helper for {@link MetadataType.createREST}
      *
-     * @param {TYPE.MetadataTypeItem} metadataEntry a single metadata Entry
+     * @param {MetadataTypeItem} metadataEntry a single metadata Entry
      * @param {object} apiResponse varies depending on the API call
-     * @param {TYPE.MetadataTypeItem} metadataEntryWithAllFields like metadataEntry but before non-creatable fields were stripped
-     * @returns {void}
+     * @param {MetadataTypeItem} metadataEntryWithAllFields like metadataEntry but before non-creatable fields were stripped
+     * @returns {Promise.<void>} -
      */
     static async postCreateTasks(metadataEntry, apiResponse, metadataEntryWithAllFields) {
         if (!apiResponse?.[this.definition.idField]) {
@@ -164,7 +182,7 @@ class Verification extends MetadataType {
     /**
      * Updates a single Data Extract
      *
-     * @param {TYPE.VerificationItem} metadata a single Data Extract
+     * @param {VerificationItem} metadata a single Data Extract
      * @returns {Promise} Promise
      */
     static update(metadata) {
@@ -177,28 +195,28 @@ class Verification extends MetadataType {
     /**
      * prepares a verification for deployment
      *
-     * @param {TYPE.VerificationItem} metadata a single verification activity definition
-     * @returns {TYPE.VerificationItem} metadata object
+     * @param {VerificationItem} metadata a single verification activity definition
+     * @returns {Promise.<VerificationItem>} metadata object
      */
-    static preDeployTasks(metadata) {
+    static async preDeployTasks(metadata) {
         metadata.targetObjectId = cache.searchForField(
             'dataExtension',
-            metadata.r__dataExtension_CustomerKey,
+            metadata.r__dataExtension_key,
             'CustomerKey',
             'ObjectID'
         );
-        delete metadata.r__dataExtension_CustomerKey;
+        delete metadata.r__dataExtension_key;
         return metadata;
     }
     /**
      * parses retrieved Metadata before saving
      *
-     * @param {TYPE.VerificationItem} metadata a single verification activity definition
-     * @returns {TYPE.VerificationItem} Array with one metadata object and one sql string
+     * @param {VerificationItem} metadata a single verification activity definition
+     * @returns {VerificationItem} Array with one metadata object and one sql string
      */
     static postRetrieveTasks(metadata) {
         try {
-            metadata.r__dataExtension_CustomerKey = cache.searchForField(
+            metadata.r__dataExtension_key = cache.searchForField(
                 'dataExtension',
                 metadata.targetObjectId,
                 'ObjectID',

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

@@ -56,10 +56,10 @@ export default {
             template: true,
         },
         availableViews: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         modelVersion: {
             isCreateable: true,

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

@@ -3,7 +3,7 @@ export default {
     dependencies: ['attributeSet'], // future may have dependency on Data Extensions
     hasExtended: false,
     idField: 'definitionID',
-    keyIsFixed: null,
+    keyIsFixed: true,
     keyField: 'definitionKey',
     nameField: 'definitionName.value',
     restPagination: false, // Hub API does not support pagination and returns everything instead
@@ -245,5 +245,11 @@ export default {
             retrieving: true,
             template: true,
         },
+        r__attributeSet_key: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
     },
 };

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

@@ -12,7 +12,7 @@ export default {
     ],
     hasExtended: false,
     idField: 'definitionID',
-    keyIsFixed: null,
+    keyIsFixed: true,
     keyField: 'definitionKey',
     nameField: 'name',
     folderIdField: 'categoryID',
@@ -906,7 +906,7 @@ export default {
             retrieving: true,
             template: null,
         },
-        r__dataExtension_CustomerKey: {
+        r__dataExtension_key: {
             isCreateable: null,
             isUpdateable: null,
             retrieving: true,

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

@@ -33,7 +33,7 @@ export default {
         'script',
         'verification',
     ],
-    folderType: 'automation',
+    folderType: 'automations',
     hasExtended: false,
     filter: {
         description: ['Event Definition Automation'],
@@ -572,6 +572,9 @@ export default {
         'steps[].activities[].r__type': {
             skipValidation: true,
         },
+        'steps[].activities[].r__key': {
+            skipValidation: true,
+        },
         'steps[].description': {
             isCreateable: true,
             isUpdateable: true,

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

@@ -4,7 +4,7 @@ export default {
     hasExtended: false,
     idField: 'id',
     keepId: true,
-    keyIsFixed: null,
+    keyIsFixed: true,
     keyField: 'name',
     nameField: 'name',
     createdDateField: 'createdDate',

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

@@ -4,7 +4,7 @@ export default {
     hasExtended: false,
     idField: 'ID',
     keepId: true,
-    keyIsFixed: null,
+    keyIsFixed: true,
     keyField: 'CustomerKey',
     nameField: 'Name',
     folderIdField: 'CategoryID',

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

@@ -36,6 +36,7 @@ export default {
             '_ChatMessagingSubscription',
             '_EnterpriseAttribute',
             '_MobileAddress',
+            '_MobileAddressApplication',
             '_MobileLineAddress',
             '_MobileLineAddressContact',
             '_MobileLineProfile',
@@ -85,6 +86,12 @@ export default {
         SMSSubscriptionLog: null, // CustomerKey cannot be retrieved
         TriggeredSendDataExtension: ['SubscriberKey', 'EmailAddress'],
     },
+    dataRetentionPeriodUnitOfMeasureMapping: {
+        Days: 3,
+        Weeks: 4,
+        Months: 5,
+        Years: 6,
+    },
     hasExtended: false,
     idField: 'ObjectID',
     keyIsFixed: false,
@@ -280,7 +287,16 @@ export default {
         r__folder_Path: {
             skipValidation: true,
         },
-        r__dataExtensionTemplate_Name: {
+        r__dataExtensionTemplate_name: {
+            skipValidation: true,
+        },
+        c__retentionPolicy: {
+            skipValidation: true,
+        },
+        c__retainUntil: {
+            skipValidation: true,
+        },
+        c__dataRetentionPeriodUnitOfMeasure: {
             skipValidation: true,
         },
     },