@wocker/ws 1.0.28 → 1.0.29

package/lib/modules/keystore/controllers/KeystoreController.js

@@ -24,13 +24,15 @@ let KeystoreController = class KeystoreController {
     async init(provider) {
         if (!provider) {
             provider = await (0, utils_1.promptSelect)({
+                required: true,
                 message: "Keystore provider",
                 type: "text",
-                options: ["file", "keytar"]
+                options: ["file", "keytar"],
+                default: this.appConfigService.config.keystore
             });
         }
         if (!this.keystoreService.hasProvider(provider)) {
-            return;
+            throw new Error(`Provider "${provider}" not found`);
         }
         this.appConfigService.config.keystore = provider;
         this.appConfigService.save();

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

@@ -1,14 +1,13 @@
-import { EventService, Project, AppConfigService } from "@wocker/core";
+import { Project, AppConfigService } from "@wocker/core";
 import { DockerService } from "@wocker/docker-module";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetListener {
     protected readonly appConfigService: AppConfigService;
-    protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
     protected readonly presetRepository: PresetRepository;
     protected readonly presetService: PresetService;
-    constructor(appConfigService: AppConfigService, eventService: EventService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    constructor(appConfigService: AppConfigService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;

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

@@ -17,15 +17,11 @@ const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 const utils_2 = require("../../../utils");
 let PresetListener = class PresetListener {
-    constructor(appConfigService, eventService, dockerService, presetRepository, presetService) {
+    constructor(appConfigService, dockerService, presetRepository, presetService) {
         this.appConfigService = appConfigService;
-        this.eventService = eventService;
         this.dockerService = dockerService;
         this.presetRepository = presetRepository;
         this.presetService = presetService;
-        this.eventService.on("project:init", (project) => this.onInit(project));
-        this.eventService.on("project:beforeStart", (project) => this.onBeforeStart(project));
-        this.eventService.on("project:rebuild", (project) => this.onRebuild(project));
     }
     async onInit(project) {
         if (project.type !== core_1.PROJECT_TYPE_PRESET) {
@@ -133,10 +129,27 @@ let PresetListener = class PresetListener {
     }
 };
 exports.PresetListener = PresetListener;
+__decorate([
+    (0, core_1.Event)("project:init"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.Project]),
+    __metadata("design:returntype", Promise)
+], PresetListener.prototype, "onInit", null);
+__decorate([
+    (0, core_1.Event)("project:rebuild"),
+    __metadata("design:type", Function),
+    __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.AppConfigService,
-        core_1.EventService,
         docker_module_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])

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

@@ -2,7 +2,7 @@ import { ProjectService } from "../services/ProjectService";
 export declare class SecretsController {
     protected readonly projectService: ProjectService;
     constructor(projectService: ProjectService);
-    create(secret?: string, name?: string): Promise<void>;
+    create(secret?: string, name?: string, global?: boolean): Promise<void>;
     inspect(secret?: string, name?: string): Promise<string | undefined>;
     rm(secret?: string, name?: string): Promise<void>;
 }

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

@@ -20,7 +20,7 @@ let SecretsController = class SecretsController {
     constructor(projectService) {
         this.projectService = projectService;
     }
-    async create(secret, name) {
+    async create(secret, name, global) {
         const project = this.projectService.get(name);
         const value = await (0, utils_1.promptInput)({
             message: "Secret value",
@@ -43,8 +43,9 @@ __decorate([
     (0, core_1.Description)("Adds project secret value to keystore"),
     __param(0, (0, core_1.Param)("secret")),
     __param(1, (0, core_1.Option)("name", "n")),
+    __param(2, (0, core_1.Option)("global", "g")),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:paramtypes", [String, String, Boolean]),
     __metadata("design:returntype", Promise)
 ], SecretsController.prototype, "create", null);
 __decorate([

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/ws",
     "type": "commonjs",
-    "version": "1.0.28",
+    "version": "1.0.29",
     "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.0.28",
-        "@wocker/docker-module": "^0.0.1",
+        "@wocker/core": "1.0.29",
+        "@wocker/docker-module": "^0.0.4",
         "@wocker/utils": "^2.0.6",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
@@ -57,7 +57,7 @@
         "@types/mute-stream": "^0.0.4",
         "@types/node": "^24.5.2",
         "@types/unzipper": "^0.10.10",
-        "@wocker/docker-mock-module": "^0.0.1",
+        "@wocker/docker-mock-module": "^0.0.2",
         "@wocker/testing": "^1.0.4",
         "jest": "^30.1.3",
         "make-coverage-badge": "^1.2.0",