breadc 0.6.1 → 0.6.4

package/dist/index.cjs

@@ -174,6 +174,8 @@ const _Command = class {
     const options = argv;
     delete options["_"];
     for (const [name, rawOption] of fullOptions) {
+      if (rawOption.type === "boolean")
+        continue;
       if (rawOption.required) {
         if (options[name] === void 0) {
           options[name] = false;
@@ -187,13 +189,12 @@ const _Command = class {
           options[name] = void 0;
         }
       }
-      if (rawOption.default !== void 0) {
-        if (options[name] === void 0 || options[name] === false) {
-          options[name] = rawOption.default;
-        }
-      }
       if (rawOption.construct !== void 0) {
         options[name] = rawOption.construct(options[name]);
+      } else if (rawOption.default !== void 0) {
+        if (options[name] === void 0 || options[name] === false || options[name] === "") {
+          options[name] = rawOption.default;
+        }
       }
     }
     for (const key of Object.keys(options)) {
@@ -418,9 +419,14 @@ class Breadc {
       }
       return map;
     }, { h: "help", v: "version" });
+    const defaultValue = allowOptions.filter((o) => o.type === "boolean" && o.default !== void 0 && o.default !== null && typeof o.default === "boolean").reduce((map, o) => {
+      map[o.name] = o.default;
+      return map;
+    }, {});
     const argv = minimist__default(args, {
       string: allowOptions.filter((o) => o.type === "string").map((o) => o.name),
       boolean: allowOptions.filter((o) => o.type === "boolean").map((o) => o.name).concat(["help", "version"]),
+      default: defaultValue,
       alias,
       "--": true,
       unknown: (t) => {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import kolorist from 'kolorist';
 import { ParsedArgs } from 'minimist';
 
-interface OptionConfig<F extends string, T = never> {
+interface OptionConfig<F extends string, T = never, O = ExtractOptionType<F>> {
     /**
      * Option description
      */
@@ -9,7 +9,7 @@ interface OptionConfig<F extends string, T = never> {
     /**
      * Option string default value
      */
-    default?: string;
+    default?: O extends boolean ? boolean : string;
     /**
      * Transform option text
      */
@@ -24,17 +24,17 @@ interface OptionConfig<F extends string, T = never> {
  * + --option <arg>
  * + --option [arg]
  */
-declare class Option<T extends string = string, F = string> {
+declare class Option<F extends string = string, T = string, O = ExtractOptionType<F>> {
     private static OptionRE;
     readonly name: string;
     readonly shortcut?: string;
-    readonly default?: string;
+    readonly default?: O extends boolean ? boolean : string;
     readonly format: string;
     readonly description: string;
     readonly type: 'string' | 'boolean';
     readonly required: boolean;
-    readonly construct?: (rawText: ExtractOptionType<T>) => F;
-    constructor(format: T, config?: OptionConfig<T, F>);
+    readonly construct?: (rawText: ExtractOptionType<F>) => T;
+    constructor(format: F, config?: OptionConfig<F, T, O>);
 }
 
 interface CommandConfig {
@@ -137,4 +137,4 @@ declare class Breadc<GlobalOption extends object = {}> {
 
 declare function breadc<T extends object = {}>(name: string, option?: AppOption): Breadc<T>;
 
-export { breadc as default };
+export { Breadc, Command, CommandConfig, Option, OptionConfig, breadc as default };

package/dist/index.mjs

@@ -167,6 +167,8 @@ const _Command = class {
     const options = argv;
     delete options["_"];
     for (const [name, rawOption] of fullOptions) {
+      if (rawOption.type === "boolean")
+        continue;
       if (rawOption.required) {
         if (options[name] === void 0) {
           options[name] = false;
@@ -180,13 +182,12 @@ const _Command = class {
           options[name] = void 0;
         }
       }
-      if (rawOption.default !== void 0) {
-        if (options[name] === void 0 || options[name] === false) {
-          options[name] = rawOption.default;
-        }
-      }
       if (rawOption.construct !== void 0) {
         options[name] = rawOption.construct(options[name]);
+      } else if (rawOption.default !== void 0) {
+        if (options[name] === void 0 || options[name] === false || options[name] === "") {
+          options[name] = rawOption.default;
+        }
       }
     }
     for (const key of Object.keys(options)) {
@@ -411,9 +412,14 @@ class Breadc {
       }
       return map;
     }, { h: "help", v: "version" });
+    const defaultValue = allowOptions.filter((o) => o.type === "boolean" && o.default !== void 0 && o.default !== null && typeof o.default === "boolean").reduce((map, o) => {
+      map[o.name] = o.default;
+      return map;
+    }, {});
     const argv = minimist(args, {
       string: allowOptions.filter((o) => o.type === "string").map((o) => o.name),
       boolean: allowOptions.filter((o) => o.type === "boolean").map((o) => o.name).concat(["help", "version"]),
+      default: defaultValue,
       alias,
       "--": true,
       unknown: (t) => {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "breadc",
-  "version": "0.6.1",
+  "version": "0.6.4",
   "description": "Yet another Command Line Application Framework with fully strong TypeScript support",
   "keywords": [
+    "breadc",
     "cli",
     "framework",
     "command-line",
@@ -40,20 +41,21 @@
   "devDependencies": {
     "@types/minimist": "^1.2.2",
     "@types/node": "^18.0.0",
-    "bumpp": "^8.2.1",
     "prettier": "^2.7.1",
-    "typescript": "^4.7.4",
-    "unbuild": "^0.7.6",
-    "vite": "^3.0.4",
-    "vitest": "^0.19.1"
+    "typescript": "^4.8.2",
+    "unbuild": "^0.8.9",
+    "vite": "^3.0.9",
+    "vitest": "^0.22.1"
   },
   "packageManager": "pnpm@7.5.2",
   "scripts": {
     "build": "unbuild",
+    "build:all": "unbuild && pnpm -r build",
     "format": "prettier --write src/**/*.ts test/*.ts examples/*.ts",
-    "release": "bumpp --commit --push --tag && pnpm publish",
+    "release": "bumpp package.json packages/*/package.json --commit --push --tag && pnpm publish && pnpm -r publish --access public",
     "test": "vitest",
     "typecheck": "tsc --noEmit",
-    "preversion": "pnpm typecheck && pnpm build"
+    "typecheck:all": "tsc --noEmit && pnpm -r typecheck",
+    "preversion": "pnpm typecheck:all && pnpm build:all"
   }
 }