@wocker/core 1.1.0-beta.5 → 1.1.0-beta.7

package/lib/core/ApplicationContext.d.ts

@@ -8,4 +8,5 @@ export declare class ApplicationContext {
     constructor(module: Type, container: Container, options?: ApplicationOptions);
     get<TInput = any, TResult = TInput>(typeOrToken: InjectionToken<TInput>): TResult;
     run(args: string[]): Promise<string>;
+    protected process(args: string[]): Promise<string>;
 }

package/lib/core/ApplicationContext.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationContext = void 0;
 const cli_1 = require("@kearisp/cli");
 const AsyncStorage_1 = require("./AsyncStorage");
+const EventService_1 = require("../services/EventService");
 const env_1 = require("../env");
 class ApplicationContext {
     constructor(module, container, options = {}) {
@@ -34,43 +35,53 @@ class ApplicationContext {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
                 AsyncStorage_1.AsyncStorage.run(this.container, () => {
-                    const cli = this.get(cli_1.Cli);
-                    cli.command("")
-                        .option("version", {
-                        type: "boolean",
-                        alias: "v"
-                    })
-                        .action((input) => {
-                        if (input.option("version")) {
-                            return env_1.WOCKER_VERSION;
+                    return resolve(this.process(args));
+                });
+            });
+        });
+    }
+    process(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cli = this.get(cli_1.Cli), eventService = this.get(EventService_1.EventService);
+            cli.command("")
+                .option("version", {
+                type: "boolean",
+                alias: "v"
+            })
+                .action((input) => {
+                if (input.option("version")) {
+                    return env_1.WOCKER_VERSION;
+                }
+                for (const [, module] of this.container.modules) {
+                    for (const [, container] of module.controllers) {
+                        if (!container.description) {
+                            continue;
                         }
-                        for (const [, module] of this.container.modules) {
-                            for (const [, container] of module.controllers) {
-                                if (!container.description) {
-                                    continue;
-                                }
-                                console.info(`${container.description}:`);
-                                const spaceLength = container.commands.reduce((space, route) => {
-                                    return route.commandNames.reduce((space, command) => {
-                                        return Math.max(space, command.length + 2);
-                                    }, space);
-                                }, 0);
-                                for (const route of container.commands) {
-                                    if (!route.description) {
-                                        continue;
-                                    }
-                                    for (const commandName of route.commandNames) {
-                                        const space = " ".repeat(Math.max(0, spaceLength - commandName.length));
-                                        console.info(`  ${commandName} ${space} ${route.description}`);
-                                    }
-                                }
-                                console.info("");
+                        console.info(`${container.description}:`);
+                        const spaceLength = container.commands.reduce((space, route) => {
+                            return route.commandNames.reduce((space, command) => {
+                                return Math.max(space, command.length + 2);
+                            }, space);
+                        }, 0);
+                        for (const route of container.commands) {
+                            if (!route.description) {
+                                continue;
+                            }
+                            for (const commandName of route.commandNames) {
+                                const space = " ".repeat(Math.max(0, spaceLength - commandName.length));
+                                console.info(`  ${commandName} ${space} ${route.description}`);
                             }
                         }
-                    });
-                    return resolve(cli.run(args));
-                });
+                        console.info("");
+                    }
+                }
             });
+            try {
+                return yield cli.run(args);
+            }
+            finally {
+                yield eventService.emit("finish");
+            }
         });
     }
 }

package/lib/core/Route.js

@@ -11,7 +11,7 @@ class Route {
         this.commandNames = [];
         this.completions = [];
         const descriptor = Object.getOwnPropertyDescriptor(this.type.prototype, this.method);
-        if (!descriptor) {
+        if (!descriptor || !descriptor.value) {
             return;
         }
         this.description = Reflect.getMetadata(env_1.DESCRIPTION_METADATA, descriptor.value) || "";

package/lib/makes/PluginConfig.d.ts

@@ -0,0 +1,7 @@
+import { FileSystem } from "./FileSystem";
+export declare abstract class PluginConfig {
+    constructor(_data: any);
+    save(): void;
+    toObject(): any;
+    static make<C extends typeof PluginConfig>(fs: FileSystem, configPath?: string): InstanceType<C>;
+}

package/lib/makes/PluginConfig.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginConfig = void 0;
+class PluginConfig {
+    constructor(_data) { }
+    save() {
+        throw new Error("Method not implemented");
+    }
+    toObject() {
+        throw new Error("Method not implemented");
+    }
+    static make(fs, configPath = "config.json") {
+        const data = fs.exists(configPath)
+            ? fs.readJSON(configPath)
+            : {};
+        return new class extends this {
+            constructor(data) {
+                super(data);
+            }
+            save() {
+                if (!fs.exists()) {
+                    fs.mkdir("", {
+                        recursive: true
+                    });
+                }
+                fs.writeJSON(configPath, this.toObject());
+            }
+        }(data);
+    }
+}
+exports.PluginConfig = PluginConfig;

package/lib/makes/Project.d.ts

@@ -1,5 +1,5 @@
 import { ProjectConfig } from "./ProjectConfig";
-import { EnvConfig, ProjectConfigScope, ProjectRef, ProjectType } from "../types";
+import { EnvConfig, ProjectConfigScope, ProjectRef, ProjectType, PresetMode } from "../types";
 export declare class Project {
     name: string;
     path: string;
@@ -13,9 +13,10 @@ export declare class Project {
     get scripts(): any;
     get preset(): string | undefined;
     set preset(preset: string | undefined);
-    get presetMode(): "project" | "global";
-    set presetMode(mode: "project" | "global");
+    get presetMode(): PresetMode;
+    set presetMode(mode: PresetMode);
     get image(): string | undefined;
+    set image(image: string | undefined);
     /** @deprecated */
     get imageName(): string | undefined;
     /** @deprecated */

package/lib/makes/Project.js

@@ -56,13 +56,20 @@ class Project {
     get image() {
         return this.configs.app.image || this.configs.project.image;
     }
+    set image(image) {
+        if (!image) {
+            delete this.configs.app.image;
+            return;
+        }
+        this.configs.app.image = image;
+    }
     /** @deprecated */
     get imageName() {
-        return this.configs.app.image || this.configs.project.image;
+        return this.image;
     }
     /** @deprecated */
     set imageName(image) {
-        this.configs.app.image = image;
+        this.image = image;
     }
     get dockerfile() {
         return this.configs.app.dockerfile || this.configs.project.dockerfile;
@@ -171,7 +178,7 @@ class Project {
         this.configs.app.unsetEnv(key, service);
     }
     hasMeta(key) {
-        return this.configs.app.metadata.hasOwnProperty(key) || this.configs.project.metadata.hasOwnProperty(key);
+        return key in this.configs.app.metadata || key in this.configs.project.metadata;
     }
     getMeta(key, byDefault) {
         return this.configs.app.metadata[key] || this.configs.project.metadata[key] || byDefault;

package/lib/makes/ProjectConfig.d.ts

@@ -1,6 +1,6 @@
-import { EnvConfig, ProjectType, ProjectConfigScope } from "../types";
 import { JsonEditor } from "./JsonEditor";
 import { ServiceConfig } from "./ServiceConfig";
+import { EnvConfig, ProjectType, ProjectConfigScope, PresetMode } from "../types";
 export declare class ProjectConfig extends JsonEditor<ProjectConfig.Data> {
     readonly _scope: ProjectConfigScope;
     constructor(_scope: ProjectConfigScope, content: string);
@@ -60,7 +60,7 @@ export declare namespace ProjectConfig {
         dockerfile?: string;
         composefile?: string;
         preset?: string;
-        presetMode?: "global" | "project";
+        presetMode?: PresetMode;
         scripts?: {
             [script: string]: string;
         };

package/lib/makes/ProjectConfig.js

@@ -102,7 +102,7 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
         return this.state.cmd;
     }
     set cmd(cmd) {
-        this.state.cmd = cmd;
+        this.set(["cmd"], cmd);
     }
     get scripts() {
         return this.createProxy(["scripts"], {
@@ -146,7 +146,10 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
             this.set(["services", service, "buildArgs", key], value);
             return;
         }
-        this.buildArgs[key] = value;
+        if (!this.state.buildArgs) {
+            this.set(["buildArgs"], {});
+        }
+        this.set(["buildArgs", key], value);
     }
     unsetBuildArg(key, service) {
         if (service) {
@@ -162,7 +165,6 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
         return byDefault;
     }
     hasEnv(key) {
-        // return this.env.hasOwnProperty(key);
         return key in this.env;
     }
     setEnv(key, value, service) {
@@ -173,6 +175,9 @@ class ProjectConfig extends JsonEditor_1.JsonEditor {
             this.set(["services", service, "env", key], sValue);
             return;
         }
+        if (!this.state.env) {
+            this.set(["env"], {});
+        }
         this.set(["env", key], sValue);
     }
     unsetEnv(key, service) {

package/lib/makes/index.d.ts

@@ -4,6 +4,7 @@ export * from "./ConfigCollection";
 export * from "./FileSystem";
 export * from "./FileSystemManager";
 export * from "./Logger";
+export * from "./PluginConfig";
 export * from "./Project";
 export * from "./Version";
 export * from "./VersionRange";

package/lib/makes/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./ConfigCollection"), exports);
 __exportStar(require("./FileSystem"), exports);
 __exportStar(require("./FileSystemManager"), exports);
 __exportStar(require("./Logger"), exports);
+__exportStar(require("./PluginConfig"), exports);
 __exportStar(require("./Project"), exports);
 __exportStar(require("./Version"), exports);
 __exportStar(require("./VersionRange"), exports);

package/lib/modules/plugin/services/PluginConfigService.d.ts

@@ -1,7 +1,7 @@
 import { WriteFileOptions, MakeDirectoryOptions, RmOptions, WriteStream, ReadStream } from "fs";
 import { FileSystemDriver } from "../../../types";
 import { AppConfigService } from "../../../services/AppConfigService";
-import { FileSystem } from "../../../makes";
+import { FileSystem, PluginConfig } from "../../../makes";
 export declare class PluginConfigService {
     protected readonly appConfigService: AppConfigService;
     protected readonly pluginDir: string;
@@ -9,6 +9,7 @@ export declare class PluginConfigService {
     protected _fs?: FileSystem;
     constructor(appConfigService: AppConfigService, pluginDir: string, driver: FileSystemDriver);
     get fs(): FileSystem;
+    getConfig<T extends typeof PluginConfig>(Config: T): InstanceType<T>;
     isVersionGTE(version: string): boolean;
     /** @deprecated */
     dataPath(...parts: string[]): string;

package/lib/modules/plugin/services/PluginConfigService.js

@@ -46,6 +46,9 @@ let PluginConfigService = class PluginConfigService {
         }
         return this._fs;
     }
+    getConfig(Config) {
+        return Config.make(this.fs);
+    }
     isVersionGTE(version) {
         if (!this.appConfigService.isVersionGTE) {
             return false;

package/lib/types/PresetMode.d.ts

@@ -0,0 +1,14 @@
+declare enum PresetModeEnum {
+    PROJECT = "project",
+    GLOBAL = "global"
+}
+export type PresetMode = PresetModeEnum;
+export declare const PresetMode: typeof PresetModeEnum & {
+    values: () => PresetModeEnum[];
+    options: () => {
+        label: string;
+        value: PresetModeEnum;
+    }[];
+    label: (mode: PresetModeEnum) => string;
+};
+export {};

package/lib/types/PresetMode.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PresetMode = void 0;
+var PresetModeEnum;
+(function (PresetModeEnum) {
+    PresetModeEnum["PROJECT"] = "project";
+    PresetModeEnum["GLOBAL"] = "global";
+})(PresetModeEnum || (PresetModeEnum = {}));
+exports.PresetMode = Object.assign({}, PresetModeEnum, {
+    values: () => {
+        return Object.values(PresetModeEnum);
+    },
+    options: () => {
+        return exports.PresetMode.values().map((mode) => {
+            return {
+                label: exports.PresetMode.label(mode),
+                value: mode
+            };
+        });
+    },
+    label: (mode) => {
+        switch (mode) {
+            case PresetModeEnum.PROJECT:
+                return "For project only";
+            case PresetModeEnum.GLOBAL:
+                return "Global usage";
+            default:
+                throw new Error(`Unsupported mode "${mode}"`);
+        }
+    }
+});

package/lib/types/index.d.ts

@@ -11,6 +11,7 @@ export * from "./PluginMetadata";
 export * from "./ProjectConfigScope";
 export * from "./PluginRef";
 export * from "./PresetRef";
+export * from "./PresetMode";
 export * from "./PresetSource";
 export * from "./ProviderType";
 export * from "./ProjectRef";
@@ -22,8 +23,3 @@ export type {
  * @deprecated
  */
 ModuleMetadata as ModuleConfig } from "./ModuleMetadata";
-export type { 
-/**
- * @deprecated
- */
-PluginMetadata as PluginConfig } from "./PluginMetadata";

package/lib/types/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./PluginMetadata"), exports);
 __exportStar(require("./ProjectConfigScope"), exports);
 __exportStar(require("./PluginRef"), exports);
 __exportStar(require("./PresetRef"), exports);
+__exportStar(require("./PresetMode"), exports);
 __exportStar(require("./PresetSource"), exports);
 __exportStar(require("./ProviderType"), exports);
 __exportStar(require("./ProjectRef"), exports);

package/package.json

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