@clerc/core 0.12.5 → 0.13.0

package/dist/index.d.ts

@@ -338,6 +338,6 @@ interface ParsedParameter {
     spread: boolean;
 }
 declare function parseParameters(parameters: string[]): ParsedParameter[];
-declare function mapParametersToArguments(mapping: Record<string, string | string[]>, parameters: ParsedParameter[], cliArguments: string[]): undefined;
+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, 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

@@ -187,16 +187,14 @@ function mapParametersToArguments(mapping, parameters, cliArguments) {
     const { name, required, spread } = parameters[i];
     const camelCaseName = camelCase(name);
     if (camelCaseName in mapping) {
-      throw new Error(`Invalid parameter: ${stringify(name)} is used more than once.`);
+      return new Error(`Invalid parameter: ${stringify(name)} is used more than once.`);
     }
     const value = spread ? cliArguments.slice(i) : cliArguments[i];
     if (spread) {
       i = parameters.length;
     }
     if (required && (!value || spread && value.length === 0)) {
-      console.error(`Error: Missing required parameter ${stringify(name)}
-`);
-      return process.exit(1);
+      return new Error(`Error: Missing required parameter ${stringify(name)}`);
     }
     mapping[camelCaseName] = value;
   }
@@ -322,7 +320,9 @@ const _Clerc = class {
     const name = resolveParametersBeforeFlag(argv, __privateGet(this, _isSingleCommand, isSingleCommand_get));
     const stringName = name.join(" ");
     const getCommand = () => __privateGet(this, _isSingleCommand, isSingleCommand_get) ? __privateGet(this, _commands)[SingleCommand] : resolveCommand(__privateGet(this, _commands), name);
+    const mapErrors = [];
     const getContext = () => {
+      mapErrors.length = 0;
       const command = getCommand();
       const isCommandResolved = !!command;
       const parsed = typeFlag((command == null ? void 0 : command.flags) || {}, [...argv]);
@@ -336,22 +336,22 @@ const _Clerc = class {
         commandParameters = commandParameters.slice(0, hasEof);
         const eofArguments = parsed._["--"];
         parameters = parameters.slice(0, -eofArguments.length || void 0);
-        mapParametersToArguments(
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(commandParameters),
           parameters
-        );
-        mapParametersToArguments(
+        ));
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(eofParameters),
           eofArguments
-        );
+        ));
       } else {
-        mapParametersToArguments(
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(commandParameters),
           parameters
-        );
+        ));
       }
       const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
       const context = {
@@ -371,6 +371,10 @@ const _Clerc = class {
       fn: () => {
         const command = getCommand();
         const handlerContext = getContext();
+        const errors = mapErrors.filter(Boolean);
+        if (errors.length > 0) {
+          throw errors[0];
+        }
         if (!command) {
           throw new NoSuchCommandError(stringName);
         }

package/dist/index.mjs

@@ -187,16 +187,14 @@ function mapParametersToArguments(mapping, parameters, cliArguments) {
     const { name, required, spread } = parameters[i];
     const camelCaseName = camelCase(name);
     if (camelCaseName in mapping) {
-      throw new Error(`Invalid parameter: ${stringify(name)} is used more than once.`);
+      return new Error(`Invalid parameter: ${stringify(name)} is used more than once.`);
     }
     const value = spread ? cliArguments.slice(i) : cliArguments[i];
     if (spread) {
       i = parameters.length;
     }
     if (required && (!value || spread && value.length === 0)) {
-      console.error(`Error: Missing required parameter ${stringify(name)}
-`);
-      return process.exit(1);
+      return new Error(`Error: Missing required parameter ${stringify(name)}`);
     }
     mapping[camelCaseName] = value;
   }
@@ -322,7 +320,9 @@ const _Clerc = class {
     const name = resolveParametersBeforeFlag(argv, __privateGet(this, _isSingleCommand, isSingleCommand_get));
     const stringName = name.join(" ");
     const getCommand = () => __privateGet(this, _isSingleCommand, isSingleCommand_get) ? __privateGet(this, _commands)[SingleCommand] : resolveCommand(__privateGet(this, _commands), name);
+    const mapErrors = [];
     const getContext = () => {
+      mapErrors.length = 0;
       const command = getCommand();
       const isCommandResolved = !!command;
       const parsed = typeFlag((command == null ? void 0 : command.flags) || {}, [...argv]);
@@ -336,22 +336,22 @@ const _Clerc = class {
         commandParameters = commandParameters.slice(0, hasEof);
         const eofArguments = parsed._["--"];
         parameters = parameters.slice(0, -eofArguments.length || void 0);
-        mapParametersToArguments(
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(commandParameters),
           parameters
-        );
-        mapParametersToArguments(
+        ));
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(eofParameters),
           eofArguments
-        );
+        ));
       } else {
-        mapParametersToArguments(
+        mapErrors.push(mapParametersToArguments(
           mapping,
           parseParameters(commandParameters),
           parameters
-        );
+        ));
       }
       const mergedFlags = { ...parsed.flags, ...parsed.unknownFlags };
       const context = {
@@ -371,6 +371,10 @@ const _Clerc = class {
       fn: () => {
         const command = getCommand();
         const handlerContext = getContext();
+        const errors = mapErrors.filter(Boolean);
+        if (errors.length > 0) {
+          throw errors[0];
+        }
         if (!command) {
           throw new NoSuchCommandError(stringName);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/core",
-  "version": "0.12.5",
+  "version": "0.13.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.12.5"
+    "@clerc/utils": "0.13.0"
   },
   "scripts": {
     "build": "puild",