@wooksjs/event-cli 0.1.0 → 0.2.1

package/README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
 <img src="../../logo.png" width="128px"><br>
-<a  href="https://github.com/prostojs/wooks/blob/main/LICENSE">
+<a  href="https://github.com/wooksjs/wooksjs/blob/main/LICENSE">
     <img src="https://img.shields.io/badge/License-MIT-green?style=for-the-badge" />
 </a>
 </p>
@@ -20,10 +20,10 @@ As a part of `wooks` event processing framework, `@wooksjs/event-cli` implements
 ## Quick Start
 
 ```js
-import { useRouteParams, Wooks } from 'wooks'
-import { WooksCli, cliShortcuts, useFlags } from '@wooksjs/event-cli'
+import { useRouteParams } from 'wooks'
+import { createCliApp, useFlags } from '@wooksjs/event-cli'
 
-const app = new Wooks().shortcuts(cliShortcuts)
+const app = createCliApp()
 
 app.cli('test', () => {
     console.log('flags:')
@@ -35,7 +35,7 @@ app.cli(':arg', () => {
     return 'done'
 })
 
-app.subscribe(new WooksCli())
+app.run()
 
 // node ./index.js test
 // node ./index.js random

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var eventCore = require('@wooksjs/event-core');
+var wooks = require('wooks');
 var minimist = require('minimist');
 
 function createCliContext(data) {
@@ -47,14 +48,21 @@ function logError(error) {
 const cliShortcuts = {
     cli: 'CLI',
 };
-class WooksCli {
-    subscribe(lookup) {
+class WooksCli extends wooks.WooksAdapterBase {
+    constructor(opts, wooks) {
+        super(wooks);
+        this.opts = opts;
+    }
+    cli(path, handler) {
+        return this.on('CLI', path, handler);
+    }
+    run(_argv) {
         return __awaiter(this, void 0, void 0, function* () {
-            const argv = process.argv.slice(2);
+            const argv = process.argv.slice(2) || _argv;
             const firstFlagIndex = argv.findIndex(a => a.startsWith('-')) + 1;
-            const routing = { method: 'CLI', url: '/' + (firstFlagIndex ? argv.slice(0, firstFlagIndex - 1) : argv).map(v => encodeURIComponent(v)).join('/') };
+            const path = '/' + (firstFlagIndex ? argv.slice(0, firstFlagIndex - 1) : argv).map(v => encodeURIComponent(v)).join('/');
             const { restoreCtx, clearCtx } = createCliContext({ argv });
-            const handlers = lookup(routing);
+            const handlers = this.wooks.lookup('CLI', path);
             if (handlers) {
                 try {
                     for (const handler of handlers) {
@@ -83,6 +91,9 @@ class WooksCli {
             }
         });
     }
+}
+function createCliApp(opts, wooks) {
+    return new WooksCli(opts, wooks);
 }
 
 function useFlags() {
@@ -99,6 +110,7 @@ function useFlag(name) {
 
 exports.WooksCli = WooksCli;
 exports.cliShortcuts = cliShortcuts;
+exports.createCliApp = createCliApp;
 exports.createCliContext = createCliContext;
 exports.useCliContext = useCliContext;
 exports.useFlag = useFlag;

package/dist/index.d.ts

@@ -1,13 +1,16 @@
 import { TGenericContextStore } from '@wooksjs/event-core';
 import { TGenericEvent } from '@wooksjs/event-core';
-import { TWooksLookupArgs } from 'wooks';
-import { TWooksLookupHandlers } from 'wooks';
-import { TWooksSubscribeAdapter } from 'wooks';
+import { TProstoRouterPathBuilder } from '@prostojs/router';
+import { TWooksHandler } from 'wooks';
+import { Wooks } from 'wooks';
+import { WooksAdapterBase } from 'wooks';
 
 export declare const cliShortcuts: {
     cli: string;
 };
 
+export declare function createCliApp(opts?: TWooksCliOptions, wooks?: Wooks | WooksAdapterBase): WooksCli;
+
 export declare function createCliContext(data: TCliEventData): {
     getCtx: () => TCliContextStore;
     restoreCtx: () => TCliContextStore;
@@ -44,6 +47,9 @@ declare interface TCliEventData {
     argv: string[];
 }
 
+export declare interface TWooksCliOptions {
+}
+
 export declare function useCliContext<T extends object>(): {
     getCtx: () => TCliContextStore & T;
     restoreCtx: () => TCliContextStore & T;
@@ -72,8 +78,11 @@ export declare function useFlags(): {
     [name: string]: string | boolean;
 };
 
-export declare class WooksCli implements TWooksSubscribeAdapter {
-    subscribe(lookup: (route: TWooksLookupArgs) => TWooksLookupHandlers | null): Promise<void>;
+export declare class WooksCli extends WooksAdapterBase {
+    protected opts?: TWooksCliOptions | undefined;
+    constructor(opts?: TWooksCliOptions | undefined, wooks?: Wooks | WooksAdapterBase);
+    cli<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
+    run(_argv?: string[]): Promise<void>;
 }
 
 export { }

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { createEventContext, useEventContext } from '@wooksjs/event-core';
+import { WooksAdapterBase } from 'wooks';
 import minimist from 'minimist';
 
 function createCliContext(data) {
@@ -45,14 +46,21 @@ function logError(error) {
 const cliShortcuts = {
     cli: 'CLI',
 };
-class WooksCli {
-    subscribe(lookup) {
+class WooksCli extends WooksAdapterBase {
+    constructor(opts, wooks) {
+        super(wooks);
+        this.opts = opts;
+    }
+    cli(path, handler) {
+        return this.on('CLI', path, handler);
+    }
+    run(_argv) {
         return __awaiter(this, void 0, void 0, function* () {
-            const argv = process.argv.slice(2);
+            const argv = process.argv.slice(2) || _argv;
             const firstFlagIndex = argv.findIndex(a => a.startsWith('-')) + 1;
-            const routing = { method: 'CLI', url: '/' + (firstFlagIndex ? argv.slice(0, firstFlagIndex - 1) : argv).map(v => encodeURIComponent(v)).join('/') };
+            const path = '/' + (firstFlagIndex ? argv.slice(0, firstFlagIndex - 1) : argv).map(v => encodeURIComponent(v)).join('/');
             const { restoreCtx, clearCtx } = createCliContext({ argv });
-            const handlers = lookup(routing);
+            const handlers = this.wooks.lookup('CLI', path);
             if (handlers) {
                 try {
                     for (const handler of handlers) {
@@ -81,6 +89,9 @@ class WooksCli {
             }
         });
     }
+}
+function createCliApp(opts, wooks) {
+    return new WooksCli(opts, wooks);
 }
 
 function useFlags() {
@@ -95,4 +106,4 @@ function useFlag(name) {
     return useFlags()[name];
 }
 
-export { WooksCli, cliShortcuts, createCliContext, useCliContext, useFlag, useFlags };
+export { WooksCli, cliShortcuts, createCliApp, createCliContext, useCliContext, useFlag, useFlags };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "@wooksjs/event-cli",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/event-cli#readme",
   "dependencies": {
     "minimist": "^1.2.6",
-    "@wooksjs/event-core": "0.1.0",
-    "wooks": "0.1.0"
+    "@wooksjs/event-core": "0.2.1",
+    "wooks": "0.2.1"
   }
 }