@wocker/ws 1.1.0 → 1.1.2

package/lib/modules/preset/controllers/PresetController.js

@@ -45,7 +45,7 @@ let PresetController = class PresetController {
             table.push([
                 preset.name,
                 preset.source,
-                preset.source === core_1.PRESET_SOURCE_EXTERNAL ? preset.path : ""
+                preset.source === core_1.PresetSource.EXTERNAL ? preset.path : ""
             ]);
         }
         return table.toString();

package/lib/modules/preset/controllers/PresetListener.d.ts

@@ -12,5 +12,4 @@ export declare class PresetListener {
     protected get interpolator(): Interpolator;
     onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
-    protected onBeforeStart(project: Project): Promise<void>;
 }

package/lib/modules/preset/controllers/PresetListener.js

@@ -97,27 +97,6 @@ let PresetListener = class PresetListener {
             await this.dockerService.imageRm(imageName);
         }
     }
-    async onBeforeStart(project) {
-        if (project.type !== core_1.ProjectType.PRESET) {
-            return;
-        }
-        const preset = this.presetService.get(project.preset);
-        if (preset.dockerfile) {
-            project.imageName = this.presetService.getImageNameForProject(project, preset);
-            if (!await this.dockerService.imageExists(project.imageName)) {
-                await this.dockerService.buildImage({
-                    version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
-                    tag: project.imageName,
-                    labels: {
-                        presetName: preset.name
-                    },
-                    buildArgs: project.buildArgs,
-                    context: preset.path,
-                    dockerfile: preset.dockerfile
-                });
-            }
-        }
-    }
 };
 exports.PresetListener = PresetListener;
 __decorate([
@@ -132,12 +111,6 @@ __decorate([
     __metadata("design:paramtypes", [core_1.Project]),
     __metadata("design:returntype", Promise)
 ], PresetListener.prototype, "onRebuild", null);
-__decorate([
-    (0, core_1.Event)("project:beforeStart"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.Project]),
-    __metadata("design:returntype", Promise)
-], PresetListener.prototype, "onBeforeStart", null);
 exports.PresetListener = PresetListener = __decorate([
     (0, core_1.Controller)(),
     __metadata("design:paramtypes", [core_1.AppService,

package/lib/modules/preset/repositories/PresetRepository.js

@@ -35,7 +35,7 @@ let PresetRepository = class PresetRepository {
             }
             save() {
                 switch (this.source) {
-                    case core_1.PRESET_SOURCE_EXTERNAL:
+                    case core_1.PresetSource.EXTERNAL:
                         fs.writeJSON("config.json", this.toObject());
                         break;
                 }
@@ -43,7 +43,7 @@ let PresetRepository = class PresetRepository {
             }
             delete() {
                 switch (this.source) {
-                    case core_1.PRESET_SOURCE_GITHUB:
+                    case core_1.PresetSource.GITHUB:
                         if (fs.exists()) {
                             fs.rm("", {
                                 recursive: true
@@ -62,12 +62,12 @@ let PresetRepository = class PresetRepository {
             ...dirs.map((name) => {
                 return {
                     name,
-                    source: core_1.PRESET_SOURCE_INTERNAL,
+                    source: core_1.PresetSource.INTERNAL,
                     path: fs.path(name)
                 };
             }),
             ...presets.map((item) => {
-                if (item.source === core_1.PRESET_SOURCE_GITHUB) {
+                if (item.source === core_1.PresetSource.GITHUB) {
                     return {
                         ...item,
                         path: this.appService.fs.path("presets", item.name)

package/lib/modules/preset/services/PresetService.js

@@ -145,7 +145,7 @@ let PresetService = class PresetService {
         }
         if (fs.exists("config.json")) {
             const config = fs.readJSON("config.json");
-            this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
+            this.appService.registerPreset(config.name, core_1.PresetSource.EXTERNAL, fs.path());
             return;
         }
         let config = {};
@@ -214,7 +214,7 @@ let PresetService = class PresetService {
             return;
         }
         fs.writeJSON("config.json", config);
-        this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_EXTERNAL, fs.path());
+        this.appService.registerPreset(config.name, core_1.PresetSource.EXTERNAL, fs.path());
     }
     async deinit() {
         const preset = this.presetRepository.searchOne({
@@ -272,7 +272,7 @@ let PresetService = class PresetService {
             let preset = this.presetRepository.searchOne({
                 name: config.name
             });
-            if (preset && satisfyingTag && preset.source === core_1.PRESET_SOURCE_GITHUB && core_1.Version.parse(ref).compare(preset.version) === 0) {
+            if (preset && satisfyingTag && preset.source === core_1.PresetSource.GITHUB && core_1.Version.parse(ref).compare(preset.version) === 0) {
                 console.info("Preset already installed");
                 return;
             }
@@ -288,7 +288,7 @@ let PresetService = class PresetService {
                 });
             }
             this.fs.mv(`presets/.tmp/${config.name}`, `presets/${config.name}`);
-            this.appService.registerPreset(config.name, core_1.PRESET_SOURCE_GITHUB);
+            this.appService.registerPreset(config.name, core_1.PresetSource.GITHUB);
             console.info("Preset installed successfully");
         }
         finally {

package/lib/modules/project/controllers/MetadataController.d.ts

@@ -1,8 +1,10 @@
+import { AppService } from "@wocker/core";
 import { ProjectService } from "../services/ProjectService";
 export declare class MetadataController {
+    protected readonly appService: AppService;
     protected readonly projectService: ProjectService;
-    constructor(projectService: ProjectService);
-    list(projectName?: string): string;
-    set(meta: string[], projectName?: string): void;
+    constructor(appService: AppService, projectService: ProjectService);
+    list(projectName?: string, global?: boolean): string;
+    set(meta: string[], projectName?: string, global?: boolean): void;
     unset(meta: string[], projectName?: string): void;
 }

package/lib/modules/project/controllers/MetadataController.js

@@ -20,10 +20,18 @@ const core_1 = require("@wocker/core");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const ProjectService_1 = require("../services/ProjectService");
 let MetadataController = class MetadataController {
-    constructor(projectService) {
+    constructor(appService, projectService) {
+        this.appService = appService;
         this.projectService = projectService;
     }
-    list(projectName) {
+    list(projectName, global) {
+        if (global) {
+            const table = new cli_table3_1.default();
+            for (const key in this.appService.config.meta) {
+                table.push([key, this.appService.config.meta[key]]);
+            }
+            return table.toString();
+        }
         const project = this.projectService.get(projectName);
         const table = new cli_table3_1.default();
         for (const key in project.metadata) {
@@ -31,16 +39,29 @@ let MetadataController = class MetadataController {
         }
         return table.toString();
     }
-    set(meta, projectName) {
-        const project = this.projectService.get(projectName);
-        for (const field of meta) {
+    set(meta, projectName, global) {
+        const fields = meta.reduce((res, field) => {
             let [, key = "", value = ""] = field.split(/^([^=]+)=(.*)$/);
             key = key.trim();
             value = value.trim();
             if (!key) {
-                continue;
+                return res;
             }
-            project.setMeta(key, value);
+            return {
+                ...res,
+                [key]: value
+            };
+        }, {});
+        if (global) {
+            for (const key in fields) {
+                this.appService.config.setMeta(key, fields[key]);
+            }
+            this.appService.save();
+            return;
+        }
+        const project = this.projectService.get(projectName);
+        for (const key in fields) {
+            project.setMeta(key, fields[key]);
         }
         project.save();
     }
@@ -60,8 +81,9 @@ __decorate([
     (0, core_1.Description)("List of metafields"),
     __param(0, (0, core_1.Option)("name", "n")),
     __param(0, (0, core_1.Description)("The name of the project")),
+    __param(1, (0, core_1.Option)("global", "g")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", void 0)
 ], MetadataController.prototype, "list", null);
 __decorate([
@@ -69,8 +91,9 @@ __decorate([
     __param(0, (0, core_1.Param)("meta")),
     __param(1, (0, core_1.Option)("name", "n")),
     __param(1, (0, core_1.Description)("The name of the project")),
+    __param(2, (0, core_1.Option)("global", "g")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, String]),
+    __metadata("design:paramtypes", [Array, String, Boolean]),
     __metadata("design:returntype", void 0)
 ], MetadataController.prototype, "set", null);
 __decorate([
@@ -85,5 +108,6 @@ __decorate([
 exports.MetadataController = MetadataController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Metadata commands"),
-    __metadata("design:paramtypes", [ProjectService_1.ProjectService])
+    __metadata("design:paramtypes", [core_1.AppService,
+        ProjectService_1.ProjectService])
 ], MetadataController);

package/lib/modules/project/controllers/ProjectController.d.ts

@@ -16,7 +16,7 @@ export declare class ProjectController {
     getScriptNames(): Promise<string[]>;
     init(name: string, type: ProjectType): Promise<void>;
     destroy(name?: string, yes?: boolean): Promise<void>;
-    start(name?: string, restart?: boolean, build?: boolean, attach?: boolean): Promise<void>;
+    start(name?: string, restart?: boolean, build?: boolean, attach?: boolean, detach?: boolean): Promise<void>;
     stop(name?: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
     buildArgsList(name?: string, service?: string): Promise<string>;

package/lib/modules/project/controllers/ProjectController.js

@@ -168,9 +168,9 @@ let ProjectController = class ProjectController {
             recursive: true
         });
     }
-    async start(name, restart, build, attach) {
+    async start(name, restart, build, attach, detach) {
         const project = this.projectService.get(name);
-        await this.projectService.start(project, restart, build, attach);
+        await this.projectService.start(project, restart, build, attach, detach);
     }
     async stop(name) {
         const project = this.projectService.get(name);
@@ -657,8 +657,10 @@ __decorate([
     __param(2, (0, core_1.Description)("Build")),
     __param(3, (0, core_1.Option)("attach", "a")),
     __param(3, (0, core_1.Description)("Attach")),
+    __param(4, (0, core_1.Option)("detach", "d")),
+    __param(4, (0, core_1.Description)("Detach")),
     __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([

package/lib/modules/project/services/ProjectService.d.ts

@@ -16,7 +16,7 @@ export declare class ProjectService extends CoreProjectService {
     search(params?: ProjectRepository.SearchParams): Project[];
     searchOne(params?: ProjectRepository.SearchParams): Project | null;
     save(project: Project): void;
-    start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean): Promise<void>;
+    start(project: Project, restart?: boolean, rebuild?: boolean, attach?: boolean, detach?: boolean): Promise<void>;
     stop(project: Project): Promise<void>;
     build(project: Project, rebuild?: boolean): Promise<void>;
     attach(project: Project): Promise<void>;

package/lib/modules/project/services/ProjectService.js

@@ -55,7 +55,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     save(project) {
         this.projectRepository.save(project);
     }
-    async start(project, restart, rebuild, attach) {
+    async start(project, restart, rebuild, attach, detach) {
         if (restart || rebuild) {
             await this.stop(project);
         }
@@ -70,7 +70,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 if (!container) {
                     container = await this.dockerService.createContainer({
                         name: project.containerName,
-                        image: project.imageName,
+                        image: project.image,
                         cmd: project.cmd,
                         env: {
                             ...this.appService.config.env || {},
@@ -106,7 +106,14 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
         }
         await this.eventService.emit("project:start", project);
         await this.eventService.emit("project:afterStart", project);
-        if (attach) {
+        let shouldAttach = (project.getMeta("start.mode") || this.appService.getMeta("start.mode")) === "attach";
+        if (typeof attach === "boolean") {
+            shouldAttach = attach;
+        }
+        if (typeof detach === "boolean") {
+            shouldAttach = !detach;
+        }
+        if (shouldAttach) {
             switch (project.type) {
                 case core_1.ProjectType.IMAGE:
                 case core_1.ProjectType.DOCKERFILE:
@@ -139,18 +146,18 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
     async build(project, rebuild) {
         switch (project.type) {
             case core_1.ProjectType.IMAGE:
-                await this.dockerService.pullImage(project.imageName);
+                await this.dockerService.pullImage(project.image);
                 break;
             case core_1.ProjectType.DOCKERFILE: {
-                project.imageName = `project-${project.name}:develop`;
+                project.image = `project-${project.name}:develop`;
                 project.save();
                 if (rebuild) {
-                    await this.dockerService.imageRm(project.imageName);
+                    await this.dockerService.imageRm(project.image);
                 }
-                if (!await this.dockerService.imageExists(project.imageName)) {
+                if (!await this.dockerService.imageExists(project.image)) {
                     await this.dockerService.buildImage({
                         version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
-                        tag: project.imageName,
+                        tag: project.image,
                         buildArgs: project.buildArgs,
                         context: project.path,
                         dockerfile: project.dockerfile
@@ -164,19 +171,19 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
                 });
                 if (preset.image) {
                     await this.dockerService.pullImage(preset.image);
-                    project.imageName = preset.image;
+                    project.image = preset.image;
                     project.save();
                 }
                 if (preset.dockerfile) {
-                    project.imageName = this.presetService.getImageNameForProject(project, preset);
+                    project.image = this.presetService.getImageNameForProject(project, preset);
                     project.save();
                     if (rebuild) {
-                        await this.dockerService.imageRm(project.imageName);
+                        await this.dockerService.imageRm(project.image);
                     }
-                    if (!await this.dockerService.imageExists(project.imageName)) {
+                    if (!await this.dockerService.imageExists(project.image)) {
                         await this.dockerService.buildImage({
                             version: this.appService.isExperimentalEnabled("buildKit") ? "2" : "1",
-                            tag: project.imageName,
+                            tag: project.image,
                             labels: {
                                 "org.wocker.preset": preset.name
                             },
@@ -251,7 +258,7 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
             case core_1.ProjectType.IMAGE:
             case core_1.ProjectType.DOCKERFILE:
             case core_1.ProjectType.PRESET:
-                await this.dockerService.exec(project.containerName, command, true);
+                await this.dockerService.exec(project.containerName, command, this.processService.stdout.isTTY ?? false);
                 break;
             case core_1.ProjectType.COMPOSE: {
                 const [service, ...args] = command;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/ws",
     "type": "commonjs",
-    "version": "1.1.0",
+    "version": "1.1.2",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -35,8 +35,8 @@
         "make-coverage-badge": "make-coverage-badge"
     },
     "dependencies": {
-        "@wocker/core": "1.1.0",
-        "@wocker/docker-module": "^1.0.0",
+        "@wocker/core": "1.1.2",
+        "@wocker/docker-module": "^1.0.1",
         "@wocker/prompts": "^1.0.0",
         "@wocker/utils": "^2.0.6",
         "async-mutex": "^0.4.0",
@@ -49,8 +49,8 @@
         "@types/jest": "^30.0.0",
         "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/docker-mock-module": "^1.0.0",
-        "@wocker/testing": "^1.0.4",
+        "@wocker/docker-mock-module": "^1.0.1",
+        "@wocker/testing": "^1.0.9",
         "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",
         "memfs": "^4.49.0",