@clerc/core 0.17.3 → 0.19.0

package/dist/index.d.ts

@@ -69,6 +69,7 @@ type TypeFlag<Schemas extends Flags> = ParsedFlags<{
     [flag in keyof Schemas]: InferFlagType<Schemas[flag]>;
 }>;
 
+type CommandType = SingleCommandType | string;
 type FlagOptions = FlagSchema & {
     description?: string;
 };
@@ -305,15 +306,6 @@ declare class NoSuchCommandError extends Error {
 declare class NoCommandGivenError extends Error {
     constructor();
 }
-declare class ParentCommandExistsError extends Error {
-    constructor(name: string);
-}
-declare class SubcommandExistsError extends Error {
-    constructor(name: string);
-}
-declare class MultipleCommandsMatchedError extends Error {
-    constructor(name: string);
-}
 declare class CommandNameConflictError extends Error {
     constructor(n1: string, n2: string);
 }
@@ -336,7 +328,8 @@ declare function resolveSubcommandsByParent(commands: CommandRecord, parent: str
 declare const resolveRootCommands: (commands: CommandRecord) => Command<string, CommandOptions<string[], _clerc_utils.MaybeArray<string>, _clerc_utils.Dict<FlagOptions>>>[];
 declare function resolveParametersBeforeFlag(argv: string[], isSingleCommand: boolean): string[];
 declare const resolveArgv: () => string[];
-declare function compose(inspectors: Inspector[]): (getCtx: () => InspectorContext) => void;
+declare function compose(inspectors: Inspector[]): (getCtx: () => InspectorContext) => void;
+declare const isInvalidName: (name: CommandType) => boolean;
 
 interface ParsedParameter {
     name: string;
@@ -346,4 +339,4 @@ interface ParsedParameter {
 declare function parseParameters(parameters: string[]): ParsedParameter[];
 declare function mapParametersToArguments(mapping: Record<string, string | string[]>, parameters: ParsedParameter[], cliArguments: string[]): Error | undefined;
 
-export { Clerc, Command, CommandAlias, CommandCustomProperties, CommandExistsError, CommandNameConflictError, CommandOptions, CommandRecord, CommandWithHandler, CommonCommandExistsError, DescriptionNotSetError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, HandlerInCommand, Inspector, InspectorContext, InspectorFn, InspectorObject, InvalidCommandNameError, MakeEventMap, MultipleCommandsMatchedError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, ParentCommandExistsError, Plugin, PossibleInputKind, SingleCommand, SingleCommandAliasError, SingleCommandError, SingleCommandType, SubcommandExistsError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, Command, CommandAlias, CommandCustomProperties, CommandExistsError, CommandNameConflictError, CommandOptions, CommandRecord, CommandType, CommandWithHandler, CommonCommandExistsError, DescriptionNotSetError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, HandlerInCommand, Inspector, InspectorContext, InspectorFn, InspectorObject, InvalidCommandNameError, MakeEventMap, NameNotSetError, NoCommandGivenError, NoSuchCommandError, Plugin, PossibleInputKind, SingleCommand, SingleCommandAliasError, SingleCommandError, SingleCommandType, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, isInvalidName, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { LiteEmit } from 'lite-emit';
 import { typeFlag } from 'type-flag';
-import { mustArray, arrayStartsWith, camelCase } from '@clerc/utils';
+import { toArray, arrayStartsWith, camelCase } from '@clerc/utils';
 import { isNode, isDeno } from 'is-platform';
 
 class SingleCommandError extends Error {
@@ -33,21 +33,6 @@ class NoCommandGivenError extends Error {
     super("No command given.");
   }
 }
-class ParentCommandExistsError extends Error {
-  constructor(name) {
-    super(`Command "${name}" cannot exist with its parent.`);
-  }
-}
-class SubcommandExistsError extends Error {
-  constructor(name) {
-    super(`Command "${name}" cannot exist with its subcommand.`);
-  }
-}
-class MultipleCommandsMatchedError extends Error {
-  constructor(name) {
-    super(`Multiple commands matched: ${name}`);
-  }
-}
 class CommandNameConflictError extends Error {
   constructor(n1, n2) {
     super(`Command name ${n1} conflicts with ${n2}. Maybe caused by alias.`);
@@ -78,7 +63,7 @@ function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
   for (const command of Object.values(commands)) {
     if (command.alias) {
-      const aliases = mustArray(command.alias);
+      const aliases = toArray(command.alias);
       for (const alias of aliases) {
         if (alias in commands) {
           throw new CommandNameConflictError(commands[alias].name, command.name);
@@ -94,19 +79,17 @@ function resolveCommand(commands, name) {
   if (name === SingleCommand) {
     return commands[SingleCommand];
   }
-  const nameArr = mustArray(name);
+  const nameArr = toArray(name);
   const commandsMap = resolveFlattenCommands(commands);
-  const possibleCommands = [];
+  let current;
+  let currentName;
   commandsMap.forEach((v, k) => {
-    if (arrayStartsWith(nameArr, k)) {
-      possibleCommands.push(v);
+    if (arrayStartsWith(nameArr, k) && (!currentName || k.length > currentName.length)) {
+      current = v;
+      currentName = k;
     }
   });
-  if (possibleCommands.length > 1) {
-    const matchedCommandNames = possibleCommands.map((c) => c.name).join(", ");
-    throw new MultipleCommandsMatchedError(matchedCommandNames);
-  }
-  return possibleCommands[0];
+  return current;
 }
 function resolveSubcommandsByParent(commands, parent, depth = Infinity) {
   const parentArr = parent === "" ? [] : Array.isArray(parent) ? parent : parent.split(" ");
@@ -152,6 +135,7 @@ function compose(inspectors) {
     }
   };
 }
+const isInvalidName = (name) => typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "));
 
 const { stringify } = JSON;
 function parseParameters(parameters) {
@@ -228,7 +212,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _name, _description, _version, _inspectors, _commands, _flattenCommands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
+var _name, _description, _version, _inspectors, _commands, _commandEmitter, _usedNames, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
 const SingleCommand = Symbol("SingleCommand");
 const _Clerc = class {
   constructor() {
@@ -239,8 +223,8 @@ const _Clerc = class {
     __privateAdd(this, _version, "");
     __privateAdd(this, _inspectors, []);
     __privateAdd(this, _commands, {});
-    __privateAdd(this, _flattenCommands, {});
     __privateAdd(this, _commandEmitter, new LiteEmit());
+    __privateAdd(this, _usedNames, []);
   }
   get _name() {
     return __privateGet(this, _name);
@@ -281,7 +265,7 @@ const _Clerc = class {
         throw new CommandExistsError("SingleCommand");
       }
     }
-    if (typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "))) {
+    if (isInvalidName(name)) {
       throw new InvalidCommandNameError(name);
     }
     if (__privateGet(this, _isSingleCommand, isSingleCommand_get)) {
@@ -293,38 +277,17 @@ const _Clerc = class {
     if (name === SingleCommand && (isCommandObject ? nameOrCommand : options).alias) {
       throw new SingleCommandAliasError();
     }
-    if (name !== SingleCommand) {
-      const splitedName = name.split(" ");
-      const existedCommandNames = Object.keys(__privateGet(this, _commands)).filter((name2) => typeof name2 === "string").map((name2) => name2.split(" "));
-      if (existedCommandNames.some((name2) => arrayStartsWith(splitedName, name2))) {
-        throw new ParentCommandExistsError(splitedName.join(" "));
-      }
-      if (existedCommandNames.some((name2) => arrayStartsWith(name2, splitedName))) {
-        throw new SubcommandExistsError(splitedName.join(" "));
-      }
-    }
     const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
     const nameList = [commandToSave.name];
-    if (commandToSave.alias) {
-      const aliasList = mustArray(commandToSave.alias);
-      nameList.push(...aliasList);
-    }
+    commandToSave.alias && nameList.push(...toArray(commandToSave.alias));
     for (const name2 of nameList) {
-      if (__privateGet(this, _flattenCommands)[name2]) {
+      if (__privateGet(this, _usedNames).includes(name2)) {
         throw new CommandExistsError(name2);
       }
     }
     __privateGet(this, _commands)[name] = commandToSave;
-    if (isCommandObject && handler) {
-      this.on(nameOrCommand.name, handler);
-    }
-    __privateGet(this, _flattenCommands)[name] = commandToSave;
-    if (commandToSave.alias) {
-      const aliasList = mustArray(commandToSave.alias);
-      aliasList.forEach((alias) => {
-        __privateGet(this, _flattenCommands)[alias] = commandToSave;
-      });
-    }
+    __privateGet(this, _usedNames).push(commandToSave.name, ...toArray(commandToSave.alias) || []);
+    isCommandObject && handler && this.on(nameOrCommand.name, handler);
     return this;
   }
   on(name, handler) {
@@ -357,7 +320,7 @@ const _Clerc = class {
       const command = getCommand();
       const isCommandResolved = !!command;
       const parsed = typeFlag((command == null ? void 0 : command.flags) || {}, [...argv]);
-      const { _: args, flags } = parsed;
+      const { _: args, flags, unknownFlags } = parsed;
       let parameters = __privateGet(this, _isSingleCommand, isSingleCommand_get) || !isCommandResolved ? args : args.slice(command.name.split(" ").length);
       let commandParameters = (command == null ? void 0 : command.parameters) || [];
       const hasEof = commandParameters.indexOf("--");
@@ -365,7 +328,7 @@ const _Clerc = class {
       const mapping = /* @__PURE__ */ Object.create(null);
       if (hasEof > -1 && eofParameters.length > 0) {
         commandParameters = commandParameters.slice(0, hasEof);
-        const eofArguments = parsed._["--"];
+        const eofArguments = args["--"];
         parameters = parameters.slice(0, -eofArguments.length || void 0);
         mapErrors.push(mapParametersToArguments(
           mapping,
@@ -384,7 +347,7 @@ const _Clerc = class {
           parameters
         ));
       }
-      const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
+      const mergedFlags = { ...flags, ...unknownFlags };
       const context = {
         name: command == null ? void 0 : command.name,
         resolved: isCommandResolved,
@@ -392,7 +355,7 @@ const _Clerc = class {
         raw: { ...parsed, parameters, mergedFlags },
         parameters: mapping,
         flags,
-        unknownFlags: parsed.unknownFlags,
+        unknownFlags,
         cli: this
       };
       return context;
@@ -428,8 +391,8 @@ _description = new WeakMap();
 _version = new WeakMap();
 _inspectors = new WeakMap();
 _commands = new WeakMap();
-_flattenCommands = new WeakMap();
 _commandEmitter = new WeakMap();
+_usedNames = new WeakMap();
 _isSingleCommand = new WeakSet();
 isSingleCommand_get = function() {
   return __privateGet(this, _commands)[SingleCommand] !== void 0;
@@ -444,4 +407,4 @@ const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (command) => command;
 
-export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, InvalidCommandNameError, MultipleCommandsMatchedError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, InvalidCommandNameError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, SingleCommand, SingleCommandAliasError, SingleCommandError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, isInvalidName, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { LiteEmit } from 'lite-emit';
 import { typeFlag } from 'type-flag';
-import { mustArray, arrayStartsWith, camelCase } from '@clerc/utils';
+import { toArray, arrayStartsWith, camelCase } from '@clerc/utils';
 import { isNode, isDeno } from 'is-platform';
 
 class SingleCommandError extends Error {
@@ -33,21 +33,6 @@ class NoCommandGivenError extends Error {
     super("No command given.");
   }
 }
-class ParentCommandExistsError extends Error {
-  constructor(name) {
-    super(`Command "${name}" cannot exist with its parent.`);
-  }
-}
-class SubcommandExistsError extends Error {
-  constructor(name) {
-    super(`Command "${name}" cannot exist with its subcommand.`);
-  }
-}
-class MultipleCommandsMatchedError extends Error {
-  constructor(name) {
-    super(`Multiple commands matched: ${name}`);
-  }
-}
 class CommandNameConflictError extends Error {
   constructor(n1, n2) {
     super(`Command name ${n1} conflicts with ${n2}. Maybe caused by alias.`);
@@ -78,7 +63,7 @@ function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
   for (const command of Object.values(commands)) {
     if (command.alias) {
-      const aliases = mustArray(command.alias);
+      const aliases = toArray(command.alias);
       for (const alias of aliases) {
         if (alias in commands) {
           throw new CommandNameConflictError(commands[alias].name, command.name);
@@ -94,19 +79,17 @@ function resolveCommand(commands, name) {
   if (name === SingleCommand) {
     return commands[SingleCommand];
   }
-  const nameArr = mustArray(name);
+  const nameArr = toArray(name);
   const commandsMap = resolveFlattenCommands(commands);
-  const possibleCommands = [];
+  let current;
+  let currentName;
   commandsMap.forEach((v, k) => {
-    if (arrayStartsWith(nameArr, k)) {
-      possibleCommands.push(v);
+    if (arrayStartsWith(nameArr, k) && (!currentName || k.length > currentName.length)) {
+      current = v;
+      currentName = k;
     }
   });
-  if (possibleCommands.length > 1) {
-    const matchedCommandNames = possibleCommands.map((c) => c.name).join(", ");
-    throw new MultipleCommandsMatchedError(matchedCommandNames);
-  }
-  return possibleCommands[0];
+  return current;
 }
 function resolveSubcommandsByParent(commands, parent, depth = Infinity) {
   const parentArr = parent === "" ? [] : Array.isArray(parent) ? parent : parent.split(" ");
@@ -152,6 +135,7 @@ function compose(inspectors) {
     }
   };
 }
+const isInvalidName = (name) => typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "));
 
 const { stringify } = JSON;
 function parseParameters(parameters) {
@@ -228,7 +212,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _name, _description, _version, _inspectors, _commands, _flattenCommands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
+var _name, _description, _version, _inspectors, _commands, _commandEmitter, _usedNames, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
 const SingleCommand = Symbol("SingleCommand");
 const _Clerc = class {
   constructor() {
@@ -239,8 +223,8 @@ const _Clerc = class {
     __privateAdd(this, _version, "");
     __privateAdd(this, _inspectors, []);
     __privateAdd(this, _commands, {});
-    __privateAdd(this, _flattenCommands, {});
     __privateAdd(this, _commandEmitter, new LiteEmit());
+    __privateAdd(this, _usedNames, []);
   }
   get _name() {
     return __privateGet(this, _name);
@@ -281,7 +265,7 @@ const _Clerc = class {
         throw new CommandExistsError("SingleCommand");
       }
     }
-    if (typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "))) {
+    if (isInvalidName(name)) {
       throw new InvalidCommandNameError(name);
     }
     if (__privateGet(this, _isSingleCommand, isSingleCommand_get)) {
@@ -293,38 +277,17 @@ const _Clerc = class {
     if (name === SingleCommand && (isCommandObject ? nameOrCommand : options).alias) {
       throw new SingleCommandAliasError();
     }
-    if (name !== SingleCommand) {
-      const splitedName = name.split(" ");
-      const existedCommandNames = Object.keys(__privateGet(this, _commands)).filter((name2) => typeof name2 === "string").map((name2) => name2.split(" "));
-      if (existedCommandNames.some((name2) => arrayStartsWith(splitedName, name2))) {
-        throw new ParentCommandExistsError(splitedName.join(" "));
-      }
-      if (existedCommandNames.some((name2) => arrayStartsWith(name2, splitedName))) {
-        throw new SubcommandExistsError(splitedName.join(" "));
-      }
-    }
     const { handler = void 0, ...commandToSave } = isCommandObject ? nameOrCommand : { name, description, ...options };
     const nameList = [commandToSave.name];
-    if (commandToSave.alias) {
-      const aliasList = mustArray(commandToSave.alias);
-      nameList.push(...aliasList);
-    }
+    commandToSave.alias && nameList.push(...toArray(commandToSave.alias));
     for (const name2 of nameList) {
-      if (__privateGet(this, _flattenCommands)[name2]) {
+      if (__privateGet(this, _usedNames).includes(name2)) {
         throw new CommandExistsError(name2);
       }
     }
     __privateGet(this, _commands)[name] = commandToSave;
-    if (isCommandObject && handler) {
-      this.on(nameOrCommand.name, handler);
-    }
-    __privateGet(this, _flattenCommands)[name] = commandToSave;
-    if (commandToSave.alias) {
-      const aliasList = mustArray(commandToSave.alias);
-      aliasList.forEach((alias) => {
-        __privateGet(this, _flattenCommands)[alias] = commandToSave;
-      });
-    }
+    __privateGet(this, _usedNames).push(commandToSave.name, ...toArray(commandToSave.alias) || []);
+    isCommandObject && handler && this.on(nameOrCommand.name, handler);
     return this;
   }
   on(name, handler) {
@@ -357,7 +320,7 @@ const _Clerc = class {
       const command = getCommand();
       const isCommandResolved = !!command;
       const parsed = typeFlag((command == null ? void 0 : command.flags) || {}, [...argv]);
-      const { _: args, flags } = parsed;
+      const { _: args, flags, unknownFlags } = parsed;
       let parameters = __privateGet(this, _isSingleCommand, isSingleCommand_get) || !isCommandResolved ? args : args.slice(command.name.split(" ").length);
       let commandParameters = (command == null ? void 0 : command.parameters) || [];
       const hasEof = commandParameters.indexOf("--");
@@ -365,7 +328,7 @@ const _Clerc = class {
       const mapping = /* @__PURE__ */ Object.create(null);
       if (hasEof > -1 && eofParameters.length > 0) {
         commandParameters = commandParameters.slice(0, hasEof);
-        const eofArguments = parsed._["--"];
+        const eofArguments = args["--"];
         parameters = parameters.slice(0, -eofArguments.length || void 0);
         mapErrors.push(mapParametersToArguments(
           mapping,
@@ -384,7 +347,7 @@ const _Clerc = class {
           parameters
         ));
       }
-      const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
+      const mergedFlags = { ...flags, ...unknownFlags };
       const context = {
         name: command == null ? void 0 : command.name,
         resolved: isCommandResolved,
@@ -392,7 +355,7 @@ const _Clerc = class {
         raw: { ...parsed, parameters, mergedFlags },
         parameters: mapping,
         flags,
-        unknownFlags: parsed.unknownFlags,
+        unknownFlags,
         cli: this
       };
       return context;
@@ -428,8 +391,8 @@ _description = new WeakMap();
 _version = new WeakMap();
 _inspectors = new WeakMap();
 _commands = new WeakMap();
-_flattenCommands = new WeakMap();
 _commandEmitter = new WeakMap();
+_usedNames = new WeakMap();
 _isSingleCommand = new WeakSet();
 isSingleCommand_get = function() {
   return __privateGet(this, _commands)[SingleCommand] !== void 0;
@@ -444,4 +407,4 @@ const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (command) => command;
 
-export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, InvalidCommandNameError, MultipleCommandsMatchedError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, InvalidCommandNameError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, SingleCommand, SingleCommandAliasError, SingleCommandError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, isInvalidName, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/core",
-  "version": "0.17.3",
+  "version": "0.19.0",
   "author": "Ray <nn_201312@163.com> (https://github.com/so1ve)",
   "description": "Clerc core",
   "keywords": [
@@ -50,7 +50,7 @@
     "is-platform": "^0.2.0",
     "lite-emit": "^1.4.0",
     "type-flag": "^3.0.0",
-    "@clerc/utils": "0.17.3"
+    "@clerc/utils": "0.19.0"
   },
   "scripts": {
     "build": "puild",