@ds-sfdc/sfparty 1.4.10 → 1.4.12

package/.prettierignore

@@ -0,0 +1 @@
+force-app-party/**/*.yaml

package/package.json

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

package/src/lib/checkVersion.js

@@ -43,6 +43,13 @@ export async function checkVersion({
 		// do not display errors
 	}
 
+	let updateCommand
+	if (process.env.npm_lifecycle_script === 'sfparty') {
+		updateCommand = 'npm i @ds-sfdc/sfparty@latest'
+	} else {
+		updateCommand = 'sfparty update'
+	}
+
 	if (result !== undefined) {
 		const latestVersion = result['dist-tags'].latest
 		if (semver.gt(latestVersion, currentVersion)) {
@@ -53,7 +60,7 @@ export async function checkVersion({
 			if (!update) {
 				console.log(
 					`Please upgrade by running ${clc.cyanBright(
-						'sfparty update',
+						updateCommand,
 					)}`,
 				)
 				return 'A newer version'

package/src/lib/fileUtils.js

@@ -44,8 +44,12 @@ export function deleteDirectory(dirPath, recursive = false, fsTmp = fs) {
 					// recurse
 					deleteDirectory(curPath, recursive, fsTmp)
 				} else {
-					// delete file
-					fsTmp.unlinkSync(curPath)
+					try {
+						// delete file
+						fsTmp.unlinkSync(curPath)
+					} catch (error) {
+						fsTmp.rmdirSync(curPath)
+					}
 				}
 			})
 			return fsTmp.rmdirSync(dirPath)

package/src/party/combine.js

@@ -116,35 +116,37 @@ export class Combine {
 		})
 
 		function processStart(that) {
-			const pathMatch = `/${that.metadataDefinition.directory}/${
-				that.#fileName.shortName
-			}/`
+			// set delta based on metadata definition if git delta enabled
+			that.#delta = that.metadataDefinition.delta && global.git.delta
 
-			// get a list of all the added files
-			that.#addedFiles = global.metaTypes[
-				that.metadataDefinition.alias
-			].add.files.filter((i) =>
-				i.toLowerCase().includes(pathMatch.toLowerCase()),
-			)
+			if (that.#delta) {
+				const pathMatch = `/${that.metadataDefinition.directory}/${
+					that.#fileName.shortName
+				}/`
 
-			// get a list of all the removed files
-			that.#deletedFiles = global.metaTypes[
-				that.metadataDefinition.alias
-			].remove.files.filter((i) =>
-				i.toLowerCase().includes(pathMatch.toLowerCase()),
-			)
+				// get a list of all the added files
+				that.#addedFiles = global.metaTypes[
+					that.metadataDefinition.alias
+				].add.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}`),
-			)
+				// get a list of all the removed files
+				that.#deletedFiles = global.metaTypes[
+					that.metadataDefinition.alias
+				].remove.files.filter((i) =>
+					i.toLowerCase().includes(pathMatch.toLowerCase()),
+				)
 
-			// set delta based on metadata definition if git delta enabled
-			that.#delta = that.metadataDefinition.delta && global.git.delta
+				// 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
@@ -456,7 +458,7 @@ export class Combine {
 
 			// abort function if doing a delta deploy and file is not in git list
 			if (
-				global.git.delta &&
+				that.#delta &&
 				!global.metaTypes[
 					that.metadataDefinition.alias
 				].add.files.includes(fileObj.fullName) &&