@ds-sfdc/sfparty 1.5.6 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ds-sfdc/sfparty",
-	"version": "1.5.6",
+	"version": "1.6.0",
 	"description": "Salesforce metadata XML splitter for CI/CD",
 	"type": "module",
 	"repository": {
@@ -22,12 +22,13 @@
 	"license": "BSD-3-Clause",
 	"dependencies": {
 		"axios": "^1.6.8",
+		"ci-info": "^4.0.0",
 		"cli-color": "^2.0.4",
 		"cli-spinners": "^2.9.2",
 		"convert-hrtime": "^5.0.0",
 		"js-yaml": "^4.1.0",
 		"log-update": "^6.0.0",
-		"marked": "^12.0.1",
+		"marked": "^12.0.2",
 		"marked-terminal": "^7.0.0",
 		"pretty-quick": "^4.0.0",
 		"semver": "^7.6.0",
@@ -39,10 +40,10 @@
 	"devDependencies": {
 		"@babel/core": "^7.24.4",
 		"@babel/preset-env": "^7.24.4",
-		"@commitlint/cli": "^19.2.2",
+		"@commitlint/cli": "^19.3.0",
 		"@commitlint/config-conventional": "^19.2.2",
 		"babel-jest": "^29.7.0",
-		"eslint": "^9.0.0",
+		"eslint": "^9.1.1",
 		"husky": "^9.0.11",
 		"jest": "^29.7.0",
 		"lint-staged": "^15.2.2",

package/src/lib/fileUtils.js

@@ -152,8 +152,8 @@ export function readFile(filePath, convert = true, fsTmp = fs) {
 			})
 			if (convert && filePath.indexOf('.yaml') != -1) {
 				result = yaml.load(data, {
-					onWarning: (warning) => {
-						throw new Error(`YAML parsing warning: ${warning}`)
+					onWarning: (warning, filePath) => {
+						throw new Error(`YAML parsing ${filePath}: ${warning}`)
 					},
 				})
 			} else if (convert && filePath.indexOf('.json') != -1) {

package/src/party/combine.js

@@ -6,6 +6,8 @@ import cliSpinners from 'cli-spinners'
 import fs from 'fs'
 import * as xml2js from 'xml2js'
 import * as fileUtils from '../lib/fileUtils.js'
+import * as cidefault from 'ci-info'
+const ci = cidefault.default
 
 const spinner = cliSpinners['dots']
 const processed = {
@@ -206,7 +208,9 @@ export class Combine {
 						that.#fileName.shortName,
 					)
 				}
-				deleteFile(that, that.#fileName.fullName)
+				try {
+					deleteFile(that, that.#fileName.fullName)
+				} catch (error) {}
 				return 'deleted'
 			}
 		}
@@ -316,29 +320,34 @@ export class Combine {
 
 				// iterate over fileList
 				fileList.forEach((file, index) => {
-					logUpdate(
-						that.#spinnerMessage
-							.replace(
-								'[%1]',
-								that.sequence
-									.toString()
-									.padStart(
-										that.total.toString().length,
-										' ',
-									),
-							)
-							.replace(
-								'[%2]',
-								`\n${clc.magentaBright(
-									nextFrame(that),
-								)} ${key} - ${index + 1} of ${
-									fileList.length
-								} - ${clc.magentaBright(file)}`,
-							)
-							.replace('[%3]', `${that.#errorMessage}`)
-							.replace('[%4]', `${global.icons.working} `)
-							.replace('[%5]', `${that.#fileName.shortName} `),
-					)
+					if (!ci.isCI) {
+						logUpdate(
+							that.#spinnerMessage
+								.replace(
+									'[%1]',
+									that.sequence
+										.toString()
+										.padStart(
+											that.total.toString().length,
+											' ',
+										),
+								)
+								.replace(
+									'[%2]',
+									`\n${clc.magentaBright(
+										nextFrame(that),
+									)} ${key} - ${index + 1} of ${
+										fileList.length
+									} - ${clc.magentaBright(file)}`,
+								)
+								.replace('[%3]', `${that.#errorMessage}`)
+								.replace('[%4]', `${global.icons.working} `)
+								.replace(
+									'[%5]',
+									`${that.#fileName.shortName} `,
+								),
+						)
+					}
 
 					const fileObj = {
 						shortName: file,
@@ -410,7 +419,30 @@ export class Combine {
 					return true
 			}
 
-			if (!fileUtils.fileExists({ filePath: fileObj.fullName, fs })) {
+			const loginIpRanges =
+				fileObj.shortName.toLowerCase() ==
+				'loginIpRanges'.toLocaleLowerCase()
+			let loginIpRangesSandboxFile
+			let loginIpRangesSandbox = false
+			if (loginIpRanges) {
+				loginIpRangesSandboxFile = fileObj.fullName.replace(
+					`.${global.format}`,
+					`-sandbox.${global.format}`,
+				)
+				loginIpRangesSandbox = fileUtils.fileExists({
+					filePath: loginIpRangesSandboxFile,
+					fs,
+				})
+			}
+			const fileExists = fileUtils.fileExists({
+				filePath: fileObj.fullName,
+				fs,
+			})
+
+			if (
+				(!fileExists && !loginIpRanges) ||
+				(loginIpRanges && !fileExists && !loginIpRangesSandbox)
+			) {
 				// File does not exist
 				// If file is main part file, then return false to indicate that the XML file should be deleted
 				if (
@@ -468,6 +500,7 @@ export class Combine {
 				!global.metaTypes[
 					that.metadataDefinition.alias
 				].add.files.includes(fileObj.fullName) &&
+				!loginIpRangesSandbox &&
 				fileObj.fullName !==
 					path.join(
 						that.sourceDir,
@@ -479,8 +512,33 @@ export class Combine {
 			}
 			let result
 			try {
-				result = fileUtils.readFile(fileObj.fullName)
+				if (loginIpRanges) {
+					let loginIpRangesResult
+					let loginIpRangesSandboxResult
+					if (fileExists)
+						loginIpRangesResult = fileUtils.readFile(
+							fileObj.fullName,
+						)
+					if (loginIpRangesSandbox)
+						loginIpRangesSandboxResult = fileUtils.readFile(
+							loginIpRangesSandboxFile,
+						)
+					if (fileExists && loginIpRangesSandbox) {
+						result = mergeIpRanges(
+							loginIpRangesResult,
+							loginIpRangesSandboxResult,
+						)
+					} else if (fileExists) {
+						result = loginIpRangesResult
+					} else if (loginIpRangesSandbox) {
+						result = loginIpRangesSandboxResult
+					}
+				} else {
+					result = fileUtils.readFile(fileObj.fullName)
+				}
 			} catch (error) {
+				logUpdate(fileObj.fullName)
+				logUpdate.done()
 				throw error
 			}
 			if (
@@ -560,6 +618,24 @@ export class Combine {
 				}
 			}
 
+			// Function to merge arrays without duplicates
+			function mergeIpRanges(array1, array2) {
+				const combined = array1
+
+				array2.loginIpRanges.forEach((item2) => {
+					if (
+						!combined.loginIpRanges.some(
+							(item1) =>
+								JSON.stringify(item1) === JSON.stringify(item2),
+						)
+					) {
+						combined.loginIpRanges.push(item2)
+					}
+				})
+
+				return combined
+			}
+
 			updateFileStats(
 				that,
 				fileObj.fullName,
@@ -612,9 +688,7 @@ export class Combine {
 				) {
 					that.#fileStats.mtime = stats.mtime
 				}
-			} catch (error) {
-				throw error
-			}
+			} catch (error) {}
 		}
 
 		function saveXML(that) {

package/src/party/split.js

@@ -63,7 +63,7 @@ export class Split {
 		let fileName = fileUtils.fileInfo(value).filename
 
 		// Use actual file name if found so it matches case sensitivity
-		let foundFile = fileUtils.getFiles(path.dirname(value), fileName)
+		const foundFile = fileUtils.getFiles(path.dirname(value), fileName)
 		if (foundFile.length > 0) fileName = path.basename(foundFile[0])
 
 		this.#fileName.shortName = fileName.replace(
@@ -94,7 +94,7 @@ export class Split {
 					that.targetDir,
 					that.#fileName.shortName,
 				)
-				let parser = new Parser()
+				const parser = new Parser()
 				const getJSON = new Promise((resolve, reject) => {
 					fs.readFile(that.metaFilePath, function (err, data) {
 						parser.parseString(data, function (err, result) {
@@ -126,9 +126,7 @@ export class Split {
 						].xmlns.replace('http:', 'https:')
 					} catch (error) {
 						global.logger.error(
-							`${
-								that.#fileName.fullName
-							} has an invalid XML root`,
+							`${that.#fileName.fullName} has an invalid XML root`,
 						)
 						resolve(false)
 						return
@@ -136,9 +134,24 @@ export class Split {
 
 					// modify the json to remove unwanted arrays
 					that.#json = transformJSON(that, result, that.#root)
+					const sandboxLoginIpRange = fileUtils.readFile(
+						path.join(that.targetDir, 'loginIpRanges-sandbox.yaml'),
+					)
+
 					fileUtils.deleteDirectory(that.targetDir, true) // recursive delete existing directory
 					fileUtils.createDirectory(that.targetDir) // create directory
 
+					if (sandboxLoginIpRange) {
+						fileUtils.saveFile(
+							sandboxLoginIpRange,
+							path.join(
+								that.targetDir,
+								'loginIpRanges-sandbox.yaml',
+							),
+							'yaml',
+						)
+					}
+
 					try {
 						processJSON(
 							that,
@@ -217,8 +230,8 @@ export class Split {
 		}
 
 		function Main(that) {
-			let fileName = path.join(that.targetDir, `main.${global.format}`)
-			let mainInfo = {
+			const fileName = path.join(that.targetDir, `main.${global.format}`)
+			const mainInfo = {
 				main: {},
 			}
 			mainInfo.main.name = that.#fileName.shortName
@@ -255,9 +268,9 @@ export class Split {
 		}
 
 		function completeFile(that) {
-			let executionTime = getTimeDiff(BigInt(that.#startTime))
-			let durationMessage = `${executionTime.seconds}.${executionTime.milliseconds}s`
-			let stateIcon =
+			const executionTime = getTimeDiff(BigInt(that.#startTime))
+			const durationMessage = `${executionTime.seconds}.${executionTime.milliseconds}s`
+			const stateIcon =
 				that.#errorMessage == ''
 					? global.icons.success
 					: global.icons.fail
@@ -333,7 +346,7 @@ function processFile(that, json, key, baseDir, fileNameOverride) {
 }
 
 function transformJSON(that, result, rootTag) {
-	let jsonString = JSON.stringify(result, (name, value) => {
+	const jsonString = JSON.stringify(result, (name, value) => {
 		if (Object.keys(that.metadataDefinition.sortKeys).includes(name)) {
 			return value
 		} else {
@@ -426,7 +439,7 @@ function xml2json(currentValue) {
 
 function getTimeDiff(startTime, endTime = process.hrtime.bigint()) {
 	const diff = BigInt(endTime) - BigInt(startTime)
-	let executionTime = convertHrtime(diff)
+	const executionTime = convertHrtime(diff)
 	executionTime.seconds = Math.round(executionTime.seconds)
 	executionTime.milliseconds = Math.round(executionTime.milliseconds / 1000)
 	if (executionTime.milliseconds == 0 && executionTime.nanoseconds > 0)