@clerc/core 0.24.0 → 0.25.1

package/dist/index.d.ts

@@ -1,5 +1,6 @@
+import { LiteralUnion, OmitIndexSignature } from 'type-fest';
 import * as _clerc_utils from '@clerc/utils';
-import { Dict, MaybeArray as MaybeArray$1, Equals, CamelCase, LiteralUnion } from '@clerc/utils';
+import { Dict, MaybeArray as MaybeArray$1, Equals, CamelCase } from '@clerc/utils';
 
 declare const DOUBLE_DASH = "--";
 type TypeFunction<ReturnType = any> = (value: any) => ReturnType;
@@ -109,27 +110,31 @@ type NonNullableParameters<T extends string[] | undefined> = T extends undefined
 type TransformParameters<C extends Command> = {
     [Parameter in NonNullableParameters<C["parameters"]>[number] as CamelCase<StripBrackets<Parameter>>]: ParameterType<Parameter>;
 };
-type TypeFlagWithDefault<C extends Command> = TypeFlag<NonNullable<C["flags"]>>;
-type Raw<C extends Command> = TypeFlagWithDefault<C> & {
+type FallbackFlags<C extends Command> = Equals<NonNullableFlag<C>["flags"], {}> extends true ? Dict<any> : NonNullableFlag<C>["flags"];
+type NonNullableFlag<C extends Command> = TypeFlag<NonNullable<C["flags"]>>;
+type ParseFlag<C extends CommandRecord, N extends keyof C> = N extends keyof C ? OmitIndexSignature<NonNullableFlag<C[N]>["flags"]> : FallbackFlags<C[N]>["flags"];
+type ParseRaw<C extends Command> = NonNullableFlag<C> & {
+    flags: FallbackFlags<C>;
     parameters: string[];
-    mergedFlags: TypeFlagWithDefault<C>["flags"] & TypeFlagWithDefault<C>["unknownFlags"];
+    mergedFlags: FallbackFlags<C> & NonNullableFlag<C>["unknownFlags"];
 };
+type ParseParameters<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> = Equals<TransformParameters<C[N]>, {}> extends true ? N extends keyof C ? TransformParameters<C[N]> : Dict<string | string[] | undefined> : TransformParameters<C[N]>;
 interface HandlerContext<C extends CommandRecord = CommandRecord, N extends keyof C = keyof C> {
-    name?: N;
+    name?: LiteralUnion<N, string>;
     called?: string | RootType;
     resolved: boolean;
     hasRootOrAlias: boolean;
     hasRoot: boolean;
     raw: {
-        [K in keyof Raw<C[N]>]: Raw<C[N]>[K];
+        [K in keyof ParseRaw<C[N]>]: ParseRaw<C[N]>[K];
     };
-    parameters: Equals<{
-        [K in keyof TransformParameters<C[N]>]: TransformParameters<C[N]>[K];
-    }, {}> extends true ? Dict<string | string[] | undefined> : {
-        [K in keyof TransformParameters<C[N]>]: TransformParameters<C[N]>[K];
+    parameters: {
+        [K in keyof ParseParameters<C, N>]: ParseParameters<C, N>[K];
     };
     unknownFlags: ParsedFlags["unknownFlags"];
-    flags: Equals<TypeFlagWithDefault<C[N]>["flags"], {}> extends true ? Dict<any> : TypeFlagWithDefault<C[N]>["flags"];
+    flags: {
+        [K in keyof ParseFlag<C, N>]: ParseFlag<C, N>[K];
+    };
     cli: Clerc<C>;
 }
 type Handler<C extends CommandRecord = CommandRecord, K extends keyof C = keyof C> = (ctx: HandlerContext<C, K>) => void;

package/dist/index.js

@@ -276,7 +276,8 @@ const _Clerc = class {
     }
     const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
     const nameList = [commandToSave.name];
-    commandToSave.alias && nameList.push(...toArray(commandToSave.alias));
+    const aliasList = commandToSave.alias ? toArray(commandToSave.alias) : [];
+    commandToSave.alias && nameList.push(...aliasList);
     for (const name2 of nameList) {
       if (__privateGet(this, _usedNames).has(name2)) {
         throw new CommandExistsError(formatCommandName(name2));
@@ -284,7 +285,7 @@ const _Clerc = class {
     }
     __privateGet(this, _commands)[name] = commandToSave;
     __privateGet(this, _usedNames).add(commandToSave.name);
-    (toArray(commandToSave.alias) || []).forEach((a) => __privateGet(this, _usedNames).add(a));
+    aliasList.forEach((a) => __privateGet(this, _usedNames).add(a));
     isCommandObject && handler && this.on(nameOrCommand.name, handler);
     return this;
   }

package/dist/index.mjs

@@ -276,7 +276,8 @@ const _Clerc = class {
     }
     const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
     const nameList = [commandToSave.name];
-    commandToSave.alias && nameList.push(...toArray(commandToSave.alias));
+    const aliasList = commandToSave.alias ? toArray(commandToSave.alias) : [];
+    commandToSave.alias && nameList.push(...aliasList);
     for (const name2 of nameList) {
       if (__privateGet(this, _usedNames).has(name2)) {
         throw new CommandExistsError(formatCommandName(name2));
@@ -284,7 +285,7 @@ const _Clerc = class {
     }
     __privateGet(this, _commands)[name] = commandToSave;
     __privateGet(this, _usedNames).add(commandToSave.name);
-    (toArray(commandToSave.alias) || []).forEach((a) => __privateGet(this, _usedNames).add(a));
+    aliasList.forEach((a) => __privateGet(this, _usedNames).add(a));
     isCommandObject && handler && this.on(nameOrCommand.name, handler);
     return this;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/core",
-  "version": "0.24.0",
+  "version": "0.25.1",
   "author": "Ray <nn_201312@163.com> (https://github.com/so1ve)",
   "description": "Clerc core",
   "keywords": [
@@ -49,8 +49,9 @@
   "dependencies": {
     "is-platform": "^0.2.0",
     "lite-emit": "^1.4.0",
+    "type-fest": "^3.5.3",
     "type-flag": "^3.0.0",
-    "@clerc/utils": "0.24.0"
+    "@clerc/utils": "0.25.1"
   },
   "scripts": {
     "build": "puild",