@wocker/ws 1.0.10 → 1.0.12

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,9 +7,10 @@ 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>;
+    start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(name: string): Promise<void>;
     run(name: string, script: string): Promise<void>;
     attach(name?: string): 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()
@@ -146,17 +155,19 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async start(name, detach, rebuild, restart) {
+    async start(name, detach, attach, rebuild, restart) {
         if (name) {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
         if (rebuild) {
-            await this.projectService.stop();
-            await this.appEventsService.emit("project:rebuild", project);
+            await this.projectService.rebuild(project);
         }
-        await this.projectService.start(restart);
-        if (!detach) {
+        await this.projectService.start(project, restart);
+        if (detach) {
+            console.info(chalk_1.default.yellow("Warning: Detach option is deprecated"));
+        }
+        if (attach) {
             const project = await this.projectService.get();
             const containerName = project.containerName;
             const container = await this.dockerService.getContainer(containerName);
@@ -171,7 +182,8 @@ let ProjectController = class ProjectController {
         if (name) {
             await this.projectService.cdProject(name);
         }
-        await this.projectService.stop();
+        const project = await this.projectService.get();
+        await this.projectService.stop(project);
     }
     async run(name, script) {
         if (name) {
@@ -266,7 +278,7 @@ let ProjectController = class ProjectController {
             const project = await this.projectService.get();
             const container = await this.dockerService.getContainer(project.containerName);
             if (container) {
-                await this.projectService.start(true);
+                await this.projectService.start(project, true);
             }
         }
     }
@@ -291,7 +303,7 @@ let ProjectController = class ProjectController {
             const project = await this.projectService.get();
             const container = await this.dockerService.getContainer(project.containerName);
             if (container) {
-                await this.projectService.start(true);
+                await this.projectService.start(project, true);
             }
         }
     }
@@ -404,6 +416,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 +501,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,25 +541,35 @@ __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", {
+    __param(2, (0, core_1.Option)("attach", {
         type: "boolean",
+        description: "Attach",
+        alias: "a"
+    })),
+    __param(3, (0, core_1.Option)("build", {
+        type: "boolean",
+        description: "Build",
         alias: "b"
     })),
-    __param(3, (0, core_1.Option)("restart", {
+    __param(4, (0, core_1.Option)("restart", {
         type: "boolean",
-        alias: "r"
+        alias: "r",
+        description: "Restart"
     })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
+    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean, Boolean]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "start", null);
 __decorate([
@@ -597,6 +629,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/controllers/ProxyController.js

@@ -143,8 +143,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async addDomain(name, addDomains) {
@@ -167,8 +167,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async removeDomain(name, removeDomains) {
@@ -194,8 +194,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async logs() {

package/lib/makes/FS.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { FS as CoreFS } from "@wocker/core";
 import * as fs from "fs";
 import { Stats, BigIntStats, PathLike, PathOrFileDescriptor, WriteFileOptions, MakeDirectoryOptions } from "fs";

package/lib/makes/LineConvertStream.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Readable } from "stream";
 import { Mutex } from "async-mutex";
 declare class LineConvertStream extends Readable {

package/lib/makes/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./FS";
 export * from "./Http";
 export * from "./Logger";
-export * from "./Preset";

package/lib/makes/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FS"), exports);
 __exportStar(require("./Http"), exports);
 __exportStar(require("./Logger"), exports);
-__exportStar(require("./Preset"), exports);

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/DockerService.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { DockerServiceParams as Params } from "@wocker/core";
 import Docker, { Container } from "dockerode";
 import { LogService } from "./LogService";

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.d.ts

@@ -15,8 +15,9 @@ declare class ProjectService {
     cdProject(name: string): Promise<void>;
     get(): Promise<Project>;
     getContainer(): Promise<import("dockerode").Container>;
-    start(restart?: boolean): Promise<void>;
-    stop(): Promise<void>;
+    rebuild(project: Project): Promise<void>;
+    start(project: Project, restart?: boolean): Promise<void>;
+    stop(project: Project): Promise<void>;
     save(project: Project): Promise<void>;
     search(params?: Partial<SearchParams>): Promise<Project[]>;
     searchOne(params?: Partial<SearchParams>): Promise<Project | null>;

package/lib/services/ProjectService.js

@@ -80,8 +80,20 @@ let ProjectService = class ProjectService {
         const project = await this.get();
         return this.dockerService.getContainer(project.containerName);
     }
-    async start(restart) {
-        const project = await this.get();
+    async rebuild(project) {
+        await this.stop(project);
+        if (project.type === "dockerfile") {
+            project.imageName = `project-${project.name}:develop`;
+            const images = await this.dockerService.imageLs({
+                tag: project.imageName
+            });
+            if (images.length > 0) {
+                await this.dockerService.imageRm(project.imageName);
+            }
+        }
+        await this.appEventsService.emit("project:rebuild", project);
+    }
+    async start(project, restart) {
         if (project.type === "dockerfile") {
             project.imageName = `project-${project.name}:develop`;
             const images = await this.dockerService.imageLs({
@@ -96,6 +108,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,14 +133,12 @@ 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();
         }
         await this.appEventsService.emit("project:start", project);
     }
-    async stop() {
-        const project = await this.get();
+    async stop(project) {
         const container = await this.dockerService.getContainer(project.containerName);
         if (!container) {
             return;

package/lib/utils/exec.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ExecOptions } from "child_process";
 type Options = Omit<ExecOptions, "maxBuffer">;
 declare const exec: (command: string, options?: Options) => Promise<string>;

package/lib/utils/followProgress.d.ts

@@ -1,6 +1 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 export declare const followProgress: (stream: NodeJS.ReadableStream) => Promise<unknown>;

package/package.json

@@ -1,9 +1,14 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.10",
+    "version": "1.0.12",
     "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",
@@ -39,8 +38,7 @@
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
-        "readable-stream": "^4.1.0",
-        "reflect-metadata": "^0.2.1"
+        "readable-stream": "^4.1.0"
     },
     "devDependencies": {
         "@types/dockerode": "3.3.23",
@@ -56,6 +54,6 @@
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^3.1.0",
-        "typescript": "^5.4.4"
+        "typescript": "^5.5.2"
     }
 }

package/lib/makes/Preset.d.ts

@@ -1,45 +0,0 @@
-import { EnvConfig } from "@wocker/core";
-import { PresetService, PresetServiceSearchOptions as SearchOptions } from "../services/PresetService";
-type TextOption = {
-    type: "string" | "number" | "int";
-    message?: string;
-    default?: string | number;
-};
-type ConfirmOption = {
-    type: "boolean";
-    message?: string;
-    default?: boolean;
-};
-type SelectOption = {
-    type: "select";
-    options: string[] | {
-        label?: string;
-        value: string;
-    }[] | {
-        [name: string]: string;
-    };
-    message?: string;
-    default?: string;
-};
-type AnyOption = TextOption | ConfirmOption | SelectOption;
-declare class Preset {
-    id: string;
-    name: string;
-    version: string;
-    dockerfile?: string;
-    buildArgsOptions?: {
-        [name: string]: AnyOption;
-    };
-    envOptions?: {
-        [name: string]: AnyOption;
-    };
-    volumes?: string[];
-    volumeOptions?: string[];
-    constructor(data: any);
-    save(): Promise<void>;
-    getImageName(buildArgs?: EnvConfig): string;
-    static install(ps: PresetService): void;
-    static search(options: SearchOptions): Promise<import("@wocker/core").Preset[]>;
-    static searchOne(options: SearchOptions): Promise<import("@wocker/core").Preset>;
-}
-export { Preset };

package/lib/makes/Preset.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Preset = void 0;
-let presetService;
-class Preset {
-    constructor(data) {
-        this.id = data.id;
-        this.name = data.name;
-        this.version = data.version;
-        this.dockerfile = data.dockerfile;
-        this.buildArgsOptions = data.buildArgsOptions;
-        this.envOptions = data.envOptions;
-        this.volumes = data.volumes;
-        this.volumeOptions = data.volumeOptions;
-    }
-    async save() {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.save(this);
-    }
-    getImageName(buildArgs) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.getImageName(this, buildArgs);
-    }
-    static install(ps) {
-        presetService = ps;
-    }
-    static search(options) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.search(options);
-    }
-    static searchOne(options) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.searchOne(options);
-    }
-}
-exports.Preset = Preset;