From e62fe73485d8465f3914ef023ada887dd961c41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 3 Dec 2025 09:41:49 +0100 Subject: [PATCH 1/2] #63: support retrieving filtered dataExtension details --- .../lib/metadataTypes/DataExtension.d.ts.map | 2 +- @types/lib/metadataTypes/Filter.d.ts | 29 +++++++++++++++++++ @types/lib/metadataTypes/Filter.d.ts.map | 2 +- .../lib/metadataTypes/FilterDefinition.d.ts | 13 +++++---- .../metadataTypes/FilterDefinition.d.ts.map | 2 +- .../metadataTypes/FilterDefinitionHidden.d.ts | 6 ---- .../FilterDefinitionHidden.d.ts.map | 2 +- @types/lib/metadataTypes/Script.d.ts | 14 +++++++++ @types/lib/metadataTypes/Script.d.ts.map | 2 +- .../definitions/Script.definition.d.ts | 10 +++++++ lib/metadataTypes/DataExtension.js | 22 ++++++++++++++ .../definitions/DataExtension.definition.js | 5 ++++ types/mcdev.d.js | 2 ++ 13 files changed, 94 insertions(+), 17 deletions(-) diff --git a/@types/lib/metadataTypes/DataExtension.d.ts.map b/@types/lib/metadataTypes/DataExtension.d.ts.map index df9e65e6b..34467039a 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/Filter.d.ts b/@types/lib/metadataTypes/Filter.d.ts index 3503763fa..f930e8f20 100644 --- a/@types/lib/metadataTypes/Filter.d.ts +++ b/@types/lib/metadataTypes/Filter.d.ts @@ -56,6 +56,20 @@ declare class Filter extends MetadataType { * @param {FilterItem} metadata single record */ static _postRetrieve_dataTypeMapping(target: "source" | "destination", metadata: FilterItem): void; + /** + * Creates a single item + * + * @param {MetadataTypeItem} item a single item + * @returns {Promise} Promise + */ + static create(item: MetadataTypeItem): Promise; + /** + * Updates a single item + * + * @param {MetadataTypeItem} item a single item + * @returns {Promise} Promise + */ + static update(item: MetadataTypeItem): Promise; /** * prepares a record for deployment * @@ -63,6 +77,21 @@ declare class Filter extends MetadataType { * @returns {Promise.} Promise of updated single record */ static preDeployTasks(metadata: FilterItem): Promise; + /** + * helper for postRetrieveTasks to map data types + * + * @param {'source'|'destination'} target we are processing source and destinations + * @param {FilterItem} metadata single record + */ + static _preDeploy_dataTypeMapping(target: "source" | "destination", metadata: FilterItem): void; + /** + * helper to allow us to select single metadata entries via REST + * + * @private + * @param {string} key customer key + * @returns {Promise.} objectId or enpty string + */ + private static _getObjectIdForSingleRetrieve; } declare namespace Filter { let definition: { diff --git a/@types/lib/metadataTypes/Filter.d.ts.map b/@types/lib/metadataTypes/Filter.d.ts.map index 12ea77dd3..3df44b1bf 100644 --- a/@types/lib/metadataTypes/Filter.d.ts.map +++ b/@types/lib/metadataTypes/Filter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Filter.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;yBAC5C,OAAO,wBAAwB,EAAE,UAAU;AAXxD;;;;;;;;;;;;GAYG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;;;;OAWG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CAIxC;IACD;;;;;OAKG;IACH,mCAHW,UAAU,GACR,UAAU,CAiCtB;IAED;;;;;OAKG;IACH,6CAHW,QAAQ,GAAC,aAAa,YACtB,UAAU,QA6CpB;IACD;;;;;OAKG;IACH,gCAHW,UAAU,GACR,OAAO,CAAE,UAAU,CAAC,CAqEhC;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAjNwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Filter.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;yBAC5C,OAAO,wBAAwB,EAAE,UAAU;AAXxD;;;;;;;;;;;;GAYG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;;;;OAWG;IACH,6BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE,kBAAkB,CAAC,CAIxC;IACD;;;;;OAKG;IACH,mCAHW,UAAU,GACR,UAAU,CAiCtB;IAED;;;;;OAKG;IACH,6CAHW,QAAQ,GAAC,aAAa,YACtB,UAAU,QA6CpB;IAED;;;;;OAKG;IACH,oBAHW,gBAAgB,gBAK1B;IAED;;;;;OAKG;IACH,oBAHW,gBAAgB,gBAK1B;IAED;;;;;OAKG;IACH,gCAHW,UAAU,GACR,OAAO,CAAE,UAAU,CAAC,CA2BhC;IAED;;;;;OAKG;IACH,0CAHW,QAAQ,GAAC,aAAa,YACtB,UAAU,QAuBpB;IAED;;;;;;OAMG;IACH,6CAWC;CAiBJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA7PwB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/FilterDefinition.d.ts b/@types/lib/metadataTypes/FilterDefinition.d.ts index fc1ced80e..44ec16085 100644 --- a/@types/lib/metadataTypes/FilterDefinition.d.ts +++ b/@types/lib/metadataTypes/FilterDefinition.d.ts @@ -39,6 +39,7 @@ export type FilterCondition = import("../../types/mcdev.d.js").FilterCondition; declare class FilterDefinition extends MetadataType { static cache: {}; static deIdKeyMap: any; + static hidden: boolean; /** * Retrieves all records and saves it to disk * @@ -55,10 +56,10 @@ declare class FilterDefinition extends MetadataType { /** * helper for {@link FilterDefinition.retrieve} * - * @param {boolean} [hidden] used to filter out hidden or non-hidden filterDefinitions + * @param {boolean} [recached] indicates if this is a recursive call after cache refresh * @returns {Promise.} Array of folder IDs */ - static _getFilterFolderIds(hidden?: boolean): Promise; + static _getFilterFolderIds(recached?: boolean): Promise; /** * helper for {@link FilterDefinition._cacheMeasures} * @@ -107,15 +108,15 @@ declare class FilterDefinition extends MetadataType { * @param {FilterConditionSet} [filter] - * @returns {void} */ - static _resolveFieldIds(metadata: FilterDefinitionItem, fieldCache?: object[], filter?: FilterConditionSet): void; + static _postRetrieve_resolveFieldIds(metadata: FilterDefinitionItem, fieldCache?: object[], filter?: FilterConditionSet): void; /** - * helper for {@link _resolveFieldIds} + * helper for {@link _postRetrieve_resolveFieldIds} * * @param {FilterCondition} condition - * @param {object[]} fieldCache - * @returns {void} */ - static _resolveFieldIdsCondition(condition: FilterCondition, fieldCache: object[]): void; + static _postRetrieve_resolveFieldIdsCondition(condition: FilterCondition, fieldCache: object[]): void; /** * helper for {@link postRetrieveTasks} * @@ -123,7 +124,7 @@ declare class FilterDefinition extends MetadataType { * @param {object} [filter] - * @returns {void} */ - static _resolveAttributeIds(metadata: FilterDefinitionItem, filter?: object): void; + static _postRetrieve_resolveAttributeIds(metadata: FilterDefinitionItem, filter?: object): void; /** * prepares a item for deployment * diff --git a/@types/lib/metadataTypes/FilterDefinition.d.ts.map b/@types/lib/metadataTypes/FilterDefinition.d.ts.map index 1f1bd42ff..3ba744aa2 100644 --- a/@types/lib/metadataTypes/FilterDefinition.d.ts.map +++ b/@types/lib/metadataTypes/FilterDefinition.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"FilterDefinition.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/FilterDefinition.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;mCAC5C,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;mCACpD,OAAO,wBAAwB,EAAE,oBAAoB;iCACrD,OAAO,wBAAwB,EAAE,kBAAkB;8BACnD,OAAO,wBAAwB,EAAE,eAAe;AAf7D;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;GAIG;AACH;IACI,iBAAkB;IAClB,uBAAkB;IAClB;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,MAAM,EAAE,OACR,MAAM,EAAE,QACR,MAAM,GACJ,OAAO,CAAE;QAAC,QAAQ,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CA4CnE;IACD;;;;;OAKG;IACH,oCAHW,OAAO,GACL,OAAO,CAAE,MAAM,EAAE,CAAC,CA2B9B;IACD;;;;OAIG;IACH,+BAFa,OAAO,CAAE,MAAM,EAAE,CAAC,CA2B9B;IAED;;;;OAIG;IACH,uCAFW,mBAAmB,iBAoD7B;IACD;;;;OAIG;IACH,gDAFW,mBAAmB,iBAkB7B;IACD;;;;OAIG;IACH,uCAFW,mBAAmB,iBA6B7B;IAED;;;;OAIG;IACH,2BAFa,OAAO,CAAE;QAAC,QAAQ,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAInE;IAED;;;;;OAKG;IACH,mCAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAyF1C;IAED;;;;;;;OAOG;IACH,kCALW,oBAAoB,eACpB,MAAM,EAAE,WACR,kBAAkB,GAChB,IAAI,CA0BhB;IACD;;;;;;OAMG;IACH,4CAJW,eAAe,cACf,MAAM,EAAE,GACN,IAAI,CAYhB;IACD;;;;;;OAMG;IACH,sCAJW,oBAAoB,WACpB,MAAM,GACJ,IAAI,CA8BhB;IAED;;;;;OAKG;IACH,gCAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CA8B1C;IACD;;;;;OAKG;IACH,wBAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAK1C;IACD;;;;;OAKG;IACH,wBAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAQ1C;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA/fwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"FilterDefinition.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/FilterDefinition.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;mCAC5C,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;mCACpD,OAAO,wBAAwB,EAAE,oBAAoB;iCACrD,OAAO,wBAAwB,EAAE,kBAAkB;8BACnD,OAAO,wBAAwB,EAAE,eAAe;AAf7D;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;GAIG;AACH;IACI,iBAAkB;IAClB,uBAAkB;IAClB,uBAAsB;IACtB;;;;;;;;OAQG;IACH,6BANW,MAAM,MACN,MAAM,EAAE,OACR,MAAM,EAAE,QACR,MAAM,GACJ,OAAO,CAAE;QAAC,QAAQ,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CA4CnE;IACD;;;;;OAKG;IACH,sCAHW,OAAO,GACL,OAAO,CAAE,MAAM,EAAE,CAAC,CA+B9B;IACD;;;;OAIG;IACH,+BAFa,OAAO,CAAE,MAAM,EAAE,CAAC,CA2B9B;IAED;;;;OAIG;IACH,uCAFW,mBAAmB,iBAoD7B;IACD;;;;OAIG;IACH,gDAFW,mBAAmB,iBAkB7B;IACD;;;;OAIG;IACH,uCAFW,mBAAmB,iBA6B7B;IAED;;;;OAIG;IACH,2BAFa,OAAO,CAAE;QAAC,QAAQ,EAAE,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAInE;IAED;;;;;OAKG;IACH,mCAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAyF1C;IAED;;;;;;;OAOG;IACH,+CALW,oBAAoB,eACpB,MAAM,EAAE,WACR,kBAAkB,GAChB,IAAI,CA0BhB;IACD;;;;;;OAMG;IACH,yDAJW,eAAe,cACf,MAAM,EAAE,GACN,IAAI,CAYhB;IACD;;;;;;OAMG;IACH,mDAJW,oBAAoB,WACpB,MAAM,GACJ,IAAI,CAiChB;IAED;;;;;OAKG;IACH,gCAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CA8B1C;IACD;;;;;OAKG;IACH,wBAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAK1C;IACD;;;;;OAKG;IACH,wBAHW,oBAAoB,GAClB,OAAO,CAAE,oBAAoB,CAAC,CAQ1C;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAvgBwB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts b/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts index 6044587cf..7b0e5677a 100644 --- a/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts +++ b/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts @@ -5,12 +5,6 @@ export default FilterDefinitionHidden; * @augments FilterDefinition */ declare class FilterDefinitionHidden extends FilterDefinition { - /** - * helper for {@link FilterDefinition.retrieve} - * - * @returns {Promise.} Array of folder IDs - */ - static _getFilterFolderIds(): Promise; } declare namespace FilterDefinitionHidden { let definition: { diff --git a/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts.map b/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts.map index 86141b176..d4cbff201 100644 --- a/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts.map +++ b/@types/lib/metadataTypes/FilterDefinitionHidden.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"FilterDefinitionHidden.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/FilterDefinitionHidden.js"],"names":[],"mappings":";AAKA;;;;GAIG;AACH;IACI;;;;OAIG;IACH,8BAFa,OAAO,CAAE,MAAM,EAAE,CAAC,CAI9B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAhB4B,uBAAuB"} \ No newline at end of file +{"version":3,"file":"FilterDefinitionHidden.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/FilterDefinitionHidden.js"],"names":[],"mappings":";AAKA;;;;GAIG;AACH;CAUC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAjB4B,uBAAuB"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/Script.d.ts b/@types/lib/metadataTypes/Script.d.ts index 21d6fadaa..1db5d36b2 100644 --- a/@types/lib/metadataTypes/Script.d.ts +++ b/@types/lib/metadataTypes/Script.d.ts @@ -78,6 +78,14 @@ declare class Script extends MetadataType { * @returns {Promise} Promise */ static update(script: MetadataTypeItem): Promise; + /** + * helper for {@link MetadataType.updateREST} and {@link MetadataType.updateSOAP} + * + * @param {MetadataTypeItem} metadataEntry a single metadata Entry + * @param {object} apiResponse varies depending on the API call + * @returns {Promise.} apiResponse, potentially modified + */ + static postUpdateTasks(metadataEntry: MetadataTypeItem, apiResponse: object): Promise; /** * Creates a single Script * @@ -290,6 +298,12 @@ declare namespace Script { retrieving: boolean; template: boolean; }; + parentCategoryId: { + isCreateable: boolean; + isUpdateable: boolean; + retrieving: boolean; + template: boolean; + }; r__folder_Path: { skipValidation: boolean; }; diff --git a/@types/lib/metadataTypes/Script.d.ts.map b/@types/lib/metadataTypes/Script.d.ts.map index 449c49af4..9cf9d52cf 100644 --- a/@types/lib/metadataTypes/Script.d.ts.map +++ b/@types/lib/metadataTypes/Script.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Script.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Script.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Script.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Script.js"],"names":[],"mappings":";uBAQa,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;0CAC5C,OAAO,wBAAwB,EAAE,2BAA2B;yBAI5D,OAAO,wBAAwB,EAAE,UAAU;wBAC3C,OAAO,wBAAwB,EAAE,SAAS;AAhBvD;;;;;;;;;;;;GAYG;AAEH;;;GAGG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;;OASG;IACH,8BANW,MAAM,MACN,IAAI,GAAG,MAAM,EAAE,OACf,IAAI,GAAG,MAAM,EAAE,QACf,MAAM,GACJ,OAAO,CAAE;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAKzD;IAED;;;;OAIG;IACH,2BAFa,OAAO,CAAE;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIzD;IAED;;;;;;;;OAQG;IACH,uCALW,MAAM,QACN,MAAM,qBACN,WAAW,GACT,OAAO,CAAE;QAAC,QAAQ,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAU1D;IAED;;;;;OAKG;IACH,sBAHW,gBAAgB,gBAK1B;IAED;;;;;;OAMG;IACH,sCAJW,gBAAgB,eAChB,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CAS5B;IAED;;;;;OAKG;IACH,sBAHW,gBAAgB,gBAK1B;IAED;;;;;;;OAOG;IACH,4BALW,UAAU,aACV,MAAM,iBACN,MAAM,GACJ,OAAO,CAAE,MAAM,CAAC,CA4B5B;IAED;;;;;;OAMG;IACH,gCAJW,UAAU,OACV,MAAM,GACJ,OAAO,CAAE,UAAU,CAAC,CAUhC;IAED;;;;;;;;;;OAUG;IACH,6CAPW,MAAM,aACN,MAAM,GAAC,MAAM,EAAE,YACf,UAAU,qBACV,WAAW,gBACX,MAAM,GACJ,OAAO,CAAE,MAAM,EAAE,EAAE,CAAC,CAiBhC;IAED;;;;;;;;;;;OAWG;IACH,2CAPW,MAAM,aACN,MAAM,GAAC,MAAM,EAAE,YACf,UAAU,qBACV,WAAW,gBACX,MAAM,GACJ,OAAO,CAAE,MAAM,EAAE,EAAE,CAAC,CAiBhC;IAED;;;;;;;;;;;OAWG;IACH,oCARW,MAAM,aACN,MAAM,GAAC,MAAM,EAAE,YACf,UAAU,qBACV,WAAW,gBACX,MAAM,QACN,YAAY,GAAC,UAAU,GACrB,OAAO,CAAE,MAAM,EAAE,EAAE,CAAC,CAsDhC;IAED;;;;;OAKG;IACH,mCAHW,UAAU,GACR,eAAe,CAO3B;IAED;;;;;OAKG;IACH,oCAHW,UAAU,GACR,eAAe,CAgB3B;IAED;;;;;;OAMG;IACH,yCAJW,MAAM,gBACN,MAAM,GACJ;QAAC,OAAO,EAAC,MAAM,CAAC;QAAA,IAAI,EAAC,MAAM,CAAA;KAAC,CAiBxC;IAyBD;;;;;;OAMG;IACH,6CAWC;IAkBD;;;;;OAKG;IACH,oCAHW,MAAM,GACJ,OAAO,CAAE,IAAI,CAAC,CAU1B;IAED;;;;;;OAMG;IACH,gCALW,gBAAgB,eAChB,MAAM,kBACN,GAAG,CAAE,MAAM,CAAC,GACV,OAAO,CAAE,eAAe,CAAC,CAarC;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAtbwB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/definitions/Script.definition.d.ts b/@types/lib/metadataTypes/definitions/Script.definition.d.ts index 52ea12144..97bf1b897 100644 --- a/@types/lib/metadataTypes/definitions/Script.definition.d.ts +++ b/@types/lib/metadataTypes/definitions/Script.definition.d.ts @@ -146,6 +146,16 @@ declare namespace _default { let template_12: boolean; export { template_12 as template }; } + namespace parentCategoryId { + let isCreateable_13: boolean; + export { isCreateable_13 as isCreateable }; + let isUpdateable_13: boolean; + export { isUpdateable_13 as isUpdateable }; + let retrieving_13: boolean; + export { retrieving_13 as retrieving }; + let template_13: boolean; + export { template_13 as template }; + } namespace r__folder_Path { let skipValidation: boolean; } diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index 67ba59274..279d838fd 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -36,6 +36,8 @@ import { checkbox } from '@inquirer/prompts'; class DataExtension extends MetadataType { /** @type {Object.} key: deKey, value: deFieldMap */ static oldFields; + static filterDefinitionMap = {}; + static deIdfilterDefinitionMap = {}; /** * Upserts dataExtensions after retrieving them from source and target to compare @@ -765,6 +767,21 @@ class DataExtension extends MetadataType { }; } let metadataMap = await this._retrieveAll(additionalFields, requestParams); + if (cache.getCache()?.filterDefinitionHidden) { + const fdhMap = cache.getCache()?.filterDefinitionHidden; + for (const key in fdhMap) { + const item = fdhMap[key]; + if ( + item.description.startsWith('Filter generated automatically for filtered DE ') + ) { + const deKey = item.description.split( + 'Filter generated automatically for filtered DE ' + )[1]; + const deObjectId = item.name.split(deKey + '-')[1]; + this.deIdfilterDefinitionMap[deObjectId] = item; + } + } + } // in case of cache dont get fields if (metadataMap && retrieveDir) { // get fields from API @@ -999,6 +1016,9 @@ class DataExtension extends MetadataType { delete metadata.DataRetentionPeriodUnitOfMeasure; } + if (this.deIdfilterDefinitionMap[metadata.ObjectID]) { + metadata.r__filterDefinition_key = this.deIdfilterDefinitionMap[metadata.ObjectID].key; + } return metadata; } @@ -1195,6 +1215,8 @@ class DataExtension extends MetadataType { delete metadata.c__dataRetentionPeriodUnitOfMeasure; } + delete metadata.r__filterDefinition_key; + return metadata; } diff --git a/lib/metadataTypes/definitions/DataExtension.definition.js b/lib/metadataTypes/definitions/DataExtension.definition.js index a41283d7b..f74ddc625 100644 --- a/lib/metadataTypes/definitions/DataExtension.definition.js +++ b/lib/metadataTypes/definitions/DataExtension.definition.js @@ -3,12 +3,14 @@ export default { dependencies: [ 'folder-hidden', 'folder-dataextension', + 'folder-filterdefinition', // for r__filterDefinition_key 'folder-salesforcedataextension', 'folder-shared_data', 'folder-shared_dataextension', 'folder-shared_salesforcedataextension', 'folder-synchronizeddataextension', 'dataExtensionTemplate', + 'filterDefinitionHidden', ], dependencyGraph: null, // dataExtensionTemplate cannot be deployed folderType: 'dataextension', @@ -302,5 +304,8 @@ export default { c__dataRetentionPeriodUnitOfMeasure: { skipValidation: true, }, + r__filterDefinition_key: { + skipValidation: true, + }, }, }; diff --git a/types/mcdev.d.js b/types/mcdev.d.js index 1d476bd51..70fad7dea 100644 --- a/types/mcdev.d.js +++ b/types/mcdev.d.js @@ -108,6 +108,7 @@ * @typedef {object} DataExtensionItem * @property {string} CustomerKey key * @property {string} Name name + * @property {string} [ObjectID] id * @property {string} Description - * @property {string} [CreatedDate] iso format * @property {string} [ModifiedDate] iso format @@ -133,6 +134,7 @@ * @property {boolean} [RowBasedRetention] true for retention policy individialRecords * @property {boolean} ResetRetentionPeriodOnImport ? * @property {boolean} [DeleteAtEndOfRetentionPeriod] true for retention policy allRecords + * @property {string} [r__filterDefinition_key] reference to (hidden) filterDefinition key */ /** From 80047c4b2bb9f1affe768dbac22401dfd0c6d457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Wed, 4 Feb 2026 23:13:26 +0100 Subject: [PATCH 2/2] #63: adapt logic to final version of dataFilter class --- @types/lib/metadataTypes/DataExtension.d.ts | 6 +++--- @types/lib/metadataTypes/DataExtension.d.ts.map | 2 +- .../definitions/DataExtension.definition.d.ts | 2 +- @types/types/mcdev.d.d.ts | 4 ++-- lib/metadataTypes/DataExtension.js | 16 ++++++++-------- .../definitions/DataExtension.definition.js | 4 ++-- types/mcdev.d.js | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/@types/lib/metadataTypes/DataExtension.d.ts b/@types/lib/metadataTypes/DataExtension.d.ts index e2ef02e9b..bc031db2e 100644 --- a/@types/lib/metadataTypes/DataExtension.d.ts +++ b/@types/lib/metadataTypes/DataExtension.d.ts @@ -35,8 +35,8 @@ declare class DataExtension extends MetadataType { [x: string]: import("../../types/mcdev.d.js").DataExtensionFieldItem; }; }; - static filterDefinitionMap: {}; - static deIdfilterDefinitionMap: {}; + static dataFilterMap: {}; + static deIdDataFilterMap: {}; /** * Upserts dataExtensions after retrieving them from source and target to compare * if create or update operation is needed. @@ -566,7 +566,7 @@ declare namespace DataExtension { c__dataRetentionPeriodUnitOfMeasure: { skipValidation: boolean; }; - r__filterDefinition_key: { + r__dataFilterHidden_key: { skipValidation: boolean; }; }; diff --git a/@types/lib/metadataTypes/DataExtension.d.ts.map b/@types/lib/metadataTypes/DataExtension.d.ts.map index 34467039a..2acf2455b 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/definitions/DataExtension.definition.d.ts b/@types/lib/metadataTypes/definitions/DataExtension.definition.d.ts index a1ebfa705..2c3563db7 100644 --- a/@types/lib/metadataTypes/definitions/DataExtension.definition.d.ts +++ b/@types/lib/metadataTypes/definitions/DataExtension.definition.d.ts @@ -233,7 +233,7 @@ declare namespace _default { c__dataRetentionPeriodUnitOfMeasure: { skipValidation: boolean; }; - r__filterDefinition_key: { + r__dataFilterHidden_key: { skipValidation: boolean; }; }; diff --git a/@types/types/mcdev.d.d.ts b/@types/types/mcdev.d.d.ts index b02817f68..1565b0e45 100644 --- a/@types/types/mcdev.d.d.ts +++ b/@types/types/mcdev.d.d.ts @@ -410,9 +410,9 @@ export type DataExtensionItem = { */ DeleteAtEndOfRetentionPeriod?: boolean; /** - * reference to (hidden) filterDefinition key + * reference to (hidden) dataFilter key */ - r__filterDefinition_key?: string; + r__dataFilterHidden_key?: string; }; export type DataExtensionMap = { [x: string]: DataExtensionItem; diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index 279d838fd..071cd974f 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -36,8 +36,8 @@ import { checkbox } from '@inquirer/prompts'; class DataExtension extends MetadataType { /** @type {Object.} key: deKey, value: deFieldMap */ static oldFields; - static filterDefinitionMap = {}; - static deIdfilterDefinitionMap = {}; + static dataFilterMap = {}; + static deIdDataFilterMap = {}; /** * Upserts dataExtensions after retrieving them from source and target to compare @@ -767,8 +767,8 @@ class DataExtension extends MetadataType { }; } let metadataMap = await this._retrieveAll(additionalFields, requestParams); - if (cache.getCache()?.filterDefinitionHidden) { - const fdhMap = cache.getCache()?.filterDefinitionHidden; + if (cache.getCache()?.dataFilterHidden) { + const fdhMap = cache.getCache()?.dataFilterHidden; for (const key in fdhMap) { const item = fdhMap[key]; if ( @@ -778,7 +778,7 @@ class DataExtension extends MetadataType { 'Filter generated automatically for filtered DE ' )[1]; const deObjectId = item.name.split(deKey + '-')[1]; - this.deIdfilterDefinitionMap[deObjectId] = item; + this.deIdDataFilterMap[deObjectId] = item; } } } @@ -1016,8 +1016,8 @@ class DataExtension extends MetadataType { delete metadata.DataRetentionPeriodUnitOfMeasure; } - if (this.deIdfilterDefinitionMap[metadata.ObjectID]) { - metadata.r__filterDefinition_key = this.deIdfilterDefinitionMap[metadata.ObjectID].key; + if (this.deIdDataFilterMap[metadata.ObjectID]) { + metadata.r__dataFilterHidden_key = this.deIdDataFilterMap[metadata.ObjectID].key; } return metadata; } @@ -1215,7 +1215,7 @@ class DataExtension extends MetadataType { delete metadata.c__dataRetentionPeriodUnitOfMeasure; } - delete metadata.r__filterDefinition_key; + delete metadata.r__dataFilterHidden_key; return metadata; } diff --git a/lib/metadataTypes/definitions/DataExtension.definition.js b/lib/metadataTypes/definitions/DataExtension.definition.js index f74ddc625..1bbf4c777 100644 --- a/lib/metadataTypes/definitions/DataExtension.definition.js +++ b/lib/metadataTypes/definitions/DataExtension.definition.js @@ -10,7 +10,7 @@ export default { 'folder-shared_salesforcedataextension', 'folder-synchronizeddataextension', 'dataExtensionTemplate', - 'filterDefinitionHidden', + 'dataFilterHidden', ], dependencyGraph: null, // dataExtensionTemplate cannot be deployed folderType: 'dataextension', @@ -304,7 +304,7 @@ export default { c__dataRetentionPeriodUnitOfMeasure: { skipValidation: true, }, - r__filterDefinition_key: { + r__dataFilterHidden_key: { skipValidation: true, }, }, diff --git a/types/mcdev.d.js b/types/mcdev.d.js index 66275822a..5b634fba6 100644 --- a/types/mcdev.d.js +++ b/types/mcdev.d.js @@ -134,7 +134,7 @@ * @property {boolean} [RowBasedRetention] true for retention policy individialRecords * @property {boolean} ResetRetentionPeriodOnImport ? * @property {boolean} [DeleteAtEndOfRetentionPeriod] true for retention policy allRecords - * @property {string} [r__filterDefinition_key] reference to (hidden) filterDefinition key + * @property {string} [r__dataFilterHidden_key] reference to (hidden) dataFilter key */ /**