@ds-sfdc/sfparty 1.4.16 → 1.4.18

package/package.json

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

package/src/lib/gitUtils.js

@@ -1,5 +1,6 @@
 import path from 'path'
 import * as os from 'node:os'
+import { execSync } from 'child_process'
 
 const defaultDefinition = {
 	git: {
@@ -159,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) {
@@ -187,10 +209,12 @@ export function updateLastCommit({ dir, latest, fileUtils, fs }) {
 		throw new Error(
 			`updateLastCommit received a ${typeof latest} instead of string`,
 		)
+
 	if (latest !== undefined) {
 		const folder = path.join(dir, '.sfdx', 'sfparty')
 		const fileName = path.join(folder, 'index.yaml')
 		let data = undefined
+
 		if (fileUtils.fileExists({ filePath: fileName, fs })) {
 			data = fileUtils.readFile(fileName)
 		}
@@ -199,7 +223,20 @@ export function updateLastCommit({ dir, latest, fileUtils, fs }) {
 			data = defaultDefinition
 		}
 
-		data.git.lastCommit = latest
+		// Determine the current branch name
+		const currentBranch = execSync(`git rev-parse --abbrev-ref HEAD`, {
+			cwd: dir,
+			encoding: 'utf-8',
+		}).trim()
+
+		// Initialize branches object if not exist
+		if (!data.git.branches) {
+			data.git.branches = {}
+		}
+
+		// Update the last commit for the current branch
+		data.git.branches[currentBranch] = latest
+
 		fileUtils.saveFile(data, fileName)
 	}
 }

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')
+})

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

@@ -1,6 +1,6 @@
-import path from 'path'
 import * as fileUtils from '../../../src/lib/fileUtils.js'
 import { updateLastCommit } from '../../../src/lib/gitUtils.js'
+import { execSync } from 'child_process'
 
 let dir, latest
 
@@ -33,41 +33,37 @@ it('should not update lastCommit property if latest is undefined', () => {
 	expect(fileUtils.saveFile).not.toHaveBeenCalled()
 })
 
-it('should update lastCommit property in index.yaml file', () => {
-	// mock the fileExists method of fileUtils
+jest.mock('child_process', () => ({
+	...jest.requireActual('child_process'), // This line ensures that other child_process methods are still available as normal
+	execSync: jest.fn().mockReturnValue('mock-branch'),
+}))
+
+// Then in your test:
+it('should update lastCommit property in index.yaml for the current branch', () => {
 	fileUtils.fileExists = jest.fn(() => true)
-	// mock the readFile method of fileUtils
 	fileUtils.readFile = jest.fn(() => ({
-		git: { lastCommit: '1111111111abcdef' },
+		git: { branches: { 'mock-branch': '1111111111abcdef' } },
 	}))
-	// mock the saveFile method of fileUtils
 	fileUtils.saveFile = jest.fn()
+
 	updateLastCommit({ dir, latest, fileUtils })
-	expect(fileUtils.readFile).toHaveBeenCalled()
+
 	expect(fileUtils.saveFile).toHaveBeenCalledWith(
-		{ git: { lastCommit: latest } },
+		{ git: { branches: { 'mock-branch': latest } } },
 		'/test/directory/.sfdx/sfparty/index.yaml',
 	)
 })
 
-it('should use existing index.yaml if it exists', () => {
-	fileUtils.fileExists = jest.fn(() => false)
-	fileUtils.readFile = jest.fn()
-	fileUtils.saveFile = jest.fn()
-	updateLastCommit({ dir, latest, fileUtils })
-	expect(fileUtils.fileExists).toHaveBeenCalled()
-	expect(fileUtils.readFile).not.toHaveBeenCalled()
-	expect(fileUtils.saveFile).toHaveBeenCalled()
-})
-
-it('should save the default definition if file does not exist', () => {
+it('should save the default definition with branches object if file does not exist', () => {
+	jest.mock('child_process', () => ({
+		execSync: jest.fn().mockReturnValue('mock-branch'),
+	}))
 	fileUtils.fileExists = jest.fn(() => false)
-	fileUtils.readFile = jest.fn()
 	fileUtils.saveFile = jest.fn()
 
-	const defaultDefinition = {
+	const defaultDefinitionWithBranches = {
 		git: {
-			lastCommit: latest,
+			branches: { 'mock-branch': latest },
 		},
 		local: {
 			lastDate: undefined,
@@ -75,10 +71,9 @@ it('should save the default definition if file does not exist', () => {
 	}
 
 	updateLastCommit({ dir, latest, fileUtils })
-	expect(fileUtils.fileExists).toHaveBeenCalled()
-	expect(fileUtils.readFile).not.toHaveBeenCalled()
+
 	expect(fileUtils.saveFile).toHaveBeenCalledWith(
-		defaultDefinition,
+		defaultDefinitionWithBranches,
 		'/test/directory/.sfdx/sfparty/index.yaml',
 	)
 })