@ds-sfdc/sfparty 1.4.1 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ds-sfdc/sfparty",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "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/CustomLabels.js

@@ -4,6 +4,7 @@ export const metadataDefinition = {
 	directory: 'labels',
 	filetype: 'labels',
 	root: 'CustomLabels',
+	type: 'CustomLabel',
 	alias: 'label',
 	main: ['$'],
 	singleFiles: [],

package/src/meta/PermissionSets.js

@@ -4,6 +4,7 @@ export const metadataDefinition = {
 	directory: 'permissionsets',
 	filetype: 'permissionset',
 	root: 'PermissionSet',
+	type: 'PermissionSet',
 	alias: 'permset',
 	main: [
 		'label',
@@ -74,4 +75,5 @@ export const metadataDefinition = {
 		tabSettings: ['tab', 'visibility'],
 		userPermissions: ['name', 'enabled'],
 	},
+	delta: false,
 }

package/src/meta/Profiles.js

@@ -4,6 +4,7 @@ export const metadataDefinition = {
 	directory: 'profiles',
 	filetype: 'profile',
 	root: 'Profile',
+	type: 'Profile',
 	alias: 'profile',
 	main: ['fullName', 'custom', 'description', 'userLicense', '$'],
 	singleFiles: [
@@ -83,4 +84,5 @@ export const metadataDefinition = {
 		userPermissions: ['name', 'enabled'],
 	},
 	xmlFirst: 'fullName',
+	delta: false,
 }

package/src/meta/Workflows.js

@@ -4,6 +4,7 @@ export const metadataDefinition = {
 	directory: 'workflows',
 	filetype: 'workflow',
 	root: 'Workflow',
+	type: 'Workflow',
 	alias: 'workflow',
 	main: ['$'],
 	singleFiles: [],
@@ -124,4 +125,5 @@ export const metadataDefinition = {
 		rules: 'WorkflowRule',
 		tasks: 'WorkflowTask',
 	},
+	delta: true,
 }

package/src/party/combine.js

@@ -6,7 +6,6 @@ import cliSpinners from 'cli-spinners'
 import fs from 'fs'
 import * as xml2js from 'xml2js'
 import * as fileUtils from '../lib/fileUtils.js'
-import * as packageUtil from '../lib/packageUtil.js'
 
 const spinner = cliSpinners['dots']
 const processed = {
@@ -32,7 +31,7 @@ export class Combine {
 		mtime: undefined,
 	}
 	#json = {}
-	#diffOnly = false
+	#delta = false
 	#addedFiles = []
 	#deletedFiles = []
 	#mainDeleted = false
@@ -86,11 +85,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}`)
@@ -148,6 +142,9 @@ export class Combine {
 					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
 
@@ -156,17 +153,17 @@ export class Combine {
 					!that.metadataDefinition.packageTypeIsDirectory &&
 					global.git.enabled
 				) {
-					if (!that.#diffOnly || that.#addedFiles.length > 0) {
+					if (!that.#delta || that.#addedFiles.length > 0) {
 						that.addPkg.addMember(
-							that.#root,
+							that.metadataDefinition.type,
 							that.#fileName.shortName,
 						)
 					}
 
 					// only include the workflow node if main part file is delete
-					if (that.#diffOnly && that.#mainDeleted) {
+					if (that.#delta && that.#mainDeleted) {
 						that.desPkg.addMember(
-							that.#root,
+							that.metadataDefinition.type,
 							that.#fileName.shortName,
 						)
 					}
@@ -197,7 +194,10 @@ export class Combine {
 					!that.metadataDefinition.packageTypeIsDirectory &&
 					global.git.enabled
 				) {
-					that.desPkg.addMember(that.#root, that.#fileName.shortName)
+					that.desPkg.addMember(
+						that.metadataDefinition.type,
+						that.#fileName.shortName,
+					)
 				}
 				deleteFile(that, that.#fileName.fullName)
 				return 'deleted'
@@ -389,7 +389,7 @@ export class Combine {
 				)
 			}
 
-			if (that.#diffOnly) {
+			if (that.#delta) {
 				if (
 					!that.#addedFiles
 						.concat(that.#deletedFiles)
@@ -445,7 +445,7 @@ export class Combine {
 						that.metadataDefinition.packageTypeIsDirectory
 					) {
 						that.desPkg.addMember(
-							that.#root,
+							that.metadataDefinition.type,
 							fileObj.shortName.replace(`.${global.format}`, ''),
 						)
 					}
@@ -526,7 +526,7 @@ export class Combine {
 					)
 				} else if (that.metadataDefinition.packageTypeIsDirectory) {
 					that.addPkg.addMember(
-						that.#root,
+						that.metadataDefinition.type,
 						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',
 		},