From 78c42d40ddb15e6f374a1b21f7bbf966b3a7c876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Sat, 22 Jun 2024 10:23:15 +0200 Subject: [PATCH 1/3] #1360: fix mcdev upgrade adding empty strings to auto-retrieve-list --- .../lib/metadataTypes/TransactionalMessage.d.ts | 15 +++++---------- .../metadataTypes/TransactionalMessage.d.ts.map | 2 +- @types/lib/util/cli.d.ts.map | 2 +- .../TransactionalMessage.definition.js | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/@types/lib/metadataTypes/TransactionalMessage.d.ts b/@types/lib/metadataTypes/TransactionalMessage.d.ts index 02d928af3..64bbe07f4 100644 --- a/@types/lib/metadataTypes/TransactionalMessage.d.ts +++ b/@types/lib/metadataTypes/TransactionalMessage.d.ts @@ -110,7 +110,11 @@ declare namespace TransactionalMessage { isUpdateable: boolean; retrieving: boolean; template: boolean; - }; + }; /** + * TransactionalMessage MetadataType + * + * @augments MetadataType + */ description: { isCreateable: boolean; isUpdateable: boolean; @@ -120,15 +124,6 @@ declare namespace TransactionalMessage { requestId: { isCreateable: boolean; isUpdateable: boolean; - /** - * Retrieves Metadata - * - * @param {string} [retrieveDir] Directory where retrieved metadata directory will be saved - * @param {void | string[]} [_] unused parameter - * @param {void | string[]} [__] unused parameter - * @param {string} [key] customer key of single item to retrieve - * @returns {Promise.} Promise of metadata - */ retrieving: boolean; template: boolean; }; diff --git a/@types/lib/metadataTypes/TransactionalMessage.d.ts.map b/@types/lib/metadataTypes/TransactionalMessage.d.ts.map index 9194b5e09..0ca9b53ba 100644 --- a/@types/lib/metadataTypes/TransactionalMessage.d.ts.map +++ b/@types/lib/metadataTypes/TransactionalMessage.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"TransactionalMessage.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/TransactionalMessage.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;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IAEI,oBAAe;IACf;;;;;;;;OAQG;IACH,8BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,QAAS,kBAAkB,CAAC,CA2CxC;IAED;;;;;;;OAOG;IACH,4BALW,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,QAAS,kBAAkB,CAAC,CAOxC;IACD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAQ1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;CAcJ;;;;;;QA1HD;;;;;;;;;;;WAWG;QAEH;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAIC;;;;;;;;mBAQG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAhCkB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"TransactionalMessage.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/TransactionalMessage.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;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IAEI,oBAAe;IACf;;;;;;;;OAQG;IACH,8BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,QAAS,kBAAkB,CAAC,CA2CxC;IAED;;;;;;;OAOG;IACH,4BALW,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,QAAS,kBAAkB,CAAC,CAOxC;IACD;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAQ1B;IAED;;;;;OAKG;IACH,wBAHW,gBAAgB,gBAK1B;CAcJ;;;;;;QA1HD;;;;;;;;;;;WAWG;QAEH;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;eAJH;;;;eAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApBsB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/util/cli.d.ts.map b/@types/lib/util/cli.d.ts.map index afad3e49e..f33c2f71a 100644 --- a/@types/lib/util/cli.d.ts.map +++ b/@types/lib/util/cli.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../lib/util/cli.js"],"names":[],"mappings":";yBAca,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;0BAC7C,OAAO,wBAAwB,EAAE,WAAW;;IAQrD;;;;;OAKG;IACH,sDAQC;IACD;;;;;OAKG;IACH,6GAgBC;IAED;;;;OAIG;IACH,2EAgCC;IACD;;;;;OAKG;IACH,4FAOC;IACD;;;;;;;;OAQG;IACH,mJAQC;IACD;;;;;;;;OAQG;IACH,gNAqEC;IACD;;;;;;;;OAQG;IACH;;;OAsEC;IACD;;;;;;;OAOG;IACH,kJA4DC;IAED;;;;;;OAMG;IACH,gHAmFC;IACD;;;;;;OAMG;IACH,kHAmGC;IACD;;;;;;;;OAQG;IACH;;2BAsBC;IAED;;;;OAIG;IACH,wEAoGC"} \ No newline at end of file +{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../lib/util/cli.js"],"names":[],"mappings":";yBAca,OAAO,wBAAwB,EAAE,UAAU;uBAC3C,OAAO,wBAAwB,EAAE,QAAQ;oBACzC,OAAO,wBAAwB,EAAE,KAAK;0BACtC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;2BAChD,OAAO,wBAAwB,EAAE,YAAY;sBAC7C,OAAO,wBAAwB,EAAE,OAAO;+BACxC,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;oCACnD,OAAO,wBAAwB,EAAE,qBAAqB;mCACtD,OAAO,wBAAwB,EAAE,oBAAoB;gCACrD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;2BAC5C,OAAO,wBAAwB,EAAE,YAAY;0BAC7C,OAAO,wBAAwB,EAAE,WAAW;;IAQrD;;;;;OAKG;IACH,sDAQC;IACD;;;;;OAKG;IACH,6GAgBC;IAED;;;;OAIG;IACH,2EAgCC;IACD;;;;;OAKG;IACH,4FAOC;IACD;;;;;;;;OAQG;IACH,mJAQC;IACD;;;;;;;;OAQG;IACH,gNAqEC;IACD;;;;;;;;OAQG;IACH;;;OAsEC;IACD;;;;;;;OAOG;IACH,kJA4DC;IAED;;;;;;OAMG;IACH,gHAmFC;IACD;;;;;;OAMG;IACH,kHAuGC;IACD;;;;;;;;OAQG;IACH;;2BAsBC;IAED;;;;OAIG;IACH,wEAwGC"} \ No newline at end of file diff --git a/lib/metadataTypes/definitions/TransactionalMessage.definition.js b/lib/metadataTypes/definitions/TransactionalMessage.definition.js index d3dcde4b7..103b079f5 100644 --- a/lib/metadataTypes/definitions/TransactionalMessage.definition.js +++ b/lib/metadataTypes/definitions/TransactionalMessage.definition.js @@ -14,7 +14,7 @@ export default { restPageSize: 100, type: '', typeDescription: 'here as a placeholder to have auto completion', - typeRetrieveByDefault: true, + typeRetrieveByDefault: false, typeName: '', fields: { name: { From 5f61c7a0574d70f3c79ea82530fee2705a9a2563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Sat, 22 Jun 2024 10:25:30 +0200 Subject: [PATCH 2/3] #1360: ensure explainTypes skips wrapper classes --- lib/util/cli.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/util/cli.js b/lib/util/cli.js index 07733eadc..7fe9e41f0 100644 --- a/lib/util/cli.js +++ b/lib/util/cli.js @@ -618,8 +618,8 @@ const Cli = { for (const apiName of apiNameArr) { const details = MetadataDefinitions[apiName]; - if (!details.type) { - // we created the main type transactional message but don't want to show it here + if (details.type === '') { + // skip wrapper types like TransactionalMessage which don't have a value in "type" continue; } const supportCheckClass = apiName.startsWith('transactional') @@ -662,6 +662,10 @@ const Cli = { const typeChoices = []; for (const el in MetadataDefinitions) { + if (MetadataDefinitions[el].type === '') { + // skip wrapper types like TransactionalMessage which don't have a value in "type" + continue; + } if (MetadataDefinitions[el].subTypes && MetadataDefinitions[el].extendedSubTypes) { // used for assets to show whats available by default typeChoices.push({ From 33e947ed6fce13f90c1994efaf8f72cbc975ca0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Sat, 22 Jun 2024 10:27:32 +0200 Subject: [PATCH 3/3] #1360: ensure selectTypes skips wrapper classes --- lib/util/cli.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/util/cli.js b/lib/util/cli.js index 7fe9e41f0..1a9f89f69 100644 --- a/lib/util/cli.js +++ b/lib/util/cli.js @@ -491,6 +491,10 @@ const Cli = { } const flattenedDefinitions = []; for (const el in MetadataDefinitions) { + if (MetadataDefinitions[el].type === '') { + // dont offer wrapper types like TransactionalMessage which don't have a value in "type" + continue; + } // if subtypes on metadata (eg. Assets) then add each nested subtype if ( MetadataDefinitions[el].subTypes &&