@ds-sfdc/sfparty 1.4.0 → 1.4.2

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.4.0",
+  "version": "1.4.2",
   "description": "Salesforce metadata XML splitter for CI/CD",
   "type": "module",
   "repository": {

package/src/lib/packageUtil.js

@@ -68,8 +68,9 @@ export class Package {
 					packageDefinition.metadataDefinition.fallbackVersion
 			}
 			that.packageJSON = json
-			if (json.Package.types !== undefined)
+			if (json.Package.types !== undefined) {
 				transformJSON(json.Package.types)
+			}
 			cleanPackage(that)
 		}
 
@@ -80,6 +81,7 @@ export class Package {
 				)
 			if (that.packageJSON.Package == undefined)
 				throw new Error('Package initialization failed')
+
 			if (that.packageJSON.Package.types === undefined)
 				return 'No types found'
 
@@ -93,6 +95,12 @@ export class Package {
 					)
 				}
 			})
+
+			// remove all types nodes that have no members
+			that.packageJSON.Package.types =
+				that.packageJSON.Package.types.filter(
+					(subType) => subType.members.length > 0,
+				)
 		}
 	}
 

package/src/meta/PermissionSets.js

@@ -74,4 +74,5 @@ export const metadataDefinition = {
 		tabSettings: ['tab', 'visibility'],
 		userPermissions: ['name', 'enabled'],
 	},
+	delta: false,
 }

package/src/meta/Profiles.js

@@ -83,4 +83,5 @@ export const metadataDefinition = {
 		userPermissions: ['name', 'enabled'],
 	},
 	xmlFirst: 'fullName',
+	delta: false,
 }

package/src/meta/Workflows.js

@@ -124,4 +124,5 @@ export const metadataDefinition = {
 		rules: 'WorkflowRule',
 		tasks: 'WorkflowTask',
 	},
+	delta: true,
 }

package/src/party/combine.js

@@ -32,7 +32,10 @@ export class Combine {
 		mtime: undefined,
 	}
 	#json = {}
-	#diffOnly = false
+	#delta = false
+	#addedFiles = []
+	#deletedFiles = []
+	#mainDeleted = false
 
 	constructor(config) {
 		this.metadataDefinition = config.metadataDefinition
@@ -83,11 +86,6 @@ 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}`)
@@ -118,28 +116,53 @@ export class Combine {
 		})
 
 		function processStart(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}`),
+			)
+
+			// set delta based on metadata definition
+			that.#delta = that.metadataDefinition.delta
+
 			let success = processParts(that)
+			// Ensure we only match existing metadata type directory and item
+
 			if (success) {
 				if (
 					!that.metadataDefinition.packageTypeIsDirectory &&
 					global.git.enabled
 				) {
-					if (
-						!that.#diffOnly ||
-						global.metaTypes[that.metadataDefinition.alias].add
-							.files.length > 0
-					) {
+					if (!that.#delta || that.#addedFiles.length > 0) {
 						that.addPkg.addMember(
 							that.#root,
 							that.#fileName.shortName,
 						)
 					}
 
-					if (
-						that.#diffOnly &&
-						global.metaTypes[that.metadataDefinition.alias].remove
-							.files.length > 0
-					) {
+					// only include the workflow node if main part file is delete
+					if (that.#delta && that.#mainDeleted) {
 						that.desPkg.addMember(
 							that.#root,
 							that.#fileName.shortName,
@@ -364,19 +387,21 @@ export class Combine {
 				)
 			}
 
-			const diffFiles = global.metaTypes[
-				that.metadataDefinition.alias
-			].add.files.concat(
-				global.metaTypes[that.metadataDefinition.alias].remove.files,
-			)
-
-			if (that.#diffOnly) {
-				if (!diffFiles.includes(fileObj.fullName)) return true
+			if (that.#delta) {
+				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(
@@ -389,6 +414,7 @@ export class Combine {
 				}
 
 				if (
+					// git enabled and (package directory OR package mapping)
 					global.git.enabled &&
 					(that.metadataDefinition.packageTypeIsDirectory ||
 						(that.metadataDefinition.package !== undefined &&
@@ -396,6 +422,7 @@ export class Combine {
 								that.metadataDefinition.package))
 				) {
 					if (
+						// package mapping
 						that.metadataDefinition.package !== undefined &&
 						path.dirname(fileObj.fullName).split('/').pop() in
 							that.metadataDefinition.package
@@ -411,7 +438,10 @@ export class Combine {
 									'',
 								),
 						)
-					} else if (that.metadataDefinition.packageTypeIsDirectory) {
+					} else if (
+						// package directory
+						that.metadataDefinition.packageTypeIsDirectory
+					) {
 						that.desPkg.addMember(
 							that.#root,
 							fileObj.shortName.replace(`.${global.format}`, ''),

package/test/lib/package/getPackageXML.spec.js

@@ -152,7 +152,7 @@ it('should correctly process the json object returned from the XML file', async
 					name: 'PermissionSet',
 				},
 				{
-					members: ['Test', 'Test.yaml'],
+					members: ['Test.yaml'],
 					name: 'Workflow',
 				},
 			],
@@ -182,10 +182,6 @@ it('should correctly process the json object returned from the XML file', async
 					members: ['Test'],
 					name: 'PermissionSet',
 				},
-				{
-					members: ['Test'],
-					name: 'Workflow',
-				},
 			],
 			version: '56.0',
 		},