zumito-framework 1.1.26 → 1.1.29

package/dist/TranslationManager.d.ts

@@ -0,0 +1,15 @@
+import { Translation } from "./types/Translation";
+export declare class TranslationManager {
+    private translations;
+    private defaultLanguage;
+    constructor();
+    get(key: string, language?: string, params?: {
+        [key: string]: string;
+    }[]): string;
+    set(key: string, language: string, text: string): void;
+    has(key: string): boolean;
+    getAll(): Map<string, Translation>;
+    setAll(translations: Map<string, Translation>): void;
+    getDefaultLanguage(): string;
+    setDefaultLanguage(language: string): void;
+}

package/dist/TranslationManager.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TranslationManager = void 0;
+const Translation_1 = require("./types/Translation");
+class TranslationManager {
+    translations = new Map();
+    defaultLanguage = 'en';
+    constructor() { }
+    get(key, language, params) {
+        return this.translations.get(key).get(language, params);
+    }
+    set(key, language, text) {
+        if (!this.translations.has(key)) {
+            this.translations.set(key, new Translation_1.Translation());
+        }
+        this.translations.get(key).set(language, text);
+    }
+    has(key) {
+        return this.translations.has(key);
+    }
+    getAll() {
+        return this.translations;
+    }
+    setAll(translations) {
+        this.translations = translations;
+    }
+    getDefaultLanguage() {
+        return this.defaultLanguage;
+    }
+    setDefaultLanguage(language) {
+        this.defaultLanguage = language;
+    }
+}
+exports.TranslationManager = TranslationManager;

package/dist/ZumitoFramework.d.ts

@@ -3,6 +3,7 @@ import { Command } from "./types/Commands";
 import { FrameworkSettings } from "./types/FrameworkSettings";
 import { Module } from "./types/Module";
 import { FrameworkEvent } from "./types/FrameworkEvent";
+import { TranslationManager } from "./TranslationManager";
 /**
  * @class ZumitoFramework
  * @classdesc The main class of the framework.
@@ -18,7 +19,7 @@ export declare class ZumitoFramework {
     modules: Map<string, Module>;
     commands: Map<string, Command>;
     events: Map<string, FrameworkEvent>;
-    translations: Map<string, string>;
+    translations: TranslationManager;
     routes: any;
     models: any;
     database: any;

package/dist/ZumitoFramework.js

@@ -4,6 +4,7 @@ exports.ZumitoFramework = void 0;
 const Module_1 = require("./types/Module");
 const ApiResponse_1 = require("./definitions/ApiResponse");
 const baseModule_1 = require("./baseModule");
+const TranslationManager_1 = require("./TranslationManager");
 const express = require("express");
 const fs = require('fs');
 const path = require('path');
@@ -30,7 +31,7 @@ class ZumitoFramework {
     modules;
     commands;
     events;
-    translations;
+    translations = new TranslationManager_1.TranslationManager();
     routes;
     models;
     database;
@@ -54,7 +55,7 @@ class ZumitoFramework {
         this.modules = new Map();
         this.commands = new Map();
         this.events = new Map();
-        this.translations = new Map();
+        this.translations = new TranslationManager_1.TranslationManager();
         this.initialize().then(() => {
             if (callback)
                 callback();
@@ -123,6 +124,10 @@ class ZumitoFramework {
         fs.readdirSync(modulesFolder).forEach(file => {
             this.registerModule(modulesFolder, file);
         });
+        this.models.forEach((modelDefiniton, modelName) => {
+            const schema = new mongoose.Schema(modelDefiniton);
+            this.models.set(modelName, mongoose.model(modelName, schema));
+        });
     }
     registerModule(modulesFolder, moduleName, module) {
         if (!module) {
@@ -146,16 +151,20 @@ class ZumitoFramework {
         this.commands = new Map([...this.commands, ...moduleInstance.getCommands()]);
         // Register module events
         this.events = new Map([...this.events, ...moduleInstance.getEvents()]);
-        // Register translations
-        this.translations = new Map([...this.translations, ...moduleInstance.getTranslations()]);
+        // Register models
+        moduleInstance.getModels().forEach((modelDefinition, modelName) => {
+            if (!this.models.has(modelName)) {
+                this.models.set(modelName, modelDefinition);
+            }
+            else {
+                this.models.set(modelName, MergeRecursive(this.models.get(modelName), modelDefinition));
+            }
+        });
         /*
 
         // Register module routes
         this.routes = new Map([...this.routes, ...moduleInstance.getRoutes()]);
 
-        // Register module models
-        this.models = new Map([...this.models, ...moduleInstance.getModels()]);
-
         */
     }
     initializeDiscordClient() {
@@ -194,3 +203,21 @@ class ZumitoFramework {
     }
 }
 exports.ZumitoFramework = ZumitoFramework;
+function MergeRecursive(obj1, obj2) {
+    for (var p in obj2) {
+        try {
+            // Property in destination object set; update its value.
+            if (obj2[p].constructor == Object) {
+                obj1[p] = MergeRecursive(obj1[p], obj2[p]);
+            }
+            else {
+                obj1[p] = obj2[p];
+            }
+        }
+        catch (e) {
+            // Property in destination object not set; create it and set its value.
+            obj1[p] = obj2[p];
+        }
+    }
+    return obj1;
+}

package/dist/types/Module.d.ts

@@ -6,7 +6,6 @@ export declare abstract class Module {
     protected framework: ZumitoFramework;
     protected commands: Map<string, Command>;
     protected events: Map<string, FrameworkEvent>;
-    protected translations: Map<string, string>;
     protected models: Map<string, any>;
     constructor(path: any, framework: any);
     registerCommands(): void;
@@ -16,8 +15,7 @@ export declare abstract class Module {
     parseEventArgs(args: any[]): any;
     getEvents(): Map<string, FrameworkEvent>;
     registerTranslations(): void;
-    getTranslations(): Map<string, string>;
-    parseTranslation(path: string, json: any): any;
+    parseTranslation(path: string, lang: string, json: any): any;
     registerModels(): void;
     getModels(): Map<string, any>;
 }

package/dist/types/Module.js

@@ -9,7 +9,6 @@ class Module {
     framework;
     commands = new Map();
     events = new Map();
-    translations = new Map();
     models = new Map();
     constructor(path, framework) {
         this.path = path;
@@ -83,21 +82,19 @@ class Module {
         fs.readdirSync(path.join(this.path, 'translations')).forEach(file => {
             if (file.endsWith('.json')) {
                 let json = require(`${this.path}/translations/${file}`);
-                this.parseTranslation('', json);
+                let lang = file.slice(0, -5);
+                this.parseTranslation('', lang, json);
             }
         });
     }
-    getTranslations() {
-        return this.translations;
-    }
-    parseTranslation(path, json) {
+    parseTranslation(path, lang, json) {
         if (typeof json === 'object') {
             for (let key in json) {
-                this.parseTranslation(path + key + '.', json[key]);
+                this.parseTranslation(path + key + '.', lang, json[key]);
             }
         }
         else {
-            this.translations.set(path.slice(0, -1), json);
+            this.framework.translations.set(path, lang, json);
         }
     }
     registerModels() {
@@ -107,8 +104,7 @@ class Module {
             if (file.endsWith('.json')) {
                 let modelName = file.slice(0, -5).charAt(0).toUpperCase() + file.slice(0, -5).slice(1);
                 let modelDefiniton = require(`${this.path}/models/${file}`);
-                const schema = new mongoose.Schema(modelDefiniton);
-                this.models.set(modelDefiniton.name, mongoose.model(modelName, schema));
+                this.models.set(modelName, modelDefiniton);
             }
         });
     }

package/dist/types/Translation.d.ts

@@ -1,7 +1,9 @@
 export declare class Translation {
     text: Map<string, string>;
     constructor();
-    get(language: string): String;
+    get(language: string, params?: {
+        [key: string]: string;
+    }[]): string;
     set(language: string, text: string): void;
     has(language: string): boolean;
     getAll(): Map<string, string>;

package/dist/types/Translation.js

@@ -4,13 +4,20 @@ exports.Translation = void 0;
 class Translation {
     text = new Map();
     constructor() { }
-    get(language) {
+    get(language, params) {
+        let text;
         if (this.has(language)) {
-            return this.text.get(language);
+            text = this.text.get(language);
         }
         else {
-            return this.text.get('en');
+            text = this.text.get('en');
         }
+        if (params) {
+            Object.keys(params).forEach(key => {
+                text = text.replace(`{${key}}`, params[key]);
+            });
+        }
+        return text;
     }
     set(language, text) {
         this.text.set(language, text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.1.26",
+  "version": "1.1.29",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",