From 04754c8fc94074f6a221a074185f93f370241ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 5 Sep 2024 14:31:22 +0200 Subject: [PATCH 01/26] #1676: fix graceful handling of "key not found" error for journey and event --- lib/metadataTypes/Event.js | 4 ++-- lib/metadataTypes/Journey.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 0e72c12a0..bdbb946ca 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -42,10 +42,10 @@ class Event extends MetadataType { * @param {string} [key] customer key of single item to retrieve * @returns {Promise.} 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) : '' diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 910d7c1af..5f70a0f7d 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -185,7 +185,7 @@ class Journey extends MetadataType { // if the interaction does not exist, the API returns an error code which would otherwise bring execution to a hold if ( [ - 'Journey matching key not found.', + 'Interaction matching key not found.', 'Must provide a valid ID or Key parameter', ].includes(ex.message) ) { From b1fcbb776ddaf7f2502017d1cbedccbac70aa3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Tue, 10 Sep 2024 15:58:35 +0200 Subject: [PATCH 02/26] #1679: remove .BAK files that get created by mcdev upgrade from version control --- boilerplate/forcedUpdates.json | 4 ++++ boilerplate/gitignore-template | 1 + 2 files changed, 5 insertions(+) diff --git a/boilerplate/forcedUpdates.json b/boilerplate/forcedUpdates.json index d571c0dfa..114a14e04 100644 --- a/boilerplate/forcedUpdates.json +++ b/boilerplate/forcedUpdates.json @@ -1,4 +1,8 @@ [ + { + "version": "7.4.1", + "files": [".gitignore"] + }, { "version": "7.3.2", "files": [".gitattributes"] diff --git a/boilerplate/gitignore-template b/boilerplate/gitignore-template index ae0a45bfa..c28aa692e 100644 --- a/boilerplate/gitignore-template +++ b/boilerplate/gitignore-template @@ -7,3 +7,4 @@ node_modules/ **/QueryStudioResults at* .mcdev-auth.json *.error.log +*.BAK From 82d47bfa029afb3592cf43d449272ab44a80cda0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 05:13:33 +0000 Subject: [PATCH 03/26] Bump eslint from 9.9.0 to 9.10.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.9.0 to 9.10.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.9.0...v9.10.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 41 +++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41b117d98..2dacd9e8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "c8": "10.0.0", "chai": "5.1.1", "chai-files": "1.4.0", - "eslint": "9.9.0", + "eslint": "9.10.0", "eslint-config-prettier": "9.1.0", "eslint-config-ssjs": "2.0.0", "eslint-plugin-jsdoc": "50.2.2", @@ -324,9 +324,9 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", - "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", "dev": true, "dependencies": { "@eslint/object-schema": "^2.1.4", @@ -441,6 +441,18 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz", + "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==", + "dev": true, + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", @@ -2571,16 +2583,17 @@ } }, "node_modules/eslint": { - "version": "9.9.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz", - "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz", + "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.17.1", + "@eslint/config-array": "^0.18.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.9.0", + "@eslint/js": "9.10.0", + "@eslint/plugin-kit": "^0.1.0", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", @@ -2603,7 +2616,6 @@ "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", @@ -2882,6 +2894,15 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/@eslint/js": { + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", + "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/eslint/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", diff --git a/package.json b/package.json index 09eb9c9e8..58ac42dd2 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "c8": "10.0.0", "chai": "5.1.1", "chai-files": "1.4.0", - "eslint": "9.9.0", + "eslint": "9.10.0", "eslint-config-prettier": "9.1.0", "eslint-config-ssjs": "2.0.0", "eslint-plugin-jsdoc": "50.2.2", From fcd3c0e11b3d75af61db903ab57fd33096d5e1e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 05:51:20 +0000 Subject: [PATCH 04/26] Bump typescript from 5.5.4 to 5.6.2 Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.6.2. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2dacd9e8b..000aea193 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "mock-fs": "5.2.0", "npm-run-all": "4.1.5", "prettier-eslint": "16.3.0", - "typescript": "5.5.4" + "typescript": "5.6.2" }, "engines": { "node": ">=18.18.2" @@ -7351,9 +7351,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 58ac42dd2..b22c7c0ba 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "mock-fs": "5.2.0", "npm-run-all": "4.1.5", "prettier-eslint": "16.3.0", - "typescript": "5.5.4" + "typescript": "5.6.2" }, "optionalDependencies": { "fsevents": "*" From dffd7d0782a8a08fefa77f6b5c391b53cd8d0ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 14:51:19 +0200 Subject: [PATCH 05/26] #1177: turn field add/update check case insensitive and remove redundant caching addresses issue for field names that have changes in letter casing --- @types/lib/metadataTypes/DataExtension.d.ts.map | 2 +- .../lib/metadataTypes/DataExtensionField.d.ts.map | 2 +- lib/metadataTypes/DataExtension.js | 13 ------------- lib/metadataTypes/DataExtensionField.js | 7 +++++-- test/general.test.js | 8 ++++---- test/type.dataExtension.test.js | 6 +++--- 6 files changed, 14 insertions(+), 24 deletions(-) diff --git a/@types/lib/metadataTypes/DataExtension.d.ts.map b/@types/lib/metadataTypes/DataExtension.d.ts.map index 41a2d81d8..b7ff82a87 100644 --- a/@types/lib/metadataTypes/DataExtension.d.ts.map +++ b/@types/lib/metadataTypes/DataExtension.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DataExtension.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtension.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DataExtension.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtension.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/DataExtensionField.d.ts.map b/@types/lib/metadataTypes/DataExtensionField.d.ts.map index 176146c05..ba8fa86a9 100644 --- a/@types/lib/metadataTypes/DataExtensionField.d.ts.map +++ b/@types/lib/metadataTypes/DataExtensionField.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DataExtensionField.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtensionField.js"],"names":[],"mappings":";uBAMa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;oCAI5C,OAAO,wBAAwB,EAAE,qBAAqB;qCACtD,OAAO,wBAAwB,EAAE,sBAAsB;AAfpE;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;GAIG;AACH;IACI,6BAAwB;IAExB;;;;;;OAMG;IACH,6BAJW,MAAM,qBACN,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIrE;IAED;;;;;;OAMG;IACH,0CAJW,iBAAiB,qBACjB,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAUrE;IAED;;;;;OAKG;IACH,uCAHW,qBAAqB,GACnB,sBAAsB,EAAE,CASpC;IAED;;;;;;OAMG;IACH,uBAJW,sBAAsB,KACtB,sBAAsB,GACpB,MAAM,CAIlB;IAED;;;;;OAKG;IACH,qCAHW,sBAAsB,GACpB,sBAAsB,CAelC;IAED;;;;;;;OAOG;IACH,mDAJW,sBAAsB,EAAE,SACxB,MAAM,GACJ,OAAO,CAAE,qBAAqB,CAAC,CAoK3C;IAYD;;;;;;OAMG;IACH,oCAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC,CAsD7B;IAED;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAO1B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAvWwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"DataExtensionField.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtensionField.js"],"names":[],"mappings":";uBAMa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;oCAI5C,OAAO,wBAAwB,EAAE,qBAAqB;qCACtD,OAAO,wBAAwB,EAAE,sBAAsB;AAfpE;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;GAIG;AACH;IACI,6BAAwB;IAExB;;;;;;OAMG;IACH,6BAJW,MAAM,qBACN,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIrE;IAED;;;;;;OAMG;IACH,0CAJW,iBAAiB,qBACjB,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAUrE;IAED;;;;;OAKG;IACH,uCAHW,qBAAqB,GACnB,sBAAsB,EAAE,CASpC;IAED;;;;;;OAMG;IACH,uBAJW,sBAAsB,KACtB,sBAAsB,GACpB,MAAM,CAIlB;IAED;;;;;OAKG;IACH,qCAHW,sBAAsB,GACpB,sBAAsB,CAelC;IAED;;;;;;;OAOG;IACH,mDAJW,sBAAsB,EAAE,SACxB,MAAM,GACJ,OAAO,CAAE,qBAAqB,CAAC,CAuK3C;IAYD;;;;;;OAMG;IACH,oCAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC,CAsD7B;IAED;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAO1B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA1WwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index b46f3869d..f023a7eed 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -46,19 +46,6 @@ class DataExtension extends MetadataType { * @returns {Promise.} keyField => metadata map */ static async upsert(metadataMap, deployDir) { - // 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); - /** @type {object[]} */ const metadataToCreate = []; /** @type {object[]} */ diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index dce7b1fd1..62cc82af8 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -149,11 +149,14 @@ 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]; } + Util.logger.debug('existingFieldByName:'); + Util.logger.debug(JSON.stringify(existingFieldByName)); for (let i = deployColumns.length - 1; i >= 0; i--) { const item = deployColumns[i]; - const itemOld = existingFieldByName[item.Name]; + const itemOld = existingFieldByName[(item.Name + '').toLowerCase()]; if (itemOld) { // field is getting updated --- diff --git a/test/general.test.js b/test/general.test.js index fa2de8fa1..59354517a 100644 --- a/test/general.test.js +++ b/test/general.test.js @@ -569,7 +569,7 @@ describe('GENERAL', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 14, + 13, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); }); @@ -632,7 +632,7 @@ describe('GENERAL', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 15, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); }); @@ -697,7 +697,7 @@ describe('GENERAL', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 11, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); }); @@ -2251,7 +2251,7 @@ describe('GENERAL', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 14, + 13, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); }); diff --git a/test/type.dataExtension.test.js b/test/type.dataExtension.test.js index d8549daeb..b10dc1c9f 100644 --- a/test/type.dataExtension.test.js +++ b/test/type.dataExtension.test.js @@ -133,7 +133,7 @@ describe('type: dataExtension', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 11, + 10, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -182,7 +182,7 @@ describe('type: dataExtension', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 8, + 7, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -233,7 +233,7 @@ describe('type: dataExtension', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 11, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; From 122c70cab5293ab4f58646cba55eef547ae05cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 15:18:15 +0200 Subject: [PATCH 06/26] #1177: cleanup & code comments --- @types/lib/metadataTypes/DataExtensionField.d.ts.map | 2 +- lib/metadataTypes/DataExtensionField.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/@types/lib/metadataTypes/DataExtensionField.d.ts.map b/@types/lib/metadataTypes/DataExtensionField.d.ts.map index ba8fa86a9..bfe6d8852 100644 --- a/@types/lib/metadataTypes/DataExtensionField.d.ts.map +++ b/@types/lib/metadataTypes/DataExtensionField.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"DataExtensionField.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtensionField.js"],"names":[],"mappings":";uBAMa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;oCAI5C,OAAO,wBAAwB,EAAE,qBAAqB;qCACtD,OAAO,wBAAwB,EAAE,sBAAsB;AAfpE;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;GAIG;AACH;IACI,6BAAwB;IAExB;;;;;;OAMG;IACH,6BAJW,MAAM,qBACN,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIrE;IAED;;;;;;OAMG;IACH,0CAJW,iBAAiB,qBACjB,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAUrE;IAED;;;;;OAKG;IACH,uCAHW,qBAAqB,GACnB,sBAAsB,EAAE,CASpC;IAED;;;;;;OAMG;IACH,uBAJW,sBAAsB,KACtB,sBAAsB,GACpB,MAAM,CAIlB;IAED;;;;;OAKG;IACH,qCAHW,sBAAsB,GACpB,sBAAsB,CAelC;IAED;;;;;;;OAOG;IACH,mDAJW,sBAAsB,EAAE,SACxB,MAAM,GACJ,OAAO,CAAE,qBAAqB,CAAC,CAuK3C;IAYD;;;;;;OAMG;IACH,oCAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC,CAsD7B;IAED;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAO1B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA1WwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"DataExtensionField.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/DataExtensionField.js"],"names":[],"mappings":";uBAMa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;oCAI5C,OAAO,wBAAwB,EAAE,qBAAqB;qCACtD,OAAO,wBAAwB,EAAE,sBAAsB;AAfpE;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;GAIG;AACH;IACI,6BAAwB;IAExB;;;;;;OAMG;IACH,6BAJW,MAAM,qBACN,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIrE;IAED;;;;;;OAMG;IACH,0CAJW,iBAAiB,qBACjB,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAUrE;IAED;;;;;OAKG;IACH,uCAHW,qBAAqB,GACnB,sBAAsB,EAAE,CASpC;IAED;;;;;;OAMG;IACH,uBAJW,sBAAsB,KACtB,sBAAsB,GACpB,MAAM,CAIlB;IAED;;;;;OAKG;IACH,qCAHW,sBAAsB,GACpB,sBAAsB,CAelC;IAED;;;;;;;OAOG;IACH,mDAJW,sBAAsB,EAAE,SACxB,MAAM,GACJ,OAAO,CAAE,qBAAqB,CAAC,CAsK3C;IAYD;;;;;;OAMG;IACH,oCAJW,MAAM,YACN,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC,CAsD7B;IAED;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAO1B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAzWwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index 62cc82af8..5ac36fe0e 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -152,10 +152,9 @@ class DataExtensionField extends MetadataType { // 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]; } - Util.logger.debug('existingFieldByName:'); - Util.logger.debug(JSON.stringify(existingFieldByName)); for (let i = deployColumns.length - 1; i >= 0; i--) { const item = deployColumns[i]; + // 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 --- From 09f9d047221ba5a74501a72bb07ef61c76635a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 15:47:30 +0200 Subject: [PATCH 07/26] #1695: ensure showing what to do in VSCE when the project config needs an update --- lib/util/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util/config.js b/lib/util/config.js index 0edbba3c4..e05eab426 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -270,15 +270,15 @@ const config = { errorMsgOutput.push(' - ' + msg); } Util.logger.error(errorMsgOutput.join('\n')); - if (Util.skipInteraction) { - return false; - } Util.logger.info( [ 'Here is what you can do to fix these issues:', ...Array.from(solutionSet), ].join('\n- ') ); + if (Util.skipInteraction) { + return false; + } const runUpgradeNow = await confirm({ message: `Do you want to run 'mcdev upgrade' now?`, default: true, From 31635342517fa52b00f6d2f2e4e19d2746b1e8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 15:51:22 +0200 Subject: [PATCH 08/26] #1690: improve error log for missing config if default value is array or object --- lib/util/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/config.js b/lib/util/config.js index e05eab426..f299e05cc 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -202,7 +202,7 @@ const config = { Array.isArray(defaultProps[key][subkey]) ? 'Array' : typeof defaultProps[key][subkey] - }): ${defaultProps[key][subkey]}` + }): ${typeof defaultProps[key][subkey] === 'object' ? JSON.stringify(defaultProps[key][subkey]) : defaultProps[key][subkey]}` ); solutionSet.add( `Run 'mcdev upgrade' to fix missing or changed configuration options` From 1f6be8a1105fdd80c9c5b601a58704a83d036a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 17:06:31 +0200 Subject: [PATCH 09/26] #1695: properly warn about potentially missing SF object access and how to fix it --- @types/lib/metadataTypes/Event.d.ts | 16 +- @types/lib/metadataTypes/Event.d.ts.map | 2 +- @types/types/mcdev.d.d.ts | 195 ++++++++++++++++++++++++ @types/types/mcdev.d.d.ts.map | 2 +- lib/metadataTypes/Event.js | 31 +++- types/mcdev.d.js | 66 ++++++++ 6 files changed, 297 insertions(+), 15 deletions(-) diff --git a/@types/lib/metadataTypes/Event.d.ts b/@types/lib/metadataTypes/Event.d.ts index f32fe47af..f10ed79e6 100644 --- a/@types/lib/metadataTypes/Event.d.ts +++ b/@types/lib/metadataTypes/Event.d.ts @@ -11,6 +11,8 @@ export type SoapRequestParams = import("../../types/mcdev.d.js").SoapRequestPara export type TemplateMap = import("../../types/mcdev.d.js").TemplateMap; export type ReferenceObject = import("../../types/mcdev.d.js").ReferenceObject; export type SfObjectField = import("../../types/mcdev.d.js").SfObjectField; +export type configurationArguments = import("../../types/mcdev.d.js").configurationArguments; +export type Conditions = import("../../types/mcdev.d.js").Conditions; /** * @typedef {import('../../types/mcdev.d.js').BuObject} BuObject * @typedef {import('../../types/mcdev.d.js').CodeExtract} CodeExtract @@ -25,6 +27,8 @@ export type SfObjectField = import("../../types/mcdev.d.js").SfObjectField; * * @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 */ /** * Event MetadataType @@ -137,9 +141,9 @@ declare class Event extends MetadataType { static defaultSalesforceFields: string[]; /** * - * @param {any} ca trigger[0].configurationArguments + * @param {configurationArguments} ca trigger[0].configurationArguments */ - static checkSalesforceEntryEvents(ca: any): void; + static checkSalesforceEntryEvents(ca: configurationArguments): void; /** * * @param {object[]} conditions - @@ -151,19 +155,19 @@ declare 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 * @returns {Promise.} - */ - static postRetrieveTasks_SalesforceEntryEvents(triggerType: string, ca: any, key: string, type?: string): Promise; + static postRetrieveTasks_SalesforceEntryEvents(triggerType: string, ca: configurationArguments, key: string, type?: string): Promise; /** * * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ... - * @param {any} ca trigger[0].configurationArguments + * @param {configurationArguments} ca trigger[0].configurationArguments * @returns {Promise.} - */ - static preDeployTasks_SalesforceEntryEvents(triggerType: string, ca: any): Promise; + static preDeployTasks_SalesforceEntryEvents(triggerType: string, ca: configurationArguments): Promise; } declare namespace Event { let definition: { diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index 8bc6db03e..5d726a76b 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":";uBAUa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;8BAE5C,OAAO,wBAAwB,EAAE,eAAe;4BAChD,OAAO,wBAAwB,EAAE,aAAa;AAb3D;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AACH;IACI,oCAAkC;IAElC;;;;;;;;;;OAUG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CAwBxC;IAED;;;;OAIG;IACH,2BAFa,OAAO,CAAE,kBAAkB,CAAC,CAIxC;IAED;;;;;;;OAOG;IACH,uCALW,MAAM,QACN,MAAM,qBACN,WAAW,GACT,OAAO,CAAE,mBAAmB,CAAC,CAiDzC;IA8BD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAU1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAmCtC;IAyLD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA2CtC;IACD;QACI,uBAAuB;yBAAZ,MAAM,EAAE;QAEnB,2EAA2E;2BAAhE;gBAAQ,MAAM,GAAE,eAAe,EAAE;SAAC;QAE7C,oGAAoG;sBAAzF;gBAAQ,MAAM,GAAE;oBAAQ,MAAM,GAAE,aAAa;aAAC;SAAC;QAE1D,6CAA6C;uBAAlC;gBAAQ,MAAM,GAAE,OAAO,CAAE,GAAG,CAAC;SAAC;QAEzC,6CAA6C;+BAAlC;gBAAQ,MAAM,GAAE,OAAO,CAAE,GAAG,CAAC;SAAC;QAEzC,4BAA4B;gCAAjB,OAAO,CAAE,GAAG,CAAC;MAE1B;IAEF;;;;OAIG;IACH,2CAFW,MAAM,iBAgFhB;IACD;;OAEG;IACH,4CAQC;IACD;;;;OAIG;IACH,2CAFW,MAAM,iBAsChB;IACD;;;;OAIG;IACH,iDAFW,MAAM,iBAmChB;IAED,yCAYE;IAEF;;;OAGG;IACH,sCAFW,GAAG,QA2Lb;IAED;;;;;OAKG;IACH,4CAJW,MAAM,EAAE,UACR,MAAM,EAAE,WACR,6BAA6B,GAAC,6BAA6B,QAerE;IAED,gDAYE;IACF;;;;;;;OAOG;IACH,4DANW,MAAM,MACN,GAAG,OACH,MAAM,SACN,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAoD1B;IAED;;;;;OAKG;IACH,yDAJW,MAAM,MACN,GAAG,GACD,OAAO,CAAE,IAAI,CAAC,CAyD1B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAn/BwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/@types/types/mcdev.d.d.ts b/@types/types/mcdev.d.d.ts index cf16c8e0d..b4a024325 100644 --- a/@types/types/mcdev.d.d.ts +++ b/@types/types/mcdev.d.d.ts @@ -1510,4 +1510,199 @@ export type SfObjectField = { */ picklist?: SfObjectPicklist[]; }; +export type configurationArguments = { + /** + * SalesforceObjectTriggerV2 + */ + applicationExtensionKey: string; + /** + * 3.0 + */ + version: string; + /** + * what record event in SF triggers this + */ + salesforceTriggerCriteria: "Created" | "Updated" | "CreatedUpdated"; + /** + * what objects are used by this event + */ + eventDataConfig: { + objects: eventDataConfigObject[]; + }; + /** + * TODO + */ + primaryObjectFilterCriteria: Conditions; + /** + * TODO + */ + relatedObjectFilterCriteria: Conditions; + /** + * seems to only exist on journey but not on event and also not on every journey + */ + additionalObjectFilterCriteria?: object; + /** + * defines how this event links to the all contacts list + */ + contactKey: { + relationshipIdName: string; + relationshipName: string; + isPolymorphic: boolean; + referenceObjectName: string; + fieldName?: string; + }; + /** + * TODO + */ + passThroughArgument: { + fields: { + ContactKey: string; + Email: object; + HasOptedOutOfEmail?: string; + }; + }; + /** + * primaryObjectFilterCriteria in simplified string-form + */ + primaryObjectFilterSummary: string; + /** + * relatedObjectFilterCriteria in simplified string-form + */ + relatedObjectFilterSummary: string; + /** + * eventDataConfig in simplified string-form + */ + eventDataSummary: string[]; + /** + * salesforceTriggerCriteria plus semi-colon + */ + evaluationCriteriaSummary: "Created;" | "Updated;" | "Created;Updated;"; + /** + * if objectAPIName==CampaignMember then this is also CampaignMember; otherwise it's Contact + */ + contactPersonType: "CampaignMember" | "Contact"; + /** + * the SF object on which the salesforceTriggerCriteria is listening on + */ + objectAPIName: string; + /** + * "objectAPIName (Contact / Lead / Contacts and Leads)" + */ + whoToInject: string; + /** + * empty string for SF events + */ + criteria: string; + /** + * set to 0 for SF events + */ + schemaVersionId: number; +}; +/** + * part of configurationArguments + */ +export type eventDataConfigObject = { + /** + * CampaignMember:Campaign: + */ + dePrefix: string; + /** + * ? + */ + isPolymorphic: boolean; + /** + * field on parent object containing the id; ends on __c for custom fields; same as referenceObject for standard fields; can be "Contacts and Leads" + */ + referenceObject: string; + /** + * field on parent object acting as lookup; ends on __r for custom fields; same as referenceObject for standard fields; can be "Common" + */ + relationshipName: string; + /** + * ? + */ + relationshipIdName?: string; + /** + * list of field names that are used by this journey + */ + fields: string[]; +}; +/** + * part of configurationArguments + */ +export type Conditions = { + /** + * - + */ + operand: "AND" | "OR"; + /** + * list of conditions + */ + conditions: (Conditions | FieldCondition)[]; +}; +/** + * part of configurationArguments + */ +export type FieldCondition = { + /** + * is 0 for booleans, otherwise field length + */ + _length: number; + /** + * type + */ + datatype: "currency" | "string" | "int" | "picklist" | "textarea" | "boolean" | "date" | "datetime" | "email"; + /** + * field API name; "TR1__Email__c" + */ + fieldName: string; + /** + * "CampaignMember-CampaignMember" + */ + folderId: string; + /** + * "CampaignMember-CampaignMember-TR1__Email__c" + */ + id: string; + /** + * ? + */ + isPolymorphic: boolean; + /** + * likely the field label; "Email" + */ + name: string; + /** + * condition comparator + */ + operator: "equals" | "EQUALS" | "WASSET"; + /** + * value to compare the field with if operator is sth like "equals"; booleans are stored as upper-camel-case string! + */ + value?: string; + /** + * ? + */ + precision: number; + /** + * "Contacts and Leads" + */ + referenceObjectName: string; + /** + * "CommonId"; can be an empty string + */ + relationshipIdName: string; + /** + * "Common"; can be an empty string + */ + relationshipName: string; + /** + * ? + */ + scale: number; + /** + * seems to be equal to name-attribute?; "Email" + */ + text: string; +}; //# sourceMappingURL=mcdev.d.d.ts.map \ No newline at end of file diff --git a/@types/types/mcdev.d.d.ts.map b/@types/types/mcdev.d.d.ts.map index b8ab84c08..cc77ccdb4 100644 --- a/@types/types/mcdev.d.d.ts.map +++ b/@types/types/mcdev.d.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"mcdev.d.d.ts","sourceRoot":"","sources":["../../types/mcdev.d.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mcdev.d.d.ts","sourceRoot":"","sources":["../../types/mcdev.d.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index bdbb946ca..5755bf790 100644 --- a/lib/metadataTypes/Event.js +++ b/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 */ /** @@ -644,8 +646,9 @@ class Event extends MetadataType { 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}`); + 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; } @@ -666,7 +669,7 @@ class Event extends MetadataType { /** * - * @param {any} ca trigger[0].configurationArguments + * @param {configurationArguments} ca trigger[0].configurationArguments */ static checkSalesforceEntryEvents(ca) { // 1 check eventDataConfig @@ -695,7 +698,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. Used fields: ` + + object.fields.join(', ') ); } else { // check if the fields selected in the eventDefinition are actually available @@ -892,7 +896,7 @@ 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 * @returns {Promise.} - @@ -902,9 +906,12 @@ class Event extends MetadataType { 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; } @@ -926,7 +933,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) : ca.eventDataSummary; ca.passThroughArgument = 'string' === typeof ca.passThroughArgument @@ -952,7 +960,7 @@ class Event extends MetadataType { /** * * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ... - * @param {any} ca trigger[0].configurationArguments + * @param {configurationArguments} ca trigger[0].configurationArguments * @returns {Promise.} - */ static async preDeployTasks_SalesforceEntryEvents(triggerType, ca) { @@ -983,31 +991,40 @@ class Event extends MetadataType { this.checkSalesforceEntryEvents(ca); // 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; + // @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; } } diff --git a/types/mcdev.d.js b/types/mcdev.d.js index c4fcc493d..ffa0d7912 100644 --- a/types/mcdev.d.js +++ b/types/mcdev.d.js @@ -560,4 +560,70 @@ complex * @property {boolean} isnamefield - * @property {SfObjectPicklist[]} [picklist] list of values */ + +/** + * @typedef {object} configurationArguments + * @property {string} applicationExtensionKey SalesforceObjectTriggerV2 + * @property {string} version 3.0 + * @property {'Created'|'Updated'|'CreatedUpdated'} salesforceTriggerCriteria what record event in SF triggers this + * @property {object} eventDataConfig what objects are used by this event + * @property {eventDataConfigObject[]} eventDataConfig.objects list of sf objects with the fields that are used + * @property {Conditions} primaryObjectFilterCriteria TODO + * @property {Conditions} relatedObjectFilterCriteria TODO + * @property {object} [additionalObjectFilterCriteria] seems to only exist on journey but not on event and also not on every journey + * @property {object} contactKey defines how this event links to the all contacts list + * @property {string} contactKey.relationshipIdName Id / the __c field + * @property {string} contactKey.relationshipName Common / the __r field + * @property {boolean} contactKey.isPolymorphic false + * @property {string} contactKey.referenceObjectName Common + * @property {string} [contactKey.fieldName] if relationshipIdName points to a __c field then this tends to be set to "Id" + * @property {object} passThroughArgument TODO + * @property {object} passThroughArgument.fields TODO + * @property {string} passThroughArgument.fields.ContactKey CampaignMember:Common:Id + * @property {object} passThroughArgument.fields.Email CampaignMember:Common:Email; not affected by changing which field is to be used for email in the journey + * @property {string} [passThroughArgument.fields.HasOptedOutOfEmail] Contact:HasOptedOutOfEmail + * @property {string} primaryObjectFilterSummary primaryObjectFilterCriteria in simplified string-form + * @property {string} relatedObjectFilterSummary relatedObjectFilterCriteria in simplified string-form + * @property {string[]} eventDataSummary eventDataConfig in simplified string-form + * @property {'Created;'|'Updated;'|'Created;Updated;'} evaluationCriteriaSummary salesforceTriggerCriteria plus semi-colon + * @property {'CampaignMember'|'Contact'} contactPersonType if objectAPIName==CampaignMember then this is also CampaignMember; otherwise it's Contact + * @property {string} objectAPIName the SF object on which the salesforceTriggerCriteria is listening on + * @property {string} whoToInject "objectAPIName (Contact / Lead / Contacts and Leads)" + * @property {string} criteria empty string for SF events + * @property {number} schemaVersionId set to 0 for SF events + */ + +/** + * @typedef {object} eventDataConfigObject part of configurationArguments + * @property {string} dePrefix CampaignMember:Campaign: + * @property {boolean} isPolymorphic ? + * @property {string} referenceObject field on parent object containing the id; ends on __c for custom fields; same as referenceObject for standard fields; can be "Contacts and Leads" + * @property {string} relationshipName field on parent object acting as lookup; ends on __r for custom fields; same as referenceObject for standard fields; can be "Common" + * @property {string} [relationshipIdName] ? + * @property {string[]} fields list of field names that are used by this journey + */ +/** + * @typedef {object} Conditions part of configurationArguments + * @property {'AND'|'OR'} operand - + * @property {(Conditions | FieldCondition)[]} conditions list of conditions + */ +/** + * @typedef {object} FieldCondition part of configurationArguments + * @property {number} _length is 0 for booleans, otherwise field length + * @property {'currency'|'string'|'int'|'picklist'|'textarea'|'boolean'|'date'|'datetime'|'email'} datatype type + * @property {string} fieldName field API name; "TR1__Email__c" + * @property {string} folderId "CampaignMember-CampaignMember" + * @property {string} id "CampaignMember-CampaignMember-TR1__Email__c" + * @property {boolean} isPolymorphic ? + * @property {string} name likely the field label; "Email" + * @property {'equals'|'EQUALS'|'WASSET'} operator condition comparator + * @property {string} [value] value to compare the field with if operator is sth like "equals"; booleans are stored as upper-camel-case string! + * @property {number} precision ? + * @property {string} referenceObjectName "Contacts and Leads" + * @property {string} relationshipIdName "CommonId"; can be an empty string + * @property {string} relationshipName "Common"; can be an empty string + * @property {number} scale ? + * @property {string} text seems to be equal to name-attribute?; "Email" + */ + export default {}; From e63d3036aca159f0adcddef36143eef7f135829e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 17:23:55 +0200 Subject: [PATCH 10/26] #1692: only warn about Common fields on non-published journeys/events --- @types/lib/metadataTypes/Event.d.ts | 8 +++++--- @types/lib/metadataTypes/Event.d.ts.map | 2 +- @types/lib/metadataTypes/Journey.d.ts.map | 2 +- lib/metadataTypes/Event.js | 18 +++++++++++------- lib/metadataTypes/Journey.js | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/@types/lib/metadataTypes/Event.d.ts b/@types/lib/metadataTypes/Event.d.ts index f10ed79e6..ad1abea8c 100644 --- a/@types/lib/metadataTypes/Event.d.ts +++ b/@types/lib/metadataTypes/Event.d.ts @@ -142,8 +142,9 @@ declare class Event extends MetadataType { /** * * @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: configurationArguments): void; + static checkSalesforceEntryEvents(ca: configurationArguments, isPublished: boolean): void; /** * * @param {object[]} conditions - @@ -157,10 +158,11 @@ declare class Event extends MetadataType { * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ... * @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.} - */ - static postRetrieveTasks_SalesforceEntryEvents(triggerType: string, ca: configurationArguments, key: string, type?: string): Promise; + static postRetrieveTasks_SalesforceEntryEvents(triggerType: string, ca: configurationArguments, key: string, isPublished: boolean, type?: string): Promise; /** * * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ... diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index 5d726a76b..a1fd405d5 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map index d7e8f0223..c6d59d2bb 100644 --- a/@types/lib/metadataTypes/Journey.d.ts.map +++ b/@types/lib/metadataTypes/Journey.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAsMtC;IAED;;;;;OAKG;IACH,6CA0cC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CA6MC;IA4LD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA1gEwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CA0cC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CA6MC;IA4LD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA3gEwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 5755bf790..31ad55d22 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -449,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( @@ -670,15 +671,17 @@ class Event extends MetadataType { /** * * @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 errors = []; const dePrefixFields = {}; const dePrefixRelationshipMap = {}; const dePrefixReferenceObjectMap = {}; - const checkCommon = ca.whoToInject === 'Contact ID/Lead ID (Contacts and Leads)'; + 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; @@ -898,10 +901,11 @@ class Event extends MetadataType { * @param {string} triggerType e.g. SalesforceObjectTriggerV2, APIEvent, ... * @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.} - */ - static async postRetrieveTasks_SalesforceEntryEvents(triggerType, ca, key, type) { + static async postRetrieveTasks_SalesforceEntryEvents(triggerType, ca, key, isPublished, type) { if (triggerType !== 'SalesforceObjectTriggerV2' || !ca) { return; } @@ -954,7 +958,7 @@ 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); } /** @@ -988,7 +992,7 @@ 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 diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 5f70a0f7d..c7d40697f 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -419,6 +419,7 @@ class Journey extends MetadataType { metadata.triggers[0].type, metadata.triggers[0].configurationArguments, metadata.key, + metadata.status === 'Published', this.definition.type ); } catch (ex) { From fc9ac6f2bb97fe49b24c77377e1f69e58dc5f749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 17:48:30 +0200 Subject: [PATCH 11/26] #1692: ensure references to the entry-object can be checked correctly; sort log output --- @types/lib/metadataTypes/Event.d.ts.map | 2 +- lib/metadataTypes/Event.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index a1fd405d5..8f53b72c8 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 31ad55d22..6db1c654a 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -685,8 +685,16 @@ class Event extends MetadataType { 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 @@ -701,8 +709,8 @@ class Event extends MetadataType { ) { // check if we found fields for the object errors.push( - `Fields for Salesforce object ${referencedObject} could not be checked. Used fields: ` + - object.fields.join(', ') + `Fields for Salesforce object ${referencedObject} could not be checked. Fields selected in entry event: ` + + object.fields.sort().join(', ') ); } else { // check if the fields selected in the eventDefinition are actually available From e316bc5be6d006608d2a9c1d017bfbefc92f1576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 17:54:06 +0200 Subject: [PATCH 12/26] #1692: code comments --- @types/lib/metadataTypes/Event.d.ts.map | 2 +- lib/metadataTypes/Event.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index 8f53b72c8..4ddec0949 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 6db1c654a..093872f03 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -680,6 +680,7 @@ class Event extends MetadataType { const dePrefixFields = {}; const dePrefixRelationshipMap = {}; const dePrefixReferenceObjectMap = {}; + // 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) { From 9168493ec82f01e972b2d984bdd98da4676b452b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 11 Sep 2024 19:23:52 +0200 Subject: [PATCH 13/26] #1680: list CC and BCC values on email activities as arrays --- @types/lib/metadataTypes/Journey.d.ts.map | 2 +- lib/metadataTypes/Journey.js | 35 ++++++++++++++++--- .../definitions/TriggeredSend.definition.js | 1 + .../9999999/journey/build-expected.json | 6 ++-- .../journey/get-multistep-expected.json | 4 +-- .../journey/get-quicksend-expected.json | 6 ++-- .../get-quicksend-rcb-id-expected.json | 4 +-- .../get-quicksend-rcb-key-expected.json | 4 +-- .../get-quicksend-rcb-name-expected.json | 8 +++-- .../get-transactionalEmail-expected.json | 4 +-- .../9999999/journey/template-expected.json | 6 ++-- 11 files changed, 59 insertions(+), 21 deletions(-) diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map index c6d59d2bb..c2126b5db 100644 --- a/@types/lib/metadataTypes/Journey.d.ts.map +++ b/@types/lib/metadataTypes/Journey.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CA0cC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CA6MC;IA4LD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA3gEwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CAkdC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CAsNC;IAsMD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAtiEwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index c7d40697f..fcf4fa102 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -635,6 +635,7 @@ class Journey extends MetadataType { triggeredSend.emailId = linkedTS.Email?.ID; triggeredSend.dynamicEmailSubject = linkedTS.DynamicEmailSubject; triggeredSend.emailSubject = linkedTS.EmailSubject; + // only the bccEmail field can be retrieved for triggeredSends, not the ccEmail field triggeredSend.bccEmail = linkedTS.BccEmail; triggeredSend.isMultipart = linkedTS.IsMultipart; triggeredSend.autoAddSubscribers = linkedTS.AutoAddSubscribers; @@ -736,6 +737,13 @@ class Journey extends MetadataType { delete triggeredSend.key; } + triggeredSend.ccEmail = triggeredSend.ccEmail + .split(';') + .filter((el) => el !== ''); + triggeredSend.bccEmail = triggeredSend.bccEmail + .split(';') + .filter((el) => el !== ''); + // List (optional) triggeredSend.r__list_PathName ||= {}; if (triggeredSend.publicationListId) { @@ -1222,6 +1230,15 @@ class Journey extends MetadataType { delete triggeredSend.r__triggeredSend_key; } + triggeredSend.ccEmail = + typeof triggeredSend.ccEmail === 'string' + ? triggeredSend.ccEmail + : triggeredSend.ccEmail.join(';'); + triggeredSend.bccEmail = + typeof triggeredSend.bccEmail === 'string' + ? triggeredSend.bccEmail + : triggeredSend.bccEmail.join(';'); + // List (optional) if (triggeredSend.r__list_PathName) { if (triggeredSend.r__list_PathName.publicationList) { @@ -1476,11 +1493,16 @@ class Journey extends MetadataType { if (triggeredSend) { // the following is very similar but not equal to the variables in TriggeredSend.js try { - triggeredSend.bccEmail = ReplaceCbReference.replaceReference( - triggeredSend.bccEmail, + let bccEmail = + typeof triggeredSend.bccEmail === 'string' + ? triggeredSend.bccEmail + : triggeredSend.bccEmail.join(';'); + bccEmail = ReplaceCbReference.replaceReference( + bccEmail, parentName, findAssetKeys ); + triggeredSend.bccEmail = bccEmail.split(';').filter((el) => el !== ''); changes = true; } catch (ex) { if (ex.code !== 200) { @@ -1488,11 +1510,16 @@ class Journey extends MetadataType { } } try { - triggeredSend.ccEmail = ReplaceCbReference.replaceReference( - triggeredSend.ccEmail, + let ccEmail = + typeof triggeredSend.ccEmail === 'string' + ? triggeredSend.ccEmail + : triggeredSend.ccEmail.join(';'); + ccEmail = ReplaceCbReference.replaceReference( + ccEmail, parentName, findAssetKeys ); + triggeredSend.ccEmail = ccEmail.split(';').filter((el) => el !== ''); changes = true; } catch (ex) { if (ex.code !== 200) { diff --git a/lib/metadataTypes/definitions/TriggeredSend.definition.js b/lib/metadataTypes/definitions/TriggeredSend.definition.js index e9367b51f..c0bae9af6 100644 --- a/lib/metadataTypes/definitions/TriggeredSend.definition.js +++ b/lib/metadataTypes/definitions/TriggeredSend.definition.js @@ -79,6 +79,7 @@ export default { templating: true, }, CCEmail: { + // this field is updatable but not retrievable for some reason isCreateable: true, isUpdateable: true, retrieving: false, diff --git a/test/resources/9999999/journey/build-expected.json b/test/resources/9999999/journey/build-expected.json index 329742f90..c65af9489 100644 --- a/test/resources/9999999/journey/build-expected.json +++ b/test/resources/9999999/journey/build-expected.json @@ -25,8 +25,10 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", - "ccEmail": "%%= ContentBlockByKey(\"testTemplated_asset_htmlblock\") =%%", + "bccEmail": [ + "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%" + ], + "ccEmail": ["%%= ContentBlockByKey(\"testTemplated_asset_htmlblock\") =%%"], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "testTemplated_ dynamic email subject %%= ContentBlockByKey(\"testTemplated_asset_htmlblock\") =%%", diff --git a/test/resources/9999999/journey/get-multistep-expected.json b/test/resources/9999999/journey/get-multistep-expected.json index fd0fc9f6b..e498b6da7 100644 --- a/test/resources/9999999/journey/get-multistep-expected.json +++ b/test/resources/9999999/journey/get-multistep-expected.json @@ -83,8 +83,8 @@ "triggeredSend": { "autoAddSubscribers": false, "autoUpdateSubscribers": false, - "bccEmail": "", - "ccEmail": "", + "bccEmail": [], + "ccEmail": [], "created": { "name": "", "date": "" }, "description": "my custom description", "domainExclusions": [], diff --git a/test/resources/9999999/journey/get-quicksend-expected.json b/test/resources/9999999/journey/get-quicksend-expected.json index 6888632ad..936eb46be 100644 --- a/test/resources/9999999/journey/get-quicksend-expected.json +++ b/test/resources/9999999/journey/get-quicksend-expected.json @@ -28,8 +28,10 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", - "ccEmail": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%", + "bccEmail": [ + "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%" + ], + "ccEmail": ["%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%"], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "testExisting_ dynamic email subject %%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%", diff --git a/test/resources/9999999/journey/get-quicksend-rcb-id-expected.json b/test/resources/9999999/journey/get-quicksend-rcb-id-expected.json index 56405981c..1e4fe20da 100644 --- a/test/resources/9999999/journey/get-quicksend-rcb-id-expected.json +++ b/test/resources/9999999/journey/get-quicksend-rcb-id-expected.json @@ -28,8 +28,8 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockById(1295064) =%%", - "ccEmail": "%%= ContentBlockById(1295064) =%%", + "bccEmail": ["%%= ContentBlockById(1295064) =%%"], + "ccEmail": ["%%= ContentBlockById(1295064) =%%"], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "testExisting_ dynamic email subject %%= ContentBlockById(1295064) =%%", diff --git a/test/resources/9999999/journey/get-quicksend-rcb-key-expected.json b/test/resources/9999999/journey/get-quicksend-rcb-key-expected.json index 500c32124..2d2b0b530 100644 --- a/test/resources/9999999/journey/get-quicksend-rcb-key-expected.json +++ b/test/resources/9999999/journey/get-quicksend-rcb-key-expected.json @@ -28,8 +28,8 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%", - "ccEmail": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%", + "bccEmail": ["%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%"], + "ccEmail": ["%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%"], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "testExisting_ dynamic email subject %%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%", diff --git a/test/resources/9999999/journey/get-quicksend-rcb-name-expected.json b/test/resources/9999999/journey/get-quicksend-rcb-name-expected.json index 91e324084..6223284a2 100644 --- a/test/resources/9999999/journey/get-quicksend-rcb-name-expected.json +++ b/test/resources/9999999/journey/get-quicksend-rcb-name-expected.json @@ -28,8 +28,12 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", - "ccEmail": "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", + "bccEmail": [ + "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%" + ], + "ccEmail": [ + "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%" + ], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "testExisting_ dynamic email subject %%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", diff --git a/test/resources/9999999/journey/get-transactionalEmail-expected.json b/test/resources/9999999/journey/get-transactionalEmail-expected.json index 0e3ae79c5..2deb7a330 100644 --- a/test/resources/9999999/journey/get-transactionalEmail-expected.json +++ b/test/resources/9999999/journey/get-transactionalEmail-expected.json @@ -28,8 +28,8 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "", - "ccEmail": "", + "bccEmail": [], + "ccEmail": [], "created": {}, "domainExclusions": [], "dynamicEmailSubject": "test email", diff --git a/test/resources/9999999/journey/template-expected.json b/test/resources/9999999/journey/template-expected.json index 81f609225..2633dbab6 100644 --- a/test/resources/9999999/journey/template-expected.json +++ b/test/resources/9999999/journey/template-expected.json @@ -25,8 +25,10 @@ "triggeredSend": { "autoAddSubscribers": true, "autoUpdateSubscribers": true, - "bccEmail": "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%", - "ccEmail": "%%= ContentBlockByKey(\"{{{prefix}}}asset_htmlblock\") =%%", + "bccEmail": [ + "%%= ContentBlockByName(\"Content Builder\\dont strip non ssjs content\") =%%" + ], + "ccEmail": ["%%= ContentBlockByKey(\"{{{prefix}}}asset_htmlblock\") =%%"], "created": {}, "description": "my activity info text", "dynamicEmailSubject": "{{{prefix}}} dynamic email subject %%= ContentBlockByKey(\"{{{prefix}}}asset_htmlblock\") =%%", From da7e7dd7feaa371010351ca95205d0cc55261142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 11:42:10 +0200 Subject: [PATCH 14/26] #1680: disable retrieving triggeredSend.BccEmail because it's always empty --- lib/metadataTypes/Journey.js | 4 ++-- lib/metadataTypes/definitions/TriggeredSend.definition.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index fcf4fa102..6bed506a8 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -635,8 +635,8 @@ class Journey extends MetadataType { triggeredSend.emailId = linkedTS.Email?.ID; triggeredSend.dynamicEmailSubject = linkedTS.DynamicEmailSubject; triggeredSend.emailSubject = linkedTS.EmailSubject; - // only the bccEmail field can be retrieved for triggeredSends, not the ccEmail field - triggeredSend.bccEmail = linkedTS.BccEmail; + // only the bccEmail field can be retrieved for triggeredSends, not the ccEmail field; for some reason BccEmail can be retrieved but does not return a value even if stored correctly in the journey. + // triggeredSend.bccEmail = linkedTS.BccEmail; triggeredSend.isMultipart = linkedTS.IsMultipart; triggeredSend.autoAddSubscribers = linkedTS.AutoAddSubscribers; triggeredSend.autoUpdateSubscribers = diff --git a/lib/metadataTypes/definitions/TriggeredSend.definition.js b/lib/metadataTypes/definitions/TriggeredSend.definition.js index c0bae9af6..57ecc82c8 100644 --- a/lib/metadataTypes/definitions/TriggeredSend.definition.js +++ b/lib/metadataTypes/definitions/TriggeredSend.definition.js @@ -67,10 +67,11 @@ export default { templating: true, }, BccEmail: { + // while this can be retrieved, it seems to be always returned empty isCreateable: true, isUpdateable: true, - retrieving: true, - templating: true, + retrieving: false, + templating: false, }, CategoryID: { isCreateable: true, From 2358697a7bd638afdccbead512b78b024d99495a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 13:08:39 +0200 Subject: [PATCH 15/26] #1680: adapt triggeredSend test cases for now missing BccEmail field --- .../testExisting_triggeredSend.triggeredSend-meta.json | 1 - .../triggeredSend/testNew_triggeredSend.triggeredSend-meta.json | 1 - test/resources/9999999/triggeredSend/build-expected.json | 1 - test/resources/9999999/triggeredSend/get-expected.json | 1 - test/resources/9999999/triggeredSend/get-rcb-id-expected.json | 1 - test/resources/9999999/triggeredSend/get-rcb-key-expected.json | 1 - test/resources/9999999/triggeredSend/get-rcb-name-expected.json | 1 - test/resources/9999999/triggeredSend/patch-expected.json | 1 - test/resources/9999999/triggeredSend/post-expected.json | 1 - test/resources/9999999/triggeredSend/template-expected.json | 1 - .../9999999/triggeredSendDefinition/create-response.xml | 1 - ...dSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml | 2 -- .../9999999/triggeredSendDefinition/update-response.xml | 1 - 13 files changed, 14 deletions(-) diff --git a/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testExisting_triggeredSend.triggeredSend-meta.json b/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testExisting_triggeredSend.triggeredSend-meta.json index 1a80fcf65..8d043390a 100644 --- a/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testExisting_triggeredSend.triggeredSend-meta.json +++ b/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testExisting_triggeredSend.triggeredSend-meta.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend", "Description": "updated on deploy", diff --git a/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testNew_triggeredSend.triggeredSend-meta.json b/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testNew_triggeredSend.triggeredSend-meta.json index 7ac9ae35e..787881c14 100644 --- a/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testNew_triggeredSend.triggeredSend-meta.json +++ b/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testNew_triggeredSend.triggeredSend-meta.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testNew_triggeredSend", "Description": "created on deploy", diff --git a/test/resources/9999999/triggeredSend/build-expected.json b/test/resources/9999999/triggeredSend/build-expected.json index e911cd481..aad4d3b25 100644 --- a/test/resources/9999999/triggeredSend/build-expected.json +++ b/test/resources/9999999/triggeredSend/build-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testTemplated_triggeredSend", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSend/get-expected.json b/test/resources/9999999/triggeredSend/get-expected.json index aec1e62b9..691f8834e 100644 --- a/test/resources/9999999/triggeredSend/get-expected.json +++ b/test/resources/9999999/triggeredSend/get-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSend/get-rcb-id-expected.json b/test/resources/9999999/triggeredSend/get-rcb-id-expected.json index a759353dd..0027f7542 100644 --- a/test/resources/9999999/triggeredSend/get-rcb-id-expected.json +++ b/test/resources/9999999/triggeredSend/get-rcb-id-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend_rcb", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSend/get-rcb-key-expected.json b/test/resources/9999999/triggeredSend/get-rcb-key-expected.json index b93897ded..2305179cd 100644 --- a/test/resources/9999999/triggeredSend/get-rcb-key-expected.json +++ b/test/resources/9999999/triggeredSend/get-rcb-key-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend_rcb", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSend/get-rcb-name-expected.json b/test/resources/9999999/triggeredSend/get-rcb-name-expected.json index d0d03a398..22bc65d1e 100644 --- a/test/resources/9999999/triggeredSend/get-rcb-name-expected.json +++ b/test/resources/9999999/triggeredSend/get-rcb-name-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend_rcb", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSend/patch-expected.json b/test/resources/9999999/triggeredSend/patch-expected.json index b919f998a..505fb7863 100644 --- a/test/resources/9999999/triggeredSend/patch-expected.json +++ b/test/resources/9999999/triggeredSend/patch-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testExisting_triggeredSend", "Description": "updated on deploy", diff --git a/test/resources/9999999/triggeredSend/post-expected.json b/test/resources/9999999/triggeredSend/post-expected.json index dbe8f1a0c..26dade668 100644 --- a/test/resources/9999999/triggeredSend/post-expected.json +++ b/test/resources/9999999/triggeredSend/post-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "testNew_triggeredSend", "Description": "created on deploy", diff --git a/test/resources/9999999/triggeredSend/template-expected.json b/test/resources/9999999/triggeredSend/template-expected.json index bc7257f21..dfb54d6fd 100644 --- a/test/resources/9999999/triggeredSend/template-expected.json +++ b/test/resources/9999999/triggeredSend/template-expected.json @@ -3,7 +3,6 @@ "AutoAddSubscribers": false, "AutoUpdateSubscribers": false, "BatchInterval": 0, - "BccEmail": "", "CreatedDate": "2018-06-25T05:58:00", "CustomerKey": "{{{prefix}}}triggeredSend", "Description": "Unsubscribe_Email", diff --git a/test/resources/9999999/triggeredSendDefinition/create-response.xml b/test/resources/9999999/triggeredSendDefinition/create-response.xml index 165f3ba75..11fd90e5e 100644 --- a/test/resources/9999999/triggeredSendDefinition/create-response.xml +++ b/test/resources/9999999/triggeredSendDefinition/create-response.xml @@ -63,7 +63,6 @@ false false 0 - You are successfully unsubscribed You are successfully unsubscribed false diff --git a/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml b/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml index 5c7a10aaa..0497b29a3 100644 --- a/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml +++ b/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml @@ -59,7 +59,6 @@ false false 0 - You are successfully unsubscribed You are successfully unsubscribed false @@ -106,7 +105,6 @@ false false 0 - %%= ContentBlockById(1295064) =%% %%= ContentBlockById(1295064) =%% false diff --git a/test/resources/9999999/triggeredSendDefinition/update-response.xml b/test/resources/9999999/triggeredSendDefinition/update-response.xml index 6d5869954..2eb67f139 100644 --- a/test/resources/9999999/triggeredSendDefinition/update-response.xml +++ b/test/resources/9999999/triggeredSendDefinition/update-response.xml @@ -62,7 +62,6 @@ false false 0 - You are successfully unsubscribed You are successfully unsubscribed false From 2fb0beb1112905b5508597fed366046a0ff2a5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 13:58:43 +0200 Subject: [PATCH 16/26] #1674: sort journey activities by key --- @types/lib/metadataTypes/Event.d.ts.map | 2 +- @types/lib/metadataTypes/Journey.d.ts.map | 2 +- @types/lib/util/util.d.ts | 7 +++++++ @types/lib/util/util.d.ts.map | 2 +- lib/metadataTypes/Journey.js | 3 +++ lib/util/util.js | 14 ++++++++++++++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index 4ddec0949..c8684f51c 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map index c2126b5db..36d53baf9 100644 --- a/@types/lib/metadataTypes/Journey.d.ts.map +++ b/@types/lib/metadataTypes/Journey.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CAkdC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CAsNC;IAsMD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAtiEwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CAydC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CAsNC;IAsMD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA7iEwB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/util/util.d.ts b/@types/lib/util/util.d.ts index d9b93e357..421f6143b 100644 --- a/@types/lib/util/util.d.ts +++ b/@types/lib/util/util.d.ts @@ -331,6 +331,13 @@ export namespace Util { * @returns {Array} all values of the given key */ function findLeafVals(object: any, key: string): any[]; + /** + * helper that returns a new object with sorted attributes of the given object + * + * @param {object} obj object with unsorted attributes + * @returns {object} obj but with sorted attributes + */ + function sortObjectAttributes(obj: object): object; } export type AuthObject = import("../../types/mcdev.d.js").AuthObject; export type BuObject = import("../../types/mcdev.d.js").BuObject; diff --git a/@types/lib/util/util.d.ts.map b/@types/lib/util/util.d.ts.map index 80c9cda35..d8349bcc4 100644 --- a/@types/lib/util/util.d.ts.map +++ b/@types/lib/util/util.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/util/util.js"],"names":[],"mappings":";;;;;;;;yBAkDe,eAAe;;;;;IAO1B;;;;;;OAMG;IACH,sCAJW;YAAQ,MAAM,GAAC,GAAC;KAAC,iBACjB,MAAM,EAAE,GACN;YAAQ,MAAM,GAAC,GAAC;KAAC,CAY7B;IAED;;;;;;OAMG;IACH,iCAJW,MAAM,EAAE,UACR,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;OAMG;IACH,sCAJW,MAAM,EAAE,UACR,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;OAMG;IACH,6BAJW,MAAM,cACN,OAAO,GACL,OAAO,CAcnB;IAED;;;;;OAKG;IACH,kCAHW,MAAM,cACN,OAAO,QAuCjB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAKhB;IAED;;;;;;OAMG;IACH,2BAHW,GAAC,GACC,OAAO,CAInB;IAED;;;;;;OAMG;IACH,4BAHW,GAAC,GACC,OAAO,CAInB;IAED;;;;;;OAMG;IACH,oCAJW,MAAM,kBACN,OAAO,GACL,OAAO,CAoBnB;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,gBACP,MAAM,kBACN,OAAO,GACL,OAAO,CAgBnB;IAED;;;;;OAKG;IACH,yCAHW,MAAM,GACJ;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,CAWzC;IAED;;;;OAIG;IACH,mCAFa,MAAM,EAAE,CA2BpB;IAQ0B,+CAHhB,OAAO,GACL,MAAM,CAqElB;;gBAMS,MAAM;IAWH,+BAJF,OAAO,cACP,OAAO,GACL,IAAI,CAsFhB;IAYe,+BAPL,MAAM,QACN,MAAM,UACN,MAAM,WACN,GAAC,WACD,MAAM,GACJ,IAAI,CAiBhB;IAUgB,8BAJN,MAAM,GAAG,MAAM,OACf,WAAW,GACT,MAAM,GAAG,MAAM,CA2B3B;IASW,0BAJD,MAAM,OACN,MAAM,GAAG,MAAM,GACb,MAAM,CASlB;IAED;;;;;OAKG;IACH,yCAHW,MAAM,GACJ,MAAM,EAAE,CAmBpB;IAED;;;;;OAKG;IACH,sCAHW,MAAM,EAAE,GACN;YAAQ,MAAM,GAAE,MAAM,EAAE;KAAC,CAsFrC;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,OACN,MAAM,GACJ,GAAG,CAIf;IAED;;;;;;;OAOG;IACH,uBALW,MAAM,SACN,MAAM,EAAE,eACR,OAAO,GACL,MAAM,GAAC,IAAI,CAuBvB;IAED;;;;;;;OAOG;IACH,uCALW,gBAAgB,EAAE,eAClB,MAAM,eACN,MAAM,GACJ,gBAAgB,CAc5B;IAED;;;;;;;;OAQG;IACH,+BALG;QAAuB,MAAM,GAArB,OAAO;QACQ,OAAO,GAAtB,OAAO;QACQ,KAAK,GAApB,OAAO;KACf,GAAU,IAAI,CA2BhB;IAED;;;;OAIG;IACH,uBAFW,MAAM,QAMhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgCD;;;;;OAKG;IACH,yBAHW,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;OAMG;IACH,iCAJW,MAAM,EAAE,WACR,MAAM,GACJ,IAAI,CAUhB;IAED;;;;;;OAMG;IACH,+BAJW,MAAM,EAAE,GAAG,MAAM,SACjB,OAAO,GACL,MAAM,CAgBlB;IAED;;;;;OAKG;IACH,mBAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAU1B;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,uBAHW,MAAM,GACJ,MAAM,CAoClB;IAED;;;;;;OAMG;IACH,gCAJW,MAAM,UACN,MAAM,GACJ,OAAO,CAenB;IAED;;;;;;OAMG;IACH,8BAJW,gBAAgB,YAChB,MAAM,GACJ,OAAO,CA+BnB;IAED;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;;OAOG;IACH,qCALW,MAAM,GAAG,MAAM,EAAE,UACjB,MAAM,EAAE,gBACR,OAAO,GACL,YAAY,CAkBxB;IAED;;;;;OAKG;IACH,6CAHW,YAAY,GACV,MAAM,CAelB;IAED;;;;;OAKG;IACH,gDAHW,YAAY,GACV,MAAM,CA4BlB;IAED;;;;;OAKG;IACH,yCAHW,YAAY,GACV,MAAM,CAQlB;IAED;;;;;;;OAOG;IACH,yDAFa,OAAO,CAAE,GAAG,GAAG,SAAS,CAAC,CAQrC;IAED;;;;;OAKG;IACH,yCAHW,MAAM,GACJ,OAAO,CAMnB;IACD;;;;;;OAMG;IACH,8BAJW,GAAG,OACH,MAAM,SAehB;;yBArmCQ,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;0BAC7C,OAAO,wBAAwB,EAAE,WAAW;qBAC5C,OAAO,wBAAwB,EAAE,MAAM;sBACvC,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;8BACrD,OAAO,wBAAwB,EAAE,eAAe;gCAChD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;uBAC7C,OAAO,wBAAwB,EAAE,QAAQ"} \ No newline at end of file +{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/util/util.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 6bed506a8..9cb176ede 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -1024,6 +1024,9 @@ class Journey extends MetadataType { // TODO: wait activity / activities[].type === 'WAIT' } + + // apply sorting by activity key to work around the API shuffling activities around + metadata.activities = metadata.activities.sort((a, b) => a.key.localeCompare(b.key)); } /** diff --git a/lib/util/util.js b/lib/util/util.js index dfa78d3f7..4791b97b8 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -1138,6 +1138,20 @@ export const Util = { }); return [...new Set(values.sort())]; }, + /** + * helper that returns a new object with sorted attributes of the given object + * + * @param {object} obj object with unsorted attributes + * @returns {object} obj but with sorted attributes + */ + sortObjectAttributes(obj) { + return Object.keys(obj) + .sort() + .reduce((acc, key) => { + acc[key] = obj[key]; + return acc; + }, {}); + }, }; Util.startLogger(false, true); From 6d210e12baa14fcbb4d0c47ab0eca148e0489203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 14:03:19 +0200 Subject: [PATCH 17/26] #1674: sort journey email activity's triggeredSend attributes alphabetically --- lib/metadataTypes/Journey.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 9cb176ede..10aa5ec01 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -900,6 +900,10 @@ class Journey extends MetadataType { } } } + + // sort attributes of triggeredSend alphabetically to allow for easier pull request reviews + configurationArguments.triggeredSend = + Util.sortObjectAttributes(triggeredSend); } break; } From 039f7b071841e398b677fa1d25b4a8c03eb8329b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 14:17:31 +0200 Subject: [PATCH 18/26] #1674: sort sf entry event objects and fields alphabetically for easier pull request reviews --- @types/lib/metadataTypes/Event.d.ts.map | 2 +- lib/metadataTypes/Event.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map index c8684f51c..6a533a7c5 100644 --- a/@types/lib/metadataTypes/Event.d.ts.map +++ b/@types/lib/metadataTypes/Event.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Event.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 093872f03..a9be54833 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -675,7 +675,9 @@ class Event extends MetadataType { */ 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 = {}; @@ -701,6 +703,8 @@ class Event extends MetadataType { // 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.`); @@ -711,7 +715,7 @@ class Event extends MetadataType { // check if we found fields for the object errors.push( `Fields for Salesforce object ${referencedObject} could not be checked. Fields selected in entry event: ` + - object.fields.sort().join(', ') + object.fields.join(', ') ); } else { // check if the fields selected in the eventDefinition are actually available @@ -947,7 +951,7 @@ class Event extends MetadataType { ca.eventDataSummary = 'string' === typeof ca.eventDataSummary ? // @ts-expect-error transforming this from API-string-format to from mcdev-format - ca.eventDataSummary.split('; ').filter(Boolean) + ca.eventDataSummary.split('; ').filter(Boolean).sort() : ca.eventDataSummary; ca.passThroughArgument = 'string' === typeof ca.passThroughArgument From b48433b6b43cd61cdf154e690c14542b4af87238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 14:35:43 +0200 Subject: [PATCH 19/26] #1674: cleanup --- @types/lib/metadataTypes/Journey.d.ts.map | 2 +- lib/metadataTypes/Journey.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map index 36d53baf9..fb6859e7c 100644 --- a/@types/lib/metadataTypes/Journey.d.ts.map +++ b/@types/lib/metadataTypes/Journey.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CAydC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CAsNC;IAsMD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA7iEwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Journey.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Journey.js"],"names":[],"mappings":";uBAca,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;;;;;GAQG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CA8JxC;IAmFD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAS1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;IAmBD;;;;OAIG;IACH,2CAFW,eAAe,iBAmBzB;IAED;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAuMtC;IAED;;;;;OAKG;IACH,6CAmdC;IAED;;;;;;OAMG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CA+ItC;IAED;;;;;OAKG;IACH,0CAsNC;IAsMD;;;;OAIG;IACH,sCAFW,eAAe,iBAWzB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,EAAE,CAAC,CAwP9B;IAED;;;;;;;;;OASG;IACH,sCAPW,MAAM,OACN,MAAM,QACN,MAAM,WACN,OAAO,eAAe,EAAE,OAAO,UAC/B,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA0C5B;IAED;;;;OAIG;IACH,2CAFW;QAAC,MAAM,EAAC,MAAM,CAAC;QAAC,MAAM,QAAO;QAAC,QAAQ,QAAM;KAAC,QAgCvD;CAuIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAviEwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 10aa5ec01..8fa29423f 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -563,7 +563,6 @@ class Journey extends MetadataType { switch (activity.type) { case 'EMAILV2': { // triggeredSend + email+asset - // TODO email / asset const configurationArguments = activity.configurationArguments; if (configurationArguments) { try { @@ -1022,11 +1021,6 @@ class Journey extends MetadataType { break; } } - // TODO: Filters / activities[].type === 'MULTICRITERIADECISION' - // - activities[].arguments.filterResult - // - activities[].arguments.configurationArguments.criteria - - // TODO: wait activity / activities[].type === 'WAIT' } // apply sorting by activity key to work around the API shuffling activities around From 607c31c4346bf68f88c21a0ccd26fe31c73b0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 14:37:19 +0200 Subject: [PATCH 20/26] #1674: fix journey tests to reflect sorted activity order --- .../journey/get-multistep-expected.json | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/test/resources/9999999/journey/get-multistep-expected.json b/test/resources/9999999/journey/get-multistep-expected.json index e498b6da7..5aa5d7592 100644 --- a/test/resources/9999999/journey/get-multistep-expected.json +++ b/test/resources/9999999/journey/get-multistep-expected.json @@ -8,58 +8,6 @@ "createdDate": "2024-05-04T05:54:48.027", "modifiedDate": "2024-05-04T17:25:57.9", "activities": [ - { - "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": "" - }, - "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": "7ba1e59a-6be4-46c7-b76f-4c06feb1268a", "key": "EMAILV2-1", @@ -231,14 +179,66 @@ } }, { - "id": "70572b1a-e274-4f09-a3fa-6fc0732ec52b", - "key": "WAITBYDURATION-2", + "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": "" + }, + "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": "a0908f9f-bc3c-47f7-9489-7fef5af25ce3", + "key": "97af222a-450a-429e-8925-649b72f01ccf", "arguments": {}, "metaData": { "invalid": false } } @@ -301,14 +301,14 @@ } }, { - "id": "e2a486cf-c85f-4543-88a2-d579cac1e0de", - "key": "WAITBYDURATION-1", - "name": "1 day", + "id": "70572b1a-e274-4f09-a3fa-6fc0732ec52b", + "key": "WAITBYDURATION-2", + "name": "", "description": "", "type": "WAIT", "outcomes": [ { - "key": "97af222a-450a-429e-8925-649b72f01ccf", + "key": "a0908f9f-bc3c-47f7-9489-7fef5af25ce3", "arguments": {}, "metaData": { "invalid": false } } From 0eab8263a40b2c31782617aa5ffb5341eb15f0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Thu, 12 Sep 2024 14:55:24 +0200 Subject: [PATCH 21/26] #1545: clean up auto-created folder-dir in deploy-dir to avoid errors about not being able to create certain folders --- @types/lib/Deployer.d.ts.map | 2 +- lib/Deployer.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/@types/lib/Deployer.d.ts.map b/@types/lib/Deployer.d.ts.map index c119c4961..2616537bd 100644 --- a/@types/lib/Deployer.d.ts.map +++ b/@types/lib/Deployer.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Deployer.d.ts","sourceRoot":"","sources":["../../lib/Deployer.js"],"names":[],"mappings":";uBAYa,OAAO,qBAAqB,EAAE,QAAQ;0BACtC,OAAO,qBAAqB,EAAE,WAAW;8BACzC,OAAO,qBAAqB,EAAE,eAAe;sBAC7C,OAAO,qBAAqB,EAAE,OAAO;+BACrC,OAAO,qBAAqB,EAAE,gBAAgB;mCAC9C,OAAO,qBAAqB,EAAE,oBAAoB;kCAClD,OAAO,qBAAqB,EAAE,mBAAmB;8BACjD,OAAO,qBAAqB,EAAE,eAAe;iCAC7C,OAAO,qBAAqB,EAAE,kBAAkB;oCAChD,OAAO,qBAAqB,EAAE,qBAAqB;gCACnD,OAAO,qBAAqB,EAAE,iBAAiB;0BAC/C,OAAO,qBAAqB,EAAE,WAAW;mCACzC,OAAO,qBAAqB,EAAE,oBAAoB;2BAClD,OAAO,qBAAqB,EAAE,YAAY;sBAE1C,OAAO,qBAAqB,EAAE,OAAO;AAhBlD;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;GAGG;AACH;IAyBI;;;;;;;OAOG;IACH,4BALW,MAAM,qBACN,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE;YAAQ,MAAM,GAAE,oBAAoB;KAAC,CAAC,CA2J3D;IAED;;;;;;;;;OASG;IACH,uBAPW,MAAM,MACN,MAAM,cACN,OAAO,YACP,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAsB1C;IAoHD;;;;;;;OAOG;IACH,iCALW,MAAM,YACN,MAAM,EAAE,gBACR,OAAO,GACL,OAAO,CAAE,oBAAoB,CAAC,CA4B1C;IAED;;;;;;;OAOG;IACH,0CALW,MAAM,YACN,oBAAoB,mBACpB,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA8G5B;IAreD;;;;;OAKG;IACH,wBAHW,OAAO,YACP,QAAQ,EAkBlB;IAfG,iDAAwB;IACxB,kDAA4B;IAC5B,kBAIE;IACF,oBAIE;IAyMN;;;;;;OAMG;IACH,gBAJW,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CA2G1C;IAnGO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CA6PjF"} \ No newline at end of file +{"version":3,"file":"Deployer.d.ts","sourceRoot":"","sources":["../../lib/Deployer.js"],"names":[],"mappings":";uBAYa,OAAO,qBAAqB,EAAE,QAAQ;0BACtC,OAAO,qBAAqB,EAAE,WAAW;8BACzC,OAAO,qBAAqB,EAAE,eAAe;sBAC7C,OAAO,qBAAqB,EAAE,OAAO;+BACrC,OAAO,qBAAqB,EAAE,gBAAgB;mCAC9C,OAAO,qBAAqB,EAAE,oBAAoB;kCAClD,OAAO,qBAAqB,EAAE,mBAAmB;8BACjD,OAAO,qBAAqB,EAAE,eAAe;iCAC7C,OAAO,qBAAqB,EAAE,kBAAkB;oCAChD,OAAO,qBAAqB,EAAE,qBAAqB;gCACnD,OAAO,qBAAqB,EAAE,iBAAiB;0BAC/C,OAAO,qBAAqB,EAAE,WAAW;mCACzC,OAAO,qBAAqB,EAAE,oBAAoB;2BAClD,OAAO,qBAAqB,EAAE,YAAY;sBAE1C,OAAO,qBAAqB,EAAE,OAAO;AAhBlD;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;GAGG;AACH;IAyBI;;;;;;;OAOG;IACH,4BALW,MAAM,qBACN,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE;YAAQ,MAAM,GAAE,oBAAoB;KAAC,CAAC,CA2J3D;IAED;;;;;;;;;OASG;IACH,uBAPW,MAAM,MACN,MAAM,cACN,OAAO,YACP,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAsB1C;IAyHD;;;;;;;OAOG;IACH,iCALW,MAAM,YACN,MAAM,EAAE,gBACR,OAAO,GACL,OAAO,CAAE,oBAAoB,CAAC,CA4B1C;IAED;;;;;;;OAOG;IACH,0CALW,MAAM,YACN,oBAAoB,mBACpB,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA8G5B;IA1eD;;;;;OAKG;IACH,wBAHW,OAAO,YACP,QAAQ,EAkBlB;IAfG,iDAAwB;IACxB,kDAA4B;IAC5B,kBAIE;IACF,oBAIE;IAyMN;;;;;;OAMG;IACH,gBAJW,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAgH1C;IAxGO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CAkQjF"} \ No newline at end of file diff --git a/lib/Deployer.js b/lib/Deployer.js index 35f7ad15d..f0022bb0a 100644 --- a/lib/Deployer.js +++ b/lib/Deployer.js @@ -321,6 +321,11 @@ class Deployer { const deployOrder = Util.getMetadataHierachy(foundDeployTypes); if (!Util.OPTIONS.fromRetrieve) { + // remove auto-created folder-directory from previous deployments unless 'folder' was specifically listed as to-be-deployed type + if (!typeArr || !typeArr.includes('folder')) { + await File.remove(File.normalizePath([this.deployDir, 'folder'])); + } + // run this AFTER identifying deployOrder or else ALL folders will be cached await Deployer.createFolderDefinitions( this.deployDir, From e1e72891144803cd034b317ae9dd7bc73eacb7de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:02:55 +0000 Subject: [PATCH 22/26] Bump lint-staged from 15.2.9 to 15.2.10 Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 15.2.9 to 15.2.10. - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v15.2.9...v15.2.10) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 000aea193..7e984f2d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "fast-xml-parser": "4.4.1", "globals": "15.9.0", "husky": "9.1.5", - "lint-staged": "15.2.9", + "lint-staged": "15.2.10", "mocha": "10.7.3", "mock-fs": "5.2.0", "npm-run-all": "4.1.5", @@ -4582,9 +4582,9 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.9.tgz", - "integrity": "sha512-BZAt8Lk3sEnxw7tfxM7jeZlPRuT4M68O0/CwZhhaw6eeWu0Lz5eERE3m386InivXB64fp/mDID452h48tvKlRQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", + "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", "dev": true, "dependencies": { "chalk": "~5.3.0", @@ -4593,7 +4593,7 @@ "execa": "~8.0.1", "lilconfig": "~3.1.2", "listr2": "~8.2.4", - "micromatch": "~4.0.7", + "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", "yaml": "~2.5.0" diff --git a/package.json b/package.json index b22c7c0ba..26eece332 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "fast-xml-parser": "4.4.1", "globals": "15.9.0", "husky": "9.1.5", - "lint-staged": "15.2.9", + "lint-staged": "15.2.10", "mocha": "10.7.3", "mock-fs": "5.2.0", "npm-run-all": "4.1.5", From 3881a1dbd294a14585b9099e8a3561dbe058e051 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:05:10 +0000 Subject: [PATCH 23/26] Bump @eslint/js from 9.9.0 to 9.10.0 Bumps [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) from 9.9.0 to 9.10.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.10.0/packages/js) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 17 ++++------------- package.json | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e984f2d4..dcd24fe11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "mcdev": "lib/cli.js" }, "devDependencies": { - "@eslint/js": "9.9.0", + "@eslint/js": "9.10.0", "@types/fs-extra": "11.0.4", "@types/inquirer": "9.0.7", "@types/mocha": "10.0.7", @@ -424,9 +424,9 @@ "dev": true }, "node_modules/@eslint/js": { - "version": "9.9.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz", - "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", + "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2894,15 +2894,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@eslint/js": { - "version": "9.10.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", - "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", - "dev": true, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, "node_modules/eslint/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", diff --git a/package.json b/package.json index 26eece332..4727244ef 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "yocto-spinner": "0.1.0" }, "devDependencies": { - "@eslint/js": "9.9.0", + "@eslint/js": "9.10.0", "@types/fs-extra": "11.0.4", "@types/inquirer": "9.0.7", "@types/mocha": "10.0.7", From c5c9d1834b73755ddacd4b994f2b513702255a03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:08:13 +0000 Subject: [PATCH 24/26] Bump @types/node from 22.4.2 to 22.5.4 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.4.2 to 22.5.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcd24fe11..7381b04a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/fs-extra": "11.0.4", "@types/inquirer": "9.0.7", "@types/mocha": "10.0.7", - "@types/node": "22.4.2", + "@types/node": "22.5.4", "@types/yargs": "17.0.33", "assert": "2.1.0", "axios-mock-adapter": "2.0.0", @@ -1051,9 +1051,9 @@ } }, "node_modules/@types/node": { - "version": "22.4.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.2.tgz", - "integrity": "sha512-nAvM3Ey230/XzxtyDcJ+VjvlzpzoHwLsF7JaDRfoI0ytO0mVheerNmM45CtA0yOILXwXXxOrcUWH3wltX+7PSw==", + "version": "22.5.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", + "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", "dependencies": { "undici-types": "~6.19.2" } diff --git a/package.json b/package.json index 4727244ef..5f4920d72 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "@types/fs-extra": "11.0.4", "@types/inquirer": "9.0.7", "@types/mocha": "10.0.7", - "@types/node": "22.4.2", + "@types/node": "22.5.4", "@types/yargs": "17.0.33", "assert": "2.1.0", "axios-mock-adapter": "2.0.0", From 4a6b28a17750d298a2e530004e30346d5666cc4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:10:54 +0000 Subject: [PATCH 25/26] Bump update-notifier from 7.2.0 to 7.3.1 Bumps [update-notifier](https://github.com/yeoman/update-notifier) from 7.2.0 to 7.3.1. - [Release notes](https://github.com/yeoman/update-notifier/releases) - [Commits](https://github.com/yeoman/update-notifier/compare/v7.2.0...v7.3.1) --- updated-dependencies: - dependency-name: update-notifier dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 34 +++++----------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7381b04a9..7f994aa45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "sfmc-sdk": "2.1.2", "simple-git": "3.25.0", "toposort": "2.0.2", - "update-notifier": "7.2.0", + "update-notifier": "7.3.1", "winston": "3.14.2", "yargs": "17.7.2", "yocto-spinner": "0.1.0" @@ -3803,14 +3803,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "engines": { - "node": ">=8" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -7424,21 +7416,19 @@ } }, "node_modules/update-notifier": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-7.2.0.tgz", - "integrity": "sha512-GoBCFKIbF88latQyk8HpHUoJHqZUzYSPI6BySAjs5TWd/TCTMynAsIfGfJ6Ep2DAx6O5YExYGPs3Hdnt2TWdzQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-7.3.1.tgz", + "integrity": "sha512-+dwUY4L35XFYEzE+OAL3sarJdUioVovq+8f7lcIJ7wnmnYQV5UD1Y/lcwaMSyaQ6Bj3JMj1XSTjZbNLHn/19yA==", "dependencies": { - "boxen": "^8.0.0", + "boxen": "^8.0.1", "chalk": "^5.3.0", "configstore": "^7.0.0", - "import-lazy": "^4.0.0", "is-in-ci": "^1.0.0", "is-installed-globally": "^1.0.0", "is-npm": "^6.0.0", "latest-version": "^9.0.0", "pupa": "^3.1.0", "semver": "^7.6.3", - "semver-diff": "^4.0.0", "xdg-basedir": "^5.1.0" }, "engines": { @@ -7459,20 +7449,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/update-notifier/node_modules/semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", diff --git a/package.json b/package.json index 5f4920d72..ab9d6ddb4 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "sfmc-sdk": "2.1.2", "simple-git": "3.25.0", "toposort": "2.0.2", - "update-notifier": "7.2.0", + "update-notifier": "7.3.1", "winston": "3.14.2", "yargs": "17.7.2", "yocto-spinner": "0.1.0" From 877f814d0ae6d0572c6343a72694f45fa82ed431 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:13:20 +0000 Subject: [PATCH 26/26] Bump inquirer from 10.1.8 to 10.2.2 Bumps [inquirer](https://github.com/SBoudrias/Inquirer.js) from 10.1.8 to 10.2.2. - [Release notes](https://github.com/SBoudrias/Inquirer.js/releases) - [Commits](https://github.com/SBoudrias/Inquirer.js/compare/inquirer@10.1.8...inquirer@10.2.2) --- updated-dependencies: - dependency-name: inquirer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 237 ++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 102 insertions(+), 137 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f994aa45..63f55737a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "console.table": "0.10.0", "deep-equal": "2.2.3", "fs-extra": "11.2.0", - "inquirer": "10.1.8", + "inquirer": "10.2.2", "json-to-table": "4.2.1", "mustache": "4.2.0", "p-limit": "6.1.0", @@ -502,13 +502,13 @@ } }, "node_modules/@inquirer/checkbox": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.7.tgz", - "integrity": "sha512-5YwCySyV1UEgqzz34gNsC38eKxRBtlRDpJLlKcRtTjlYA/yDKuc1rfw+hjw+2WJxbAZtaDPsRl5Zk7J14SBoBw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", + "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", "dependencies": { - "@inquirer/core": "^9.0.10", + "@inquirer/core": "^9.1.0", "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", + "@inquirer/type": "^1.5.3", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, @@ -517,26 +517,26 @@ } }, "node_modules/@inquirer/confirm": { - "version": "3.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz", - "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz", + "integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/core": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz", - "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.1.0.tgz", + "integrity": "sha512-RZVfH//2ytTjmaBIzeKT1zefcQZzuruwkpTwwbe/i2jTl4o9M+iML5ChULzz6iw1Ok8iUBBsRCjY2IEbD8Ft4w==", "dependencies": { "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", + "@inquirer/type": "^1.5.3", "@types/mute-stream": "^0.0.4", - "@types/node": "^22.1.0", + "@types/node": "^22.5.2", "@types/wrap-ansi": "^3.0.0", "ansi-escapes": "^4.3.2", "cli-spinners": "^2.9.2", @@ -551,28 +551,6 @@ "node": ">=18" } }, - "node_modules/@inquirer/core/node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@inquirer/core/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@inquirer/core/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -587,12 +565,12 @@ } }, "node_modules/@inquirer/editor": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.22.tgz", - "integrity": "sha512-K1QwTu7GCK+nKOVRBp5HY9jt3DXOfPGPr6WRDrPImkcJRelG9UTx2cAtK1liXmibRrzJlTWOwqgWT3k2XnS62w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz", + "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", "external-editor": "^3.1.0" }, "engines": { @@ -600,12 +578,12 @@ } }, "node_modules/@inquirer/expand": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.22.tgz", - "integrity": "sha512-wTZOBkzH+ItPuZ3ZPa9lynBsdMp6kQ9zbjVPYEtSBG7UulGjg2kQiAnUjgyG4SlntpTce5bOmXAPvE4sguXjpA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz", + "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -621,36 +599,36 @@ } }, "node_modules/@inquirer/input": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.2.9.tgz", - "integrity": "sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", + "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/number": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.0.10.tgz", - "integrity": "sha512-kWTxRF8zHjQOn2TJs+XttLioBih6bdc5CcosXIzZsrTY383PXI35DuhIllZKu7CdXFi2rz2BWPN9l0dPsvrQOA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz", + "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/password": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.1.22.tgz", - "integrity": "sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", + "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", "ansi-escapes": "^4.3.2" }, "engines": { @@ -658,32 +636,32 @@ } }, "node_modules/@inquirer/prompts": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz", - "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==", - "dependencies": { - "@inquirer/checkbox": "^2.4.7", - "@inquirer/confirm": "^3.1.22", - "@inquirer/editor": "^2.1.22", - "@inquirer/expand": "^2.1.22", - "@inquirer/input": "^2.2.9", - "@inquirer/number": "^1.0.10", - "@inquirer/password": "^2.1.22", - "@inquirer/rawlist": "^2.2.4", - "@inquirer/search": "^1.0.7", - "@inquirer/select": "^2.4.7" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.5.0.tgz", + "integrity": "sha512-BHDeL0catgHdcHbSFFUddNzvx/imzJMft+tWDPwTm3hfu8/tApk1HrooNngB2Mb4qY+KaRWF+iZqoVUPeslEog==", + "dependencies": { + "@inquirer/checkbox": "^2.5.0", + "@inquirer/confirm": "^3.2.0", + "@inquirer/editor": "^2.2.0", + "@inquirer/expand": "^2.3.0", + "@inquirer/input": "^2.3.0", + "@inquirer/number": "^1.1.0", + "@inquirer/password": "^2.2.0", + "@inquirer/rawlist": "^2.3.0", + "@inquirer/search": "^1.1.0", + "@inquirer/select": "^2.5.0" }, "engines": { "node": ">=18" } }, "node_modules/@inquirer/rawlist": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.2.4.tgz", - "integrity": "sha512-pb6w9pWrm7EfnYDgQObOurh2d2YH07+eDo3xQBsNAM2GRhliz6wFXGi1thKQ4bN6B0xDd6C3tBsjdr3obsCl3Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz", + "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -691,13 +669,13 @@ } }, "node_modules/@inquirer/search": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.0.7.tgz", - "integrity": "sha512-p1wpV+3gd1eST/o5N3yQpYEdFNCzSP0Klrl+5bfD3cTTz8BGG6nf4Z07aBW0xjlKIj1Rp0y3x/X4cZYi6TfcLw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", + "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", "dependencies": { - "@inquirer/core": "^9.0.10", + "@inquirer/core": "^9.1.0", "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", + "@inquirer/type": "^1.5.3", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -705,13 +683,13 @@ } }, "node_modules/@inquirer/select": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.4.7.tgz", - "integrity": "sha512-JH7XqPEkBpNWp3gPCqWqY8ECbyMoFcCZANlL6pV9hf59qK6dGmkOlx1ydyhY+KZ0c5X74+W6Mtp+nm2QX0/MAQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz", + "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==", "dependencies": { - "@inquirer/core": "^9.0.10", + "@inquirer/core": "^9.1.0", "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", + "@inquirer/type": "^1.5.3", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, @@ -720,9 +698,9 @@ } }, "node_modules/@inquirer/type": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.2.tgz", - "integrity": "sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.3.tgz", + "integrity": "sha512-xUQ14WQGR/HK5ei+2CvgcwoH9fQ4PgPGmVFSN0pc1+fVyDL3MREhyAY7nxEErSu6CkllBM3D7e3e+kOvtu+eIg==", "dependencies": { "mute-stream": "^1.0.0" }, @@ -1916,6 +1894,17 @@ "node": ">=4" } }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cli-truncate": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", @@ -3088,18 +3077,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/execa/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -3372,18 +3349,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -3845,12 +3810,13 @@ } }, "node_modules/inquirer": { - "version": "10.1.8", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.1.8.tgz", - "integrity": "sha512-syxGpOzLyqVeZi1KDBjRTnCn5PiGWySGHP0BbqXbqsEK0ckkZk3egAepEWslUjZXj0rhkUapVXM/IpADWe4D6w==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.2.2.tgz", + "integrity": "sha512-tyao/4Vo36XnUItZ7DnUXX4f1jVao2mSrleV/5IPtW/XAEA26hRVsbc68nuTEKWcr5vMP/1mVoT2O7u8H4v1Vg==", "dependencies": { - "@inquirer/prompts": "^5.3.8", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/prompts": "^5.5.0", + "@inquirer/type": "^1.5.3", "@types/mute-stream": "^0.0.4", "ansi-escapes": "^4.3.2", "mute-stream": "^1.0.0", @@ -6574,18 +6540,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/restore-cursor/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -6805,6 +6759,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/simple-git": { "version": "3.25.0", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.25.0.tgz", diff --git a/package.json b/package.json index ab9d6ddb4..3af6070e5 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "console.table": "0.10.0", "deep-equal": "2.2.3", "fs-extra": "11.2.0", - "inquirer": "10.1.8", + "inquirer": "10.2.2", "json-to-table": "4.2.1", "mustache": "4.2.0", "p-limit": "6.1.0",