@ds-sfdc/sfparty 1.7.0 → 1.7.1

package/manifest/destructiveChanges-party.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="https://soap.sforce.com/2006/04/metadata">
+  <version>56.0</version>
+</Package>

package/manifest/package-party.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="https://soap.sforce.com/2006/04/metadata">
+  <types>
+    <members>Experience_Profile_Manager</members>
+    <name>PermissionSet</name>
+  </types>
+  <version>56.0</version>
+</Package>

package/package.json

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

package/src/index.js

@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 'use strict'
 import { spawnSync, spawn, execSync } from 'child_process'
+import { argv, env } from 'process'
+import { fileURLToPath } from 'url'
+import { dirname, resolve } from 'path'
+import { createRequire } from 'module'
 import fs from 'fs'
 import path from 'path'
 import yargs from 'yargs'
@@ -26,6 +30,8 @@ import * as git from './lib/gitUtils.js'
 import * as packageUtil from './lib/packageUtil.js'
 
 const processStartTime = process.hrtime.bigint()
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 marked.setOptions({
 	// Define custom renderer
@@ -101,6 +107,8 @@ global.metaTypes = {
 	},
 }
 
+global.runType = null
+
 let types = []
 const packageDir = getRootPath()
 
@@ -117,6 +125,33 @@ displayHeader() // display header mast
 
 let checkYargs = false
 
+const isRunningUnderNpx = () => {
+	const npxIndicator = argv.some((arg) => arg.includes('_npx'))
+	const initCwd = env.INIT_CWD
+	return npxIndicator || initCwd !== undefined
+}
+
+const isRunningDirectlyWithNode = async () => {
+	const require = createRequire(import.meta.url)
+	const modulePath = resolve(__dirname, 'index.js')
+	const mainModulePath = process.argv[1]
+
+	const { main } = await import('module')
+	return modulePath === mainModulePath
+}
+
+const checkExecutionContext = async () => {
+	if (isRunningUnderNpx()) {
+		global.runType = 'npx'
+	} else if (await isRunningDirectlyWithNode()) {
+		global.runType = 'node'
+	} else {
+		global.runType = 'global'
+	}
+}
+
+checkExecutionContext()
+
 yargs(hideBin(process.argv))
 	.command({
 		command: 'help',

package/src/lib/checkVersion.js

@@ -30,7 +30,7 @@ export async function checkVersion({
 }) {
 	let result
 	try {
-		let { data } = await axios.get(
+		const { data } = await axios.get(
 			'https://registry.npmjs.org/@ds-sfdc/sfparty',
 			{
 				params: {
@@ -44,10 +44,16 @@ export async function checkVersion({
 	}
 
 	let updateCommand
-	if (process.env.npm_lifecycle_script === 'sfparty') {
-		updateCommand = 'npm i @ds-sfdc/sfparty@latest'
-	} else {
-		updateCommand = 'sfparty update'
+	switch (global.runType) {
+		case 'global':
+			updateCommand = 'sfparty update'
+			break
+		case 'npx':
+			updateCommand = 'npm i @ds-sfdc/sfparty@latest'
+			break
+		case 'node':
+			updateCommand = 'git pull'
+			break
 	}
 
 	if (result !== undefined) {
@@ -65,7 +71,7 @@ export async function checkVersion({
 				)
 				return 'A newer version'
 			} else {
-				let command = 'npm i -g @ds-sfdc/sfparty@latest'.split(' ')
+				const command = 'npm i -g @ds-sfdc/sfparty@latest'.split(' ')
 				console.log(
 					`Updating the application using ${clc.cyanBright(
 						command.join(' '),

package/src/meta/Profiles.js

@@ -79,7 +79,12 @@ export const metadataDefinition = {
 		],
 		pageAccesses: ['apexPage', 'enabled'],
 		profileActionOverrides: ['pageOrSobjectType'], // TODO
-		recordTypeVisibilities: ['recordType', 'visible'],
+		recordTypeVisibilities: [
+			'recordType',
+			'default',
+			'visible',
+			'personAccountDefault',
+		],
 		tabVisibilities: ['tab', 'visibility'],
 		userPermissions: ['name', 'enabled'],
 	},

package/test/lib/checkVersion.spec.js

@@ -4,92 +4,192 @@ import clc from 'cli-color'
 import { checkVersion } from '../../src/lib/checkVersion.js'
 
 global.icons = {
-    "success": clc.greenBright('✔'),
-    "fail": '❗',
-    "working": '⏳',
+	success: clc.greenBright('✔'),
+	fail: '❗',
+	working: '⏳',
 }
 
+global.runType = null
+
 jest.mock('axios')
 jest.mock('child_process', () => ({ spawnSync: jest.fn() }))
 
 describe('checkVersion', () => {
-    let spy
-    beforeEach(() => {
-        jest.clearAllMocks()
-        spy = jest.spyOn(console, 'log')
-    })
-    afterEach(() => {
-        spy.mockRestore()
-    })
+	let spy
+	beforeEach(() => {
+		jest.clearAllMocks()
+		spy = jest.spyOn(console, 'log')
+	})
+	afterEach(() => {
+		spy.mockRestore()
+	})
+
+	it(
+		'should return "A newer version" if a newer version is available',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '2.0.0' } },
+			})
+			const result = await checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: '1.0.0',
+			})
+			expect(result).toBe('A newer version')
+		},
+		{ silent: true },
+	)
+
+	it(
+		'should return "You are on the latest version" if the current version is the latest version',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '1.0.0' } },
+			})
+			const result = await checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: '1.0.0',
+			})
+			expect(result).toBe('You are on the latest version')
+		},
+		{ silent: true },
+	)
+
+	it(
+		'should throw a NpmNotInstalledError if npm is not installed',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '2.0.0' } },
+			})
+			spawnSync.mockReturnValue({
+				status: 1,
+				stderr: { toString: () => 'command not found' },
+			})
+			try {
+				await checkVersion({
+					axios,
+					spawnSync,
+					currentVersion: '1.0.0',
+					update: true,
+				})
+			} catch (err) {
+				expect(err.name).toBe('NpmNotInstalledError')
+				expect(err.message).toBe(
+					'npm is not installed on this system. Please install npm and run the command again.',
+				)
+			}
+		},
+		{ silent: true },
+	)
 
-    it('should return "A newer version" if a newer version is available', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '2.0.0' } } })
-        const result = await checkVersion({axios, spawnSync, currentVersion: '1.0.0'})
-        expect(result).toBe('A newer version')
-    }, { silent: true })
+	it(
+		'should throw a PackageNotFoundError if the package is not found on the npm registry',
+		async () => {
+			axios.get.mockRejectedValue({ response: { status: 404 } })
+			try {
+				await checkVersion({
+					axios,
+					spawnSync,
+					currentVersion: '1.0.0',
+				})
+			} catch (err) {
+				expect(err.name).toBe('PackageNotFoundError')
+				expect(err.message).toBe(
+					'Package not found on the npm registry',
+				)
+			}
+		},
+		{ silent: true },
+	)
 
-    it('should return "You are on the latest version" if the current version is the latest version', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '1.0.0' } } })
-        const result = await checkVersion({axios, spawnSync, currentVersion: '1.0.0'})
-        expect(result).toBe('You are on the latest version')
-    }, { silent: true })
+	it(
+		'should throw a UpdateError if an error occurs while updating the package',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '2.0.0' } },
+			})
+			spawnSync.mockReturnValue({
+				status: 1,
+				stderr: { toString: () => 'Update error' },
+			})
+			try {
+				await checkVersion({
+					axios,
+					spawnSync,
+					currentVersion: '1.0.0',
+					update: true,
+				})
+			} catch (err) {
+				expect(err.name).toBe('UpdateError')
+				expect(err.message).toBe('Error updating the application.')
+			}
+		},
+		{ silent: true },
+	)
 
-    it('should throw a NpmNotInstalledError if npm is not installed', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '2.0.0' } } })
-        spawnSync.mockReturnValue({ status: 1, stderr: { toString: () => 'command not found' } })
-        try {
-            await checkVersion({axios, spawnSync, currentVersion: '1.0.0', update: true})
-        } catch (err) {
-            expect(err.name).toBe('NpmNotInstalledError')
-            expect(err.message).toBe('npm is not installed on this system. Please install npm and run the command again.')
-        }
-    }, { silent: true })
+	it(
+		'should throw a UpdateError if update.status !== 0',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '2.0.0' } },
+			})
+			spawnSync.mockImplementationOnce(() => ({ status: 0 }))
+			spawnSync.mockImplementationOnce(() => ({
+				status: 1,
+				stderr: { toString: () => 'Update error' },
+			}))
+			try {
+				await checkVersion({
+					axios,
+					spawnSync,
+					currentVersion: '1.0.0',
+					update: true,
+				})
+			} catch (err) {
+				expect(err.name).toBe('UpdateError')
+				expect(err.message).toBe('Error updating the application.')
+			}
+		},
+		{ silent: true },
+	)
 
-    it('should throw a PackageNotFoundError if the package is not found on the npm registry', async () => {
-        axios.get.mockRejectedValue({ response: { status: 404 } });
-        try {
-            await checkVersion({axios, spawnSync, currentVersion: '1.0.0'});
-        } catch (err) {
-            expect(err.name).toBe('PackageNotFoundError');
-            expect(err.message).toBe('Package not found on the npm registry');
-        }
-    }, { silent: true });
-    
-    it('should throw a UpdateError if an error occurs while updating the package', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '2.0.0' } } });
-        spawnSync.mockReturnValue({ status: 1, stderr: { toString: () => 'Update error' } });
-        try {
-            await checkVersion({axios, spawnSync, currentVersion: '1.0.0', update: true});
-        } catch (err) {
-            expect(err.name).toBe('UpdateError');
-            expect(err.message).toBe('Error updating the application.');
-        }
-    }, { silent: true });
+	it(
+		'should log "You are on the latest version" if update flag is true and the current version is the latest version',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '1.0.0' } },
+			})
+			await checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: '1.0.0',
+				update: true,
+			})
+			expect(console.log).toHaveBeenCalledWith(
+				`${global.icons.success} You are on the latest version.`,
+			)
+		},
+		{ silent: true },
+	)
 
-    it('should throw a UpdateError if update.status !== 0', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '2.0.0' } } });
-        spawnSync.mockImplementationOnce(() => ({ status: 0 }));
-        spawnSync.mockImplementationOnce(() => ({ status: 1, stderr: { toString: () => 'Update error' } }));
-        try {
-            await checkVersion({axios, spawnSync, currentVersion: '1.0.0', update: true});
-        } catch (err) {
-            expect(err.name).toBe('UpdateError');
-            expect(err.message).toBe('Error updating the application.');
-        }
-    }, { silent: true });
-    
-    
-    it('should log "You are on the latest version" if update flag is true and the current version is the latest version', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '1.0.0' } } });
-        await checkVersion({axios, spawnSync, currentVersion: '1.0.0', update: true});
-        expect(console.log).toHaveBeenCalledWith(`${global.icons.success} You are on the latest version.`);
-    }, { silent: true });
-    
-    it('should log "Application updated successfully." after successful update', async () => {
-        axios.get.mockResolvedValue({ data: { 'dist-tags': { latest: '2.0.0' } } });
-        spawnSync.mockReturnValue({ status: 0 });
-        await checkVersion({axios, spawnSync, currentVersion: '1.0.0', update: true});
-        expect(console.log).toHaveBeenCalledWith("Application updated successfully.");
-    }, { silent: true });
-    
+	it(
+		'should log "Application updated successfully." after successful update',
+		async () => {
+			axios.get.mockResolvedValue({
+				data: { 'dist-tags': { latest: '2.0.0' } },
+			})
+			spawnSync.mockReturnValue({ status: 0 })
+			await checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: '1.0.0',
+				update: true,
+			})
+			expect(console.log).toHaveBeenCalledWith(
+				'Application updated successfully.',
+			)
+		},
+		{ silent: true },
+	)
 })