breadc 0.4.2 → 0.4.5

package/dist/index.cjs

@@ -167,6 +167,11 @@ const _Command = class {
         }
       }
     }
+    for (const key of Object.keys(options)) {
+      if (!fullOptions.has(key)) {
+        delete options[key];
+      }
+    }
     return {
       command: this,
       arguments: argumentss,
@@ -179,7 +184,7 @@ const _Command = class {
   }
   async run(...args) {
     if (this.actionFn) {
-      this.actionFn(...args, { logger: this.logger });
+      return await this.actionFn(...args, { logger: this.logger });
     } else {
       this.logger.warn(`You may miss action function in "${this.format}"`);
     }
@@ -235,6 +240,10 @@ class Breadc {
   constructor(name, option) {
     this.options = [];
     this.commands = [];
+    this.callbacks = {
+      pre: [],
+      post: []
+    };
     this.name = name;
     this._version = option.version ?? "unknown";
     this.description = option.description;
@@ -376,10 +385,16 @@ class Breadc {
       options
     };
   }
+  on(event, fn) {
+    this.callbacks[event].push(fn);
+  }
   async run(args) {
     const parsed = this.parse(args);
     if (parsed.command) {
-      parsed.command.run(...parsed.arguments, parsed.options);
+      await Promise.all(this.callbacks.pre.map((fn) => fn(parsed.options)));
+      const returnValue = await parsed.command.run(...parsed.arguments, parsed.options);
+      await Promise.all(this.callbacks.post.map((fn) => fn(parsed.options)));
+      return returnValue;
     }
   }
 }

package/dist/index.d.ts

@@ -52,7 +52,7 @@ declare class Command<F extends string = string, CommandOption extends object =
     shouldRun(args: ParsedArgs): boolean;
     parseArgs(args: ParsedArgs, globalOptions: Option[]): ParseResult;
     action(fn: ActionFn<ExtractCommand<F>, CommandOption>): this;
-    run(...args: any[]): Promise<void>;
+    run(...args: any[]): Promise<any>;
 }
 
 interface AppOption {
@@ -93,7 +93,7 @@ declare type Push<T extends any[], U, R> = [...T, U, R];
 declare type Context = {
     logger: Logger;
 };
-declare type ActionFn<T extends any[], Option extends object = {}> = (...arg: Push<T, Option, Context>) => void;
+declare type ActionFn<T extends any[], Option extends object = {}, R = any> = (...arg: Push<T, Option, Context>) => R | Promise<R>;
 /**
  * Max Dep: 5
  *
@@ -117,7 +117,9 @@ declare class Breadc<GlobalOption extends object = {}> {
     command<F extends string>(format: F, description: string, config?: Omit<CommandConfig, 'description'>): Command<F, GlobalOption>;
     command<F extends string>(format: F, config?: CommandConfig): Command<F, GlobalOption>;
     parse(args: string[]): ParseResult;
-    run(args: string[]): Promise<void>;
+    private readonly callbacks;
+    on(event: 'pre' | 'post', fn: (option: GlobalOption) => void | Promise<void>): void;
+    run(args: string[]): Promise<any>;
 }
 
 declare function breadc(name: string, option?: AppOption): Breadc<{}>;

package/dist/index.mjs

@@ -160,6 +160,11 @@ const _Command = class {
         }
       }
     }
+    for (const key of Object.keys(options)) {
+      if (!fullOptions.has(key)) {
+        delete options[key];
+      }
+    }
     return {
       command: this,
       arguments: argumentss,
@@ -172,7 +177,7 @@ const _Command = class {
   }
   async run(...args) {
     if (this.actionFn) {
-      this.actionFn(...args, { logger: this.logger });
+      return await this.actionFn(...args, { logger: this.logger });
     } else {
       this.logger.warn(`You may miss action function in "${this.format}"`);
     }
@@ -228,6 +233,10 @@ class Breadc {
   constructor(name, option) {
     this.options = [];
     this.commands = [];
+    this.callbacks = {
+      pre: [],
+      post: []
+    };
     this.name = name;
     this._version = option.version ?? "unknown";
     this.description = option.description;
@@ -369,10 +378,16 @@ class Breadc {
       options
     };
   }
+  on(event, fn) {
+    this.callbacks[event].push(fn);
+  }
   async run(args) {
     const parsed = this.parse(args);
     if (parsed.command) {
-      parsed.command.run(...parsed.arguments, parsed.options);
+      await Promise.all(this.callbacks.pre.map((fn) => fn(parsed.options)));
+      const returnValue = await parsed.command.run(...parsed.arguments, parsed.options);
+      await Promise.all(this.callbacks.post.map((fn) => fn(parsed.options)));
+      return returnValue;
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "breadc",
-  "version": "0.4.2",
+  "version": "0.4.5",
   "description": "Yet another Command Line Application Framework with fully strong TypeScript support",
   "keywords": [
     "cli",