@ds-sfdc/sfparty 1.4.17 → 1.4.19

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ds-sfdc/sfparty",
-	"version": "1.4.17",
+	"version": "1.4.19",
 	"description": "Salesforce metadata XML splitter for CI/CD",
 	"type": "module",
 	"repository": {
@@ -13,7 +13,6 @@
 	"main": "src/index.js",
 	"scripts": {
 		"test": "jest",
-		"_postinstall": "husky install",
 		"prepack": "pinst --disable",
 		"postpack": "pinst --enable"
 	},

package/src/lib/gitUtils.js

@@ -160,21 +160,42 @@ export function lastCommit({
 		try {
 			const folder = path.resolve(dir, '.sfdx', 'sfparty')
 			const filePath = path.resolve(folder, fileName)
-			let lastCommit = undefined
+			let branchSpecificLastCommit
 
+			// Ensure the folder exists
 			fileUtils.createDirectory(folder)
+
 			if (existsSync(filePath)) {
 				const data = fileUtils.readFile(filePath)
-				if (data.git.lastCommit !== undefined) {
-					lastCommit = data.git.lastCommit
+
+				// Determine the current branch name
+				const currentBranch = execSync(
+					`git rev-parse --abbrev-ref HEAD`,
+					{
+						cwd: dir,
+						encoding: 'utf-8',
+					},
+				).trim()
+
+				// Check if branch-specific last commit exists
+				if (
+					data.git.branches &&
+					data.git.branches[currentBranch] !== undefined
+				) {
+					branchSpecificLastCommit = data.git.branches[currentBranch]
+				} else {
+					// Fallback to top-level lastCommit if branch-specific commit doesn't exist
+					branchSpecificLastCommit = data.git.lastCommit
 				}
 			}
+
 			const latestCommit = execSync(`git log --format=format:%H -1`, {
 				cwd: dir,
 				encoding: 'utf-8',
 			})
+
 			resolve({
-				lastCommit: lastCommit,
+				lastCommit: branchSpecificLastCommit,
 				latestCommit: latestCommit,
 			})
 		} catch (error) {

package/test/lib/git/lastCommit.spec.js

@@ -134,3 +134,30 @@ test('should throw an error when execSync returns an error', async () => {
 		expect(e.message).toBe('execSync error')
 	}
 })
+
+// Mock execSync to simulate branch detection
+jest.mock('child_process', () => ({
+	...jest.requireActual('child_process'),
+	execSync: jest.fn((command) => {
+		if (command === 'git rev-parse --abbrev-ref HEAD') {
+			return 'currentBranch' // Simulate current branch name
+		}
+		return 'testCommit' // Simulate latest commit hash
+	}),
+}))
+
+test('should throw an error when execSync returns an error', async () => {
+	jest.spyOn(child_process, 'execSync').mockImplementationOnce(() => {
+		throw new Error('execSync error')
+	})
+
+	await expect(
+		lastCommit({
+			dir: '/test',
+			fileUtils,
+			fs,
+			existsSync: fs.existsSync,
+			execSync: child_process.execSync,
+		}),
+	).rejects.toThrow('execSync error')
+})