@wocker/ws 1.0.21 → 1.0.23

package/lib/controllers/PresetController.js

@@ -54,22 +54,27 @@ const utils_1 = require("@wocker/utils");
 const utils_2 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const env_1 = require("../env");
 const utils_3 = require("../utils");
-const services_1 = require("../services");
+const repositories_1 = require("../repositories");
+const AppConfigService_1 = require("../services/AppConfigService");
+const AppEventsService_1 = require("../services/AppEventsService");
+const ProjectService_1 = require("../services/ProjectService");
+const PresetService_1 = require("../services/PresetService");
+const modules_1 = require("../modules");
 let PresetController = class PresetController {
-    constructor(appConfigService, appEventsService, projectService, presetService, dockerService) {
+    constructor(appConfigService, appEventsService, projectService, presetService, presetRepository, dockerService) {
         this.appConfigService = appConfigService;
         this.appEventsService = appEventsService;
         this.projectService = projectService;
         this.presetService = presetService;
+        this.presetRepository = presetRepository;
         this.dockerService = dockerService;
         this.appEventsService.on("project:init", (project) => this.onInit(project));
         this.appEventsService.on("project:beforeStart", (project) => this.onBeforeStart(project));
         this.appEventsService.on("project:rebuild", (project) => this.onRebuild(project));
     }
     async presets() {
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         return presets.map((preset) => {
             return preset.name;
         });
@@ -78,12 +83,12 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         if (presets.length === 0) {
             throw new Error("No presets");
         }
         project.preset = await (0, utils_1.promptSelect)({
-            message: "Choose preset:",
+            message: "Choose preset",
             options: presets.map((preset) => {
                 return {
                     label: preset.name,
@@ -93,7 +98,7 @@ let PresetController = class PresetController {
             default: project.preset
         });
         project.presetMode = await (0, utils_1.promptSelect)({
-            message: "Preset mode:",
+            message: "Preset mode",
             options: [
                 {
                     label: "For project only",
@@ -106,15 +111,15 @@ let PresetController = class PresetController {
             ],
             default: project.presetMode
         });
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error("Preset not found");
         }
         if (preset.buildArgsOptions) {
-            project.buildArgs = await (0, utils_1.promptConfig)(preset.buildArgsOptions, project.buildArgs);
+            project.buildArgs = await this.presetService.prompt(preset.buildArgsOptions, project.buildArgs);
         }
         if (preset.envOptions) {
-            project.env = await (0, utils_1.promptConfig)(preset.envOptions, project.env);
+            project.env = await this.presetService.prompt(preset.envOptions, project.env);
         }
         if (preset.volumeOptions) {
             for (let volume of preset.volumeOptions) {
@@ -122,15 +127,15 @@ let PresetController = class PresetController {
                     ...project.buildArgs || {},
                     ...project.env || {}
                 });
-                const { source, destination, options } = (0, utils_3.volumeParse)(volume);
+                const { source, destination, options } = (0, utils_2.volumeParse)(volume);
                 let projectVolume = project.getVolumeByDestination(destination);
-                const newSource = await (0, utils_1.promptText)({
-                    message: "Volume:",
+                const newSource = await (0, utils_1.promptInput)({
+                    message: "Volume",
                     required: true,
                     suffix: `:${destination}`,
-                    default: projectVolume ? (0, utils_3.volumeParse)(projectVolume).source : source
+                    default: projectVolume ? (0, utils_2.volumeParse)(projectVolume).source : source
                 });
-                projectVolume = (0, utils_3.volumeFormat)({
+                projectVolume = (0, utils_2.volumeFormat)({
                     source: newSource,
                     destination,
                     options
@@ -146,7 +151,7 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error(`Preset ${project.preset} not found`);
         }
@@ -161,7 +166,7 @@ let PresetController = class PresetController {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
             return;
         }
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (preset.dockerfile) {
             project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
@@ -180,27 +185,32 @@ let PresetController = class PresetController {
     async init() {
         await this.presetService.init();
     }
-    async deinit() {
+    async destroy() {
         await this.presetService.deinit();
     }
     async add(name, version) {
         await this.presetService.addPreset(name, version);
     }
     async list() {
-        const presets = await this.presetService.search();
+        const presets = this.presetRepository.search();
         const table = new cli_table3_1.default({
             head: [
                 "Name",
-                "Source"
+                "Source",
+                "Path"
             ]
         });
         for (const preset of presets) {
-            table.push([preset.name, preset.source]);
+            table.push([
+                preset.name,
+                preset.source,
+                preset.source === core_1.PRESET_SOURCE_EXTERNAL ? preset.path : ""
+            ]);
         }
         return table.toString();
     }
     async delete(name, confirm) {
-        const preset = await this.presetService.get(name);
+        const preset = this.presetService.get(name);
         if (typeof confirm === "undefined" || confirm === null) {
             confirm = await (0, utils_2.promptConfirm)({
                 message: `Delete preset ${name}?`,
@@ -211,14 +221,14 @@ let PresetController = class PresetController {
             return;
         }
         console.info("Deleting...");
-        await preset.delete();
+        preset.delete();
     }
     async eject(name) {
         if (name) {
             this.projectService.cdProject(name);
         }
         const project = this.projectService.get();
-        const preset = await this.presetService.get(project.preset);
+        const preset = this.presetService.get(project.preset);
         if (!preset) {
             throw new Error("Preset not found");
         }
@@ -256,17 +266,17 @@ let PresetController = class PresetController {
                     recursive: true
                 });
             }
-            await copier.copy(path);
+            copier.copy(path);
         }
         delete project.preset;
         delete project.imageName;
-        await project.save();
+        project.save();
     }
     async build(presetName, rebuild) {
-        const preset = await this.presetService.get(presetName);
+        const preset = this.presetService.get(presetName);
         let buildArgs = {};
         if (preset.buildArgsOptions) {
-            buildArgs = await (0, utils_1.promptGroup)(preset.buildArgsOptions);
+            buildArgs = await this.presetService.prompt(preset.buildArgsOptions);
         }
         const imageName = this.presetService.getImageName(preset, buildArgs);
         if (rebuild) {
@@ -278,7 +288,7 @@ let PresetController = class PresetController {
                 presetName: preset.name
             },
             buildArgs: buildArgs,
-            context: Path.join(env_1.PRESETS_DIR, preset.name),
+            context: preset.path,
             src: preset.dockerfile
         });
     }
@@ -286,19 +296,21 @@ let PresetController = class PresetController {
 exports.PresetController = PresetController;
 __decorate([
     (0, core_1.Command)("preset:init"),
+    (0, core_1.Description)("Creates preset config for current dir"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "init", null);
 __decorate([
-    (0, core_1.Command)("preset:deinit"),
+    (0, core_1.Command)("preset:destroy"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
-], PresetController.prototype, "deinit", null);
+], PresetController.prototype, "destroy", null);
 __decorate([
-    (0, core_1.Command)("preset:add <preset>"),
-    (0, core_1.Command)("preset:add <preset>@<version>"),
+    (0, core_1.Command)("preset:install <preset>"),
+    (0, core_1.Command)("preset:install <preset>@<version>"),
+    (0, core_1.Description)("Adding preset from github repository"),
     __param(0, (0, core_1.Param)("preset")),
     __param(1, (0, core_1.Param)("version")),
     __metadata("design:type", Function),
@@ -307,6 +319,7 @@ __decorate([
 ], PresetController.prototype, "add", null);
 __decorate([
     (0, core_1.Command)("preset:ls"),
+    (0, core_1.Description)("List of all available presets"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
@@ -314,42 +327,38 @@ __decorate([
 __decorate([
     (0, core_1.Command)("preset:delete <preset>"),
     __param(0, (0, core_1.Param)("preset")),
-    __param(1, (0, core_1.Option)("yes", {
-        alias: "y",
-        description: "Confirm deletion"
-    })),
+    __param(1, (0, core_1.Option)("yes", "y")),
+    __param(1, (0, core_1.Description)("Confirm deletion")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "delete", null);
 __decorate([
     (0, core_1.Command)("preset:eject"),
-    __param(0, (0, core_1.Option)("name", {
-        type: "string",
-        alias: "n",
-        description: "Project name"
-    })),
+    (0, core_1.Description)("Eject preset files into the project"),
+    __param(0, (0, core_1.Option)("name", "n")),
+    __param(0, (0, core_1.Description)("The name of the project")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "eject", null);
 __decorate([
     (0, core_1.Command)("preset:build <preset>"),
+    (0, core_1.Description)("Build docker image form a preset"),
     __param(0, (0, core_1.Param)("preset")),
-    __param(1, (0, core_1.Option)("rebuild", {
-        type: "boolean",
-        alias: "r",
-        description: "Rebuild image"
-    })),
+    __param(1, (0, core_1.Option)("rebuild", "r")),
+    __param(1, (0, core_1.Description)("Rebuild image")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "build", null);
 exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService,
-        services_1.AppEventsService,
-        services_1.ProjectService,
-        services_1.PresetService,
-        services_1.DockerService])
+    (0, core_1.Description)("Preset commands"),
+    __metadata("design:paramtypes", [AppConfigService_1.AppConfigService,
+        AppEventsService_1.AppEventsService,
+        ProjectService_1.ProjectService,
+        PresetService_1.PresetService,
+        repositories_1.PresetRepository,
+        modules_1.DockerService])
 ], PresetController);

package/lib/controllers/ProjectController.d.ts

@@ -1,5 +1,9 @@
 import { ProjectType } from "@wocker/core";
-import { AppConfigService, AppEventsService, ProjectService, LogService, DockerService } from "../services";
+import { AppConfigService } from "../services/AppConfigService";
+import { AppEventsService } from "../services/AppEventsService";
+import { ProjectService } from "../services/ProjectService";
+import { LogService } from "../services/LogService";
+import { DockerService } from "../modules";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
     protected readonly appEventsService: AppEventsService;
@@ -10,6 +14,7 @@ export declare class ProjectController {
     protected getProjectNames(): Promise<string[]>;
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;
+    destroy(name?: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
     start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(name: string): Promise<void>;
@@ -28,7 +33,7 @@ export declare class ProjectController {
     configUnset(configs: string[], name?: string, global?: boolean): Promise<void>;
     buildArgsList(name?: string): Promise<string>;
     buildArgsGet(args: string[], name?: string): Promise<string>;
-    buildArgsSet(name: string, args: string[]): Promise<void>;
+    buildArgsSet(args: string[], name: string): Promise<void>;
     buildArgsUnset(args: string[], name: string): Promise<void>;
     volumeList(name?: string): Promise<string>;
     volumeMount(volumes: string[], name: string): Promise<void>;