clerc 0.8.0 → 0.8.2

package/dist/index.cjs

@@ -53,11 +53,7 @@ class CommandNameConflictError extends Error {
   }
 }
 
-function resolveCommand(commands, name) {
-  if (name === SingleCommand) {
-    return commands[SingleCommand];
-  }
-  const nameArr = utils.mustArray(name);
+function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
   for (const command of Object.values(commands)) {
     if (command.alias) {
@@ -66,11 +62,19 @@ function resolveCommand(commands, name) {
         if (alias in commands) {
           throw new CommandNameConflictError(commands[alias].name, command.name);
         }
-        commandsMap.set(alias.split(" "), command);
+        commandsMap.set(alias.split(" "), { ...command, __isAlias: true });
       }
     }
     commandsMap.set(command.name.split(" "), command);
   }
+  return commandsMap;
+}
+function resolveCommand(commands, name) {
+  if (name === SingleCommand) {
+    return commands[SingleCommand];
+  }
+  const nameArr = utils.mustArray(name);
+  const commandsMap = resolveFlattenCommands(commands);
   const possibleCommands = [];
   commandsMap.forEach((v, k) => {
     if (utils.arrayStartsWith(nameArr, k)) {
@@ -384,6 +388,7 @@ exports.mapParametersToArguments = mapParametersToArguments;
 exports.parseParameters = parseParameters;
 exports.resolveArgv = resolveArgv;
 exports.resolveCommand = resolveCommand;
+exports.resolveFlattenCommands = resolveFlattenCommands;
 exports.resolveParametersBeforeFlag = resolveParametersBeforeFlag;
 exports.resolveRootCommands = resolveRootCommands;
 exports.resolveSubcommandsByParent = resolveSubcommandsByParent;

package/dist/index.d.ts

@@ -89,6 +89,9 @@ type Command<N extends string | SingleCommandType = string, O extends CommandOpt
     name: N;
     description: string;
 };
+type CommandAlias<N extends string | SingleCommandType = string, O extends CommandOptions = CommandOptions> = Command<N, O> & {
+    __isAlias?: true;
+};
 type CommandWithHandler<N extends string | SingleCommandType = string, O extends CommandOptions = CommandOptions> = Command<N, O> & {
     handler?: HandlerInCommand<Record<N, Command<N, O>>, N>;
 };
@@ -299,6 +302,7 @@ declare class CommandNameConflictError extends Error {
     constructor(n1: string, n2: string);
 }
 
+declare function resolveFlattenCommands(commands: CommandRecord): Map<string[], CommandAlias<string, CommandOptions<string[], _clerc_utils.MaybeArray<string>, _clerc_utils.Dict<FlagOptions>>>>;
 declare function resolveCommand(commands: CommandRecord, name: string | string[] | SingleCommandType): Command | undefined;
 declare function resolveSubcommandsByParent(commands: CommandRecord, parent: string | string[], depth?: number): Command<string, CommandOptions<string[], _clerc_utils.MaybeArray<string>, _clerc_utils.Dict<FlagOptions>>>[];
 declare const resolveRootCommands: (commands: CommandRecord) => Command<string, CommandOptions<string[], _clerc_utils.MaybeArray<string>, _clerc_utils.Dict<FlagOptions>>>[];
@@ -314,4 +318,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, 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, 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, defineCommandWithHandler, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.mjs

@@ -49,11 +49,7 @@ class CommandNameConflictError extends Error {
   }
 }
 
-function resolveCommand(commands, name) {
-  if (name === SingleCommand) {
-    return commands[SingleCommand];
-  }
-  const nameArr = mustArray(name);
+function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
   for (const command of Object.values(commands)) {
     if (command.alias) {
@@ -62,11 +58,19 @@ function resolveCommand(commands, name) {
         if (alias in commands) {
           throw new CommandNameConflictError(commands[alias].name, command.name);
         }
-        commandsMap.set(alias.split(" "), command);
+        commandsMap.set(alias.split(" "), { ...command, __isAlias: true });
       }
     }
     commandsMap.set(command.name.split(" "), command);
   }
+  return commandsMap;
+}
+function resolveCommand(commands, name) {
+  if (name === SingleCommand) {
+    return commands[SingleCommand];
+  }
+  const nameArr = mustArray(name);
+  const commandsMap = resolveFlattenCommands(commands);
   const possibleCommands = [];
   commandsMap.forEach((v, k) => {
     if (arrayStartsWith(nameArr, k)) {
@@ -359,4 +363,4 @@ 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, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+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 };

package/package.json

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