@ds-sfdc/sfparty 1.4.3 → 1.4.5

package/package.json

@@ -1,64 +1,64 @@
 {
-  "name": "@ds-sfdc/sfparty",
-  "version": "1.4.3",
-  "description": "Salesforce metadata XML splitter for CI/CD",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/TimPaulaskasDS/sfparty.git"
-  },
-  "bin": {
-    "sfparty": "src/index.js"
-  },
-  "main": "src/index.js",
-  "scripts": {
-    "test": "jest",
-    "_postinstall": "husky install",
-    "prepack": "pinst --disable",
-    "postpack": "pinst --enable"
-  },
-  "keywords": [
-    "salesforce,metadata,xml,split,yaml,json"
-  ],
-  "author": "Tim Paulaskas",
-  "license": "BSD-3-Clause",
-  "dependencies": {
-    "axios": "^1.2.2",
-    "cli-color": "^2.0.3",
-    "cli-spinners": "^2.7.0",
-    "convert-hrtime": "^5.0.0",
-    "js-yaml": "^4.1.0",
-    "log-update": "^5.0.1",
-    "marked": "^4.2.12",
-    "marked-terminal": "^5.1.1",
-    "pinst": "^3.0.0",
-    "pretty-quick": "^3.1.3",
-    "semver": "^7.3.8",
-    "util": "^0.10.3",
-    "winston": "^3.8.2",
-    "xml2js": "^0.4.23",
-    "yargs": "^17.6.2"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/preset-env": "^7.20.2",
-    "@commitlint/cli": "^17.4.0",
-    "@commitlint/config-conventional": "^17.4.0",
-    "babel-jest": "^29.3.1",
-    "husky": "^8.0.3",
-    "jest": "^29.3.1",
-    "nodemon": "^2.0.20",
-    "prettier": "^2.8.3"
-  },
-  "engines": {
-    "node": ">=0.11"
-  },
-  "bugs": {
-    "url": "https://github.com/TimPaulaskasDS/sfparty/issues"
-  },
-  "homepage": "https://github.com/TimPaulaskasDS/sfparty#readme",
-  "directories": {
-    "lib": "lib",
-    "test": "tests"
-  }
+	"name": "@ds-sfdc/sfparty",
+	"version": "1.4.5",
+	"description": "Salesforce metadata XML splitter for CI/CD",
+	"type": "module",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/TimPaulaskasDS/sfparty.git"
+	},
+	"bin": {
+		"sfparty": "src/index.js"
+	},
+	"main": "src/index.js",
+	"scripts": {
+		"test": "jest",
+		"_postinstall": "husky install",
+		"prepack": "pinst --disable",
+		"postpack": "pinst --enable"
+	},
+	"keywords": [
+		"salesforce,metadata,xml,split,yaml,json"
+	],
+	"author": "Tim Paulaskas",
+	"license": "BSD-3-Clause",
+	"dependencies": {
+		"axios": "^1.2.2",
+		"cli-color": "^2.0.3",
+		"cli-spinners": "^2.7.0",
+		"convert-hrtime": "^5.0.0",
+		"js-yaml": "^4.1.0",
+		"log-update": "^5.0.1",
+		"marked": "^4.2.12",
+		"marked-terminal": "^5.1.1",
+		"pinst": "^3.0.0",
+		"pretty-quick": "^3.1.3",
+		"semver": "^7.3.8",
+		"util": "^0.10.3",
+		"winston": "^3.8.2",
+		"xml2js": "^0.4.23",
+		"yargs": "^17.6.2"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.20.12",
+		"@babel/preset-env": "^7.20.2",
+		"@commitlint/cli": "^17.4.0",
+		"@commitlint/config-conventional": "^17.4.0",
+		"babel-jest": "^29.3.1",
+		"husky": "^8.0.3",
+		"jest": "^29.3.1",
+		"nodemon": "^2.0.20",
+		"prettier": "^2.8.3"
+	},
+	"engines": {
+		"node": ">=0.11"
+	},
+	"bugs": {
+		"url": "https://github.com/TimPaulaskasDS/sfparty/issues"
+	},
+	"homepage": "https://github.com/TimPaulaskasDS/sfparty#readme",
+	"directories": {
+		"lib": "lib",
+		"test": "tests"
+	}
 }

package/src/index.js

@@ -350,7 +350,11 @@ function yargCheck(argv, options) {
 			!options.array.includes(key),
 	)
 
-	if (!argv._.includes('update')) {
+	if (
+		!argv._.includes('update') &&
+		!argv._.includes('combine') &&
+		!argv._.includes('split')
+	) {
 		checkVersion({
 			axios,
 			spawnSync,
@@ -452,6 +456,12 @@ function splitHandler(argv, startTime) {
 				let message = `Split completed in `
 				displayMessageAndDuration(startTime, message)
 			}
+			checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: pkgObj.version,
+				update: false,
+			})
 		}
 	})
 }
@@ -598,9 +608,15 @@ function combineHandler(argv, startTime) {
 				desPkg.savePackage(xml2js, fileUtils)
 			}
 			if (argv.type === undefined || argv.type.split(',').length > 1) {
-				let message = `Split completed in `
+				let message = `Combine completed in `
 				displayMessageAndDuration(startTime, message)
 			}
+			checkVersion({
+				axios,
+				spawnSync,
+				currentVersion: pkgObj.version,
+				update: false,
+			})
 		}
 	})
 	combine.catch((error) => {

package/src/lib/checkVersion.js

@@ -28,8 +28,9 @@ export async function checkVersion({
 	currentVersion,
 	update = false,
 }) {
+	let result
 	try {
-		const { data } = await axios.get(
+		let { data } = await axios.get(
 			'https://registry.npmjs.org/@ds-sfdc/sfparty',
 			{
 				params: {
@@ -37,9 +38,15 @@ export async function checkVersion({
 				},
 			},
 		)
-		const latestVersion = data['dist-tags'].latest
+		result = data
+	} catch (error) {
+		// do not display errors
+	}
+
+	if (result !== undefined) {
+		const latestVersion = result['dist-tags'].latest
 		if (semver.gt(latestVersion, currentVersion)) {
-			const version = clc.bgMagenta(data['dist-tags'].latest)
+			const version = clc.bgMagenta(result['dist-tags'].latest)
 			const icon = update ? global.icons.working : global.icons.fail
 			console.log()
 			console.log(`${icon} A newer version ${version} is available.`)
@@ -85,12 +92,5 @@ export async function checkVersion({
 			}
 			return 'You are on the latest version'
 		}
-	} catch (error) {
-		if (error.response && error.response.status === 404) {
-			error = new PackageNotFoundError(
-				'Package not found on the npm registry',
-			)
-		}
-		throw error
 	}
 }