clerc 0.9.1 → 0.9.2

package/dist/index.cjs

@@ -267,9 +267,10 @@ const _Clerc = class {
         throw new SubcommandExistsError(splitedName.join(" "));
       }
     }
-    __privateGet(this, _commands)[name] = !isCommandObject ? { name, description, ...options } : nameOrCommand;
-    if (isCommandObject && nameOrCommand.handler) {
-      this.on(nameOrCommand.name, nameOrCommand.handler);
+    const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
+    __privateGet(this, _commands)[name] = commandToSave;
+    if (isCommandObject && handler) {
+      this.on(nameOrCommand.name, handler);
     }
     return this;
   }
@@ -365,7 +366,6 @@ const definePlugin = (p) => p;
 const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (c) => c;
-const defineCommandWithHandler = (c) => c;
 
 exports.Clerc = Clerc;
 exports.CommandExistsError = CommandExistsError;
@@ -380,7 +380,6 @@ exports.SingleCommandError = SingleCommandError;
 exports.SubcommandExistsError = SubcommandExistsError;
 exports.compose = compose;
 exports.defineCommand = defineCommand;
-exports.defineCommandWithHandler = defineCommandWithHandler;
 exports.defineHandler = defineHandler;
 exports.defineInspector = defineInspector;
 exports.definePlugin = definePlugin;

package/dist/index.d.ts

@@ -103,30 +103,28 @@ type MakeEventMap<T extends CommandRecord> = {
     [K in keyof T]: [InspectorContext];
 };
 type PossibleInputKind = string | number | boolean | Dict<any>;
-type NonNullableFlag<T extends Dict<FlagOptions> | undefined> = T extends undefined ? {} : NonNullable<T>;
 type NonNullableParameters<T extends string[] | undefined> = T extends undefined ? [] : NonNullable<T>;
 interface HandlerContext<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> {
     name?: N;
     resolved: boolean;
     isSingleCommand: boolean;
-    raw: TypeFlag<NonNullableFlag<C[N]["flags"]>> & {
+    raw: TypeFlag<NonNullable<C[N]["flags"]>> & {
         parameters: string[];
     };
     parameters: {
         [Parameter in [...NonNullableParameters<C[N]["parameters"]>][number] as CamelCase<StripBrackets<Parameter>>]: ParameterType<Parameter>;
     };
     unknownFlags: ParsedFlags["unknownFlags"];
-    flags: TypeFlag<NonNullableFlag<C[N]["flags"]>>["flags"];
+    flags: TypeFlag<NonNullable<C[N]["flags"]>>["flags"];
     cli: Clerc<C>;
 }
 type Handler<C extends CommandRecord = CommandRecord, K extends keyof C = keyof C> = (ctx: HandlerContext<C, K>) => void;
 type HandlerInCommand<C extends CommandRecord = CommandRecord, K extends keyof C = keyof C> = (ctx: HandlerContext<C, K> & {
     name: K;
-    flags: Exclude<TypeFlag<NonNullableFlag<C[K]["flags"]>>["flags"], Record<string, never>>;
 }) => void;
 type FallbackType<T, U> = {} extends T ? U : T;
 type InspectorContext<C extends CommandRecord = CommandRecord> = HandlerContext<C> & {
-    flags: FallbackType<TypeFlag<NonNullableFlag<C[keyof C]["flags"]>>["flags"], Dict<any>>;
+    flags: FallbackType<TypeFlag<NonNullable<C[keyof C]["flags"]>>["flags"], Dict<any>>;
 };
 type Inspector<C extends CommandRecord = CommandRecord> = (ctx: InspectorContext<C>, next: () => void) => void;
 interface Plugin<T extends Clerc = Clerc, U extends Clerc = Clerc> {
@@ -273,8 +271,7 @@ declare class Clerc<C extends CommandRecord = {}> {
 declare const definePlugin: <T extends Clerc<{}>, U extends Clerc<{}>>(p: Plugin<T, U>) => Plugin<T, U>;
 declare const defineHandler: <C extends Clerc<{}>, K extends keyof C["_commands"]>(_cli: C, _key: K, handler: Handler<C["_commands"], K>) => Handler<C["_commands"], K>;
 declare const defineInspector: <C extends Clerc<{}>>(_cli: C, inspector: Inspector<C["_commands"]>) => Inspector<C["_commands"]>;
-declare const defineCommand: <N extends string | typeof SingleCommand, P extends string[], O extends CommandOptions<[...P], MaybeArray<string>, Dict<FlagOptions>>>(c: Command<N, O>) => Command<N, O>;
-declare const defineCommandWithHandler: <N extends string | typeof SingleCommand, 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>>) => CommandWithHandler<N, O & CommandOptions<[...P], A, F>>;
+declare const defineCommand: <N extends string | typeof SingleCommand, 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>>) => CommandWithHandler<N, O & CommandOptions<[...P], A, F>>;
 
 declare class SingleCommandError extends Error {
     constructor();
@@ -320,4 +317,4 @@ interface ParsedParameter {
 declare function parseParameters(parameters: string[]): ParsedParameter[];
 declare function mapParametersToArguments(mapping: Record<string, string | string[]>, parameters: ParsedParameter[], cliArguments: string[]): undefined;
 
-export { Clerc, Command, CommandAlias, CommandCustomProperties, CommandExistsError, CommandNameConflictError, CommandOptions, CommandRecord, CommandWithHandler, CommonCommandExistsError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, HandlerInCommand, Inspector, InspectorContext, MakeEventMap, MultipleCommandsMatchedError, NoSuchCommandError, ParentCommandExistsError, Plugin, PossibleInputKind, SingleCommand, SingleCommandAliasError, SingleCommandError, SingleCommandType, SubcommandExistsError, compose, defineCommand, defineCommandWithHandler, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, Command, CommandAlias, CommandCustomProperties, CommandExistsError, CommandNameConflictError, CommandOptions, CommandRecord, CommandWithHandler, CommonCommandExistsError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, HandlerInCommand, Inspector, InspectorContext, MakeEventMap, MultipleCommandsMatchedError, NoSuchCommandError, ParentCommandExistsError, Plugin, PossibleInputKind, SingleCommand, SingleCommandAliasError, SingleCommandError, SingleCommandType, SubcommandExistsError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.mjs

@@ -263,9 +263,10 @@ const _Clerc = class {
         throw new SubcommandExistsError(splitedName.join(" "));
       }
     }
-    __privateGet(this, _commands)[name] = !isCommandObject ? { name, description, ...options } : nameOrCommand;
-    if (isCommandObject && nameOrCommand.handler) {
-      this.on(nameOrCommand.name, nameOrCommand.handler);
+    const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
+    __privateGet(this, _commands)[name] = commandToSave;
+    if (isCommandObject && handler) {
+      this.on(nameOrCommand.name, handler);
     }
     return this;
   }
@@ -361,6 +362,5 @@ const definePlugin = (p) => p;
 const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (c) => c;
-const defineCommandWithHandler = (c) => c;
 
-export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, MultipleCommandsMatchedError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, compose, defineCommand, defineCommandWithHandler, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, MultipleCommandsMatchedError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clerc",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "author": "Ray <nn_201312@163.com> (https://github.com/so1ve)",
   "description": "Clerc is a simple and easy-to-use cli framework.",
   "keywords": [
@@ -42,7 +42,7 @@
     "is-platform": "^0.2.0",
     "lite-emit": "^1.4.0",
     "type-flag": "^3.0.0",
-    "@clerc/utils": "0.9.1"
+    "@clerc/utils": "0.9.2"
   },
   "scripts": {
     "build": "puild",