finish

src/discord/index.ts

@@ -1,99 +1,67 @@
-import { MessageEmbed } from 'discord.js';
+import { basicObject, basicObjectStringable, embedObject, LangObj } from '../types';
-import { template, resolveColor, bigString } from '..';
+import { convertBasicObject, template } from '../util';
-import { embedObject, basicObjectString, authorData, footerData } from '../types';
+import { embedDataType } from './types';
-
+import { embedObjEmbed } from './util';
-export * from "..";
+import Lang, { getLang } from '..';
 
 /**
- * converts embedObj to Discord.MessageEmbed
+ * reads language json as an object (could be embed or just string)
+ * @param id ex: discord.error.noActiveQueue
+ * @param argsraw list of key/value pairs to represent template values
+ * @param otherOptions values to be passed through to the return value
+ * @returns language value, defaults to `id` parameter
  */
-export function embedObjEmbed(embedObj: embedObject, args: basicObjectString = {}): MessageEmbed {
+function getEmbed(id: string, argsraw: basicObjectStringable = {}, otherOptions: basicObject = {}): embedDataType {
-    const embed = new MessageEmbed(),
-        { author, color, description, fields, footer, image, thumbnail, timestamp, title, url } = embedObj;
 
-    if (author !== undefined) {
+    const args = convertBasicObject(argsraw),
-
+        embedData: embedDataType = {
-        let authorFix: authorData;
+        ...otherOptions,
-
+        embeds: []
-        if (typeof author === 'string')
-            authorFix = {
-                name: template(author, args)
-            };
-        else {
-
-            const {name, iconURL, url} = author;
-
-            authorFix = {
-                name: template(name, args)
     };
     
-            if (iconURL !== undefined)
+    const keySpl = id.split('.').map(k => k.trim()).filter(k => k);
-                authorFix.iconURL = template(iconURL, args);
 
-            if (url !== undefined)
+    let finding = getLang();
-                authorFix.url = template(url, args);
+
+    for (const key of keySpl) {
+
+        if (key in finding) {
+
+            const found = finding[key];
+
+            if (typeof found === 'string') {
+                embedData.content = template(found, args);
+                break;
+            }
+
+            if (found.embed === true) {
+                const embedObj = found as embedObject,
+                    {content} = embedObj,
+                    embed = embedObjEmbed(embedObj, args);
+
+                embedData.embeds.push(embed);
+
+                if (content !== undefined)
+                    embedData.content = content;
+
+                return embedData;
+            }
+            
+            finding = found as LangObj;
+
+        } else
+            break;
         
     }
 
-        embed.setAuthor(authorFix);
+    return embedData;
-
 }
 
-    if (footer !== undefined) {
+export * from './types';
+export * from './util';
+export * from '..';
 
-        let footerFix: footerData;
+export default {
-
+    ...Lang,
-        if (typeof footer === 'string') {
+    getEmbed
-
-            footerFix = {
-                text: template(footer, args)
 };
-
-        } else {
-
-            const {text, iconURL} = footer;
-
-            footerFix = {
-                text: template(text, args)
-            };
-
-            if (iconURL !== undefined)
-                footerFix.iconURL = template(iconURL, args);
-
-        }
-
-        embed.setFooter(footerFix);
-
-    }
-
-    if (color !== undefined)
-        embed.setColor(resolveColor(template(color, args)));
-
-    if (description !== undefined)
-        embed.setDescription(template(bigString(description), args));
-
-    if (image !== undefined)
-        embed.setImage(template(image, args));
-
-    if (thumbnail !== undefined)
-        embed.setThumbnail(template(thumbnail, args));
-
-    if (title !== undefined)
-        embed.setTitle(template(title, args));
-
-    if (url !== undefined)
-        embed.setURL(template(url, args));
-
-    if (timestamp === true)
-        embed.setTimestamp();
-    else if (typeof timestamp === 'string')
-        embed.setTimestamp(new Date(template(timestamp, args)));
-    else if (timestamp !== false)
-        embed.setTimestamp(timestamp);
-
-    fields?.forEach(field => {
-        embed.addField(template(field.name, args), template(bigString(field.value), args), field.inline);
-    });
-
-    return embed;
-}

src/discord/types.ts

@@ -7,3 +7,5 @@ export interface embedDataType {
     content?: string,
     embeds: MessageEmbed[]
 }
+
+export * from '../types';

src/discord/util.ts

@@ -0,0 +1,99 @@
+import { MessageEmbed } from 'discord.js';
+import { template, resolveColor, bigString } from '../util';
+import { embedObject, basicObjectString, authorData, footerData } from '../types';
+
+/**
+ * converts embedObj to Discord.MessageEmbed
+ */
+export function embedObjEmbed(embedObj: embedObject, args: basicObjectString = {}): MessageEmbed {
+    const embed = new MessageEmbed(),
+        { author, color, description, fields, footer, image, thumbnail, timestamp, title, url } = embedObj;
+
+    if (author !== undefined) {
+
+        let authorFix: authorData;
+
+        if (typeof author === 'string')
+            authorFix = {
+                name: template(author, args)
+            };
+        else {
+
+            const {name, iconURL, url} = author;
+
+            authorFix = {
+                name: template(name, args)
+            };
+
+            if (iconURL !== undefined)
+                authorFix.iconURL = template(iconURL, args);
+
+            if (url !== undefined)
+                authorFix.url = template(url, args);
+
+        }
+
+        embed.setAuthor(authorFix);
+
+    }
+
+    if (footer !== undefined) {
+
+        let footerFix: footerData;
+
+        if (typeof footer === 'string') {
+
+            footerFix = {
+                text: template(footer, args)
+            };
+
+        } else {
+
+            const {text, iconURL} = footer;
+
+            footerFix = {
+                text: template(text, args)
+            };
+
+            if (iconURL !== undefined)
+                footerFix.iconURL = template(iconURL, args);
+
+        }
+
+        embed.setFooter(footerFix);
+
+    }
+
+    if (color !== undefined)
+        embed.setColor(resolveColor(template(color, args)));
+
+    if (description !== undefined)
+        embed.setDescription(template(bigString(description), args));
+
+    if (image !== undefined)
+        embed.setImage(template(image, args));
+
+    if (thumbnail !== undefined)
+        embed.setThumbnail(template(thumbnail, args));
+
+    if (title !== undefined)
+        embed.setTitle(template(title, args));
+
+    if (url !== undefined)
+        embed.setURL(template(url, args));
+
+    if (timestamp === true)
+        embed.setTimestamp();
+    else if (typeof timestamp === 'string')
+        embed.setTimestamp(new Date(template(timestamp, args)));
+    else if (timestamp !== false)
+        embed.setTimestamp(timestamp);
+
+    fields?.forEach(field => {
+        embed.addField(template(field.name, args), template(bigString(field.value), args), field.inline);
+    });
+
+    return embed;
+}
+
+export * from '../util';

src/index.ts

@@ -1,76 +1,56 @@
+import { basicObjectStringable, embedObject, LangObj } from './types';
+import { convertBasicObject, embedObjStr, template } from './util';
 
-import { authorData, basicObject, basicObjectString, bigStringType, embedObject, footerData } from './types';
+/* MAIN */
+var LANG: LangObj = {};
 
-/**
+export function setLang(lang: LangObj) {
- * 
+    LANG = lang;
- * @param str 
+}
- * @param args 
- * @returns 
- */
-export function template(str: string, args: basicObject): string {
-
-    return str.replace(/{\w+}/g, str => {
-
-        const key = str.substring(1, str.length-1);
-
-        if (key in args)
-            return args[key];
-
-        return key;
-
-    });
 
+export function getLang(): LangObj {
+    return LANG;
 }
 
 /**
- * converts bigString to string
+ * reads language json (just strings)
+ * @param id ex: discord.error.noActiveQueue
+ * @param argsraw list of key/value pairs to represent template values
+ * @returns language value, defaults to `id` parameter
  */
-export function bigString(bigStr: bigStringType): string {
+function get(id: string, argsraw: basicObjectStringable = {}): string {
-    if (Array.isArray(bigStr))
-        return bigStr.join('\n');
-    return bigStr;
-}
 
+    const args = convertBasicObject(argsraw),
+        keySpl = id.split('.').map(k => k.trim()).filter(k => k);
 
-/**
+    let finding = LANG;
- * converts Hex Color string to an RGB array
- */
-export function resolveColor(color: string): [number, number, number] {
-    color = color.replace(/[^0-9a-f]/gi, '');
 
-    const colorNum: [number, number, number] = [0, 0, 0];
+    for (const key of keySpl) {
 
-    if (color.length === 3 || color.length === 6) {
+        if (key in finding) {
 
-        const colorSplRaw = /([0-9a-f]{1,2})([0-9a-f]{1,2})([0-9a-f]{1,2})/.exec(color);
+            const found = finding[key];
 
-        if (!colorSplRaw)
+            if (typeof found === 'string')
-            return colorNum;
+                return template(found, args);
 
-        const colorSpl = colorSplRaw.slice(1, 4);
+            if (found.embed === true)
+                return embedObjStr(found as embedObject, args, id);
                 
-        if (color.length === 3)
+            finding = found as LangObj;
-            colorSpl.map(c => c + c);
 
-        for (let i = 0; i < colorSpl.length && i < colorNum.length; i++)
+        } else
-            colorNum[i] = parseInt(colorSpl[i], 16);
+            break;
         
     }
 
-    return colorNum;
+    return id;
 }
 
-/**
+export default {
- * converts embedObj to a string if applicable
+    setLang,
- * @param fallback the string to use if no valid strings can be found
+    get
- */
+};
-export function embedObjStr(embedObj: embedObject, args: basicObjectString = {}, fallback = ''): string {
 
-    if (embedObj.content !== undefined)
+export * from './types';
-        return template(bigString(embedObj.content), args);
+export * from './util';
-
-    if (embedObj.description !== undefined)
-        return template(bigString(embedObj.description), args);
-
-    return fallback;
-}

src/types.ts

@@ -1,5 +1,3 @@
-
-
 /**
  * any indexable object
  */
@@ -90,10 +88,3 @@ export interface embedObject {
  * `LANG > Language`
  */
 export type LangObj = { [keys:string]: LangObj | embedObject | string }
-
-/**
- * the entire LANG object
- * 
- * `LANG`
- */
-export type LangObjWhole = { [langid:string]: LangObj }

src/util.ts

@@ -0,0 +1,91 @@
+import { basicObject, basicObjectString, basicObjectStringable, bigStringType, embedObject } from './types';
+
+/**
+ * 
+ * @param str 
+ * @param args 
+ * @returns 
+ */
+export function template(str: string, args: basicObject): string {
+
+    return str.replace(/{\w+}/g, str => {
+
+        const key = str.substring(1, str.length-1);
+
+        if (key in args)
+            return args[key];
+
+        return key;
+
+    });
+
+}
+
+/**
+ * converts bigString to string
+ */
+export function bigString(bigStr: bigStringType): string {
+    if (Array.isArray(bigStr))
+        return bigStr.join('\n');
+    return bigStr;
+}
+
+
+/**
+ * converts Hex Color string to an RGB array
+ */
+export function resolveColor(color: string): [number, number, number] {
+    color = color.replace(/[^0-9a-f]/gi, '');
+
+    const colorNum: [number, number, number] = [0, 0, 0];
+
+    if (color.length === 3 || color.length === 6) {
+
+        const colorSplRaw = /([0-9a-f]{1,2})([0-9a-f]{1,2})([0-9a-f]{1,2})/.exec(color);
+
+        if (!colorSplRaw)
+            return colorNum;
+
+        const colorSpl = colorSplRaw.slice(1, 4);
+
+        if (color.length === 3)
+            colorSpl.map(c => c + c);
+
+        for (let i = 0; i < colorSpl.length && i < colorNum.length; i++)
+            colorNum[i] = parseInt(colorSpl[i], 16);
+
+    }
+
+    return colorNum;
+}
+
+/**
+ * converts embedObj to a string if applicable
+ * @param fallback the string to use if no valid strings can be found
+ */
+export function embedObjStr(embedObj: embedObject, args: basicObjectString = {}, fallback = ''): string {
+
+    if (embedObj.content !== undefined)
+        return template(bigString(embedObj.content), args);
+
+    if (embedObj.description !== undefined)
+        return template(bigString(embedObj.description), args);
+
+    return fallback;
+}
+
+export function convertBasicObject(obj: basicObjectStringable): basicObjectString {
+    let ret: basicObjectString = {};
+    for (const key in obj) {
+        const val = obj[key];
+        if (typeof val === 'string')
+            ret[key] = val;
+        else if (typeof val === 'boolean')
+            ret[key] = val.toString();
+        else if (typeof val === 'number')
+            ret[key] = val.toString();
+        else
+            ret[key] = '';
+    }
+    return ret;
+}