clerc 0.5.0 → 0.6.1

package/dist/index.cjs

@@ -3,15 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var liteEmit = require('lite-emit');
-var mri = require('mri');
 var typeFlag = require('type-flag');
 var utils = require('@clerc/utils');
 var isPlatform = require('is-platform');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var mri__default = /*#__PURE__*/_interopDefaultLegacy(mri);
-
 class SingleCommandError extends Error {
   constructor() {
     super("Single command mode enabled.");
@@ -76,6 +71,16 @@ function resolveSubcommandsByParent(commands, parent, depth = Infinity) {
   });
 }
 const resolveRootCommands = (commands) => resolveSubcommandsByParent(commands, "", 1);
+function resolveParametersBeforeFlag(argv) {
+  const parameters = [];
+  for (const arg of argv) {
+    if (arg.startsWith("-")) {
+      break;
+    }
+    parameters.push(arg);
+  }
+  return parameters;
+}
 const resolveArgv = () => isPlatform.isNode() ? process.argv.slice(2) : isPlatform.isDeno() ? Deno.args : [];
 function compose(inspectors) {
   return (getCtx) => {
@@ -186,8 +191,7 @@ const _Clerc = class {
     return this;
   }
   parse(argv = resolveArgv()) {
-    const parsed = mri__default["default"](argv);
-    const name = parsed._.map(String);
+    const name = resolveParametersBeforeFlag(argv);
     const stringName = name.join(" ");
     const getCommand = () => __privateGet(this, _isSingleCommand, isSingleCommand_get) ? __privateGet(this, _commands)[SingleCommand] : resolveCommand(__privateGet(this, _commands), name);
     const getContext = () => {
@@ -258,5 +262,6 @@ exports.resolveArgv = resolveArgv;
 exports.resolveCommand = resolveCommand;
 exports.resolveFlagAlias = resolveFlagAlias;
 exports.resolveFlagDefault = resolveFlagDefault;
+exports.resolveParametersBeforeFlag = resolveParametersBeforeFlag;
 exports.resolveRootCommands = resolveRootCommands;
 exports.resolveSubcommandsByParent = resolveSubcommandsByParent;

package/dist/index.d.ts

@@ -277,7 +277,8 @@ declare const resolveFlagDefault: (_command: Command) => Dict<any>;
 declare function resolveCommand(commands: CommandRecord, name: string | string[] | SingleCommandType): Command | undefined;
 declare function resolveSubcommandsByParent(commands: CommandRecord, parent: string | string[], depth?: number): Command<string, string, CommandOptions<_clerc_utils.MaybeArray<string>, Dict<FlagOptions>>>[];
 declare const resolveRootCommands: (commands: CommandRecord) => Command<string, string, CommandOptions<_clerc_utils.MaybeArray<string>, Dict<FlagOptions>>>[];
+declare function resolveParametersBeforeFlag(argv: string[]): string[];
 declare const resolveArgv: () => string[];
 declare function compose(inspectors: Inspector[]): (getCtx: () => InspectorContext) => void;
 
-export { Clerc, Command, CommandExistsError, CommandOptions, CommandRecord, CommonCommandExistsError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, Inspector, InspectorContext, MakeEventMap, NoSuchCommandError, ParentCommandExistsError, Plugin, PossibleInputKind, SingleCommand, SingleCommandError, SingleCommandType, SubcommandExistsError, compose, defineHandler, defineInspector, definePlugin, resolveArgv, resolveCommand, resolveFlagAlias, resolveFlagDefault, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, Command, CommandExistsError, CommandOptions, CommandRecord, CommonCommandExistsError, FallbackType, Flag, FlagOptions, Handler, HandlerContext, Inspector, InspectorContext, MakeEventMap, NoSuchCommandError, ParentCommandExistsError, Plugin, PossibleInputKind, SingleCommand, SingleCommandError, SingleCommandType, SubcommandExistsError, compose, defineHandler, defineInspector, definePlugin, resolveArgv, resolveCommand, resolveFlagAlias, resolveFlagDefault, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import { LiteEmit } from 'lite-emit';
-import mri from 'mri';
 import { typeFlag } from 'type-flag';
 import { mustArray, kebabCase, arrayStartsWith } from '@clerc/utils';
 import { isNode, isDeno } from 'is-platform';
@@ -68,6 +67,16 @@ function resolveSubcommandsByParent(commands, parent, depth = Infinity) {
   });
 }
 const resolveRootCommands = (commands) => resolveSubcommandsByParent(commands, "", 1);
+function resolveParametersBeforeFlag(argv) {
+  const parameters = [];
+  for (const arg of argv) {
+    if (arg.startsWith("-")) {
+      break;
+    }
+    parameters.push(arg);
+  }
+  return parameters;
+}
 const resolveArgv = () => isNode() ? process.argv.slice(2) : isDeno() ? Deno.args : [];
 function compose(inspectors) {
   return (getCtx) => {
@@ -178,8 +187,7 @@ const _Clerc = class {
     return this;
   }
   parse(argv = resolveArgv()) {
-    const parsed = mri(argv);
-    const name = parsed._.map(String);
+    const name = resolveParametersBeforeFlag(argv);
     const stringName = name.join(" ");
     const getCommand = () => __privateGet(this, _isSingleCommand, isSingleCommand_get) ? __privateGet(this, _commands)[SingleCommand] : resolveCommand(__privateGet(this, _commands), name);
     const getContext = () => {
@@ -234,4 +242,4 @@ const definePlugin = (p) => p;
 const defineHandler = (_cli, _key, handler) => handler;
 const defineInspector = (_cli, inspector) => inspector;
 
-export { Clerc, CommandExistsError, CommonCommandExistsError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandError, SubcommandExistsError, compose, defineHandler, defineInspector, definePlugin, resolveArgv, resolveCommand, resolveFlagAlias, resolveFlagDefault, resolveRootCommands, resolveSubcommandsByParent };
+export { Clerc, CommandExistsError, CommonCommandExistsError, NoSuchCommandError, ParentCommandExistsError, SingleCommand, SingleCommandError, SubcommandExistsError, compose, defineHandler, defineInspector, definePlugin, resolveArgv, resolveCommand, resolveFlagAlias, resolveFlagDefault, resolveParametersBeforeFlag, resolveRootCommands, resolveSubcommandsByParent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clerc",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "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,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@clerc/utils": "0.5.0",
+    "@clerc/utils": "0.6.1",
     "is-platform": "^0.2.0",
     "lite-emit": "^1.4.0",
-    "mri": "^1.2.0",
     "type-flag": "^3.0.0"
   },
   "scripts": {