@wocker/core 1.0.17-dev.1 → 1.0.17-dev.3

package/lib/makes/Container.d.ts

@@ -9,4 +9,5 @@ export declare class Container {
     addModule<TInput = any>(type: Type<TInput>, module: Module): void;
     hasModule<TInput = any>(type: Type<TInput>): boolean;
     getModule<TInput = any>(type: Type<TInput>): Module<TInput>;
+    addProvider(type: Type, wrapper: InstanceWrapper): void;
 }

package/lib/makes/Container.js

@@ -4,6 +4,7 @@ exports.Container = void 0;
 const cli_1 = require("@kearisp/cli");
 const InstanceWrapper_1 = require("./InstanceWrapper");
 const Module_1 = require("./Module");
+const env_1 = require("../env");
 class Container {
     constructor() {
         this.modules = new Map();
@@ -24,5 +25,11 @@ class Container {
         }
         return module;
     }
+    addProvider(type, wrapper) {
+        const token = typeof type !== "string"
+            ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type
+            : type;
+        this.providers.set(token, wrapper);
+    }
 }
 exports.Container = Container;

package/lib/makes/Module.d.ts

@@ -5,18 +5,14 @@ import { InstanceWrapper } from "./InstanceWrapper";
 export declare class Module<TInput = any> {
     readonly container: Container;
     type: TInput;
-    parent?: Module | undefined;
     imports: Map<any, InstanceWrapper>;
     controllers: Map<any, InstanceWrapper>;
     providers: Map<any, InstanceWrapper>;
     exports: Set<any>;
-    constructor(container: Container, type: TInput, parent?: Module | undefined);
+    constructor(container: Container, type: TInput);
     get<TInput = any, TResult = TInput>(type: Type<TInput> | Function | string | symbol): TResult;
     getWrapper(type: any): InstanceWrapper | undefined;
-    addImport(module: any): void;
     addProvider(provider: Provider, instance?: any): void;
-    getProvider(): void;
-    addInjection(): void;
     addController(type: any): void;
     addExport(type: any): void;
 }

package/lib/makes/Module.js

@@ -4,10 +4,9 @@ exports.Module = void 0;
 const InstanceWrapper_1 = require("./InstanceWrapper");
 const env_1 = require("../env");
 class Module {
-    constructor(container, type, parent) {
+    constructor(container, type) {
         this.container = container;
         this.type = type;
-        this.parent = parent;
         this.imports = new Map();
         this.controllers = new Map();
         this.providers = new Map();
@@ -16,6 +15,12 @@ class Module {
     get(type) {
         const wrapper = this.getWrapper(type);
         if (!wrapper) {
+            if (typeof type === "function") {
+                throw new Error(`Provider "${type.prototype.constructor.name}" not found`);
+            }
+            else if (typeof type === "string") {
+                throw new Error(`Provider "${type}" not found`);
+            }
             throw new Error("Provider not found");
         }
         return wrapper.instance;
@@ -25,27 +30,15 @@ class Module {
             ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type
             : type;
         const wrapper = this.providers.get(token);
-        if (!wrapper && this.parent) {
-            return this.parent.getWrapper(type);
-        }
         if (!wrapper) {
-            return this.container.providers.get(type);
+            return this.container.providers.get(token);
         }
         return wrapper;
     }
-    addImport(module) {
-        // this.imports.add(module);
-    }
     addProvider(provider, instance) {
         const wrapper = new InstanceWrapper_1.InstanceWrapper(this, provider, instance);
         this.providers.set(wrapper.token, wrapper);
     }
-    getProvider() {
-        //
-    }
-    addInjection() {
-        //
-    }
     addController(type) {
         this.controllers.set(type, new InstanceWrapper_1.InstanceWrapper(this, type));
         for (const name of Object.getOwnPropertyNames(type.prototype)) {
@@ -57,11 +50,13 @@ class Module {
             if (!command) {
                 continue;
             }
-            // console.log(">", name, command);
         }
     }
     addExport(type) {
-        this.exports.add(type);
+        const token = typeof type !== "string"
+            ? Reflect.getMetadata(env_1.INJECT_TOKEN_METADATA, type) || type
+            : type;
+        this.exports.add(token);
     }
 }
 exports.Module = Module;

package/lib/makes/Project.d.ts

@@ -7,6 +7,7 @@ export declare abstract class Project {
     type: string;
     path: string;
     preset?: string;
+    presetMode?: "global" | "project";
     imageName?: string;
     dockerfile?: string;
     scripts?: string[];

package/lib/makes/Project.js

@@ -9,6 +9,7 @@ class Project {
         this.type = data.type;
         this.path = data.path;
         this.preset = data.preset;
+        this.presetMode = data.presetMode;
         this.imageName = data.imageName;
         this.dockerfile = data.dockerfile;
         this.scripts = data.scripts;
@@ -177,6 +178,7 @@ class Project {
             type: this.type,
             path: this.path,
             preset: this.preset,
+            presetMode: this.presetMode,
             imageName: this.imageName,
             dockerfile: this.dockerfile,
             scripts: this.scripts,

package/lib/makes/Scanner.js

@@ -14,7 +14,6 @@ require("reflect-metadata");
 const cli_1 = require("@kearisp/cli");
 const Container_1 = require("./Container");
 const Module_1 = require("./Module");
-const Logger_1 = require("./Logger");
 const env_1 = require("../env");
 class Scanner {
     constructor() {
@@ -74,7 +73,7 @@ class Scanner {
             if (isGlobal) {
                 const wrapper = module.getWrapper(type);
                 if (wrapper) {
-                    this.container.providers.set(type, wrapper);
+                    this.container.addProvider(type, wrapper);
                 }
             }
         });
@@ -85,10 +84,11 @@ class Scanner {
             return;
         }
         const cli = cliWrapper.instance;
-        // Logger.unmute();
-        Logger_1.Logger.info(">_<");
         for (const [, module] of this.container.modules) {
             for (const [type, controller] of module.controllers) {
+                if (!controller.instance) {
+                    continue;
+                }
                 const controllerCommands = [];
                 const controllerCompletions = [];
                 for (const name of Object.getOwnPropertyNames(type.prototype)) {
@@ -96,6 +96,7 @@ class Scanner {
                     if (!descriptor) {
                         continue;
                     }
+                    const description = Reflect.getMetadata(env_1.COMMAND_DESCRIPTION_METADATA, descriptor.value);
                     const commandName = Reflect.getMetadata(env_1.COMMAND_METADATA, descriptor.value);
                     const completions = (Reflect.getMetadata(env_1.COMPLETION_METADATA, descriptor.value) || [])
                         .map((completion) => {
@@ -114,7 +115,7 @@ class Scanner {
                         const argsMeta = Reflect.getMetadata(env_1.ARGS_METADATA, type, name) || [];
                         const command = cli.command(commandName);
                         command.help({
-                            description: "Des"
+                            description: description
                         });
                         for (const argMeta of argsMeta) {
                             if (argMeta.type === "option") {
@@ -184,6 +185,7 @@ class Scanner {
                         const provider = module.getWrapper(type);
                         if (!provider) {
                             // console.log(type, ">_<", provider);
+                            return;
                         }
                         // @ts-ignore
                         parentModule.providers.set(type, provider);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/core",
-    "version": "1.0.17-dev.1",
+    "version": "1.0.17-dev.3",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",