breadc 0.4.3 → 0.4.6

package/dist/index.cjs

@@ -59,7 +59,7 @@ const _Option = class {
   }
 };
 let Option = _Option;
-Option.OptionRE = /^(-[a-zA-Z], )?--([a-zA-Z]+)( \[[a-zA-Z]+\]| <[a-zA-Z]+>)?$/;
+Option.OptionRE = /^(-[a-zA-Z0-9], )?--([a-zA-Z0-9\-]+)( \[[a-zA-Z0-9]+\]| <[a-zA-Z0-9]+>)?$/;
 
 const _Command = class {
   constructor(format, config) {
@@ -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,
@@ -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) {
-      return await 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

@@ -117,6 +117,8 @@ 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;
+    private readonly callbacks;
+    on(event: 'pre' | 'post', fn: (option: GlobalOption) => void | Promise<void>): void;
     run(args: string[]): Promise<any>;
 }
 

package/dist/index.mjs

@@ -52,7 +52,7 @@ const _Option = class {
   }
 };
 let Option = _Option;
-Option.OptionRE = /^(-[a-zA-Z], )?--([a-zA-Z]+)( \[[a-zA-Z]+\]| <[a-zA-Z]+>)?$/;
+Option.OptionRE = /^(-[a-zA-Z0-9], )?--([a-zA-Z0-9\-]+)( \[[a-zA-Z0-9]+\]| <[a-zA-Z0-9]+>)?$/;
 
 const _Command = class {
   constructor(format, config) {
@@ -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,
@@ -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) {
-      return await 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.3",
+  "version": "0.4.6",
   "description": "Yet another Command Line Application Framework with fully strong TypeScript support",
   "keywords": [
     "cli",
@@ -45,7 +45,7 @@
     "typescript": "^4.7.4",
     "unbuild": "^0.7.4",
     "vite": "^2.9.12",
-    "vitest": "^0.15.2"
+    "vitest": "^0.16.0"
   },
   "packageManager": "pnpm@7.3.0",
   "scripts": {