@wocker/core 1.0.26-beta.4 → 1.0.26-beta.6

package/lib/core/ApplicationContext.d.ts

@@ -1,9 +1,9 @@
 import { Type } from "../types";
 import { Container } from "./Container";
 export declare class ApplicationContext {
-    protected readonly module: any;
+    protected readonly module: Type;
     protected readonly container: Container;
-    constructor(module: any, container: Container);
+    constructor(module: Type, container: Container);
     get<TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol): TResult;
     run(args: string[]): Promise<string>;
 }

package/lib/core/Container.d.ts

@@ -1,11 +1,10 @@
+import { Type, InjectionToken, ProviderType } from "../types";
 import { InstanceWrapper } from "./InstanceWrapper";
 import { ModuleWrapper } from "./ModuleWrapper";
-import { Type, InjectionToken, ProviderType } from "../types";
 export declare class Container {
     readonly modules: Map<Type, ModuleWrapper>;
     readonly moduleExportIndex: Map<InjectionToken, Set<ModuleWrapper>>;
     readonly globalProviders: Map<InjectionToken, InstanceWrapper>;
-    constructor();
     addModule<TInput = any>(type: Type<TInput>, module: ModuleWrapper): void;
     hasModule<TInput = any>(type: Type<TInput>): boolean;
     getModule<TInput = any>(type: Type<TInput>): ModuleWrapper<TInput>;

package/lib/core/Container.js

@@ -1,17 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
-const cli_1 = require("@kearisp/cli");
-const InstanceWrapper_1 = require("./InstanceWrapper");
-const ModuleWrapper_1 = require("./ModuleWrapper");
 const env_1 = require("../env");
 class Container {
     constructor() {
         this.modules = new Map();
         this.moduleExportIndex = new Map();
         this.globalProviders = new Map();
-        const cliWrapper = new InstanceWrapper_1.InstanceWrapper(new ModuleWrapper_1.ModuleWrapper(this, null), cli_1.Cli);
-        this.globalProviders.set(cli_1.Cli, cliWrapper);
     }
     addModule(type, module) {
         this.modules.set(type, module);

package/lib/core/ControllerWrapper.d.ts

@@ -1,8 +1,7 @@
-import "reflect-metadata";
 import { CommandInput } from "@kearisp/cli";
+import { Type } from "../types";
 import { InstanceWrapper } from "./InstanceWrapper";
 import { ModuleWrapper } from "./ModuleWrapper";
-import { Type } from "../types/Type";
 import { Route } from "./Route";
 export declare class ControllerWrapper<TInput = any> extends InstanceWrapper {
     readonly _type: Type<TInput>;

package/lib/core/ControllerWrapper.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ControllerWrapper = void 0;
-require("reflect-metadata");
+const env_1 = require("../env");
 const InstanceWrapper_1 = require("./InstanceWrapper");
 const Route_1 = require("./Route");
-const env_1 = require("../env");
 class ControllerWrapper extends InstanceWrapper_1.InstanceWrapper {
     constructor(module, type) {
         super(module, type);

package/lib/core/CoreModule.d.ts

@@ -0,0 +1,2 @@
+export declare class CoreModule {
+}

package/lib/core/CoreModule.js

@@ -0,0 +1,54 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoreModule = void 0;
+const cli_1 = require("@kearisp/cli");
+const decorators_1 = require("../decorators");
+const AppService_1 = require("../services/AppService");
+const AppConfigService_1 = require("../services/AppConfigService");
+const AppFileSystemService_1 = require("../services/AppFileSystemService");
+const ProcessService_1 = require("../services/ProcessService");
+const EventService_1 = require("../services/EventService");
+const LogService_1 = require("../services/LogService");
+const env_1 = require("../env");
+let CoreModule = class CoreModule {
+};
+exports.CoreModule = CoreModule;
+exports.CoreModule = CoreModule = __decorate([
+    (0, decorators_1.Global)(),
+    (0, decorators_1.Module)({
+        providers: [
+            cli_1.Cli,
+            {
+                provide: env_1.WOCKER_VERSION_KEY,
+                useValue: env_1.WOCKER_VERSION
+            },
+            {
+                provide: env_1.WOCKER_DATA_DIR_KEY,
+                useValue: env_1.DATA_DIR
+            },
+            AppService_1.AppService,
+            AppConfigService_1.AppConfigService,
+            AppFileSystemService_1.AppFileSystemService,
+            ProcessService_1.ProcessService,
+            EventService_1.EventService,
+            LogService_1.LogService
+        ],
+        exports: [
+            cli_1.Cli,
+            env_1.WOCKER_VERSION_KEY,
+            env_1.WOCKER_DATA_DIR_KEY,
+            AppService_1.AppService,
+            AppConfigService_1.AppConfigService,
+            AppFileSystemService_1.AppFileSystemService,
+            ProcessService_1.ProcessService,
+            EventService_1.EventService,
+            LogService_1.LogService
+        ]
+    })
+], CoreModule);

package/lib/core/Factory.js

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Factory = void 0;
 const ApplicationContext_1 = require("./ApplicationContext");
+const Container_1 = require("./Container");
 const Scanner_1 = require("./Scanner");
 class Factory {
     static create(module) {
         return __awaiter(this, void 0, void 0, function* () {
-            const scanner = new Scanner_1.Scanner();
+            const container = new Container_1.Container(), scanner = new Scanner_1.Scanner(container);
             yield scanner.scan(module);
             return new ApplicationContext_1.ApplicationContext(module, scanner.container);
         });

package/lib/core/Scanner.d.ts

@@ -1,4 +1,3 @@
-import "reflect-metadata";
 import { Cli } from "@kearisp/cli";
 import { Type, DynamicModule, ProviderType } from "../types";
 import { Container } from "./Container";

package/lib/core/Scanner.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scanner = void 0;
-require("reflect-metadata");
 const cli_1 = require("@kearisp/cli");
 const Container_1 = require("./Container");
 const ModuleWrapper_1 = require("./ModuleWrapper");
+const CoreModule_1 = require("./CoreModule");
 const env_1 = require("../env");
 class Scanner {
     constructor(container) {
@@ -21,6 +21,7 @@ class Scanner {
     }
     scan(moduleDefinition) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.scanModule(CoreModule_1.CoreModule);
             this.scanModule(moduleDefinition);
             yield this.scanDynamicModules();
             this.scanRoutes();
@@ -82,13 +83,11 @@ class Scanner {
         return module;
     }
     scanControllers(module, controllers) {
-        // const controllers = Reflect.getMetadata(MODULE_METADATA.CONTROLLERS, module.type) || [];
         controllers.forEach((controller) => {
             module.addController(controller);
         });
     }
     scanProviders(module, providers) {
-        // const providers: ProviderType[] = Reflect.getMetadata(MODULE_METADATA.PROVIDERS, module.type) || [];
         providers.forEach((provider) => {
             module.addProvider(provider);
         });

package/lib/env.d.ts

@@ -1,3 +1,4 @@
+export declare const WOCKER_VERSION = "1.0.26";
 export declare const IS_GLOBAL_METADATA = "IS_GLOBAL";
 export declare const IS_MODULE_METADATA = "isModule";
 export declare const INJECTABLE_WATERMARK = "__injectable__";

package/lib/env.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WOCKER_DATA_DIR_KEY = exports.WOCKER_VERSION_KEY = exports.DATA_DIR = exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.PLUGIN_DIR_KEY = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.OPTION_META = exports.ALIAS_METADATA = exports.ARGS_OLD_METADATA = exports.ARGS_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_METADATA = exports.DESCRIPTION_METADATA = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = void 0;
+exports.WOCKER_DATA_DIR_KEY = exports.WOCKER_VERSION_KEY = exports.DATA_DIR = exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.PLUGIN_DIR_KEY = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.OPTION_META = exports.ALIAS_METADATA = exports.ARGS_OLD_METADATA = exports.ARGS_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_METADATA = exports.DESCRIPTION_METADATA = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = exports.WOCKER_VERSION = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+exports.WOCKER_VERSION = "1.0.26";
 exports.IS_GLOBAL_METADATA = "IS_GLOBAL";
 exports.IS_MODULE_METADATA = "isModule";
 exports.INJECTABLE_WATERMARK = "__injectable__";

package/lib/makes/AppConfig.d.ts

@@ -1,8 +1,4 @@
-import { EnvConfig, PackageManagerType } from "../types";
-import { PluginRef } from "../types/PluginRef";
-import { PresetRef } from "../types/PresetRef";
-import { ProjectRef, ProjectOldRef } from "../types/ProjectRef";
-import { PresetSource } from "../types/PresetSource";
+import { EnvConfig, PackageManagerType, PluginRef, PresetRef, ProjectRef, ProjectOldRef, PresetSource } from "../types";
 export type AppConfigProperties = {
     debug?: boolean;
     pm?: PackageManagerType;

package/lib/makes/AppConfig.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
-const PresetSource_1 = require("../types/PresetSource");
+const types_1 = require("../types");
 class AppConfig {
     constructor(data) {
         this.logLevel = "off";
@@ -83,11 +83,11 @@ class AppConfig {
         });
     }
     registerPreset(name, source, path) {
-        if (source === PresetSource_1.PRESET_SOURCE_INTERNAL) {
+        if (source === types_1.PRESET_SOURCE_INTERNAL) {
             return;
         }
         let presetData = this.presets.find((preset) => {
-            if (source === PresetSource_1.PRESET_SOURCE_EXTERNAL && preset.path === path) {
+            if (source === types_1.PRESET_SOURCE_EXTERNAL && preset.path === path) {
                 return true;
             }
             return preset.name === name;
@@ -100,7 +100,7 @@ class AppConfig {
             this.presets.push(presetData);
         }
         presetData.source = source;
-        if (presetData.source === PresetSource_1.PRESET_SOURCE_EXTERNAL) {
+        if (presetData.source === types_1.PRESET_SOURCE_EXTERNAL) {
             presetData.path = path;
         }
         else if (presetData.path) {

package/lib/services/AppConfigService.d.ts

@@ -1,8 +1,5 @@
 import { AppConfig } from "../makes/AppConfig";
-import { PresetRef } from "../types/PresetRef";
-import { ProjectRef } from "../types/ProjectRef";
-import { PluginRef } from "../types/PluginRef";
-import { PresetSource } from "../types/PresetSource";
+import { PresetSource, PresetRef, ProjectRef, PluginRef } from "../types";
 import { AppFileSystemService } from "./AppFileSystemService";
 import { ProcessService } from "./ProcessService";
 type TypeMap = {

package/lib/services/AppConfigService.js

@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfigService = void 0;
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../decorators");
-const AppConfig_1 = require("../makes/AppConfig");
 const modules_1 = require("../modules");
+const AppConfig_1 = require("../makes/AppConfig");
 const AppFileSystemService_1 = require("./AppFileSystemService");
 const ProcessService_1 = require("./ProcessService");
 const env_1 = require("../env");
@@ -155,7 +155,7 @@ let AppConfigService = class AppConfigService {
         this.save();
     }
     addPlugin(name, env) {
-        this.config.addPlugin(name);
+        this.config.addPlugin(name, env);
     }
     removePlugin(name) {
         this.config.removePlugin(name);

package/lib/services/DockerService.d.ts

@@ -72,8 +72,8 @@ export declare abstract class DockerService {
     abstract imageLs(options?: DockerServiceParams.ImageList): Promise<ImageInfo[]>;
     abstract imageRm(tag: string, force?: boolean): Promise<void>;
     abstract pullImage(tag: string): Promise<void>;
-    abstract attach(name: string | Container): Promise<NodeJS.ReadWriteStream>;
+    abstract attach(name: string | Container): Promise<NodeJS.ReadWriteStream | null | undefined>;
     abstract attachStream(stream: NodeJS.ReadWriteStream): Promise<NodeJS.ReadWriteStream>;
-    abstract exec(name: string, command?: DockerServiceParams.Exec | string[], tty?: boolean): Promise<Duplex>;
-    abstract logs(containerOrName: string | Container): Promise<NodeJS.ReadableStream>;
+    abstract exec(name: string, command?: DockerServiceParams.Exec | string[], tty?: boolean): Promise<Duplex | null>;
+    abstract logs(containerOrName: string | Container): Promise<NodeJS.ReadableStream | null | undefined>;
 }

package/lib/types/PluginRef.d.ts

@@ -1,4 +1,4 @@
 export type PluginRef = {
     name: string;
-    env: "latest" | "beta";
+    env: string;
 };

package/lib/types/index.d.ts

@@ -6,11 +6,13 @@ export * from "./ModuleMetadata";
 export * from "./PackageManagerType";
 export * from "./PickProperties";
 export * from "./PluginMetadata";
+export * from "./PluginRef";
 export * from "./PresetRef";
 export * from "./PresetSource";
+export * from "./ProviderType";
+export * from "./ProjectRef";
 export * from "./Type";
 export * from "./Volume";
-export * from "./ProviderType";
 export type { 
 /**
  * @deprecated

package/lib/types/index.js

@@ -22,8 +22,10 @@ __exportStar(require("./ModuleMetadata"), exports);
 __exportStar(require("./PackageManagerType"), exports);
 __exportStar(require("./PickProperties"), exports);
 __exportStar(require("./PluginMetadata"), exports);
+__exportStar(require("./PluginRef"), exports);
 __exportStar(require("./PresetRef"), exports);
 __exportStar(require("./PresetSource"), exports);
+__exportStar(require("./ProviderType"), exports);
+__exportStar(require("./ProjectRef"), exports);
 __exportStar(require("./Type"), exports);
 __exportStar(require("./Volume"), exports);
-__exportStar(require("./ProviderType"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.0.26-beta.4",
+    "version": "1.0.26-beta.6",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",