@wooksjs/event-cli 0.3.11 → 0.4.0

package/dist/index.cjs

@@ -167,14 +167,16 @@ class WooksCli extends wooks.WooksAdapterBase {
      *
      * @param _argv optionally overwrite `process.argv.slice(2)` with your `argv` array
      */
-    run(_argv) {
+    run(_argv, _opts) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const argv = _argv || process.argv.slice(2);
-            const pathParams = argv.filter(a => !a.startsWith('-'));
+            const parsedFlags = minimist(argv, _opts);
+            const pathParams = parsedFlags._;
             const path = '/' +
                 pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
-            const { restoreCtx, clearCtx, store } = createCliContext({ argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
+            const { restoreCtx, clearCtx, store } = createCliContext({ opts: _opts, argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
+            store('flags').value = parsedFlags;
             this.computeAliases();
             const { handlers: foundHandlers, firstStatic } = this.wooks.lookup('CLI', path);
             if (typeof firstStatic === 'string') {
@@ -409,7 +411,8 @@ function useCliOptions() {
     const { store } = useCliContext();
     const flags = store('flags');
     if (!flags.value) {
-        flags.value = minimist(store('event').value.argv);
+        const event = store('event');
+        flags.value = minimist(event.value.argv, event.get('opts'));
     }
     return flags.value;
 }

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { CliHelpRenderer } from '@prostojs/cli-help';
+import minimist from 'minimist';
 import { TCliEntry } from '@prostojs/cli-help';
 import { TCliHelpOptions } from '@prostojs/cli-help';
 import { TConsoleBase } from '@prostojs/logger';
@@ -56,6 +57,7 @@ export declare interface TCliEventData {
     argv: string[];
     pathParams: string[];
     command: string;
+    opts?: minimist.Opts;
     type: 'CLI';
     cliHelp: TCliHelpRenderer;
 }
@@ -267,7 +269,7 @@ export declare class WooksCli extends WooksAdapterBase {
      *
      * @param _argv optionally overwrite `process.argv.slice(2)` with your `argv` array
      */
-    run(_argv?: string[]): Promise<void>;
+    run(_argv?: string[], _opts?: minimist.Opts): Promise<void>;
     protected onError(e: Error): void;
     /**
      * Triggers `unknown command` processing and callbacks

package/dist/index.mjs

@@ -165,14 +165,16 @@ class WooksCli extends WooksAdapterBase {
      *
      * @param _argv optionally overwrite `process.argv.slice(2)` with your `argv` array
      */
-    run(_argv) {
+    run(_argv, _opts) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const argv = _argv || process.argv.slice(2);
-            const pathParams = argv.filter(a => !a.startsWith('-'));
+            const parsedFlags = minimist(argv, _opts);
+            const pathParams = parsedFlags._;
             const path = '/' +
                 pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
-            const { restoreCtx, clearCtx, store } = createCliContext({ argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
+            const { restoreCtx, clearCtx, store } = createCliContext({ opts: _opts, argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
+            store('flags').value = parsedFlags;
             this.computeAliases();
             const { handlers: foundHandlers, firstStatic } = this.wooks.lookup('CLI', path);
             if (typeof firstStatic === 'string') {
@@ -407,7 +409,8 @@ function useCliOptions() {
     const { store } = useCliContext();
     const flags = store('flags');
     if (!flags.value) {
-        flags.value = minimist(store('event').value.argv);
+        const event = store('event');
+        flags.value = minimist(event.value.argv, event.get('opts'));
     }
     return flags.value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-cli",
-  "version": "0.3.11",
+  "version": "0.4.0",
   "description": "@wooksjs/event-cli",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,8 +31,8 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "wooks": "0.3.11",
-    "@wooksjs/event-core": "0.3.11"
+    "wooks": "0.4.0",
+    "@wooksjs/event-core": "0.4.0"
   },
   "dependencies": {
     "minimist": "^1.2.6",