@ds-sfdc/sfparty 1.3.7 → 1.3.9

package/src/lib/checkVersion.js

@@ -2,73 +2,95 @@ import clc from 'cli-color'
 import semver from 'semver'
 
 class NpmNotInstalledError extends Error {
-    constructor(message) {
-        super(message)
-        this.name = "NpmNotInstalledError"
-    }
+	constructor(message) {
+		super(message)
+		this.name = 'NpmNotInstalledError'
+	}
 }
 
 class PackageNotFoundError extends Error {
-    constructor(message) {
-        super(message)
-        this.name = "PackageNotFoundError"
-    }
+	constructor(message) {
+		super(message)
+		this.name = 'PackageNotFoundError'
+	}
 }
 
 class UpdateError extends Error {
-    constructor(message) {
-        super(message)
-        this.name = "UpdateError"
-    }
+	constructor(message) {
+		super(message)
+		this.name = 'UpdateError'
+	}
 }
 
-export async function checkVersion({axios, spawnSync, currentVersion, update = false}) {
-    try {
-        const { data } = await axios.get('https://registry.npmjs.org/@ds-sfdc/sfparty', {
-            params: {
-                field: 'dist-tags.latest'
-            }
-        })
-        const latestVersion = data['dist-tags'].latest
-        if (semver.gt(latestVersion, currentVersion)) {
-            let icon
-            const version = clc.bgCyanBright(data['dist-tags'].latest)
-            if (update) {
-                icon = global.icons.working
-            } else {
-                icon = global.icons.fail
-            }
-            console.log(`${icon} A newer version ${version} is available.`)
-            if (!update) {
-                console.log(`Please upgrade by running ${clc.cyanBright('sfparty update')}`)
-                return 'A newer version'
-            } else {
-                let command = 'npm i -g @ds-sfdc/sfparty@latest'.split(' ')
-                console.log(`Updating the application using ${clc.cyanBright(command.join(' '))}`)
-                try {
-                    const npmVersion = spawnSync('npm', ['-v'])
-                    if (npmVersion.stderr && npmVersion.stderr.toString().trim() === 'command not found') {
-                        throw new NpmNotInstalledError("npm is not installed on this system. Please install npm and run the command again.")
-                    }
-                    const update = spawnSync(command[0], command.slice(1))
-                    if (update.status !== 0) {
-                        throw new UpdateError("Error updating the application.")
-                    }
-                    console.log("Application updated successfully.")
-                } catch (err) {
-                    throw err
-                }
-            }
-        } else {
-            if (update) {
-                console.log(`${global.icons.success} You are on the latest version.`)
-            }
-            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
-    }
-}
+export async function checkVersion({
+	axios,
+	spawnSync,
+	currentVersion,
+	update = false,
+}) {
+	try {
+		const { data } = await axios.get(
+			'https://registry.npmjs.org/@ds-sfdc/sfparty',
+			{
+				params: {
+					field: 'dist-tags.latest',
+				},
+			},
+		)
+		const latestVersion = data['dist-tags'].latest
+		if (semver.gt(latestVersion, currentVersion)) {
+			const version = clc.bgCyanBright(data['dist-tags'].latest)
+			const icon = update ? global.icons.working : global.icons.fail
+			console.log()
+			console.log(`${icon} A newer version ${version} is available.`)
+			if (!update) {
+				console.log(
+					`Please upgrade by running ${clc.cyanBright(
+						'sfparty update',
+					)}`,
+				)
+				return 'A newer version'
+			} else {
+				let command = 'npm i -g @ds-sfdc/sfparty@latest'.split(' ')
+				console.log(
+					`Updating the application using ${clc.cyanBright(
+						command.join(' '),
+					)}`,
+				)
+				try {
+					const npmVersion = spawnSync('npm', ['-v'])
+					if (
+						npmVersion.stderr &&
+						npmVersion.stderr.toString().trim() ===
+							'command not found'
+					) {
+						throw new NpmNotInstalledError(
+							'npm is not installed on this system. Please install npm and run the command again.',
+						)
+					}
+					const update = spawnSync(command[0], command.slice(1))
+					if (update.status !== 0) {
+						throw new UpdateError('Error updating the application.')
+					}
+					console.log('Application updated successfully.')
+				} catch (err) {
+					throw err
+				}
+			}
+		} else {
+			if (update) {
+				console.log(
+					`${global.icons.success} You are on the latest version.`,
+				)
+			}
+			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
+	}
+}

package/src/lib/fileUtils.js

@@ -5,193 +5,212 @@ import * as yaml from 'js-yaml'
 import { Parser } from 'xml2js'
 
 export function directoryExists(dirPath, fsTmp = fs) {
-    return fsTmp.existsSync(dirPath) && fsTmp.statSync(dirPath).isDirectory()
+	return fsTmp.existsSync(dirPath) && fsTmp.statSync(dirPath).isDirectory()
 }
 
 export function fileExists(filePath, fsTmp = fs) {
-    return fsTmp.existsSync(filePath) && fsTmp.statSync(filePath).isFile()
+	return fsTmp.existsSync(filePath) && fsTmp.statSync(filePath).isFile()
 }
 
 export function createDirectory(dirPath, fsTmp = fs) {
-    if (!fsTmp.existsSync(dirPath)) {
-        fsTmp.mkdirSync(dirPath, { recursive: true })
-    }
+	if (!fsTmp.existsSync(dirPath)) {
+		fsTmp.mkdirSync(dirPath, { recursive: true })
+	}
 }
 
 export function deleteDirectory(dirPath, recursive = false, fsTmp = fs) {
-    if (!directoryExists(dirPath, fsTmp)) {
-        return false
-    } else {
-        if (fsTmp.existsSync(dirPath)) {
-            fsTmp.readdirSync(dirPath).forEach(function (file) {
-                var curPath = path.join(dirPath, file)
-                if (fsTmp.lstatSync(curPath).isDirectory() && recursive) { // recurse
-                    deleteDirectory(curPath, recursive, fsTmp);
-                } else { // delete file
-                    fsTmp.unlinkSync(curPath);
-                }
-            })
-            return fsTmp.rmdirSync(dirPath);
-        }
-    }
+	if (!directoryExists(dirPath, fsTmp)) {
+		return false
+	} else {
+		if (fsTmp.existsSync(dirPath)) {
+			fsTmp.readdirSync(dirPath).forEach(function (file) {
+				var curPath = path.join(dirPath, file)
+				if (fsTmp.lstatSync(curPath).isDirectory() && recursive) {
+					// recurse
+					deleteDirectory(curPath, recursive, fsTmp)
+				} else {
+					// delete file
+					fsTmp.unlinkSync(curPath)
+				}
+			})
+			return fsTmp.rmdirSync(dirPath)
+		}
+	}
 }
 
 export function getFiles(dirPath, filter = undefined, fsTmp = fs) {
-    const filesList = []
-    if (directoryExists(dirPath, fsTmp)) {
-        fsTmp.readdirSync(dirPath).forEach(file => {
-            if (!filter) {
-                filesList.push(file)
-            } else {
-                if (file.toLocaleLowerCase().endsWith(filter.toLocaleLowerCase())) {
-                    filesList.push(file)
-                }
-            }
-        })
-        filesList.sort()
-        return filesList
-    } else {
-        return []
-    }
+	const filesList = []
+	if (directoryExists(dirPath, fsTmp)) {
+		fsTmp.readdirSync(dirPath).forEach((file) => {
+			if (!filter) {
+				filesList.push(file)
+			} else {
+				if (
+					file
+						.toLocaleLowerCase()
+						.endsWith(filter.toLocaleLowerCase())
+				) {
+					filesList.push(file)
+				}
+			}
+		})
+		filesList.sort()
+		return filesList
+	} else {
+		return []
+	}
 }
 
 export function getDirectories(dirPath, fsTmp = fs) {
-    if (directoryExists(dirPath, fsTmp)) {
-        return fsTmp.readdirSync(dirPath, { withFileTypes: true })
-            .filter(dirent => dirent.isDirectory())
-            .map(dirent => dirent.name)
-    } else {
-        return []
-    }
+	if (directoryExists(dirPath, fsTmp)) {
+		return fsTmp
+			.readdirSync(dirPath, { withFileTypes: true })
+			.filter((dirent) => dirent.isDirectory())
+			.map((dirent) => dirent.name)
+	} else {
+		return []
+	}
 }
 
 export function deleteFile(filePath, fsTmp = fs) {
-    if (!fileExists(filePath, fsTmp)) {
-        return false
-    } else {
-        return fsTmp.unlinkSync(filePath, { recursive: false, force: true });
-    }
+	if (!fileExists(filePath, fsTmp)) {
+		return false
+	} else {
+		return fsTmp.unlinkSync(filePath, { recursive: false, force: true })
+	}
 }
 
 export function fileInfo(filePath, fsTmp = fs) {
-    return {
-        "dirname": path.join(path.dirname(filePath)), //something/folder/example
-        "basename": path.basename(filePath, path.extname(filePath)), //example
-        "filename": path.basename(filePath), //example.txt
-        "extname": path.extname(filePath), //txt
-        "exists": fsTmp.existsSync(filePath), //true if exists or false if not exists
-        "stats": fsTmp.existsSync(filePath) ? fsTmp.statSync(filePath) : undefined //stats object if exists or undefined if not exists
-    }
+	return {
+		dirname: path.join(path.dirname(filePath)), //something/folder/example
+		basename: path.basename(filePath, path.extname(filePath)), //example
+		filename: path.basename(filePath), //example.txt
+		extname: path.extname(filePath), //txt
+		exists: fsTmp.existsSync(filePath), //true if exists or false if not exists
+		stats: fsTmp.existsSync(filePath)
+			? fsTmp.statSync(filePath)
+			: undefined, //stats object if exists or undefined if not exists
+	}
 }
 
-export function saveFile(json, fileName, format = path.extname(fileName).replace('.', ''), fsTmp = fs) {
-    try {
-        switch (format) {
-            case 'json':
-                let jsonString = JSON.stringify(json, null, '\t')
-                fsTmp.writeFileSync(fileName, jsonString)
-                break
-            case 'yaml':
-                let doc = yaml.dump(json)
-                fsTmp.writeFileSync(fileName, doc)
-                break
-        }
-        return true
-    } catch (error) {
-        global.logger.error(error)
-        throw error
-    }
+export function saveFile(
+	json,
+	fileName,
+	format = path.extname(fileName).replace('.', ''),
+	fsTmp = fs,
+) {
+	try {
+		switch (format) {
+			case 'json':
+				let jsonString = JSON.stringify(json, null, '\t')
+				fsTmp.writeFileSync(fileName, jsonString)
+				break
+			case 'yaml':
+				let doc = yaml.dump(json)
+				fsTmp.writeFileSync(fileName, doc)
+				break
+		}
+		return true
+	} catch (error) {
+		global.logger.error(error)
+		throw error
+	}
 }
 
 export function readFile(fileName, convert = true, fsTmp = fs) {
-    try {
-        let result = undefined
-        if (fileExists(fileName, fsTmp)) {
-            const data = fsTmp.readFileSync(fileName, { encoding: 'utf8', flag: 'r' })
-            if (convert && fileName.indexOf('.yaml') != -1) {
-                result = yaml.load(data)
-            } else if (convert && fileName.indexOf('.json') != -1) {
-                result = JSON.parse(data)
-            } else if (convert && fileName.indexOf('.xml') != -1) {
-                // returns a promise
-                result = convertXML(data)
-            } else {
-                result = data
-            }
-            return result
-        } else {
-            return undefined
-        }
-    } catch (error) {
-        global.logger.error(error)
-        throw error
-    }
+	try {
+		let result = undefined
+		if (fileExists(fileName, fsTmp)) {
+			const data = fsTmp.readFileSync(fileName, {
+				encoding: 'utf8',
+				flag: 'r',
+			})
+			if (convert && fileName.indexOf('.yaml') != -1) {
+				result = yaml.load(data)
+			} else if (convert && fileName.indexOf('.json') != -1) {
+				result = JSON.parse(data)
+			} else if (convert && fileName.indexOf('.xml') != -1) {
+				// returns a promise
+				result = convertXML(data)
+			} else {
+				result = data
+			}
+			return result
+		} else {
+			return undefined
+		}
+	} catch (error) {
+		global.logger.error(error)
+		throw error
+	}
 }
 
 async function convertXML(data) {
-    return new Promise((resolve, reject) => {
-        try {
-            let parser = new Parser()
-            parser.parseString(data, function (err, result) {
-                if (err) throw err
-                resolve(result)
-            })
-        } catch (error) {
-            reject(error)
-        }
-    })
+	return new Promise((resolve, reject) => {
+		try {
+			let parser = new Parser()
+			parser.parseString(data, function (err, result) {
+				if (err) throw err
+				resolve(result)
+			})
+		} catch (error) {
+			reject(error)
+		}
+	})
 }
 
-export function writeFile(fileName, data, atime = new Date(), mtime = new Date(), fsTmp = fs) {
-    try {
-        // write data to the file
-        fsTmp.writeFileSync(fileName, data)
-
-        // if atime or mtime are undefined, use current date/time
-        if (atime === undefined) atime = new Date()
-        if (mtime === undefined) mtime = new Date()
-
-        // update XML file to match the latest atime and mtime of the files processed
-        fsTmp.utimesSync(fileName, atime, mtime)
-
-    } catch (error) {
-        global.logger.error(error)
-        throw error
-    }
+export function writeFile(
+	fileName,
+	data,
+	atime = new Date(),
+	mtime = new Date(),
+	fsTmp = fs,
+) {
+	try {
+		// write data to the file
+		fsTmp.writeFileSync(fileName, data)
+
+		// if atime or mtime are undefined, use current date/time
+		if (atime === undefined) atime = new Date()
+		if (mtime === undefined) mtime = new Date()
+
+		// update XML file to match the latest atime and mtime of the files processed
+		fsTmp.utimesSync(fileName, atime, mtime)
+	} catch (error) {
+		global.logger.error(error)
+		throw error
+	}
 }
 
 export function find(filename, root, fsTmp = fs) {
-    // code Copyright (c) 2014, Ben Gourley
-    // https://github.com/bengourley/find-nearest-file
-    root = root || process.cwd();
-
-    if (!filename) throw new Error('filename is required')
-
-    if (filename.indexOf('/') !== -1 || filename === '..') {
-        throw new Error('filename must be just a filename and not a path')
-    }
-
-
-    function findFile(directory, filename) {
-
-        var file = path.join(directory, filename)
-
-        try {
-            if (fsTmp.statSync(file).isFile()) return file
-            // stat existed, but isFile() returned false
-            return nextLevelUp()
-        } catch (e) {
-            // stat did not exist
-            return nextLevelUp()
-        }
-
-        function nextLevelUp() {
-            // Don't proceed to the next directory when already at the fs root
-            if (directory === path.resolve('/')) return null
-            return findFile(path.dirname(directory), filename)
-        }
-
-    }
-
-    return findFile(root, filename)
-}
+	// code Copyright (c) 2014, Ben Gourley
+	// https://github.com/bengourley/find-nearest-file
+	root = root || process.cwd()
+
+	if (!filename) throw new Error('filename is required')
+
+	if (filename.indexOf('/') !== -1 || filename === '..') {
+		throw new Error('filename must be just a filename and not a path')
+	}
+
+	function findFile(directory, filename) {
+		var file = path.join(directory, filename)
+
+		try {
+			if (fsTmp.statSync(file).isFile()) return file
+			// stat existed, but isFile() returned false
+			return nextLevelUp()
+		} catch (e) {
+			// stat did not exist
+			return nextLevelUp()
+		}
+
+		function nextLevelUp() {
+			// Don't proceed to the next directory when already at the fs root
+			if (directory === path.resolve('/')) return null
+			return findFile(path.dirname(directory), filename)
+		}
+	}
+
+	return findFile(root, filename)
+}