diff --git a/@types/lib/Deployer.d.ts.map b/@types/lib/Deployer.d.ts.map index 2dbd875da..5080f9895 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;IA2HD;;;;;;;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;IA5eD;;;;;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,CAkH1C;IA1GO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CAoQjF"} \ 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;IA0BI;;;;;;;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;IA2HD;;;;;;;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;IA7eD;;;;;OAKG;IACH,wBAHW,OAAO,YACP,QAAQ,EAmBlB;IAhBG,iDAAwB;IACxB,kDAA4B;IAC5B,kBAIE;IACF,oBAIE;IA0MN;;;;;;OAMG;IACH,gBAJW,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAkH1C;IA1GO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CAoQjF"} \ No newline at end of file diff --git a/@types/lib/metadataTypes/Folder.d.ts b/@types/lib/metadataTypes/Folder.d.ts index b8115bbce..5b3e78018 100644 --- a/@types/lib/metadataTypes/Folder.d.ts +++ b/@types/lib/metadataTypes/Folder.d.ts @@ -117,10 +117,9 @@ declare class Folder extends MetadataType { * * @param {ListMap} results metadata results from deploy * @param {string} retrieveDir directory where metadata should be stored after deploy/retrieve - * @param {number | string} mid unused parameter * @returns {Promise.} Promise of saved metadata */ - static saveResults(results: ListMap, retrieveDir: string, mid: number | string): Promise; + static saveResults(results: ListMap, retrieveDir: string): Promise; } declare namespace Folder { let definition: { diff --git a/@types/lib/metadataTypes/Folder.d.ts.map b/@types/lib/metadataTypes/Folder.d.ts.map index 5558d56b9..05499aff6 100644 --- a/@types/lib/metadataTypes/Folder.d.ts.map +++ b/@types/lib/metadataTypes/Folder.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,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;uBAE5C,OAAO,wBAAwB,EAAE,QAAQ;sBACzC,OAAO,wBAAwB,EAAE,OAAO;wBACxC,OAAO,wBAAwB,EAAE,SAAS;AAdvD;;;;;;;;;;;;;;;GAeG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,GACJ,OAAO,CAAE;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAsIvD;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIvD;IAED;;;;;;;OAOG;IACH,wBAHW,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CAqK7B;IAED;;;;;OAKG;IACH,6BAHW,QAAQ,GACN,OAAO,CAAE,GAAG,CAAC,CAqEzB;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,GACd,OAAO,CAAE,GAAG,CAAC,CA8BzB;IAED;;;;;OAKG;IACH,gCAHW,QAAQ,GACN,OAAO,CAAE,QAAQ,CAAC,CAgD9B;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CAkE7B;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,QAAQ,EAAE,CAAC,CA2BhC;IAED;;;;;OAKG;IACH,mCAHW,QAAQ,GACN,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,4BALW,OAAO,eACP,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,OAAO,CAAC,CAwD7B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA9rBwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,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;uBAE5C,OAAO,wBAAwB,EAAE,QAAQ;sBACzC,OAAO,wBAAwB,EAAE,OAAO;wBACxC,OAAO,wBAAwB,EAAE,SAAS;AAdvD;;;;;;;;;;;;;;;GAeG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,GACJ,OAAO,CAAE;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAsIvD;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,GACN,OAAO,CAAE;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAIvD;IAED;;;;;;;OAOG;IACH,wBAHW,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CAqK7B;IAED;;;;;OAKG;IACH,6BAHW,QAAQ,GACN,OAAO,CAAE,GAAG,CAAC,CAqEzB;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,GACd,OAAO,CAAE,GAAG,CAAC,CA8BzB;IAED;;;;;OAKG;IACH,gCAHW,QAAQ,GACN,OAAO,CAAE,QAAQ,CAAC,CAgD9B;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,OAAO,CAAC,CAkE7B;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,QAAQ,EAAE,CAAC,CA2BhC;IAED;;;;;OAKG;IACH,mCAHW,QAAQ,GACN,QAAQ,CAIpB;IAED;;;;;;OAMG;IACH,4BAJW,OAAO,eACP,MAAM,GACJ,OAAO,CAAE,OAAO,CAAC,CA0D7B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA/rBwB,mBAAmB"} \ No newline at end of file diff --git a/lib/Deployer.js b/lib/Deployer.js index 3980c9aeb..6128e0956 100644 --- a/lib/Deployer.js +++ b/lib/Deployer.js @@ -54,7 +54,8 @@ class Deployer { ]); // prep folders for auto-creation MetadataTypeInfo.folder.client = auth.getSDK(buObject); - MetadataTypeInfo.folder.properties = this.properties; + MetadataTypeInfo.folder.buObject = buObject; + MetadataTypeInfo.folder.properties = properties; } /** @@ -515,7 +516,7 @@ class Deployer { if (i > 0) { MetadataTypeInfo.folder.definition.fields._generated.retrieving = true; // ensure we keep that flag in deploy folder // await results to allow us to re-read it right after - await MetadataTypeInfo.folder.saveResults(folderMetadata, deployDir, null); + await MetadataTypeInfo.folder.saveResults(folderMetadata, deployDir); MetadataTypeInfo.folder.definition.fields._generated.retrieving = false; // reset flag Util.logger.info(`Created folders in deploy dir: ${i}`); diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index 2a7e8914c..d36c8fb3e 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -164,7 +164,7 @@ class Folder extends MetadataType { } } if (retrieveDir) { - const savedMetadata = await this.saveResults(metadata, retrieveDir, this.buObject.mid); + const savedMetadata = await this.saveResults(metadata, retrieveDir); Util.logger.info( `Downloaded: ${this.definition.type} (${Object.keys(savedMetadata).length})` ); @@ -644,17 +644,18 @@ class Folder extends MetadataType { * * @param {ListMap} results metadata results from deploy * @param {string} retrieveDir directory where metadata should be stored after deploy/retrieve - * @param {number | string} mid unused parameter * @returns {Promise.} Promise of saved metadata */ - static async saveResults(results, retrieveDir, mid) { + static async saveResults(results, retrieveDir) { + const mid = this.buObject.mid; /** @type {ListMap} */ const savedResults = {}; for (const metadataEntry in results) { try { // skip saving shared folders as they technically live in parent. - // ! Warning: our result set does not have Client.ID in it - bad check? if (results[metadataEntry].Client && mid != results[metadataEntry].Client.ID) { + // deploy: folders auto-generated by deploy do not have .Client set and hence this check will be skipped + // retrieve: Client.ID is set to the MID of the BU that the folder belongs to; we only want folders of the current BU saved here continue; } else if ( results[metadataEntry] &&