@wooksjs/event-cli 0.4.10 → 0.4.11

package/dist/index.cjs

@@ -7,7 +7,10 @@ var minimist = require('minimist');
 
 function createCliContext(data, options) {
     return eventCore.createEventContext({
-        event: Object.assign(Object.assign({}, data), { type: 'CLI' }),
+        event: {
+            ...data,
+            type: 'CLI',
+        },
         options,
     });
 }
@@ -20,51 +23,19 @@ function useCliContext() {
     return eventCore.useEventContext('CLI');
 }
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 const cliShortcuts = {
     cli: 'CLI',
 };
 class WooksCli extends wooks.WooksAdapterBase {
     constructor(opts, wooks) {
-        super(wooks, opts === null || opts === void 0 ? void 0 : opts.logger, opts === null || opts === void 0 ? void 0 : opts.router);
+        super(wooks, opts?.logger, opts?.router);
         this.opts = opts;
         this.alreadyComputedAliases = false;
-        this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || this.getLogger('wooks-cli');
+        this.logger = opts?.logger || this.getLogger('wooks-cli');
         this.cliHelp =
-            (opts === null || opts === void 0 ? void 0 : opts.cliHelp) instanceof cliHelp.CliHelpRenderer
+            opts?.cliHelp instanceof cliHelp.CliHelpRenderer
                 ? opts.cliHelp
-                : new cliHelp.CliHelpRenderer(opts === null || opts === void 0 ? void 0 : opts.cliHelp);
+                : new cliHelp.CliHelpRenderer(opts?.cliHelp);
     }
     /**
      * ### Register CLI Command
@@ -103,7 +74,6 @@ class WooksCli extends wooks.WooksAdapterBase {
      * @returns
      */
     cli(path, _options) {
-        var _a;
         const options = typeof _options === 'function' ? { handler: _options } : _options;
         const handler = typeof _options === 'function' ? _options : _options.handler;
         const makePath = (s) => '/' + s.replace(/\s+/g, '/');
@@ -124,7 +94,9 @@ class WooksCli extends wooks.WooksAdapterBase {
         }
         // register helpCli entry
         const command = routed.getStaticPart().replace(/\//g, ' ').trim();
-        const args = Object.assign({}, (options.args || {}));
+        const args = {
+            ...(options.args || {}),
+        };
         for (const arg of routed.getArgs()) {
             if (!args[arg]) {
                 args[arg] = '';
@@ -132,7 +104,7 @@ class WooksCli extends wooks.WooksAdapterBase {
         }
         this.cliHelp.addEntry({
             command,
-            aliases: (_a = options.aliases) === null || _a === void 0 ? void 0 : _a.map(alias => alias.replace(/\\:/g, ':')), // unescape ":" character
+            aliases: options.aliases?.map(alias => alias.replace(/\\:/g, ':')), // unescape ":" character
             args,
             description: options.description,
             examples: options.examples,
@@ -172,62 +144,58 @@ class WooksCli extends wooks.WooksAdapterBase {
      *
      * @param _argv optionally overwrite `process.argv.slice(2)` with your `argv` array
      */
-    run(_argv, _opts) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const argv = _argv || process.argv.slice(2);
-            const parsedFlags = minimist(argv, _opts);
-            const pathParams = parsedFlags._;
-            const path = '/' +
-                pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
-            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') {
-                // overwriting command with firstStatic to properly search for help
-                store('event').set('command', firstStatic.replace(/\//g, ' ').trim());
-            }
-            const handlers = foundHandlers ||
-                (((_b = this.opts) === null || _b === void 0 ? void 0 : _b.onNotFound) && [this.opts.onNotFound]) ||
-                null;
-            if (handlers) {
-                try {
-                    for (const handler of handlers) {
-                        restoreCtx();
-                        const response = yield handler();
-                        if (typeof response === 'string') {
-                            console.log(response);
-                        }
-                        else if (Array.isArray(response)) {
-                            response.forEach((r) => console.log(typeof r === 'string'
-                                ? r
-                                : JSON.stringify(r, null, '  ')));
-                        }
-                        else if (response instanceof Error) {
-                            this.onError(response);
-                        }
-                        else if (response) {
-                            if (response) {
-                                console.log(JSON.stringify(response, null, '  '));
-                            }
+    async run(_argv, _opts) {
+        const argv = _argv || process.argv.slice(2);
+        const parsedFlags = minimist(argv, _opts);
+        const pathParams = parsedFlags._;
+        const path = '/' +
+            pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
+        const { restoreCtx, clearCtx, store } = createCliContext({ opts: _opts, argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions(this.opts?.eventOptions));
+        store('flags').value = parsedFlags;
+        this.computeAliases();
+        const { handlers: foundHandlers, firstStatic } = this.wooks.lookup('CLI', path);
+        if (typeof firstStatic === 'string') {
+            // overwriting command with firstStatic to properly search for help
+            store('event').set('command', firstStatic.replace(/\//g, ' ').trim());
+        }
+        const handlers = foundHandlers ||
+            (this.opts?.onNotFound && [this.opts.onNotFound]) ||
+            null;
+        if (handlers) {
+            try {
+                for (const handler of handlers) {
+                    restoreCtx();
+                    const response = await handler();
+                    if (typeof response === 'string') {
+                        console.log(response);
+                    }
+                    else if (Array.isArray(response)) {
+                        response.forEach((r) => console.log(typeof r === 'string'
+                            ? r
+                            : JSON.stringify(r, null, '  ')));
+                    }
+                    else if (response instanceof Error) {
+                        this.onError(response);
+                    }
+                    else if (response) {
+                        if (response) {
+                            console.log(JSON.stringify(response, null, '  '));
                         }
                     }
                 }
-                catch (e) {
-                    this.onError(e);
-                }
-                clearCtx();
             }
-            else {
-                this.onUnknownCommand(pathParams);
-                clearCtx();
+            catch (e) {
+                this.onError(e);
             }
-        });
+            clearCtx();
+        }
+        else {
+            this.onUnknownCommand(pathParams);
+            clearCtx();
+        }
     }
     onError(e) {
-        var _a;
-        if ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.onError) {
+        if (this.opts?.onError) {
             this.opts.onError(e);
         }
         else {
@@ -240,12 +208,11 @@ class WooksCli extends wooks.WooksAdapterBase {
      * @param pathParams `string[]` containing command
      */
     onUnknownCommand(pathParams) {
-        var _a;
         const raiseError = () => {
             this.error('' + 'Unknown command: ' + pathParams.join(' '));
             process.exit(1);
         };
-        if ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.onUnknownCommand) {
+        if (this.opts?.onUnknownCommand) {
             this.opts.onUnknownCommand(pathParams, raiseError);
         }
         else {
@@ -287,7 +254,7 @@ function createCliApp(opts, wooks) {
 function useCliHelp() {
     const event = useCliContext().store('event');
     const getCliHelp = () => event.get('cliHelp');
-    const getEntry = () => { var _a; return (_a = getCliHelp().match(event.get('command'))) === null || _a === void 0 ? void 0 : _a.main; };
+    const getEntry = () => getCliHelp().match(event.get('command'))?.main;
     return {
         getCliHelp,
         getEntry,
@@ -428,9 +395,8 @@ function useCliOptions() {
  * @returns value of a CLI option
  */
 function useCliOption(name) {
-    var _a;
     try {
-        const options = ((_a = useCliHelp().getEntry()) === null || _a === void 0 ? void 0 : _a.options) || [];
+        const options = useCliHelp().getEntry()?.options || [];
         const opt = options.find(o => o.keys.includes(name));
         if (opt) {
             for (const key of opt.keys) {

package/dist/index.mjs

@@ -5,7 +5,10 @@ import minimist from 'minimist';
 
 function createCliContext(data, options) {
     return createEventContext({
-        event: Object.assign(Object.assign({}, data), { type: 'CLI' }),
+        event: {
+            ...data,
+            type: 'CLI',
+        },
         options,
     });
 }
@@ -18,51 +21,19 @@ function useCliContext() {
     return useEventContext('CLI');
 }
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 const cliShortcuts = {
     cli: 'CLI',
 };
 class WooksCli extends WooksAdapterBase {
     constructor(opts, wooks) {
-        super(wooks, opts === null || opts === void 0 ? void 0 : opts.logger, opts === null || opts === void 0 ? void 0 : opts.router);
+        super(wooks, opts?.logger, opts?.router);
         this.opts = opts;
         this.alreadyComputedAliases = false;
-        this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || this.getLogger('wooks-cli');
+        this.logger = opts?.logger || this.getLogger('wooks-cli');
         this.cliHelp =
-            (opts === null || opts === void 0 ? void 0 : opts.cliHelp) instanceof CliHelpRenderer
+            opts?.cliHelp instanceof CliHelpRenderer
                 ? opts.cliHelp
-                : new CliHelpRenderer(opts === null || opts === void 0 ? void 0 : opts.cliHelp);
+                : new CliHelpRenderer(opts?.cliHelp);
     }
     /**
      * ### Register CLI Command
@@ -101,7 +72,6 @@ class WooksCli extends WooksAdapterBase {
      * @returns
      */
     cli(path, _options) {
-        var _a;
         const options = typeof _options === 'function' ? { handler: _options } : _options;
         const handler = typeof _options === 'function' ? _options : _options.handler;
         const makePath = (s) => '/' + s.replace(/\s+/g, '/');
@@ -122,7 +92,9 @@ class WooksCli extends WooksAdapterBase {
         }
         // register helpCli entry
         const command = routed.getStaticPart().replace(/\//g, ' ').trim();
-        const args = Object.assign({}, (options.args || {}));
+        const args = {
+            ...(options.args || {}),
+        };
         for (const arg of routed.getArgs()) {
             if (!args[arg]) {
                 args[arg] = '';
@@ -130,7 +102,7 @@ class WooksCli extends WooksAdapterBase {
         }
         this.cliHelp.addEntry({
             command,
-            aliases: (_a = options.aliases) === null || _a === void 0 ? void 0 : _a.map(alias => alias.replace(/\\:/g, ':')), // unescape ":" character
+            aliases: options.aliases?.map(alias => alias.replace(/\\:/g, ':')), // unescape ":" character
             args,
             description: options.description,
             examples: options.examples,
@@ -170,62 +142,58 @@ class WooksCli extends WooksAdapterBase {
      *
      * @param _argv optionally overwrite `process.argv.slice(2)` with your `argv` array
      */
-    run(_argv, _opts) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const argv = _argv || process.argv.slice(2);
-            const parsedFlags = minimist(argv, _opts);
-            const pathParams = parsedFlags._;
-            const path = '/' +
-                pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
-            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') {
-                // overwriting command with firstStatic to properly search for help
-                store('event').set('command', firstStatic.replace(/\//g, ' ').trim());
-            }
-            const handlers = foundHandlers ||
-                (((_b = this.opts) === null || _b === void 0 ? void 0 : _b.onNotFound) && [this.opts.onNotFound]) ||
-                null;
-            if (handlers) {
-                try {
-                    for (const handler of handlers) {
-                        restoreCtx();
-                        const response = yield handler();
-                        if (typeof response === 'string') {
-                            console.log(response);
-                        }
-                        else if (Array.isArray(response)) {
-                            response.forEach((r) => console.log(typeof r === 'string'
-                                ? r
-                                : JSON.stringify(r, null, '  ')));
-                        }
-                        else if (response instanceof Error) {
-                            this.onError(response);
-                        }
-                        else if (response) {
-                            if (response) {
-                                console.log(JSON.stringify(response, null, '  '));
-                            }
+    async run(_argv, _opts) {
+        const argv = _argv || process.argv.slice(2);
+        const parsedFlags = minimist(argv, _opts);
+        const pathParams = parsedFlags._;
+        const path = '/' +
+            pathParams.map((v) => encodeURI(v).replace(/\//g, '%2F')).join('/');
+        const { restoreCtx, clearCtx, store } = createCliContext({ opts: _opts, argv, pathParams, cliHelp: this.cliHelp, command: path.replace(/\//g, ' ').trim() }, this.mergeEventOptions(this.opts?.eventOptions));
+        store('flags').value = parsedFlags;
+        this.computeAliases();
+        const { handlers: foundHandlers, firstStatic } = this.wooks.lookup('CLI', path);
+        if (typeof firstStatic === 'string') {
+            // overwriting command with firstStatic to properly search for help
+            store('event').set('command', firstStatic.replace(/\//g, ' ').trim());
+        }
+        const handlers = foundHandlers ||
+            (this.opts?.onNotFound && [this.opts.onNotFound]) ||
+            null;
+        if (handlers) {
+            try {
+                for (const handler of handlers) {
+                    restoreCtx();
+                    const response = await handler();
+                    if (typeof response === 'string') {
+                        console.log(response);
+                    }
+                    else if (Array.isArray(response)) {
+                        response.forEach((r) => console.log(typeof r === 'string'
+                            ? r
+                            : JSON.stringify(r, null, '  ')));
+                    }
+                    else if (response instanceof Error) {
+                        this.onError(response);
+                    }
+                    else if (response) {
+                        if (response) {
+                            console.log(JSON.stringify(response, null, '  '));
                         }
                     }
                 }
-                catch (e) {
-                    this.onError(e);
-                }
-                clearCtx();
             }
-            else {
-                this.onUnknownCommand(pathParams);
-                clearCtx();
+            catch (e) {
+                this.onError(e);
             }
-        });
+            clearCtx();
+        }
+        else {
+            this.onUnknownCommand(pathParams);
+            clearCtx();
+        }
     }
     onError(e) {
-        var _a;
-        if ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.onError) {
+        if (this.opts?.onError) {
             this.opts.onError(e);
         }
         else {
@@ -238,12 +206,11 @@ class WooksCli extends WooksAdapterBase {
      * @param pathParams `string[]` containing command
      */
     onUnknownCommand(pathParams) {
-        var _a;
         const raiseError = () => {
             this.error('' + 'Unknown command: ' + pathParams.join(' '));
             process.exit(1);
         };
-        if ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.onUnknownCommand) {
+        if (this.opts?.onUnknownCommand) {
             this.opts.onUnknownCommand(pathParams, raiseError);
         }
         else {
@@ -285,7 +252,7 @@ function createCliApp(opts, wooks) {
 function useCliHelp() {
     const event = useCliContext().store('event');
     const getCliHelp = () => event.get('cliHelp');
-    const getEntry = () => { var _a; return (_a = getCliHelp().match(event.get('command'))) === null || _a === void 0 ? void 0 : _a.main; };
+    const getEntry = () => getCliHelp().match(event.get('command'))?.main;
     return {
         getCliHelp,
         getEntry,
@@ -426,9 +393,8 @@ function useCliOptions() {
  * @returns value of a CLI option
  */
 function useCliOption(name) {
-    var _a;
     try {
-        const options = ((_a = useCliHelp().getEntry()) === null || _a === void 0 ? void 0 : _a.options) || [];
+        const options = useCliHelp().getEntry()?.options || [];
         const opt = options.find(o => o.keys.includes(name));
         if (opt) {
             for (const key of opt.keys) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-cli",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "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.4.10",
-    "@wooksjs/event-core": "0.4.10"
+    "wooks": "0.4.11",
+    "@wooksjs/event-core": "0.4.11"
   },
   "dependencies": {
     "minimist": "^1.2.6",