mcdev 7.3.1 → 7.4.1

package/lib/metadataTypes/DataExtension.js

@@ -42,22 +42,10 @@ class DataExtension extends MetadataType {
      * if create or update operation is needed.
      *
      * @param {DataExtensionMap} metadataMap dataExtensions mapped by their customerKey
-     * @returns {Promise} Promise
+     * @param {string} deployDir directory where deploy metadata are saved
+     * @returns {Promise.<MetadataTypeMap>} keyField => metadata map
      */
-    static async upsert(metadataMap) {
-        // get existing DE-fields for DE-keys in deployment package to properly handle add/update/delete of fields
-        // we need to use IN here because it would fail otherwise if we try to deploy too many DEs at the same time
-        /** @type {SoapRequestParams} */
-        const fieldOptions = {
-            filter: {
-                leftOperand: 'DataExtension.CustomerKey',
-                operator: 'IN',
-                rightOperand: Object.keys(metadataMap),
-            },
-        };
-        Util.logger.info(` - Caching dependent Metadata: dataExtensionField`);
-        await this.#attachFields(metadataMap, fieldOptions);
-
+    static async upsert(metadataMap, deployDir) {
         /** @type {object[]} */
         const metadataToCreate = [];
         /** @type {object[]} */
@@ -66,6 +54,11 @@ class DataExtension extends MetadataType {
         for (const metadataKey in metadataMap) {
             try {
                 metadataMap[metadataKey] = await this.preDeployTasks(metadataMap[metadataKey]);
+                metadataMap[metadataKey] = await this.validation(
+                    'deploy',
+                    metadataMap[metadataKey],
+                    deployDir
+                );
             } catch (ex) {
                 // output error & remove from deploy list
                 Util.logger.error(
@@ -187,7 +180,7 @@ class DataExtension extends MetadataType {
             DataExtension.oldFields[metadataMap[metadataKey][this.definition.keyField]] =
                 await DataExtensionField.prepareDeployColumnsOnUpdate(
                     metadataMap[metadataKey].Fields,
-                    metadataKey
+                    Util.matchedByName?.[this.definition.type]?.[metadataKey] || metadataKey
                 );
 
             if (
@@ -893,7 +886,7 @@ class DataExtension extends MetadataType {
             if (metadata[field?.DataExtension?.CustomerKey]) {
                 metadata[field.DataExtension.CustomerKey].Fields.push(field);
             } else {
-                Util.logger.warn(` - Issue retrieving data extension fields. key='${key}'`);
+                // field was retrieved for which we do not have the right dataExtension. This might be due to us having to resort to not using a DE filter to avoid the "String or binary data would be truncated." error
             }
         }
 
@@ -1632,6 +1625,70 @@ class DataExtension extends MetadataType {
             return super.getFilesToCommit(keyArr);
         }
     }
+    /**
+     * helper for {@link MetadataType.createOrUpdate}
+     *
+     * @param {MetadataTypeItem} metadataItem to be deployed item
+     * @returns {MetadataTypeItem} cached item or undefined
+     */
+    static getCacheMatchedByName(metadataItem) {
+        let cacheMatchedByName;
+
+        if (Util.OPTIONS.matchName) {
+            // make sure to run the search ONLY if OPTIONS.matchName is true and definition.allowMatchingByName signals support
+            const typeCache = cache.getCache()?.[this.definition.type];
+            const potentials = [];
+            for (const key in typeCache) {
+                const cachedItem = typeCache[key];
+                if (
+                    cachedItem[this.definition.nameField] ===
+                    metadataItem[this.definition.nameField]
+                ) {
+                    potentials.push(cachedItem);
+                }
+            }
+            if (potentials.length > 1) {
+                throw new Error(
+                    `found multiple name matches in cache for ${this.definition.type} ${metadataItem[this.definition.keyField]} / ${metadataItem[this.definition.nameField]}. Check their keys for more details: ${potentials.map((p) => p[this.definition.keyField]).join(', ')}`
+                );
+            } else if (potentials.length === 1) {
+                // only one item found, confirm that it's in the same folder
+                const deployFolderPath = cache.searchForField(
+                    'folder',
+                    metadataItem[this.definition.folderIdField],
+                    'ID',
+                    'Path'
+                );
+                if (
+                    potentials[0][this.definition.folderIdField] ===
+                    metadataItem[this.definition.folderIdField]
+                ) {
+                    cacheMatchedByName = potentials[0];
+
+                    Util.logger.info(
+                        Util.getGrayMsg(
+                            ` - found ${this.definition.type} ${metadataItem[this.definition.keyField]} in cache by name "${metadataItem[this.definition.nameField]}" and folder "${deployFolderPath}": ${cacheMatchedByName[this.definition.keyField]}`
+                        )
+                    );
+                } else {
+                    const cacheFolderPath = cache.searchForField(
+                        'folder',
+                        potentials[0][this.definition.folderIdField],
+                        'ID',
+                        'Path'
+                    );
+                    throw new Error(
+                        `found ${this.definition.type} ${metadataItem[this.definition.keyField]} in cache by name "${metadataItem[this.definition.nameField]}" but in different folders: "${deployFolderPath}" vs "${cacheFolderPath}": ${potentials[0][this.definition.keyField]}`
+                    );
+                }
+            } else {
+                Util.logger.debug(
+                    ` - no name-match found for ${this.definition.type} ${metadataItem[this.definition.keyField]}. Creating new ${this.definition.type} instead.`
+                );
+            }
+        }
+        return cacheMatchedByName;
+    }
 }
 
 // Assign definition to static attributes

package/lib/metadataTypes/DataExtensionField.js

@@ -48,7 +48,13 @@ class DataExtensionField extends MetadataType {
      * @returns {Promise.<{metadata: DataExtensionFieldMap, type: string}>} Promise of items
      */
     static async retrieveForCacheDE(requestParams, additionalFields) {
-        return super.retrieveSOAP(null, requestParams, null, additionalFields);
+        let response;
+        response = await super.retrieveSOAP(null, requestParams, null, additionalFields);
+        if (!response) {
+            // try again but without filters as a workaround for the "String or binary data would be truncated." issue
+            response = await super.retrieveSOAP(null, {}, null, additionalFields);
+        }
+        return response;
     }
 
     /**
@@ -143,11 +149,13 @@ class DataExtensionField extends MetadataType {
         const existingFieldByName = {};
 
         for (const key of Object.keys(fieldsObj)) {
-            existingFieldByName[fieldsObj[key].Name] = fieldsObj[key];
+            // make sure we stringify the name in case it looked numeric and then lowercase it for easy comparison as the server is comparing field names case-insensitive
+            existingFieldByName[(fieldsObj[key].Name + '').toLowerCase()] = fieldsObj[key];
         }
         for (let i = deployColumns.length - 1; i >= 0; i--) {
             const item = deployColumns[i];
-            const itemOld = existingFieldByName[item.Name];
+            // make sure we stringify the name in case it looked numeric and then lowercase it for easy comparison as the server is comparing field names case-insensitive
+            const itemOld = existingFieldByName[(item.Name + '').toLowerCase()];
             if (itemOld) {
                 // field is getting updated ---
 

package/lib/metadataTypes/Event.js

@@ -21,6 +21,8 @@ import pLimit from 'p-limit';
  *
  * @typedef {import('../../types/mcdev.d.js').ReferenceObject} ReferenceObject
  * @typedef {import('../../types/mcdev.d.js').SfObjectField} SfObjectField
+ * @typedef {import('../../types/mcdev.d.js').configurationArguments} configurationArguments
+ * @typedef {import('../../types/mcdev.d.js').Conditions} Conditions
  */
 
 /**
@@ -42,10 +44,10 @@ class Event extends MetadataType {
      * @param {string} [key] customer key of single item to retrieve
      * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
-    static retrieve(retrieveDir, _, __, key) {
+    static async retrieve(retrieveDir, _, __, key) {
         Util.logBeta(this.definition.type);
         try {
-            return super.retrieveREST(
+            return await super.retrieveREST(
                 retrieveDir,
                 `/interaction/v1/eventDefinitions${
                     key ? '/key:' + encodeURIComponent(key) : ''
@@ -447,7 +449,8 @@ class Event extends MetadataType {
             await this.postRetrieveTasks_SalesforceEntryEvents(
                 metadata.type,
                 metadata.configurationArguments,
-                metadata.eventDefinitionKey
+                metadata.eventDefinitionKey,
+                metadata.publishedInteractionCount >= 1
             );
         } catch (ex) {
             Util.logger.warn(
@@ -464,6 +467,12 @@ class Event extends MetadataType {
         referencedObjects: {},
         /** @type {Object.<string, Object.<string, SfObjectField>>} object-name > field-name > field data */
         objectFields: {},
+        /** @type {Object.<string, Promise.<any>>} */
+        loadingFields: {},
+        /** @type {Object.<string, Promise.<any>>} */
+        loadingRelatedObjects: {},
+        /** @type {Promise.<any>} */
+        loadingWorkflowObjects: null,
     };
 
     /**
@@ -479,53 +488,20 @@ class Event extends MetadataType {
         // 1 get all available Salesforce objects
         // similar response to /jbint/getWorkflowObjects
         if (!this.sfObjects.workflowObjects) {
-            Util.logger.info(Util.getGrayMsg(' - Caching Salesforce Objects'));
-            const workflowObjectsResponse = await this.client.rest.get(
-                `/data/v1/integration/member/salesforce/workflowobjects`
-            );
-            this.sfObjects.workflowObjects = workflowObjectsResponse
-                ? workflowObjectsResponse.map((o) => o.apiname)
-                : [];
+            if (!this.sfObjects.loadingWorkflowObjects) {
+                this.sfObjects.loadingWorkflowObjects = this._getWorkflowObjects();
+            }
+            await this.sfObjects.loadingWorkflowObjects;
         }
 
         // 2 get objects related to the selected object
         // same response as /jbint/getRelatedObjects?type=<objectAPIName>
         if (!this.sfObjects.referencedObjects?.[objectAPIName]) {
-            Util.logger.info(
-                Util.getGrayMsg(' - Caching Related Salesforce Objects for ' + objectAPIName)
-            );
-            try {
-                const referenceObjectsResponse = await this.client.rest.get(
-                    `/data/v1/integration/member/salesforce/object/${objectAPIName}/referenceobjects`
-                );
-                // add itself first so that we get the fields for objectAPIName as well
-                const selfReference = {
-                    referenceObjectName: objectAPIName,
-                    relationshipName: objectAPIName,
-                };
-                this.sfObjects.referencedObjects[objectAPIName] = referenceObjectsResponse
-                    ? [selfReference, ...referenceObjectsResponse]
-                    : [selfReference];
-                if (
-                    referenceObjectsResponse.some((el) => el.referenceObjectName === 'Lead') &&
-                    referenceObjectsResponse.some((el) => el.referenceObjectName === 'Contact')
-                ) {
-                    // add fake object "Common" to referenced objects for testing
-                    this.sfObjects.referencedObjects[objectAPIName].push({
-                        displayname: 'Common',
-                        relationshipIdName: 'Id',
-                        relationshipName: 'Common',
-                        isPolymorphic: false,
-                        referenceObjectName: 'Common',
-                    });
-                }
-            } catch (ex) {
-                if (ex.code === 'ERR_BAD_RESPONSE') {
-                    throw new Error(
-                        `Could not find Salesforce entry object ${objectAPIName} on connected org.`
-                    );
-                }
+            if (!this.sfObjects.loadingRelatedObjects[objectAPIName]) {
+                this.sfObjects.loadingRelatedObjects[objectAPIName] =
+                    this._getRelatedSfObjects(objectAPIName);
             }
+            await this.sfObjects.loadingRelatedObjects[objectAPIName];
 
             // 3 get fields
             const rateLimit = pLimit(20);
@@ -541,47 +517,9 @@ class Event extends MetadataType {
             await Promise.all(
                 uniqueSfObjectNames.map((objectAPIName) =>
                     rateLimit(async () => {
-                        if (
-                            this.sfObjects.objectFields[objectAPIName] ||
-                            objectAPIName === 'Common'
-                        ) {
-                            return;
-                        }
-                        Util.logger.info(
-                            Util.getGrayMsg(
-                                ' - Caching Fields for Salesforce Object ' + objectAPIName
-                            )
-                        );
-
-                        const referenceObjectsFieldsResponse = await this.client.rest.get(
-                            `/legacy/v1/beta/integration/member/salesforce/object/${objectAPIName}`
-                        );
-                        if (referenceObjectsFieldsResponse?.sfobjectfields?.length) {
-                            Util.logger.debug(
-                                `Found ${referenceObjectsFieldsResponse?.sfobjectfields?.length} fields for Salesforce Object ${objectAPIName}`
-                            );
-                            this.sfObjects.objectFields[objectAPIName] = {};
-                            // !add default fields that are somehow not always returned by this legacy beta API
-                            for (const field of this.defaultSalesforceFields) {
-                                // @ts-expect-error hack to work around shortcomings of legacy beta API
-                                this.sfObjects.objectFields[objectAPIName][field] = {
-                                    label: field,
-                                    name: field,
-                                };
-                            }
-                            // add fields returned by API
-                            for (const field of referenceObjectsFieldsResponse.sfobjectfields) {
-                                this.sfObjects.objectFields[objectAPIName][field.name] = field;
-                            }
-                        } else {
-                            Util.logger.debug(
-                                `Could not find any fields for Salesforce Object ${objectAPIName}`
-                            );
-                            throw new Error(
-                                `Could not find any fields for Salesforce Object ${objectAPIName}`
-                            );
-                        }
-                        return;
+                        this.sfObjects.loadingFields[objectAPIName] ||=
+                            this._getSalesforceObjectFields(objectAPIName);
+                        return this.sfObjects.loadingFields[objectAPIName];
                     })
                 )
             );
@@ -619,6 +557,101 @@ class Event extends MetadataType {
                     this.sfObjects.objectFields[contactLeadName];
             }
         }
+        return;
+    }
+    /**
+     * helper that allows skipping to run this again in multi-key retrieval
+     */
+    static async _getWorkflowObjects() {
+        Util.logger.info(Util.getGrayMsg(' - Caching Salesforce Objects'));
+        const workflowObjectsResponse = await this.client.rest.get(
+            `/data/v1/integration/member/salesforce/workflowobjects`
+        );
+        this.sfObjects.workflowObjects = workflowObjectsResponse
+            ? workflowObjectsResponse.map((o) => o.apiname)
+            : [];
+    }
+    /**
+     * helper that allows skipping to run this again in multi-key retrieval
+     *
+     * @param {string} objectAPIName SF entry object of the current event
+     */
+    static async _getRelatedSfObjects(objectAPIName) {
+        Util.logger.info(
+            Util.getGrayMsg(' - Caching Related Salesforce Objects for ' + objectAPIName)
+        );
+        try {
+            const referenceObjectsResponse = await this.client.rest.get(
+                `/data/v1/integration/member/salesforce/object/${objectAPIName}/referenceobjects`
+            );
+            // add itself first so that we get the fields for objectAPIName as well
+            const selfReference = {
+                referenceObjectName: objectAPIName,
+                relationshipName: objectAPIName,
+            };
+            this.sfObjects.referencedObjects[objectAPIName] = referenceObjectsResponse
+                ? [selfReference, ...referenceObjectsResponse]
+                : [selfReference];
+            if (
+                referenceObjectsResponse.some((el) => el.referenceObjectName === 'Lead') &&
+                referenceObjectsResponse.some((el) => el.referenceObjectName === 'Contact')
+            ) {
+                // add fake object "Common" to referenced objects for testing
+                this.sfObjects.referencedObjects[objectAPIName].push({
+                    displayname: 'Common',
+                    relationshipIdName: 'Id',
+                    relationshipName: 'Common',
+                    isPolymorphic: false,
+                    referenceObjectName: 'Common',
+                });
+            }
+        } catch (ex) {
+            if (ex.code === 'ERR_BAD_RESPONSE') {
+                throw new Error(
+                    `Could not find Salesforce entry object ${objectAPIName} on connected org.`
+                );
+            }
+        }
+    }
+    /**
+     * helper that allows skipping to run this again in multi-key retrieval
+     *
+     * @param {string} objectAPIName SF object for which to get the fields
+     */
+    static async _getSalesforceObjectFields(objectAPIName) {
+        if (this.sfObjects.objectFields[objectAPIName] || objectAPIName === 'Common') {
+            return;
+        }
+        Util.logger.info(
+            Util.getGrayMsg(' - Caching Fields for Salesforce Object ' + objectAPIName)
+        );
+
+        const referenceObjectsFieldsResponse = await this.client.rest.get(
+            `/legacy/v1/beta/integration/member/salesforce/object/${objectAPIName}`
+        );
+        if (referenceObjectsFieldsResponse?.sfobjectfields?.length) {
+            Util.logger.debug(
+                `Found ${referenceObjectsFieldsResponse?.sfobjectfields?.length} fields for Salesforce Object ${objectAPIName}`
+            );
+            this.sfObjects.objectFields[objectAPIName] = {};
+            // !add default fields that are somehow not always returned by this legacy beta API
+            for (const field of this.defaultSalesforceFields) {
+                // @ts-expect-error hack to work around shortcomings of legacy beta API
+                this.sfObjects.objectFields[objectAPIName][field] = {
+                    label: field,
+                    name: field,
+                };
+            }
+            // add fields returned by API
+            for (const field of referenceObjectsFieldsResponse.sfobjectfields) {
+                this.sfObjects.objectFields[objectAPIName][field.name] = field;
+            }
+        } else {
+            Util.logger.warn(
+                `Could not cache fields for Salesforce Object '${objectAPIName}'. This is likely caused by insufficient access of your MC-Connect integration user. Please check assigned permission sets / the profile.`
+            );
+        }
+        return;
     }
 
     static defaultSalesforceFields = [
@@ -637,26 +670,41 @@ class Event extends MetadataType {
 
     /**
      *
-     * @param {any} ca trigger[0].configurationArguments
+     * @param {configurationArguments} ca trigger[0].configurationArguments
+     * @param {boolean} isPublished if the current item is published it means we do not need to do contact vs common checks
      */
-    static checkSalesforceEntryEvents(ca) {
+    static checkSalesforceEntryEvents(ca, isPublished) {
         // 1 check eventDataConfig
-        const edcObjects = ca.eventDataConfig.objects;
+        const edcObjects = ca.eventDataConfig.objects.sort((a, b) =>
+            a.dePrefix.localeCompare(b.dePrefix)
+        );
         const errors = [];
         const dePrefixFields = {};
         const dePrefixRelationshipMap = {};
         const dePrefixReferenceObjectMap = {};
-        const checkCommon = ca.whoToInject === 'Contact ID/Lead ID (Contacts and Leads)';
+        // SFMC only uses "Common" to aggreagate Contacts and Leads if that was actively selected in the entry event. Also, already published journeys/events continue to work even if fields would later be changed, leading to a shift from or to the "common" fake-object.
+        const checkCommon =
+            ca.whoToInject === 'Contact ID/Lead ID (Contacts and Leads)' && !isPublished;
         for (const object of edcObjects) {
             // create secondary object to quickly check eventDataSummary against
             dePrefixFields[object.dePrefix] = object.fields;
-            dePrefixRelationshipMap[object.dePrefix] = object.relationshipName;
-            dePrefixReferenceObjectMap[object.dePrefix] = object.referenceObject;
+
+            // if the current object is the entry object then relationshipName and referenceObject are set to empty strings because it's not "referencing" a "relationship" but just listing its own fields
+            dePrefixRelationshipMap[object.dePrefix] =
+                object.relationshipName === ''
+                    ? object.dePrefix.split(':')[0]
+                    : object.relationshipName;
+            dePrefixReferenceObjectMap[object.dePrefix] =
+                object.referenceObject === ''
+                    ? object.dePrefix.split(':')[0]
+                    : object.referenceObject;
 
             // 1.1 check if fields in eventDataConfig exist in Salesforce
             // if it has no value this is the entry-source object itself
             const referencedObject =
                 object.referenceObject === '' ? ca.objectAPIName : object.referenceObject;
+            // sort list of fields alphabetically
+            object.fields.sort();
             // check if object was cached earlier
             if (!this.sfObjects.workflowObjects.includes(referencedObject)) {
                 errors.push(`Salesforce object ${referencedObject} not found on connected org.`);
@@ -666,7 +714,8 @@ class Event extends MetadataType {
             ) {
                 // check if we found fields for the object
                 errors.push(
-                    `No fields found for Salesforce object ${referencedObject} on connected org.`
+                    `Fields for Salesforce object ${referencedObject} could not be checked. Fields selected in entry event: ` +
+                        object.fields.join(', ')
                 );
             } else {
                 // check if the fields selected in the eventDefinition are actually available
@@ -689,7 +738,7 @@ class Event extends MetadataType {
                     if (!ca.eventDataSummary.includes(object.dePrefix + fieldName)) {
                         // TODO instead, remove in postRetrieve and re-add in preDeploy
                         errors.push(
-                            `Field ${object.dePrefix + fieldName} is listed under eventDataConfig for referenceObject ${object.referenceObject} but not in eventDataSummary`
+                            `Field ${object.dePrefix + fieldName} is listed under eventDataConfig${object.referenceObject ? ` for referenceObject ` + object.referenceObject : ''} but not in eventDataSummary`
                         );
                     }
                 }
@@ -704,7 +753,11 @@ class Event extends MetadataType {
             const fieldPath = fieldName.split(':');
             fieldName = fieldPath.pop();
             const dePrefix = fieldPath.join(':') + ':';
-            if (!dePrefixFields[dePrefix].includes(fieldName)) {
+            if (!dePrefixFields[dePrefix]) {
+                errors.push(
+                    `Field ${dePrefix + fieldName} is listed under eventDataSummary but object ${dePrefix} was not found in eventDataConfig`
+                );
+            } else if (!dePrefixFields[dePrefix]?.includes(fieldName)) {
                 errors.push(
                     `Field ${dePrefix + fieldName} is listed under eventDataSummary but not in eventDataConfig`
                 );
@@ -859,19 +912,23 @@ class Event extends MetadataType {
     /**
      *
      * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ...
-     * @param {any} ca trigger[0].configurationArguments
+     * @param {configurationArguments} ca trigger[0].configurationArguments
      * @param {string} key of event / journey
-     * @param {string} [type] optionally provide type for error on missing configurationArguments attributes
+     * @param {boolean} isPublished if the current item is published it means we do not need to do contact vs common checks
+     * @param {string} [type] optionally provide metadatype for error on missing configurationArguments attributes
      * @returns {Promise.<void>} -
      */
-    static async postRetrieveTasks_SalesforceEntryEvents(triggerType, ca, key, type) {
+    static async postRetrieveTasks_SalesforceEntryEvents(triggerType, ca, key, isPublished, type) {
         if (triggerType !== 'SalesforceObjectTriggerV2' || !ca) {
             return;
         }
         // normalize payload because these fields are sometimes set as strings and sometimes as objects
+        // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
         if (ca.objectApiName) {
             // on event only the uppercase version is used. lets make sure we normalize that here.
+            // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
             ca.objectAPIName = ca.objectApiName;
+            // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
             delete ca.objectApiName;
         }
 
@@ -893,7 +950,8 @@ class Event extends MetadataType {
                 : ca.eventDataConfig;
         ca.eventDataSummary =
             'string' === typeof ca.eventDataSummary
-                ? ca.eventDataSummary.split('; ').filter(Boolean)
+                ? // @ts-expect-error transforming this from API-string-format to from mcdev-format
+                  ca.eventDataSummary.split('; ').filter(Boolean).sort()
                 : ca.eventDataSummary;
         ca.passThroughArgument =
             'string' === typeof ca.passThroughArgument
@@ -913,13 +971,13 @@ class Event extends MetadataType {
         await this.getSalesforceObjects(ca.objectAPIName);
 
         // check if whats on the journey matches what SF Core offers
-        this.checkSalesforceEntryEvents(ca);
+        this.checkSalesforceEntryEvents(ca, isPublished);
     }
 
     /**
      *
      * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ...
-     * @param {any} ca trigger[0].configurationArguments
+     * @param {configurationArguments} ca trigger[0].configurationArguments
      * @returns {Promise.<void>} -
      */
     static async preDeployTasks_SalesforceEntryEvents(triggerType, ca) {
@@ -947,35 +1005,43 @@ class Event extends MetadataType {
         await this.getSalesforceObjects(ca.objectAPIName);
 
         // check if whats on the journey matches what SF Core offers
-        this.checkSalesforceEntryEvents(ca);
+        this.checkSalesforceEntryEvents(ca, false);
 
         // normalize payload because these fields are sometimes set as strings and sometimes as objects
+        // @ts-expect-error reverting this back from mcdev-format to API format
         ca.contactKey =
             'object' === typeof ca.contactKey ? JSON.stringify(ca.contactKey) : ca.contactKey;
+        // @ts-expect-error reverting this back from mcdev-format to API format
         ca.eventDataConfig =
             'object' === typeof ca.eventDataConfig
                 ? JSON.stringify(ca.eventDataConfig)
                 : ca.eventDataConfig;
-        ca.eventDataSummary =
-            'object' === typeof ca.eventDataSummary
-                ? ca.eventDataSummary.join('; ') + '; '
-                : ca.eventDataSummary;
+        // @ts-expect-error reverting this back from mcdev-format to API format
+        ca.eventDataSummary = Array.isArray(ca.eventDataSummary)
+            ? ca.eventDataSummary.join('; ') + '; '
+            : ca.eventDataSummary;
+        // @ts-expect-error reverting this back from mcdev-format to API format
         ca.passThroughArgument =
             'object' === typeof ca.passThroughArgument
                 ? JSON.stringify(ca.passThroughArgument)
                 : ca.passThroughArgument;
+        // @ts-expect-error reverting this back from mcdev-format to API format
         ca.primaryObjectFilterCriteria =
             'object' === typeof ca.primaryObjectFilterCriteria
                 ? JSON.stringify(ca.primaryObjectFilterCriteria)
                 : ca.primaryObjectFilterCriteria;
+        // @ts-expect-error reverting this back from mcdev-format to API format
         ca.relatedObjectFilterCriteria =
             'object' === typeof ca.relatedObjectFilterCriteria
                 ? JSON.stringify(ca.relatedObjectFilterCriteria)
                 : ca.relatedObjectFilterCriteria;
 
+        // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
         if (ca.objectApiName) {
             // on event only the uppercase version is used. lets make sure we normalize that here.
+            // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
             ca.objectAPIName = ca.objectApiName;
+            // @ts-expect-error journeys SOMETIMES spell it "Api" and this script aims to auto-correct that
             delete ca.objectApiName;
         }
     }