@moostjs/event-cli 0.2.13 → 0.2.15

package/dist/index.cjs

@@ -99,16 +99,8 @@ 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);
+function getCliMate() {
+    return moost.getMoostMate();
 }
 
 /**
@@ -128,8 +120,13 @@ function Flag(name) {
 function Flags() {
     return moost.Resolve(() => eventCli.useFlags(), 'flags');
 }
+function formatParams(keys) {
+    const names = [keys].flat();
+    return names.map(n => n.length === 1 ? '-' + n : '--' + n);
+}
 function CliParam(keys, descr) {
-    return moost.Resolve(() => {
+    const mate = getCliMate();
+    return mate.apply(mate.decorate('cliParams', { keys, descr }, true), moost.Resolve(() => {
         const flags = eventCli.useFlags();
         const names = [keys].flat();
         const vals = [];
@@ -139,17 +136,17 @@ function CliParam(keys, descr) {
             }
         }
         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.`);
+            throw new Error(`Options ${formatParams(names).join(' and ')} are synonyms. Please use only one of them.`);
         }
         if (vals.length === 0) {
             return false;
         }
         return vals[0];
-    });
+    }, formatParams(keys).join(', ')));
 }
 
 function Cli(path) {
-    return moost.getMoostMate().decorate('handlers', { path, type: 'CLI' }, true);
+    return getCliMate().decorate('handlers', { path, type: 'CLI' }, true);
 }
 
 exports.Cli = Cli;

package/dist/index.d.ts

@@ -5,7 +5,7 @@ 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;
+export declare function CliParam(keys: string | [string, string], descr?: string): MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 
 /**
  * Get Cli Flag

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { WooksCli, createCliApp, useCliContext, useFlags } from '@wooksjs/event-cli';
 import { useEventId } from '@wooksjs/event-core';
-import { Resolve, getMoostMate } from 'moost';
+import { getMoostMate, Resolve } from 'moost';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -97,16 +97,8 @@ 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);
+function getCliMate() {
+    return getMoostMate();
 }
 
 /**
@@ -126,8 +118,13 @@ function Flag(name) {
 function Flags() {
     return Resolve(() => useFlags(), 'flags');
 }
+function formatParams(keys) {
+    const names = [keys].flat();
+    return names.map(n => n.length === 1 ? '-' + n : '--' + n);
+}
 function CliParam(keys, descr) {
-    return Resolve(() => {
+    const mate = getCliMate();
+    return mate.apply(mate.decorate('cliParams', { keys, descr }, true), Resolve(() => {
         const flags = useFlags();
         const names = [keys].flat();
         const vals = [];
@@ -137,17 +134,17 @@ function CliParam(keys, descr) {
             }
         }
         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.`);
+            throw new Error(`Options ${formatParams(names).join(' and ')} are synonyms. Please use only one of them.`);
         }
         if (vals.length === 0) {
             return false;
         }
         return vals[0];
-    });
+    }, formatParams(keys).join(', ')));
 }
 
 function Cli(path) {
-    return getMoostMate().decorate('handlers', { path, type: 'CLI' }, true);
+    return getCliMate().decorate('handlers', { path, type: 'CLI' }, true);
 }
 
 export { Cli, CliParam, Flag, Flags, MoostCli };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-cli",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "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.13",
-    "wooks": "^0.2.7",
-    "@wooksjs/event-core": "^0.2.7"
+    "moost": "0.2.15",
+    "wooks": "^0.2.8",
+    "@wooksjs/event-core": "^0.2.8"
   },
   "dependencies": {
-    "@wooksjs/event-cli": "^0.2.7"
+    "@wooksjs/event-cli": "^0.2.8"
   }
 }