@ds-sfdc/sfparty 1.3.16 → 1.4.1

package/.prettierrc

@@ -1,9 +1,8 @@
 {
-    "semi": false,
-    "useTabs": true,
-    "tabWidth": 4,
-    "singleQuote": true,
-    "trailingComma": "all",
-    "printWidth": 80
-  }
-  
+	"semi": false,
+	"useTabs": true,
+	"tabWidth": 4,
+	"singleQuote": true,
+	"trailingComma": "all",
+	"printWidth": 80
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ds-sfdc/sfparty",
-  "version": "1.3.16",
+  "version": "1.4.1",
   "description": "Salesforce metadata XML splitter for CI/CD",
   "type": "module",
   "repository": {

package/src/index.js

@@ -4,6 +4,7 @@ import { spawnSync, spawn, execSync } from 'child_process'
 import fs from 'fs'
 import path from 'path'
 import yargs from 'yargs'
+import xml2js from 'xml2js'
 import { hideBin } from 'yargs/helpers'
 import winston from 'winston'
 import clc from 'cli-color'
@@ -22,6 +23,7 @@ import * as permsetDefinition from './meta/PermissionSets.js'
 import * as workflowDefinition from './meta/Workflows.js'
 import { checkVersion } from './lib/checkVersion.js'
 import * as git from './lib/gitUtils.js'
+import * as packageUtil from './lib/packageUtil.js'
 
 const processStartTime = process.hrtime.bigint()
 
@@ -109,7 +111,8 @@ let errorMessage = clc.red(
 		clc.whiteBright.bgRedBright('combine') +
 		'.',
 )
-
+let addPkg
+let desPkg
 displayHeader() // display header mast
 
 let checkYargs = false
@@ -254,7 +257,32 @@ yargs(hideBin(process.argv))
 			})
 			startProm.then((result) => {
 				global.git.enabled = result
-				combineHandler(argv, processStartTime)
+
+				if (global.git.enabled) {
+					let addManifest =
+						argv.package || 'manifest/package-party.xml'
+					let desManifest =
+						argv.destructive ||
+						'manifest/destructiveChanges-party.xml'
+
+					addPkg = new packageUtil.Package(addManifest)
+					desPkg = new packageUtil.Package(desManifest)
+					const prom1 = addPkg.getPackageXML(fileUtils)
+					const prom2 = desPkg.getPackageXML(fileUtils)
+
+					Promise.allSettled([prom1, prom2]).then((results) => {
+						const rejected = results.filter(
+							(p) => p.status === 'rejected',
+						)
+						if (rejected.length > 0) {
+							throw new Error(rejected[0].value)
+						} else {
+							combineHandler(argv, processStartTime)
+						}
+					})
+				} else {
+					combineHandler(argv, processStartTime)
+				}
 			})
 			startProm.catch((error) => {
 				global.displayError(error, true)
@@ -565,6 +593,10 @@ function combineHandler(argv, startTime) {
 					fs,
 				})
 			}
+			if (global.git.enabled) {
+				addPkg.savePackage(xml2js, fileUtils)
+				desPkg.savePackage(xml2js, fileUtils)
+			}
 			if (argv.type === undefined || argv.type.split(',').length > 1) {
 				let message = `Split completed in `
 				displayMessageAndDuration(startTime, message)
@@ -599,8 +631,6 @@ function processCombine(typeItem, argv) {
 		let name = argv.name
 		let all =
 			argv.type === undefined || name === undefined ? true : argv.all
-		let addManifest = argv.package
-		let desManifest = argv.destructive
 
 		sourceDir = path.join(
 			global.__basedir,
@@ -680,13 +710,13 @@ function processCombine(typeItem, argv) {
 		processList.forEach((metaDir) => {
 			const metadataItem = new metadataCombine.Combine({
 				metadataDefinition: typeObj.definition,
-				sourceDir: sourceDir,
-				targetDir: targetDir,
-				metaDir: metaDir,
+				sourceDir,
+				targetDir,
+				metaDir,
 				sequence: promList.length + 1,
 				total: processed.total,
-				addManifest: addManifest,
-				desManifest: desManifest,
+				addPkg,
+				desPkg,
 			})
 			const metadataItemProm = metadataItem.combine()
 			promList.push(metadataItemProm)

package/src/party/combine.js

@@ -15,7 +15,6 @@ const processed = {
 	current: 0,
 	type: undefined,
 }
-
 export class Combine {
 	#type = undefined
 	#root = undefined
@@ -33,8 +32,10 @@ export class Combine {
 		mtime: undefined,
 	}
 	#json = {}
-	#addPkg = undefined
-	#desPkg = undefined
+	#diffOnly = false
+	#addedFiles = []
+	#deletedFiles = []
+	#mainDeleted = false
 
 	constructor(config) {
 		this.metadataDefinition = config.metadataDefinition
@@ -43,9 +44,8 @@ export class Combine {
 		this.metaDir = config.metaDir
 		this.sequence = config.sequence
 		this.total = config.total
-		this.addManifest = config.addManifest || 'manifest/package-party.xml'
-		this.desManifest =
-			config.desManifest || 'manifest/destructiveChanges-party.xml'
+		this.addPkg = config.addPkg
+		this.desPkg = config.desPkg
 	}
 
 	get metadataDefinition() {
@@ -86,6 +86,12 @@ export class Combine {
 	combine() {
 		return new Promise((resolve, reject) => {
 			const that = this
+			that.#diffOnly =
+				global.metaTypes[that.metadataDefinition.alias].add.files
+					.length > 0 ||
+				global.metaTypes[that.metadataDefinition.alias].remove.files
+					.length > 0
+
 			if (!fileUtils.directoryExists({ dirPath: that.sourceDir, fs }))
 				reject(`Path does not exist: ${that.sourceDir}`)
 			let types = ['directories', 'singleFiles', 'main']
@@ -111,38 +117,61 @@ export class Combine {
 				that.#json[key] = undefined
 			})
 
-			if (global.git.enabled) {
-				that.#addPkg = new packageUtil.Package(that.addManifest)
-				that.#desPkg = new packageUtil.Package(that.desManifest)
-				const prom1 = that.#addPkg.getPackageXML(fileUtils)
-				const prom2 = that.#desPkg.getPackageXML(fileUtils)
-
-				Promise.allSettled([prom1, prom2]).then((results) => {
-					const rejected = results.filter(
-						(p) => p.status === 'rejected',
-					)
-					if (rejected.length > 0) {
-						reject(rejected[0].value)
-					} else {
-						resolve(processStart(that))
-					}
-				})
-			} else {
-				resolve(processStart(that))
-			}
+			resolve(processStart(that))
 		})
 
 		function processStart(that) {
-			let success = getXML(that)
+			const pathMatch = `/${that.metadataDefinition.directory}/${
+				that.#fileName.shortName
+			}/`
+
+			// get a list of all the added files
+			that.#addedFiles = global.metaTypes[
+				that.metadataDefinition.alias
+			].add.files.filter((i) =>
+				i.toLowerCase().includes(pathMatch.toLowerCase()),
+			)
+
+			// get a list of all the removed files
+			that.#deletedFiles = global.metaTypes[
+				that.metadataDefinition.alias
+			].remove.files.filter((i) =>
+				i.toLowerCase().includes(pathMatch.toLowerCase()),
+			)
+
+			// check if main part file deleted
+			that.#mainDeleted = global.metaTypes[
+				that.metadataDefinition.alias
+			].remove.files.some(
+				(i) =>
+					i.includes(pathMatch) &&
+					i.toLowerCase().includes(`/main.${global.format}`),
+			)
+
+			let success = processParts(that)
+			// Ensure we only match existing metadata type directory and item
+
 			if (success) {
 				if (
 					!that.metadataDefinition.packageTypeIsDirectory &&
 					global.git.enabled
 				) {
-					that.#addPkg.addMember(that.#root, that.#fileName.shortName)
+					if (!that.#diffOnly || that.#addedFiles.length > 0) {
+						that.addPkg.addMember(
+							that.#root,
+							that.#fileName.shortName,
+						)
+					}
+
+					// only include the workflow node if main part file is delete
+					if (that.#diffOnly && that.#mainDeleted) {
+						that.desPkg.addMember(
+							that.#root,
+							that.#fileName.shortName,
+						)
+					}
 				}
 				saveXML(that)
-				if (global.git.enabled) savePackageXML(that)
 				return true
 			} else {
 				logUpdate(
@@ -168,20 +197,14 @@ export class Combine {
 					!that.metadataDefinition.packageTypeIsDirectory &&
 					global.git.enabled
 				) {
-					that.#desPkg.addMember(that.#root, that.#fileName.shortName)
+					that.desPkg.addMember(that.#root, that.#fileName.shortName)
 				}
-				deleteFile(that.#fileName.fullName)
-				if (global.git.enabled) savePackageXML(that)
+				deleteFile(that, that.#fileName.fullName)
 				return 'deleted'
 			}
 		}
 
-		function savePackageXML(that) {
-			that.#addPkg.savePackage(xml2js, fileUtils)
-			that.#desPkg.savePackage(xml2js, fileUtils)
-		}
-
-		function getXML(that) {
+		function processParts(that) {
 			if (processed.type != that.#root) {
 				processed.current = 0
 				processed.type = that.#root
@@ -320,11 +343,28 @@ export class Combine {
 					processFile(that, key, fileObj)
 				})
 			}
+
+			const filteredArray = global.metaTypes[
+				that.metadataDefinition.alias
+			].remove.files.filter((filePath) =>
+				filePath.startsWith(
+					path.join(that.sourceDir, that.metaDir, key),
+				),
+			)
+			filteredArray.forEach((file) => {
+				const fileObj = {
+					shortName: path.basename(file),
+					fullName: file,
+				}
+				processFile(that, key, fileObj)
+			})
+
 			return true
 		}
 
-		function deleteFile(fileName) {
+		function deleteFile(that, fileName) {
 			fileUtils.deleteFile(fileName)
+			fileUtils.deleteDirectory(path.join(that.sourceDir, that.metaDir))
 		}
 
 		function processFile(
@@ -349,9 +389,21 @@ export class Combine {
 				)
 			}
 
+			if (that.#diffOnly) {
+				if (
+					!that.#addedFiles
+						.concat(that.#deletedFiles)
+						.includes(fileObj.fullName) &&
+					!fileObj.fullName
+						.toLowerCase()
+						.includes(`/main.${global.format}`)
+				)
+					return true
+			}
+
 			if (!fileUtils.fileExists({ filePath: fileObj.fullName, fs })) {
 				// File does not exist
-				// If file is main.yaml, then return false to indicate that the XML file should be deleted
+				// If file is main part file, then return false to indicate that the XML file should be deleted
 				if (
 					fileObj.fullName ==
 					path.join(
@@ -364,6 +416,7 @@ export class Combine {
 				}
 
 				if (
+					// git enabled and (package directory OR package mapping)
 					global.git.enabled &&
 					(that.metadataDefinition.packageTypeIsDirectory ||
 						(that.metadataDefinition.package !== undefined &&
@@ -371,11 +424,12 @@ export class Combine {
 								that.metadataDefinition.package))
 				) {
 					if (
+						// package mapping
 						that.metadataDefinition.package !== undefined &&
 						path.dirname(fileObj.fullName).split('/').pop() in
 							that.metadataDefinition.package
 					) {
-						that.#desPkg.addMember(
+						that.desPkg.addMember(
 							that.metadataDefinition.package[
 								path.dirname(fileObj.fullName).split('/').pop()
 							],
@@ -386,8 +440,11 @@ export class Combine {
 									'',
 								),
 						)
-					} else if (that.metadataDefinition.packageTypeIsDirectory) {
-						that.#desPkg.addMember(
+					} else if (
+						// package directory
+						that.metadataDefinition.packageTypeIsDirectory
+					) {
+						that.desPkg.addMember(
 							that.#root,
 							fileObj.shortName.replace(`.${global.format}`, ''),
 						)
@@ -459,7 +516,7 @@ export class Combine {
 					path.dirname(fileObj.fullName).split('/').pop() in
 						that.metadataDefinition.package
 				) {
-					that.#addPkg.addMember(
+					that.addPkg.addMember(
 						that.metadataDefinition.package[
 							path.dirname(fileObj.fullName).split('/').pop()
 						],
@@ -468,7 +525,7 @@ export class Combine {
 							fileObj.shortName.replace(`.${global.format}`, ''),
 					)
 				} else if (that.metadataDefinition.packageTypeIsDirectory) {
-					that.#addPkg.addMember(
+					that.addPkg.addMember(
 						that.#root,
 						fileObj.shortName.replace(`.${global.format}`, ''),
 					)