@wocker/mongodb-plugin 1.0.1 → 1.0.3

package/lib/controllers/MongodbController.d.ts

@@ -2,7 +2,7 @@ import { MongodbService } from "../services/MongodbService";
 export declare class MongodbController {
     protected readonly mongodbService: MongodbService;
     constructor(mongodbService: MongodbService);
-    create(name?: string, image?: string, imageVersion?: string): Promise<void>;
+    create(name?: string, imageName?: string, imageVersion?: string): Promise<void>;
     destroy(name: string, yes?: boolean, force?: boolean): Promise<void>;
     use(name: string): Promise<void>;
     start(name?: string, restart?: boolean): Promise<void>;

package/lib/controllers/MongodbController.js

@@ -28,9 +28,13 @@ let MongodbController = class MongodbController {
     constructor(mongodbService) {
         this.mongodbService = mongodbService;
     }
-    create(name, image, imageVersion) {
+    create(name, imageName, imageVersion) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.mongodbService.create(name, image, imageVersion);
+            yield this.mongodbService.create({
+                name,
+                imageName,
+                imageVersion
+            });
         });
     }
     destroy(name, yes, force) {
@@ -64,7 +68,7 @@ let MongodbController = class MongodbController {
     }
     getNames() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.mongodbService.config.databases.items.map((database) => {
+            return this.mongodbService.config.databases.map((database) => {
                 return database.name;
             });
         });

package/lib/makes/Config.d.ts

@@ -1,4 +1,3 @@
-import { ConfigCollection } from "@wocker/core";
 import { Database, DatabaseProps } from "./Database";
 export type ConfigProps = {
     default?: string;
@@ -6,7 +5,7 @@ export type ConfigProps = {
 };
 export declare abstract class Config {
     default?: string;
-    databases: ConfigCollection<Database, DatabaseProps>;
+    databases: Database[];
     constructor(props: ConfigProps);
     setDatabase(database: Database): void;
     hasDatabase(name: string): boolean;
@@ -15,5 +14,5 @@ export declare abstract class Config {
     getDatabase(name: string): Database;
     removeDatabase(name: string): void;
     abstract save(): void;
-    toJSON(): ConfigProps;
+    toObject(): ConfigProps;
 }

package/lib/makes/Config.js

@@ -1,29 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
-const core_1 = require("@wocker/core");
 const Database_1 = require("./Database");
 class Config {
     constructor(props) {
         const { default: defaultDatabase, databases = [] } = props;
         this.default = defaultDatabase;
-        this.databases = new core_1.ConfigCollection(Database_1.Database, databases);
+        this.databases = databases.map(database => new Database_1.Database(database));
     }
     setDatabase(database) {
-        this.databases.setConfig(database);
+        let exists = false;
+        for (let i = 0; i < this.databases.length; i++) {
+            if (this.databases[i].name === database.name) {
+                exists = true;
+                this.databases[i] = database;
+            }
+        }
+        if (!exists) {
+            this.databases.push(database);
+        }
+        if (!this.default) {
+            this.default = database.name;
+        }
     }
     hasDatabase(name) {
-        return !!this.databases.getConfig(name);
+        const database = this.databases.find(database => database.name === name);
+        return !!database;
     }
     getDefault() {
         if (!this.default) {
             throw new Error("Default database is not defined");
         }
-        const database = this.databases.getConfig(this.default);
-        if (!database) {
-            throw new Error(`Default database "${this.default}" not found`);
-        }
-        return database;
+        return this.getDatabase(this.default);
     }
     getDatabaseOrDefault(name) {
         if (!name) {
@@ -32,23 +40,28 @@ class Config {
         return this.getDatabase(name);
     }
     getDatabase(name) {
-        const database = this.databases.getConfig(name);
+        const database = this.databases.find((database) => {
+            return database.name === name;
+        });
         if (!database) {
             throw new Error(`Database "${name}" not found`);
         }
         return database;
     }
     removeDatabase(name) {
-        const database = this.databases.getConfig(name);
-        if (!database) {
-            throw new Error(`Database "${name}" not found`);
+        this.databases = this.databases.filter((database) => {
+            return database.name !== name;
+        });
+        if (this.default === name) {
+            delete this.default;
         }
-        this.databases.removeConfig(name);
     }
-    toJSON() {
+    toObject() {
         return {
             default: this.default,
-            databases: this.databases.toArray()
+            databases: this.databases.length > 0
+                ? this.databases.map((database) => database.toObject())
+                : []
         };
     }
 }

package/lib/services/MongodbService.d.ts

@@ -1,5 +1,6 @@
 import { AppConfigService, PluginConfigService, DockerService, ProxyService } from "@wocker/core";
 import { Config } from "../makes/Config";
+import { DatabaseProps } from "../makes/Database";
 export declare class MongodbService {
     protected readonly appConfigService: AppConfigService;
     protected readonly pluginConfigService: PluginConfigService;
@@ -9,7 +10,7 @@ export declare class MongodbService {
     adminContainerName: string;
     constructor(appConfigService: AppConfigService, pluginConfigService: PluginConfigService, dockerService: DockerService, proxyService: ProxyService);
     get config(): Config;
-    create(name?: string, imageName?: string, imageVersion?: string, username?: string, password?: string): Promise<void>;
+    create(props?: Partial<DatabaseProps>): Promise<void>;
     upgrade(name?: string, imageName?: string, imageVersion?: string): Promise<void>;
     destroy(name: string, yes?: boolean, force?: boolean): Promise<void>;
     use(name: string): void;

package/lib/services/MongodbService.js

@@ -48,19 +48,20 @@ let MongodbService = class MongodbService {
                             recursive: true
                         });
                     }
-                    fs.writeJSON("config.json", this.toJSON());
+                    fs.writeJSON("config.json", this.toObject());
                 }
             }(data);
         }
         return this._config;
     }
-    create(name_1, imageName_1, imageVersion_1) {
-        return __awaiter(this, arguments, void 0, function* (name, imageName, imageVersion, username = "", password = "") {
-            if (name && this.config.hasDatabase(name)) {
-                throw new Error(`Database name "${name}" is already taken`);
+    create() {
+        return __awaiter(this, arguments, void 0, function* (props = {}) {
+            if (props.name && this.config.hasDatabase(props.name)) {
+                console.info(`Database name "${props.name}" is already taken`);
+                delete props.name;
             }
-            if (!name) {
-                name = (yield (0, utils_1.promptText)({
+            if (!props.name) {
+                props.name = (yield (0, utils_1.promptText)({
                     message: "Mongodb name:",
                     type: "string",
                     validate: (name) => {
@@ -74,34 +75,34 @@ let MongodbService = class MongodbService {
                     }
                 }));
             }
-            if (!username) {
-                username = yield (0, utils_1.promptText)({
+            if (!props.username) {
+                props.username = yield (0, utils_1.promptText)({
                     message: "Username:",
                     type: "string",
                     required: true
                 });
             }
-            if (!password) {
-                password = yield (0, utils_1.promptText)({
+            if (!props.password) {
+                props.password = (yield (0, utils_1.promptText)({
                     message: "Password:",
                     type: "password",
                     required: true
-                });
+                }));
                 const confirmPassword = yield (0, utils_1.promptText)({
                     message: "Confirm password:",
                     type: "password",
                     required: true
                 });
-                if (password !== confirmPassword) {
+                if (props.password !== confirmPassword) {
                     throw new Error("Passwords do not match");
                 }
             }
             const database = new Database_1.Database({
-                name,
-                imageName,
-                imageVersion,
-                username,
-                password
+                name: props.name,
+                imageName: props.imageName,
+                imageVersion: props.imageVersion,
+                username: props.username,
+                password: props.password
             });
             this.config.setDatabase(database);
             this.config.save();
@@ -199,7 +200,7 @@ let MongodbService = class MongodbService {
     admin() {
         return __awaiter(this, void 0, void 0, function* () {
             const connections = [];
-            for (const database of this.config.databases.items) {
+            for (const database of this.config.databases) {
                 try {
                     const container = yield this.dockerService.getContainer(database.containerName);
                     if (!container) {
@@ -264,7 +265,7 @@ let MongodbService = class MongodbService {
                     "Storages"
                 ]
             });
-            for (const database of this.config.databases.items) {
+            for (const database of this.config.databases) {
                 table.push([
                     database.name + (database.name === this.config.default ? " (default)" : ""),
                     database.username,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/mongodb-plugin",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Mongodb plugin for wocker",
     "license": "MIT",
@@ -31,7 +31,7 @@
         "cli-table3": "^0.6.5"
     },
     "devDependencies": {
-        "@types/node": "^22.7.8",
-        "typescript": "^5.6.3"
+        "@types/node": "^22.13.4",
+        "typescript": "^5.7.3"
     }
 }