@wocker/ws 1.0.10 → 1.0.11

package/lib/controllers/PresetController.d.ts

@@ -11,6 +11,7 @@ export declare class PresetController {
     protected onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;
+    add(preset: string): Promise<void>;
     eject(name?: string): Promise<void>;
     build(rebuild: boolean, presetName: string): Promise<void>;
 }

package/lib/controllers/PresetController.js

@@ -122,7 +122,7 @@ let PresetController = class PresetController {
         if (!preset) {
             throw new Error(`Preset ${project.preset} not found`);
         }
-        const imageName = preset.getImageName(project.buildArgs || {});
+        const imageName = this.presetService.getImageName(preset, project.buildArgs || {});
         const exists = await this.dockerService.imageExists(imageName);
         if (exists) {
             console.info(`Removing image: ${imageName}`);
@@ -135,7 +135,7 @@ let PresetController = class PresetController {
         }
         const preset = await this.presetService.get(project.preset);
         if (preset.dockerfile) {
-            project.imageName = preset.getImageName(project.buildArgs);
+            project.imageName = this.presetService.getImageName(preset, project.buildArgs);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
                     tag: project.imageName,
@@ -149,6 +149,8 @@ let PresetController = class PresetController {
             }
         }
     }
+    async add(preset) {
+    }
     async eject(name) {
         if (name) {
             await this.projectService.cdProject(name);
@@ -204,7 +206,7 @@ let PresetController = class PresetController {
         if (preset.buildArgsOptions) {
             buildArgs = await (0, utils_1.promptGroup)(preset.buildArgsOptions);
         }
-        const imageName = preset.getImageName(buildArgs);
+        const imageName = this.presetService.getImageName(preset, buildArgs);
         await this.dockerService.buildImage({
             tag: imageName,
             labels: {
@@ -217,6 +219,12 @@ let PresetController = class PresetController {
     }
 };
 exports.PresetController = PresetController;
+__decorate([
+    (0, core_1.Command)("preset:add <preset>"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "add", null);
 __decorate([
     (0, core_1.Command)("preset:eject"),
     __param(0, (0, core_1.Option)("name", {

package/lib/controllers/ProjectController.d.ts

@@ -7,6 +7,7 @@ export declare class ProjectController {
     protected readonly logService: LogService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService, logService: LogService);
     protected getProjectNames(): Promise<string[]>;
+    getScriptNames(): Promise<string[]>;
     init(name: string, type: string, preset: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
     start(name?: string, detach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;

package/lib/controllers/ProjectController.js

@@ -62,6 +62,15 @@ let ProjectController = class ProjectController {
             return project.name;
         });
     }
+    async getScriptNames() {
+        try {
+            const project = await this.projectService.get();
+            return Object.keys(project.scripts);
+        }
+        catch (err) {
+            return [];
+        }
+    }
     async init(name, type, preset) {
         let project = await this.projectService.searchOne({
             path: this.appConfigService.getPWD()
@@ -404,6 +413,10 @@ let ProjectController = class ProjectController {
             const prepareLog = (str) => {
                 return str.replace(/^\[.*]\s([^:]+):\s.*$/gm, (substring, type) => {
                     switch (type) {
+                        case "debug":
+                            return chalk_1.default.grey(substring);
+                        case "log":
+                            return chalk_1.default.white(substring);
                         case "info":
                             return chalk_1.default.green(substring);
                         case "warn":
@@ -485,6 +498,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "getProjectNames", null);
+__decorate([
+    (0, core_1.Completion)("script"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "getScriptNames", null);
 __decorate([
     (0, core_1.Command)("init"),
     __param(0, (0, core_1.Option)("name", {
@@ -519,22 +538,27 @@ __decorate([
 ], ProjectController.prototype, "projectList", null);
 __decorate([
     (0, core_1.Command)("start"),
+    (0, core_1.Description)("Starting project"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "Project name",
+        help: true
     })),
     __param(1, (0, core_1.Option)("detach", {
         type: "boolean",
+        description: "Detach",
         alias: "d"
     })),
     __param(2, (0, core_1.Option)("build", {
         type: "boolean",
+        description: "Build",
         alias: "b"
     })),
     __param(3, (0, core_1.Option)("restart", {
         type: "boolean",
-        alias: "r"
+        alias: "r",
+        description: "Restart"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
@@ -597,6 +621,7 @@ __decorate([
         type: "boolean",
         alias: "g"
     })),
+    __param(2, (0, core_1.Param)("key")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Array]),
     __metadata("design:returntype", Promise)

package/lib/plugins/ElasticSearchPlugin.d.ts

@@ -1,5 +1,4 @@
 import { FSManager } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, DockerService } from "../services";
 type StartOptions = {
     restart?: boolean;
@@ -10,7 +9,6 @@ export declare class ElasticSearchPlugin {
     protected containerName: string;
     protected fs: FSManager;
     constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    install(cli: Cli): void;
     start(options: StartOptions): Promise<void>;
     stop(): Promise<void>;
 }

package/lib/plugins/ElasticSearchPlugin.js

@@ -19,17 +19,6 @@ let ElasticSearchPlugin = class ElasticSearchPlugin {
         this.containerName = "elastic-search.workspace";
         this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
     }
-    install(cli) {
-        cli.command("elastica:start")
-            .option("restart", {
-            type: "boolean",
-            alias: "r",
-            description: "Restart service"
-        })
-            .action((options) => this.start(options));
-        cli.command("elastica:stop")
-            .action(() => this.stop());
-    }
     async start(options) {
         const { restart } = options;
         await this.dockerService.pullImage("docker.elastic.co/elasticsearch/elasticsearch:7.5.2");

package/lib/plugins/LocaltunnelPlugin.d.ts

@@ -1,5 +1,4 @@
 import { Project } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {
     name?: string;
@@ -21,7 +20,6 @@ export declare class LocaltunnelPlugin {
     protected readonly projectService: ProjectService;
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
-    install(cli: Cli): void;
     getIp(): Promise<string>;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;

package/lib/plugins/LocaltunnelPlugin.js

@@ -25,64 +25,6 @@ let LocaltunnelPlugin = class LocaltunnelPlugin {
         this.projectService = projectService;
         this.dockerService = dockerService;
     }
-    install(cli) {
-        this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
-        this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
-        cli.command("localtunnel:init")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .action((options) => this.init(options));
-        cli.command("localtunnel:start")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.start(options));
-        cli.command("localtunnel:restart")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.restart(options));
-        cli.command("localtunnel:stop")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .action((options) => this.stop(options));
-        cli.command("localtunnel:build")
-            .action(() => this.build());
-        cli.command("localtunnel:rebuild")
-            .action(() => this.rebuild());
-        cli.command("localtunnel:logs")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.logs(options));
-    }
     async getIp() {
         const res = await axios_1.default.get("https://ipv4.icanhazip.com");
         return res.data.replace("\n", "");

package/lib/plugins/MaildevPlugin.d.ts

@@ -1,11 +1,9 @@
-import { Cli } from "@kearisp/cli";
 import { DockerService, AppConfigService } from "../services";
 export declare class MaildevPlugin {
     protected readonly appConfigService: AppConfigService;
     protected readonly dockerService: DockerService;
     protected containerName: string;
     constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    install(cli: Cli): void;
     start(): Promise<void>;
     stop(): Promise<void>;
 }

package/lib/plugins/MaildevPlugin.js

@@ -18,12 +18,6 @@ let MaildevPlugin = class MaildevPlugin {
         this.dockerService = dockerService;
         this.containerName = "maildev.workspace";
     }
-    install(cli) {
-        cli.command("maildev:start")
-            .action(() => this.start());
-        cli.command("maildev:stop")
-            .action(() => this.stop());
-    }
     async start() {
         console.log("Maildev starting...");
         const imageName = "ws-maildev";

package/lib/plugins/MongodbPlugin.d.ts

@@ -1,4 +1,3 @@
-import { Cli } from "@kearisp/cli";
 import { DockerService } from "../services";
 export declare class MongodbPlugin {
     protected readonly dockerService: DockerService;
@@ -7,7 +6,6 @@ export declare class MongodbPlugin {
     protected dataDir: string;
     constructor(dockerService: DockerService);
     protected dataPath(...parts: string[]): string;
-    install(cli: Cli): void;
     getDatabases(): Promise<string[]>;
     getDatabasesDumps(): Promise<string[]>;
     start(): Promise<void>;

package/lib/plugins/MongodbPlugin.js

@@ -50,63 +50,6 @@ let MongodbPlugin = class MongodbPlugin {
     dataPath(...parts) {
         return Path.join(this.dataDir, ...parts);
     }
-    install(cli) {
-        cli.command("mongodb:start").action(() => {
-            return this.start();
-        });
-        cli.command("mongodb:stop").action(() => {
-            return this.stop();
-        });
-        cli.command("mongodb:restart").action(() => {
-            return this.restart();
-        });
-        cli.command("mongodb:backup [database]")
-            .completion("database", () => {
-            return this.getDatabases();
-        })
-            .action((options, database) => {
-            return this.backup(database);
-        });
-        cli.command("mongodb:restore [database] [filename]")
-            .completion("database", () => {
-            const dumpPath = this.dataPath("dump");
-            return makes_1.FS.readdir(dumpPath);
-        })
-            .completion("filename", (options, database) => {
-            if (!database) {
-                return [];
-            }
-            const dirPath = this.dataPath("dump", database);
-            if (!makes_1.FS.existsSync(dirPath)) {
-                return [];
-            }
-            return makes_1.FS.readdir(dirPath);
-        })
-            .action((options, database, filename) => {
-            return this.restore(database, filename);
-        });
-        cli.command("mongodb:delete-backup [database] [filename]")
-            .option("yes", {
-            type: "boolean",
-            alias: "y"
-        })
-            .completion("database", () => {
-            return this.getDatabasesDumps();
-        })
-            .completion("filename", (options, database) => {
-            if (!database) {
-                return [];
-            }
-            const dumpPath = this.dataPath("dump", database);
-            if (!makes_1.FS.existsSync(dumpPath)) {
-                return [];
-            }
-            return makes_1.FS.readdirFiles(dumpPath);
-        })
-            .action((options, database, filename) => {
-            return this.deleteBackup(database, filename, options.yes);
-        });
-    }
     async getDatabases() {
         const stream = await this.dockerService.exec(this.container, [
             "mongosh",

package/lib/plugins/PageKitePlugin.d.ts

@@ -1,5 +1,4 @@
 import { Project } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {};
 type StartOptions = {
@@ -21,7 +20,6 @@ export declare class PageKitePlugin {
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
     pluginPath(...parts: string[]): string;
-    install(cli: Cli): void;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
     init(options: InitOptions): Promise<void>;

package/lib/plugins/PageKitePlugin.js

@@ -23,38 +23,6 @@ let PageKitePlugin = class PageKitePlugin {
     pluginPath(...parts) {
         return this.appConfigService.pluginsPath("pagekite", ...parts);
     }
-    install(cli) {
-        this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
-        this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
-        cli.command("pagekite:init")
-            .action((options) => this.init(options));
-        cli.command("pagekite:start")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .option("restart", {
-            type: "boolean",
-            alias: "r",
-            description: "Restart"
-        })
-            .action((options) => this.start(options));
-        cli.command("pagekite:stop")
-            .option("name", {
-            type: "string",
-            alias: "n",
-            description: "Project name"
-        })
-            .action((options) => this.stop(options));
-        cli.command("pagekite:build")
-            .option("rebuild", {
-            type: "boolean",
-            alias: "r",
-            description: "Rebuild"
-        })
-            .action((options) => this.build(options));
-    }
     async onProjectStart(project) {
         if (!project || project.getEnv("PAGEKITE_ENABLE", "false") !== "true") {
             return;

package/lib/services/PresetService.js

@@ -44,14 +44,14 @@ let PresetService = class PresetService {
     }
     async get(name) {
         const config = await makes_1.FS.readJSON(env_1.PRESETS_DIR, name, "config.json");
+        const _this = this;
         return new class extends core_1.Preset {
-            constructor(presetService, data) {
+            constructor(data) {
                 super(data);
-                this.presetService = presetService;
             }
             async save() {
             }
-        }(this, {
+        }({
             name,
             ...config
         });
@@ -64,11 +64,7 @@ let PresetService = class PresetService {
             if (name && name !== dir) {
                 continue;
             }
-            const config = await makes_1.FS.readJSON(env_1.PRESETS_DIR, dir, "config.json");
-            const preset = new core_1.Preset({
-                name: dir,
-                ...config
-            });
+            const preset = await this.get(dir);
             presets.push(preset);
         }
         return presets;

package/lib/services/ProjectService.js

@@ -96,6 +96,7 @@ let ProjectService = class ProjectService {
                 });
             }
         }
+        await this.appEventsService.emit("project:beforeStart", project);
         let container = await this.dockerService.getContainer(project.containerName);
         if (container && restart) {
             container = null;
@@ -120,7 +121,6 @@ let ProjectService = class ProjectService {
             });
         }
         const { State: { Status } } = await container.inspect();
-        await this.appEventsService.emit("project:beforeStart", project);
         if (Status === "created" || Status === "exited") {
             await container.start();
         }

package/package.json

@@ -1,9 +1,14 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "bin": {
+        "ws": "./bin/ws.js"
+    },
     "homepage": "https://kearisp.github.io/wocker",
     "repository": {
         "type": "git",
@@ -12,11 +17,6 @@
     "bugs": {
         "url": "https://github.com/kearisp/wocker-ws/issues"
     },
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
-    "bin": {
-        "ws": "./bin/ws.js"
-    },
     "scripts": {
         "prepare": "npm run build",
         "start": "npm run watch",
@@ -25,8 +25,7 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@kearisp/cli": "^1.0.7",
-        "@wocker/core": "^1.0.10",
+        "@wocker/core": "^1.0.11",
         "@wocker/utils": "^1.0.4",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",