@wocker/core 1.0.19 → 1.0.20-dev.1

package/lib/{makes → core}/Module.js

@@ -26,7 +26,7 @@ class Module {
         return wrapper.instance;
     }
     getWrapper(type) {
-        const token = typeof type !== "string"
+        const token = typeof type === "function"
             ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type
             : type;
         const wrapper = this.providers.get(token);

package/lib/{makes → core}/Scanner.d.ts

@@ -1,5 +1,7 @@
 import "reflect-metadata";
+import { Cli } from "@kearisp/cli";
 import { Container } from "./Container";
+import { InstanceWrapper } from "./InstanceWrapper";
 import { Module } from "./Module";
 export declare class Scanner {
     readonly container: Container;
@@ -11,5 +13,6 @@ export declare class Scanner {
     protected scanImports(module: Module): void;
     protected scanExports(module: Module): void;
     protected scanRoutes(): void;
+    protected scanControllerRoutes(cli: Cli, controller: any, wrapper: InstanceWrapper): boolean;
     protected scanDynamicModules(): Promise<void>;
 }

package/lib/{makes → core}/Scanner.js

@@ -89,89 +89,110 @@ class Scanner {
                 if (!controller.instance) {
                     continue;
                 }
-                const controllerCommands = [];
-                const controllerCompletions = [];
-                for (const name of Object.getOwnPropertyNames(type.prototype)) {
-                    const descriptor = Object.getOwnPropertyDescriptor(type.prototype, name);
-                    if (!descriptor) {
-                        continue;
-                    }
-                    const description = Reflect.getMetadata(env_1.COMMAND_DESCRIPTION_METADATA, descriptor.value);
-                    const commandNames = Reflect.getMetadata(env_1.COMMAND_METADATA, descriptor.value) || [];
-                    const completions = (Reflect.getMetadata(env_1.COMPLETION_METADATA, descriptor.value) || [])
-                        .map((completion) => {
-                        return Object.assign(Object.assign({}, completion), { method: name });
+                this.scanControllerRoutes(cli, type, controller);
+            }
+        }
+    }
+    scanControllerRoutes(cli, controller, wrapper) {
+        const controllerCommandNames = [];
+        for (const name of Object.getOwnPropertyNames(controller.prototype)) {
+            const descriptor = Object.getOwnPropertyDescriptor(controller.prototype, name);
+            if (!descriptor) {
+                continue;
+            }
+            const commandNames = Reflect.getMetadata(env_1.COMMAND_METADATA, descriptor.value) || [];
+            if (commandNames.length === 0) {
+                continue;
+            }
+            const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, controller, name) || [];
+            const designTypes = Reflect.getMetadata(env_1.PARAMTYPES_METADATA, controller.prototype, name) || [];
+            const description = Reflect.getMetadata(env_1.COMMAND_DESCRIPTION_METADATA, descriptor.value);
+            for (const commandName of commandNames) {
+                controllerCommandNames.push(commandName);
+                const command = cli.command(commandName);
+                if (description) {
+                    command.help({
+                        description
                     });
-                    if (completions.length > 0) {
-                        controllerCompletions.push(...completions);
+                }
+                argsMeta.forEach((argMeta) => {
+                    if (argMeta.type === "option") {
+                        command.option(argMeta.name, argMeta.params);
                     }
-                    if (commandNames.length > 0) {
-                        for (const commandName of commandNames) {
-                            controllerCommands.push({
-                                command: commandName,
-                                controller,
-                                method: name,
-                                argsMeta: Reflect.getMetadata(env_1.ARGS_METADATA, type, name) || []
-                            });
-                            const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, type, name) || [];
-                            const command = cli.command(commandName);
-                            command.help({
-                                description: description
-                            });
-                            for (const argMeta of argsMeta) {
-                                if (argMeta.type === "option") {
-                                    command.option(argMeta.name, argMeta.params);
+                });
+                command.action((input) => {
+                    const args = [];
+                    argsMeta.forEach((argMeta) => {
+                        switch (argMeta.type) {
+                            case "param":
+                                args[argMeta.index] = input.argument(argMeta.name);
+                                break;
+                            case "option":
+                                if (designTypes[argMeta.index] === Array) {
+                                    args[argMeta.index] = input.options(argMeta.name);
+                                }
+                                else {
+                                    args[argMeta.index] = input.option(argMeta.name);
                                 }
-                            }
-                            // command.action((options, ...params) => {
-                            //     const args: any[] = [];
-                            //
-                            //     argsMeta.forEach((argMeta: any) => {
-                            //         if(argMeta.type === "option") {
-                            //             args[argMeta.index] = options[argMeta.name];
-                            //         }
-                            //     });
-                            //
-                            //     return controller.instance[name](...args, ...params);
-                            // });
+                                break;
                         }
-                    }
-                }
-                for (const controllerCommand of controllerCommands) {
-                    const { command: commandName, method, argsMeta } = controllerCommand;
-                    cli.command(commandName)
-                        .action((input) => {
-                        const args = [];
-                        const params = Object.values(input.arguments());
-                        argsMeta.forEach((argMeta) => {
-                            if (argMeta.type === "param") {
-                                args[argMeta.index] = input.argument(argMeta.name);
-                            }
-                            else if (argMeta.type === "option") {
-                                args[argMeta.index] = input.option(argMeta.name);
-                            }
-                        });
-                        return controller.instance[method](...args, ...params);
                     });
-                }
-                for (const controllerCompletion of controllerCompletions) {
-                    const { name, command: commandName, method } = controllerCompletion;
-                    if (!commandName) {
-                        for (const route of controllerCommands) {
-                            const { command } = route;
-                            cli.command(command).completion(name, () => {
-                                return controller.instance[method]();
-                            });
+                    return wrapper.instance[name](...args);
+                });
+            }
+        }
+        const controllerCompletions = [];
+        for (const method of Object.getOwnPropertyNames(controller.prototype)) {
+            const descriptor = Object.getOwnPropertyDescriptor(controller.prototype, method);
+            if (!descriptor) {
+                continue;
+            }
+            const completions = Reflect.getMetadata(env_1.COMPLETION_METADATA, descriptor.value) || [];
+            if (completions.length === 0) {
+                continue;
+            }
+            for (const completion of completions) {
+                controllerCompletions.push(Object.assign(Object.assign({}, completion), { method }));
+            }
+        }
+        controllerCompletions.sort((a, b) => {
+            return a.command < b.command ? -1 : 1;
+        });
+        for (const completion of controllerCompletions) {
+            const commandNames = completion.command
+                ? [completion.command]
+                : controllerCommandNames.filter((commandName) => {
+                    return !controllerCompletions.filter((c) => {
+                        return c.name === completion.name && typeof c.command !== "undefined";
+                    }).map((c) => {
+                        return c.method;
+                    }).includes(commandName);
+                });
+            const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, controller, completion.method) || [];
+            const designTypes = Reflect.getMetadata(env_1.PARAMTYPES_METADATA, controller.prototype, completion.method) || [];
+            for (const commandName of commandNames) {
+                cli.command(commandName).completion(completion.name, (input) => {
+                    const args = [];
+                    argsMeta.forEach((argMeta) => {
+                        switch (argMeta.type) {
+                            case "param":
+                                args[argMeta.index] = input.argument(argMeta.name);
+                                break;
+                            case "option":
+                                if (designTypes[argMeta.index] === Array) {
+                                    args[argMeta.index] = input.options(argMeta.name);
+                                }
+                                else {
+                                    args[argMeta.index] = input.option(argMeta.name);
+                                }
+                                break;
                         }
-                    }
-                    else {
-                        cli.command(commandName).completion(name, () => {
-                            return controller.instance[method]();
-                        });
-                    }
-                }
+                    });
+                    return wrapper.instance[completion.method](...args);
+                });
             }
         }
+        return true;
     }
     scanDynamicModules() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -186,7 +207,6 @@ class Scanner {
                     module.exports.forEach((type) => {
                         const provider = module.getWrapper(type);
                         if (!provider) {
-                            // console.log(type, ">_<", provider);
                             return;
                         }
                         // @ts-ignore

package/lib/core/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./ApplicationContext";
+export * from "./Container";
+export * from "./Factory";
+export * from "./InstanceWrapper";
+export * from "./Scanner";

package/lib/core/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ApplicationContext"), exports);
+__exportStar(require("./Container"), exports);
+__exportStar(require("./Factory"), exports);
+__exportStar(require("./InstanceWrapper"), exports);
+__exportStar(require("./Scanner"), exports);

package/lib/index.d.ts

@@ -1,4 +1,6 @@
+import "reflect-metadata";
 export { Cli } from "@kearisp/cli";
+export * from "./core";
 export * from "./decorators";
 export * from "./makes";
 export * from "./services";

package/lib/index.js

@@ -15,8 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PLUGIN_DIR_KEY = exports.PLUGIN_NAME_METADATA = exports.MODULE_METADATA = exports.IS_MODULE_METADATA = exports.Cli = void 0;
+require("reflect-metadata");
 var cli_1 = require("@kearisp/cli");
 Object.defineProperty(exports, "Cli", { enumerable: true, get: function () { return cli_1.Cli; } });
+__exportStar(require("./core"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./makes"), exports);
 __exportStar(require("./services"), exports);

package/lib/makes/index.d.ts

@@ -1,11 +1,9 @@
 export * from "./AppConfig";
 export * from "./Config";
 export * from "./ConfigCollection";
-export * from "./Container";
 export * from "./FileSystem";
 export * from "./FS";
 export * from "./FSManager";
 export * from "./Logger";
 export * from "./Preset";
 export * from "./Project";
-export * from "./Factory";

package/lib/makes/index.js

@@ -17,11 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AppConfig"), exports);
 __exportStar(require("./Config"), exports);
 __exportStar(require("./ConfigCollection"), exports);
-__exportStar(require("./Container"), exports);
 __exportStar(require("./FileSystem"), exports);
 __exportStar(require("./FS"), exports);
 __exportStar(require("./FSManager"), exports);
 __exportStar(require("./Logger"), exports);
 __exportStar(require("./Preset"), exports);
 __exportStar(require("./Project"), exports);
-__exportStar(require("./Factory"), exports);

package/lib/services/DockerService.d.ts

@@ -43,6 +43,11 @@ export declare namespace DockerServiceParams {
         context: string;
         src: string;
     };
+    type Exec = {
+        cmd: string[];
+        tty?: boolean;
+        user?: string;
+    };
 }
 export declare abstract class DockerService {
     abstract createContainer(params: DockerServiceParams.CreateContainer): Promise<Container>;
@@ -58,6 +63,6 @@ export declare abstract class DockerService {
     abstract pullImage(tag: string): Promise<void>;
     abstract attach(name: string | Container): Promise<NodeJS.ReadWriteStream>;
     abstract attachStream(stream: NodeJS.ReadWriteStream): Promise<void>;
-    abstract exec(name: string, command?: string[], tty?: boolean): Promise<Duplex>;
+    abstract exec(name: string, command?: DockerServiceParams.Exec | string[], tty?: boolean): Promise<Duplex>;
     abstract logs(containerOrName: string | Container): Promise<NodeJS.ReadableStream>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/core",
-    "version": "1.0.19",
+    "version": "1.0.20-dev.1",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",
@@ -25,7 +25,7 @@
         "test-watch": "jest --colors --watchAll --coverage"
     },
     "dependencies": {
-        "@kearisp/cli": "^2.0.6",
+        "@kearisp/cli": "^2.0.7-dev.0",
         "fs": "^0.0.1-security",
         "path": "^0.12.7",
         "reflect-metadata": "^0.2.2"