@clerc/core 0.10.2 → 0.10.4

package/dist/index.cjs

@@ -320,11 +320,12 @@ const _Clerc = class {
           parameters
         );
       }
+      const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
       const context = {
         name: command == null ? void 0 : command.name,
         resolved: isCommandResolved,
         isSingleCommand: __privateGet(this, _isSingleCommand, isSingleCommand_get),
-        raw: { ...parsed, parameters },
+        raw: { ...parsed, parameters, mergedFlags },
         parameters: mapping,
         flags,
         unknownFlags: parsed.unknownFlags,

package/dist/index.d.ts

@@ -104,18 +104,27 @@ type MakeEventMap<T extends CommandRecord> = {
 };
 type PossibleInputKind = string | number | boolean | Dict<any>;
 type NonNullableParameters<T extends string[] | undefined> = T extends undefined ? [] : NonNullable<T>;
+type TransformParameters<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> = {
+    [Parameter in [...NonNullableParameters<C[N]["parameters"]>][number] as CamelCase<StripBrackets<Parameter>>]: ParameterType<Parameter>;
+};
+type TransformFlags<F extends Record<string, FlagSchema>> = {
+    [K in keyof F]: F[K]["type"] extends any[] ? F[K]["default"] extends never[] ? F[K] & {
+        default: any[];
+    } : F[K] : F[K];
+};
+type TypeFlagWithDefault<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> = TypeFlag<TransformFlags<NonNullable<C[N]["flags"]>>>;
+type Raw<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> = TypeFlagWithDefault<C, N> & {
+    parameters: string[];
+    mergedFlags: TypeFlagWithDefault<C, N>["flags"] & TypeFlagWithDefault<C, N>["unknownFlags"];
+};
 interface HandlerContext<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> {
     name?: N;
     resolved: boolean;
     isSingleCommand: boolean;
-    raw: TypeFlag<NonNullable<C[N]["flags"]>> & {
-        parameters: string[];
-    };
-    parameters: {
-        [Parameter in [...NonNullableParameters<C[N]["parameters"]>][number] as CamelCase<StripBrackets<Parameter>>]: ParameterType<Parameter>;
-    };
+    raw: Raw<C, N>;
+    parameters: TransformParameters<C, N>;
     unknownFlags: ParsedFlags["unknownFlags"];
-    flags: TypeFlag<NonNullable<C[N]["flags"]>>["flags"];
+    flags: TypeFlagWithDefault<C, N>["flags"];
     cli: Clerc<C>;
 }
 type Handler<C extends CommandRecord = CommandRecord, K extends keyof C = keyof C> = (ctx: HandlerContext<C, K>) => void;
@@ -213,8 +222,8 @@ declare class Clerc<C extends CommandRecord = {}> {
      *   })
      * ```
      */
-    command<N extends string | SingleCommandType, O extends CommandOptions<[...P], A, F>, P extends string[] = string[], A extends MaybeArray<string> = MaybeArray<string>, F extends Dict<FlagOptions> = Dict<FlagOptions>>(c: CommandWithHandler<N, O & CommandOptions<[...P], A, F>>): this & Clerc<C & Record<N, Command<N, O>>>;
-    command<N extends string | SingleCommandType, P extends string[], O extends CommandOptions<[...P]>>(name: N, description: string, options?: O & CommandOptions<[...P]>): this & Clerc<C & Record<N, Command<N, O>>>;
+    command<N extends string | SingleCommandType, O extends CommandOptions<[...P], A, F>, P extends string[] = string[], A extends MaybeArray<string> = MaybeArray<string>, F extends Dict<FlagOptions> = {}>(c: CommandWithHandler<N, O & CommandOptions<[...P], A, F>>): this & Clerc<C & Record<N, Command<N, O>>>;
+    command<N extends string | SingleCommandType, O extends CommandOptions<[...P], A, F>, P extends string[] = string[], A extends MaybeArray<string> = MaybeArray<string>, F extends Dict<FlagOptions> = {}>(name: N, description: string, options?: O & CommandOptions<[...P], A, F>): this & Clerc<C & Record<N, Command<N, O>>>;
     /**
      * Register a handler
      * @param name

package/dist/index.mjs

@@ -316,11 +316,12 @@ const _Clerc = class {
           parameters
         );
       }
+      const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
       const context = {
         name: command == null ? void 0 : command.name,
         resolved: isCommandResolved,
         isSingleCommand: __privateGet(this, _isSingleCommand, isSingleCommand_get),
-        raw: { ...parsed, parameters },
+        raw: { ...parsed, parameters, mergedFlags },
         parameters: mapping,
         flags,
         unknownFlags: parsed.unknownFlags,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/core",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "author": "Ray <nn_201312@163.com> (https://github.com/so1ve)",
   "description": "Clerc core",
   "keywords": [
@@ -32,6 +32,14 @@
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./dist/*",
+        "./dist/index.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
@@ -39,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@clerc/utils": "0.10.2",
     "is-platform": "^0.2.0",
     "lite-emit": "^1.4.0",
-    "type-flag": "^3.0.0"
+    "type-flag": "^3.0.0",
+    "@clerc/utils": "0.10.4"
   },
   "scripts": {
     "build": "puild",