node-confmanager 1.4.2 → 1.4.5

package/lib/main.js

@@ -6,7 +6,7 @@
 	const { dirname, join } = require("path");
 
 	// externals
-	const { isFileProm, mkdirpProm, readJSONFileProm, unlinkProm, writeJSONFileProm } = require("node-promfs");
+	const { pathExists, mkdirp, readJson, unlink, writeJson } = require("fs-extra");
 	const Container = require("node-containerpattern");
 
 	// locals
@@ -55,45 +55,33 @@ module.exports = class ConfManager extends Container {
 
 		return Promise.resolve().then(() => {
 
-			const args = (0, process).argv.slice(2, (0, process).argv.length);
+			(0, process).argv.slice(2, (0, process).argv.length).forEach((arg, i, args) => {
 
-			return !args.length ? Promise.resolve() : new Promise((resolve) => {
+				if (arg.startsWith("-")) {
 
-				for (let i = 0; i < args.length; ++i) {
+					const isShortcut = !arg.startsWith("--");
 
-					if (0 === args[i].indexOf("-")) {
+					const argument = arg.slice(isShortcut ? 1 : 2, arg.length);
 
-						const isShortcut = -1 >= args[i].indexOf("--");
+					if (!isShortcut || this.shortcuts[argument]) {
 
-						const argument = args[i].slice(isShortcut ? 1 : 2, args[i].length);
-
-						if (!isShortcut || this.shortcuts[argument]) {
-
-							const key = isShortcut ? this.shortcuts[argument] : argument;
-
-							if (i + 1 < args.length && -1 >= args[i + 1].indexOf("--")) {
-
-								this.set(key, args[i + 1]);
-								++i;
-
-							}
-							else if (this.skeletons[key] && "boolean" === this.skeletons[key]) {
-
-								this.set(key, true);
-								++i;
-
-							}
+						const key = isShortcut ? this.shortcuts[argument] : argument;
 
+						if (i + 1 < args.length && -1 >= args[i + 1].indexOf("--")) {
+							this.set(key, args[i + 1]);
+						}
+						else if (this.skeletons[key] && "boolean" === this.skeletons[key]) {
+							this.set(key, true);
 						}
 
 					}
 
 				}
 
-				resolve();
-
 			});
 
+			return Promise.resolve();
+
 		});
 
 	}
@@ -119,11 +107,15 @@ module.exports = class ConfManager extends Container {
 	}
 
 	deleteFile () {
-		return !this.filePath ? Promise.resolve() : unlinkProm(this.filePath);
+
+		return !this.filePath ? Promise.resolve() : pathExists(this.filePath).then((exists) => {
+			return exists ? unlink(this.filePath) : Promise.resolve();
+		});
+
 	}
 
 	fileExists () {
-		return !this.filePath ? Promise.resolve(false) : isFileProm(this.filePath);
+		return !this.filePath ? Promise.resolve(false) : pathExists(this.filePath);
 	}
 
 	load () {
@@ -132,7 +124,7 @@ module.exports = class ConfManager extends Container {
 
 		return this.fileExists().then((exists) => {
 
-			return !exists ? this._loadFromConsole() : readJSONFileProm(this.filePath, "utf8").then((data) => {
+			return !exists ? this._loadFromConsole() : readJson(this.filePath, "utf8").then((data) => {
 
 				for (const key in data) {
 					this.set(key, data[key]);
@@ -148,21 +140,19 @@ module.exports = class ConfManager extends Container {
 
 	save () {
 
-		return !this.filePath ? Promise.resolve() : mkdirpProm(dirname(this.filePath)).then(() => {
+		return !this.filePath ? Promise.resolve() : mkdirp(dirname(this.filePath)).then(() => {
 
 			const objects = {};
 			this.forEach((value, key) => {
 				objects[key] = value;
 			});
 
-			return this.spaces ?
-				writeJSONFileProm(this.filePath, objects, {
-					"encoding": "utf8",
-					"space": 2
-				}) :
-				writeJSONFileProm(this.filePath, objects, {
-					"encoding": "utf8"
-				});
+			return this.spaces ? writeJson(this.filePath, objects, {
+				"encoding": "utf8",
+				"space": 2
+			}) : writeJson(this.filePath, objects, {
+				"encoding": "utf8"
+			});
 
 		});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-confmanager",
-  "version": "1.4.2",
+  "version": "1.4.5",
   "description": "A configuration manager",
   "main": "lib/main.js",
   "typings": "lib/index.d.ts",
@@ -45,18 +45,18 @@
     "url": "https://github.com/Psychopoulet/node-confmanager/issues"
   },
   "dependencies": {
-    "node-containerpattern": "1.4.2",
-    "node-promfs": "3.7.0"
+    "node-containerpattern": "1.4.3",
+    "fs-extra": "10.1.0"
   },
   "devDependencies": {
-    "@types/node": "14.14.35",
-    "typescript": "4.2.3",
-    "check-version-modules": "1.3.0",
-    "coveralls": "3.1.0",
-    "eslint": "7.22.0",
-    "husky": "5.1.3",
-    "mocha": "8.3.2",
-    "nyc": "15.1.0"
+    "@types/node": "17.0.35",
+    "check-version-modules": "1.3.5",
+    "coveralls": "3.1.1",
+    "eslint": "8.15.0",
+    "husky": "8.0.1",
+    "mocha": "10.0.0",
+    "nyc": "15.1.0",
+    "typescript": "4.6.4"
   },
   "homepage": "https://github.com/Psychopoulet/node-confmanager#readme",
   "engines": {