node-confmanager 1.4.7 → 1.6.1

package/README.md

@@ -24,106 +24,23 @@ $ npm install node-confmanager
 
 ## Doc
 
-see the [node-containerpattern](https://www.npmjs.com/package/node-containerpattern) documentation to see extended methods & attribues
+### Inheritance
 
-### node-confmanager
+[check the official 'node-containerpattern' object documentation](https://github.com/Psychopoulet/node-containerpattern)
 
-  -- Attributes --
+### Content
 
-  * ``` filePath: string ``` conf file
-  * ``` spaces: string ``` formate file
-  * ``` shortcuts: string ``` for container
-
-  -- Constructor --
-
-  * ``` constructor(confPath?: string, spaces?: boolean, recursionSeparator?: string) ```
-
-  -- Methods --
-
-  * ``` deleteFile() : return Promise instance ``` delete the conf file
-  * ``` fileExists() : return Promise instance => then((exists) => {}) ``` check if the conf file exists
-  * ``` clearShortcuts() : return this ``` forget all the shortcuts
-  * ``` clear() : return this ``` node-containerpattern.clear & clearShortcuts
-  * ``` load() : return Promise instance ``` load data from conf file then commandline (commandline takeover)
-  * ``` save() : return Promise instance ``` save data into conf file
-  * ``` shortcut(string key, string shortkey) : return this ``` bind a shortcut for commandline
+[check the TypeScript definition file](https://github.com/Psychopoulet/node-confmanager/blob/master/lib/index.d.ts)
 
 ## Examples
 
-### Native
-
-```javascript
-const ConfManager = require("node-confmanager");
-
-const conf = new ConfManager(require("path").join(__dirname, "conf.json"));
-
-conf
-  .skeleton("debug", "boolean") // add skeleton (based on [node-containerpattern](https://www.npmjs.com/package/node-containerpattern)) to check datatype
-  .shortcut("debug", "d") // add shortcut to simply use comandline params, can add "-d true" to commandline to activate debug
-  .shortcut("usr.login", "ul")
-  .shortcut("usr.password", "up");
-
-conf.fileExists().then((exists) => {
-  
-  return exists ? Promise.resolve() : Conf.set("usr", { login : "login", pwd : "pwd" })
-      .set("debug", false)
-      .set("prod", "n") // = false
-      .save();
-
-}).then(() => {
-
-  // can add "--usr.login login2" or "-ul login2" to commandline to force login change
-  return conf.load();
-
-}).then(() => {
-
-    console.log(conf.get("debug"));
-    console.log(conf.get("usr.login"));
-
-}).catch((err) => {
-  console.log(err);
-});
-```
-
-### Typescript
-
-```typescript
-import ConfManager = require("node-confmanager");
-import { join } from "path";
-
-const Conf = new ConfManager(join(__dirname, "conf.json"));
-
-Conf
-  .skeleton("debug", "boolean").shortcut("debug", "d")
-  .shortcut("usr.login", "ul")
-  .shortcut("usr.password", "up");
-
-Conf.fileExists().then((exists: boolean) => {
-
-  return exists ? Promise.resolve() : Conf.set("usr", { login : "login", pwd : "pwd" })
-      .set("debug", false)
-      .set("prod", "n") // = false
-      .save();
-
-}).then(() => {
-
-  return Conf.load();
-
-}).then(() => {
-
-    console.log(Conf.get("debug"));
-    console.log(Conf.get("usr.login"));
-
-}).catch((err: Error) => {
-  console.log(err);
-});
-```
+[check the TypeScript compilation tests](https://github.com/Psychopoulet/node-confmanager/blob/master/test/typescript/compilation.ts)
 
 ### Run
 
 ```bash
 node mysoft.js -d
-node mysoft.js --debug
+node mysoft.js --debug # if "skeleton" is defined as a boolean
 node mysoft.js --debug "true"
 node mysoft.js --debug "yes"
 node mysoft.js --debug "y"

package/lib/index.d.ts

@@ -6,22 +6,22 @@ declare module "node-confmanager" {
 
 	class ConfManager extends Container {
 
-		public filePath: string;
-		public spaces: boolean;
-		public shortcuts: Array<string>;
+		public filePath: string; // conf file
+		public spaces: boolean; // formate file
+		public shortcuts: Array<string>; // for container
 
 		constructor(filePath?: string, spaces?: boolean, recursionSeparator?: string);
 
 		protected _loadFromConsole(): Promise<void>;
 
-		public shortcut(key: string, shortkey: string): this;
-		public clearShortcuts(): this;
-		public clear(): this;
-		public deleteFile(): Promise<void>;
-		public get(key: string): any;
-		public fileExists(): Promise<boolean>;
-		public load(): Promise<void>;
-		public save(): Promise<void>;
+		// public clear(): void; // Container.clear & clearShortcuts
+		public clearShortcuts(): this; // forget all the shortcuts
+		public deleteFile(): Promise<void>; // delete the conf file
+		public fileExists(): Promise<boolean>; // check if the conf file exists
+		// public get(key: string): any; // Container.get with cloned data
+		public load(): Promise<void>; // load data from conf file then commandline (commandline takeover)
+		public save(): Promise<void>; // save data into conf file
+		public shortcut(key: string, shortkey: string): this; // bind a shortcut for commandline
 
 	}
 

package/lib/main.js

@@ -60,19 +60,27 @@ module.exports = class ConfManager extends Container {
 				if (arg.startsWith("-")) {
 
 					const isShortcut = !arg.startsWith("--");
-
 					const argument = arg.slice(isShortcut ? 1 : 2, arg.length);
 
-					if (!isShortcut || this.shortcuts[argument]) {
+					if (argument && (!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]);
-						}
-						else if (this.skeletons[key] && "boolean" === this.skeletons[key]) {
+						if (this.skeletons[key] && "boolean" === this.skeletons[key]) {
 							this.set(key, true);
 						}
+						else if (i + 1 >= args.length) {
+							throw new ReferenceError("Missing value for \"" + argument + "\" key (no more arguments)");
+						}
+						else if (args[i + 1].startsWith("--")) {
+							throw new ReferenceError("Missing value for \"" + argument + "\" key (next argument is a valid key)");
+						}
+						else if (args[i + 1].startsWith("-") && this.shortcuts[args[i + 1].slice(1)]) {
+							throw new ReferenceError("Missing value for \"" + argument + "\" key (next argument is a valid shortcut)");
+						}
+						else {
+							this.set(key, args[i + 1]);
+						}
 
 					}
 
@@ -86,26 +94,21 @@ module.exports = class ConfManager extends Container {
 
 	}
 
-	shortcut (_key, _shortkey) {
-
-		const { key, shortkey } = checkShortcut(_key, _shortkey);
-
-		this.shortcuts[shortkey] = key;
-
-		return this;
+	// public
 
+	// Container.clear & clearShortcuts
+	clear () {
+		super.clear();
+		this.clearShortcuts();
 	}
 
+	// forget all the shortcuts
 	clearShortcuts () {
 		this.shortcuts = [];
 		return this;
 	}
 
-	clear () {
-		super.clear();
-		return this.clearShortcuts();
-	}
-
+	// delete the conf file
 	deleteFile () {
 
 		return !this.filePath ? Promise.resolve() : pathExists(this.filePath).then((exists) => {
@@ -114,10 +117,17 @@ module.exports = class ConfManager extends Container {
 
 	}
 
+	// check if the conf file exists
 	fileExists () {
 		return !this.filePath ? Promise.resolve(false) : pathExists(this.filePath);
 	}
 
+	// Container.get with cloned data
+	get (key) {
+		return clone(super.get(key));
+	}
+
+	// load data from conf file then commandline (commandline takeover)
 	load () {
 
 		this.clearData();
@@ -138,6 +148,7 @@ module.exports = class ConfManager extends Container {
 
 	}
 
+	// save data into conf file
 	save () {
 
 		return !this.filePath ? Promise.resolve() : mkdirp(dirname(this.filePath)).then(() => {
@@ -158,8 +169,15 @@ module.exports = class ConfManager extends Container {
 
 	}
 
-	get (key) {
-		return clone(super.get(key));
+	// bind a shortcut for commandline
+	shortcut (_key, _shortkey) {
+
+		const { key, shortkey } = checkShortcut(_key, _shortkey);
+
+		this.shortcuts[shortkey] = key;
+
+		return this;
+
 	}
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-confmanager",
-  "version": "1.4.7",
+  "version": "1.6.1",
   "description": "A configuration manager",
   "main": "lib/main.js",
   "typings": "lib/index.d.ts",
@@ -45,7 +45,7 @@
     "url": "https://github.com/Psychopoulet/node-confmanager/issues"
   },
   "dependencies": {
-    "node-containerpattern": "1.4.5",
+    "node-containerpattern": "1.6.0",
     "fs-extra": "10.1.0"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "husky": "8.0.1",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "typescript": "4.6.4"
+    "typescript": "4.7.2"
   },
   "homepage": "https://github.com/Psychopoulet/node-confmanager#readme",
   "engines": {