@clerc/core 0.17.2 → 0.17.3

package/dist/index.d.ts

@@ -325,6 +325,9 @@ declare class DescriptionNotSetError extends Error {
 }
 declare class VersionNotSetError extends Error {
     constructor();
+}
+declare class InvalidCommandNameError extends Error {
+    constructor(name: string);
 }
 
 declare function resolveFlattenCommands(commands: CommandRecord): Map<string[], CommandAlias<string, CommandOptions<string[], _clerc_utils.MaybeArray<string>, _clerc_utils.Dict<FlagOptions>>>>;
@@ -343,4 +346,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, 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, 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 };

package/dist/index.js

@@ -68,6 +68,11 @@ class VersionNotSetError extends Error {
     super("Version not set.");
   }
 }
+class InvalidCommandNameError extends Error {
+  constructor(name) {
+    super(`Bad name format: ${name}`);
+  }
+}
 
 function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
@@ -223,7 +228,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _name, _description, _version, _inspectors, _commands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
+var _name, _description, _version, _inspectors, _commands, _flattenCommands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
 const SingleCommand = Symbol("SingleCommand");
 const _Clerc = class {
   constructor() {
@@ -234,6 +239,7 @@ const _Clerc = class {
     __privateAdd(this, _version, "");
     __privateAdd(this, _inspectors, []);
     __privateAdd(this, _commands, {});
+    __privateAdd(this, _flattenCommands, {});
     __privateAdd(this, _commandEmitter, new LiteEmit());
   }
   get _name() {
@@ -275,6 +281,9 @@ const _Clerc = class {
         throw new CommandExistsError("SingleCommand");
       }
     }
+    if (typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "))) {
+      throw new InvalidCommandNameError(name);
+    }
     if (__privateGet(this, _isSingleCommand, isSingleCommand_get)) {
       throw new SingleCommandError();
     }
@@ -295,10 +304,27 @@ const _Clerc = class {
       }
     }
     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);
+    }
+    for (const name2 of nameList) {
+      if (__privateGet(this, _flattenCommands)[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;
+      });
+    }
     return this;
   }
   on(name, handler) {
@@ -402,6 +428,7 @@ _description = new WeakMap();
 _version = new WeakMap();
 _inspectors = new WeakMap();
 _commands = new WeakMap();
+_flattenCommands = new WeakMap();
 _commandEmitter = new WeakMap();
 _isSingleCommand = new WeakSet();
 isSingleCommand_get = function() {
@@ -417,4 +444,4 @@ const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (command) => command;
 
-export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, 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, MultipleCommandsMatchedError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.mjs

@@ -68,6 +68,11 @@ class VersionNotSetError extends Error {
     super("Version not set.");
   }
 }
+class InvalidCommandNameError extends Error {
+  constructor(name) {
+    super(`Bad name format: ${name}`);
+  }
+}
 
 function resolveFlattenCommands(commands) {
   const commandsMap = /* @__PURE__ */ new Map();
@@ -223,7 +228,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _name, _description, _version, _inspectors, _commands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
+var _name, _description, _version, _inspectors, _commands, _flattenCommands, _commandEmitter, _isSingleCommand, isSingleCommand_get, _hasCommands, hasCommands_get;
 const SingleCommand = Symbol("SingleCommand");
 const _Clerc = class {
   constructor() {
@@ -234,6 +239,7 @@ const _Clerc = class {
     __privateAdd(this, _version, "");
     __privateAdd(this, _inspectors, []);
     __privateAdd(this, _commands, {});
+    __privateAdd(this, _flattenCommands, {});
     __privateAdd(this, _commandEmitter, new LiteEmit());
   }
   get _name() {
@@ -275,6 +281,9 @@ const _Clerc = class {
         throw new CommandExistsError("SingleCommand");
       }
     }
+    if (typeof name === "string" && (name.startsWith(" ") || name.endsWith(" "))) {
+      throw new InvalidCommandNameError(name);
+    }
     if (__privateGet(this, _isSingleCommand, isSingleCommand_get)) {
       throw new SingleCommandError();
     }
@@ -295,10 +304,27 @@ const _Clerc = class {
       }
     }
     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);
+    }
+    for (const name2 of nameList) {
+      if (__privateGet(this, _flattenCommands)[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;
+      });
+    }
     return this;
   }
   on(name, handler) {
@@ -402,6 +428,7 @@ _description = new WeakMap();
 _version = new WeakMap();
 _inspectors = new WeakMap();
 _commands = new WeakMap();
+_flattenCommands = new WeakMap();
 _commandEmitter = new WeakMap();
 _isSingleCommand = new WeakSet();
 isSingleCommand_get = function() {
@@ -417,4 +444,4 @@ const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 const defineCommand = (command) => command;
 
-export { Clerc, CommandExistsError, CommandNameConflictError, CommonCommandExistsError, DescriptionNotSetError, 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, MultipleCommandsMatchedError, NameNotSetError, NoCommandGivenError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandAliasError, SingleCommandError, SubcommandExistsError, VersionNotSetError, compose, defineCommand, defineHandler, defineInspector, definePlugin, mapParametersToArguments, parseParameters, resolveArgv, resolveCommand, resolveFlattenCommands, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/core",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "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.2"
+    "@clerc/utils": "0.17.3"
   },
   "scripts": {
     "build": "puild",