@moostjs/event-cli 0.2.9 → 0.2.11

package/dist/index.cjs

@@ -42,7 +42,7 @@ class MoostCli {
         }
     }
     onInit() {
-        this.cliApp.run();
+        void this.cliApp.run();
     }
     bindHandler(opts) {
         let fn;
@@ -86,6 +86,7 @@ class MoostCli {
                             }
                         }
                     }
+                    restoreCtx();
                     // fire after interceptors
                     response = yield interceptorHandler.fireAfter(response);
                     unscope();
@@ -98,6 +99,18 @@ class MoostCli {
     }
 }
 
+const banner = () => `[${"@moostjs/event-cli"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
+
+/* istanbul ignore file */
+function logError(error) {
+    console.error('' + '' + banner() + error + '');
+}
+
+function panic(error) {
+    logError(error);
+    return new Error(error);
+}
+
 /**
  * Get Cli Flag
  * @decorator
@@ -114,6 +127,25 @@ function Flag(name) {
  */
 function Flags() {
     return moost.Resolve(() => eventCli.useFlags(), 'flags');
+}
+function CliParam(keys, descr) {
+    return moost.Resolve(() => {
+        const flags = eventCli.useFlags();
+        const names = [keys].flat();
+        const vals = [];
+        for (const name of names) {
+            if (flags[name]) {
+                vals.push(flags[name]);
+            }
+        }
+        if (vals.length > 1) {
+            throw panic(`Options ${names.map(n => n.length === 1 ? '-' + n : '--' + n).join(' and ')} are synonyms. Please use only one of them.`);
+        }
+        if (vals.length === 0) {
+            return false;
+        }
+        return vals[0];
+    });
 }
 
 function Cli(path) {
@@ -121,6 +153,7 @@ function Cli(path) {
 }
 
 exports.Cli = Cli;
+exports.CliParam = CliParam;
 exports.Flag = Flag;
 exports.Flags = Flags;
 exports.MoostCli = MoostCli;

package/dist/index.d.ts

@@ -5,20 +5,22 @@ import { WooksCli } from '@wooksjs/event-cli';
 
 export declare function Cli(path?: string): MethodDecorator;
 
+export declare function CliParam(keys: string | [string, string], descr?: string): ParameterDecorator & PropertyDecorator;
+
 /**
  * Get Cli Flag
  * @decorator
  * @param name - flag name
  * @paramType string
  */
-export declare function Flag(name: string): ParameterDecorator;
+export declare function Flag(name: string): ParameterDecorator & PropertyDecorator;
 
 /**
  * Get Cli Flags
  * @decorator
  * @paramType object
  */
-export declare function Flags(): ParameterDecorator;
+export declare function Flags(): ParameterDecorator & PropertyDecorator;
 
 export declare class MoostCli implements TMoostAdapter<TCliHandlerMeta> {
     protected cliApp: WooksCli;

package/dist/index.mjs

@@ -40,7 +40,7 @@ class MoostCli {
         }
     }
     onInit() {
-        this.cliApp.run();
+        void this.cliApp.run();
     }
     bindHandler(opts) {
         let fn;
@@ -84,6 +84,7 @@ class MoostCli {
                             }
                         }
                     }
+                    restoreCtx();
                     // fire after interceptors
                     response = yield interceptorHandler.fireAfter(response);
                     unscope();
@@ -96,6 +97,18 @@ class MoostCli {
     }
 }
 
+const banner = () => `[${"@moostjs/event-cli"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
+
+/* istanbul ignore file */
+function logError(error) {
+    console.error('' + '' + banner() + error + '');
+}
+
+function panic(error) {
+    logError(error);
+    return new Error(error);
+}
+
 /**
  * Get Cli Flag
  * @decorator
@@ -112,10 +125,29 @@ function Flag(name) {
  */
 function Flags() {
     return Resolve(() => useFlags(), 'flags');
+}
+function CliParam(keys, descr) {
+    return Resolve(() => {
+        const flags = useFlags();
+        const names = [keys].flat();
+        const vals = [];
+        for (const name of names) {
+            if (flags[name]) {
+                vals.push(flags[name]);
+            }
+        }
+        if (vals.length > 1) {
+            throw panic(`Options ${names.map(n => n.length === 1 ? '-' + n : '--' + n).join(' and ')} are synonyms. Please use only one of them.`);
+        }
+        if (vals.length === 0) {
+            return false;
+        }
+        return vals[0];
+    });
 }
 
 function Cli(path) {
     return getMoostMate().decorate('handlers', { path, type: 'CLI' }, true);
 }
 
-export { Cli, Flag, Flags, MoostCli };
+export { Cli, CliParam, Flag, Flags, MoostCli };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-cli",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "@moostjs/event-cli",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/moostjs/moostjs/tree/main/packages/event-cli#readme",
   "peerDependencies": {
-    "moost": "0.2.9",
-    "wooks": "^0.2.5",
-    "@wooksjs/event-core": "^0.2.5"
+    "moost": "0.2.11",
+    "wooks": "^0.2.6",
+    "@wooksjs/event-core": "^0.2.6"
   },
   "dependencies": {
-    "@wooksjs/event-cli": "^0.2.5"
+    "@wooksjs/event-cli": "^0.2.6"
   }
 }