Updates

2025-07-05 14:59:30 +01:00
parent 6e334c2525
commit 7e8bb37c09
526 changed files with 17560 additions and 11386 deletions
@@ -1,22 +1,7 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addAdminUserOnLogin;
-const serverError_1 = __importDefault(require("./serverError"));
-const DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/DB_HANDLER"));
-const addDbEntry_1 = __importDefault(require("./db/addDbEntry"));
-const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/LOCAL_DB_HANDLER"));
+import serverError from "./serverError";
+import DB_HANDLER from "../../utils/backend/global-db/DB_HANDLER";
+import addDbEntry from "./db/addDbEntry";
+import LOCAL_DB_HANDLER from "../../utils/backend/global-db/LOCAL_DB_HANDLER";
 /**
 * Add Admin User on Login
 * ==============================================================================
@@ -25,88 +10,86 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-d
 * admin user. This fires when the invited user has been logged in or a new account
 * has been created for the invited user
 */
-function addAdminUserOnLogin(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ query, user, }) {
-        var _b;
-        try {
-            const finalDbHandler = global.DSQL_USE_LOCAL
-                ? LOCAL_DB_HANDLER_1.default
-                : DB_HANDLER_1.default;
-            const { invite, database_access, priviledge, email } = query;
-            const lastInviteTimeQuery = `SELECT date_created_code FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`;
-            const lastInviteTimeValues = [invite, email];
-            const lastInviteTimeArray = yield finalDbHandler(lastInviteTimeQuery, lastInviteTimeValues);
-            if (!lastInviteTimeArray || !lastInviteTimeArray[0]) {
-                throw new Error("No Invitation Found");
+export default async function addAdminUserOnLogin({ query, user, }) {
+    var _a;
+    try {
+        const finalDbHandler = global.DSQL_USE_LOCAL
+            ? LOCAL_DB_HANDLER
+            : DB_HANDLER;
+        const { invite, database_access, priviledge, email } = query;
+        const lastInviteTimeQuery = `SELECT date_created_code FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`;
+        const lastInviteTimeValues = [invite, email];
+        const lastInviteTimeArray = await finalDbHandler(lastInviteTimeQuery, lastInviteTimeValues);
+        if (!lastInviteTimeArray || !lastInviteTimeArray[0]) {
+            throw new Error("No Invitation Found");
+        }
+        ////////////////////////////////////////////////
+        ////////////////////////////////////////////////
+        ////////////////////////////////////////////////
+        const invitingUserDbQuery = `SELECT first_name,last_name,email FROM users WHERE id=?`;
+        const invitingUserDbValues = [invite];
+        const invitingUserDb = await finalDbHandler(invitingUserDbQuery, invitingUserDbValues);
+        if (invitingUserDb === null || invitingUserDb === void 0 ? void 0 : invitingUserDb[0]) {
+            const existingUserUser = await finalDbHandler(`SELECT email FROM user_users WHERE user_id=? AND invited_user_id=? AND user_type='admin' AND email=?`, [invite, user.id, email]);
+            if (existingUserUser === null || existingUserUser === void 0 ? void 0 : existingUserUser[0]) {
+                console.log("User already added");
            }
-            ////////////////////////////////////////////////
-            ////////////////////////////////////////////////
-            ////////////////////////////////////////////////
-            const invitingUserDbQuery = `SELECT first_name,last_name,email FROM users WHERE id=?`;
-            const invitingUserDbValues = [invite];
-            const invitingUserDb = yield finalDbHandler(invitingUserDbQuery, invitingUserDbValues);
-            if (invitingUserDb === null || invitingUserDb === void 0 ? void 0 : invitingUserDb[0]) {
-                const existingUserUser = yield finalDbHandler(`SELECT email FROM user_users WHERE user_id=? AND invited_user_id=? AND user_type='admin' AND email=?`, [invite, user.id, email]);
-                if (existingUserUser === null || existingUserUser === void 0 ? void 0 : existingUserUser[0]) {
-                    console.log("User already added");
-                }
-                else {
-                    (0, addDbEntry_1.default)({
-                        dbFullName: "datasquirel",
-                        tableName: "user_users",
-                        data: {
-                            user_id: invite,
-                            invited_user_id: user.id,
-                            database_access: database_access,
-                            first_name: user.first_name,
-                            last_name: user.last_name,
-                            phone: user.phone,
-                            email: user.email,
-                            username: user.username,
-                            user_type: "admin",
-                            user_priviledge: priviledge,
-                            image: user.image,
-                            image_thumbnail: user.image_thumbnail,
-                        },
-                    });
-                    ////////////////////////////////////////////////
-                    ////////////////////////////////////////////////
-                    ////////////////////////////////////////////////
-                    const dbTableData = yield finalDbHandler(`SELECT db_tables_data FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`, [invite, email]);
-                    const clearEntries = yield finalDbHandler(`DELETE FROM delegated_user_tables WHERE root_user_id=? AND delegated_user_id=?`, [invite, user.id]);
-                    ////////////////////////////////////////////////
-                    ////////////////////////////////////////////////
-                    ////////////////////////////////////////////////
-                    if (dbTableData && dbTableData[0]) {
-                        const dbTableEntries = dbTableData[0].db_tables_data.split("|");
-                        for (let i = 0; i < dbTableEntries.length; i++) {
-                            const dbTableEntry = dbTableEntries[i];
-                            const dbTableEntryArray = dbTableEntry.split("-");
-                            const [db_slug, table_slug] = dbTableEntryArray;
-                            const newEntry = yield (0, addDbEntry_1.default)({
-                                dbFullName: "datasquirel",
-                                tableName: "delegated_user_tables",
-                                data: {
-                                    delegated_user_id: user.id,
-                                    root_user_id: invite,
-                                    database: db_slug,
-                                    table: table_slug,
-                                    priviledge: priviledge,
-                                },
-                            });
-                        }
+            else {
+                addDbEntry({
+                    dbFullName: "datasquirel",
+                    tableName: "user_users",
+                    data: {
+                        user_id: invite,
+                        invited_user_id: user.id,
+                        database_access: database_access,
+                        first_name: user.first_name,
+                        last_name: user.last_name,
+                        phone: user.phone,
+                        email: user.email,
+                        username: user.username,
+                        user_type: "admin",
+                        user_priviledge: priviledge,
+                        image: user.image,
+                        image_thumbnail: user.image_thumbnail,
+                    },
+                });
+                ////////////////////////////////////////////////
+                ////////////////////////////////////////////////
+                ////////////////////////////////////////////////
+                const dbTableData = await finalDbHandler(`SELECT db_tables_data FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`, [invite, email]);
+                const clearEntries = await finalDbHandler(`DELETE FROM delegated_user_tables WHERE root_user_id=? AND delegated_user_id=?`, [invite, user.id]);
+                ////////////////////////////////////////////////
+                ////////////////////////////////////////////////
+                ////////////////////////////////////////////////
+                if (dbTableData && dbTableData[0]) {
+                    const dbTableEntries = dbTableData[0].db_tables_data.split("|");
+                    for (let i = 0; i < dbTableEntries.length; i++) {
+                        const dbTableEntry = dbTableEntries[i];
+                        const dbTableEntryArray = dbTableEntry.split("-");
+                        const [db_slug, table_slug] = dbTableEntryArray;
+                        const newEntry = await addDbEntry({
+                            dbFullName: "datasquirel",
+                            tableName: "delegated_user_tables",
+                            data: {
+                                delegated_user_id: user.id,
+                                root_user_id: invite,
+                                database: db_slug,
+                                table: table_slug,
+                                priviledge: priviledge,
+                            },
+                        });
                    }
                }
-                const inviteAccepted = yield finalDbHandler(`UPDATE invitations SET invitation_status='Accepted' WHERE inviting_user_id=? AND invited_user_email=?`, [invite, email]);
            }
+            const inviteAccepted = await finalDbHandler(`UPDATE invitations SET invitation_status='Accepted' WHERE inviting_user_id=? AND invited_user_email=?`, [invite, email]);
        }
-        catch (error) {
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Add Admin User On Login Error`, error);
-            (0, serverError_1.default)({
-                component: "addAdminUserOnLogin",
-                message: error.message,
-                user: user,
-            });
-        }
-    });
+    }
+    catch (error) {
+        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Add Admin User On Login Error`, error);
+        serverError({
+            component: "addAdminUserOnLogin",
+            message: error.message,
+            user: user,
+        });
+    }
 }
@@ -1,70 +1,54 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addMariadbUser;
-const generate_password_1 = __importDefault(require("generate-password"));
-const DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/DB_HANDLER"));
-const NO_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/NO_DB_HANDLER"));
-const addDbEntry_1 = __importDefault(require("./db/addDbEntry"));
-const encrypt_1 = __importDefault(require("../dsql/encrypt"));
-const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/LOCAL_DB_HANDLER"));
+import generator from "generate-password";
+import DB_HANDLER from "../../utils/backend/global-db/DB_HANDLER";
+import NO_DB_HANDLER from "../../utils/backend/global-db/NO_DB_HANDLER";
+import addDbEntry from "./db/addDbEntry";
+import encrypt from "../dsql/encrypt";
+import LOCAL_DB_HANDLER from "../../utils/backend/global-db/LOCAL_DB_HANDLER";
+import grabSQLKeyName from "../../utils/grab-sql-key-name";
 /**
 * # Add Mariadb User
 */
-function addMariadbUser(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ userId }) {
-        try {
-            const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1";
-            const username = `dsql_user_${userId}`;
-            const password = generate_password_1.default.generate({
-                length: 16,
-                numbers: true,
-                symbols: true,
-                uppercase: true,
-                exclude: "*#.'`\"",
-            });
-            const encryptedPassword = (0, encrypt_1.default)({ data: password });
-            const createMariadbUsersQuery = `CREATE USER IF NOT EXISTS '${username}'@'127.0.0.1' IDENTIFIED BY '${password}'`;
-            if (global.DSQL_USE_LOCAL) {
-                yield (0, LOCAL_DB_HANDLER_1.default)(createMariadbUsersQuery);
-            }
-            else {
-                yield (0, NO_DB_HANDLER_1.default)(createMariadbUsersQuery);
-            }
-            const updateUserQuery = `UPDATE users SET mariadb_user = ?, mariadb_host = '127.0.0.1', mariadb_pass = ? WHERE id = ?`;
-            const updateUserValues = [username, encryptedPassword, userId];
-            const updateUser = global.DSQL_USE_LOCAL
-                ? yield (0, LOCAL_DB_HANDLER_1.default)(updateUserQuery, updateUserValues)
-                : yield (0, DB_HANDLER_1.default)(updateUserQuery, updateUserValues);
-            const addMariadbUser = yield (0, addDbEntry_1.default)({
-                tableName: "mariadb_users",
-                data: {
-                    user_id: userId,
-                    username,
-                    host: defaultMariadbUserHost,
-                    password: encryptedPassword,
-                    primary: "1",
-                    grants: '[{"database":"*","table":"*","privileges":["ALL"]}]',
-                },
-                dbContext: "Master",
-            });
-            console.log(`User ${userId} SQL credentials successfully added.`);
+export default async function addMariadbUser({ userId }) {
+    try {
+        const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1";
+        const username = grabSQLKeyName({ type: "user", userId });
+        const password = generator.generate({
+            length: 16,
+            numbers: true,
+            symbols: true,
+            uppercase: true,
+            exclude: "*#.'`\"",
+        });
+        const encryptedPassword = encrypt({ data: password });
+        const createMariadbUsersQuery = `CREATE USER IF NOT EXISTS '${username}'@'127.0.0.1' IDENTIFIED BY '${password}'`;
+        if (global.DSQL_USE_LOCAL) {
+            await LOCAL_DB_HANDLER(createMariadbUsersQuery);
        }
-        catch ( /** @type {any} */error) {
-            console.log(`Error in adding SQL user in 'addMariadbUser' function =>`, error.message);
+        else {
+            await NO_DB_HANDLER(createMariadbUsersQuery);
        }
-    });
+        const updateUserQuery = `UPDATE users SET mariadb_user = ?, mariadb_host = '127.0.0.1', mariadb_pass = ? WHERE id = ?`;
+        const updateUserValues = [username, encryptedPassword, userId];
+        const updateUser = global.DSQL_USE_LOCAL
+            ? await LOCAL_DB_HANDLER(updateUserQuery, updateUserValues)
+            : await DB_HANDLER(updateUserQuery, updateUserValues);
+        const addMariadbUser = await addDbEntry({
+            tableName: "mariadb_users",
+            data: {
+                user_id: userId,
+                username,
+                host: defaultMariadbUserHost,
+                password: encryptedPassword,
+                primary: "1",
+                grants: '[{"database":"*","table":"*","privileges":["ALL"]}]',
+            },
+            dbContext: "Master",
+        });
+        console.log(`User ${userId} SQL credentials successfully added.`);
+    }
+    catch ( /** @type {any} */error) {
+        console.log(`Error in adding SQL user in 'addMariadbUser' function =>`, error.message);
+    }
 }
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////
@@ -4,9 +4,10 @@ type Param = {
    payload?: {
        [s: string]: any;
    };
+    dbId: string | number;
 };
 /**
 * # Add User Table to Database
 */
-export default function addUsersTableToDb({ userId, database, payload, }: Param): Promise<any>;
+export default function addUsersTableToDb({ userId, database, payload, dbId, }: Param): Promise<any>;
 export {};
@@ -1,81 +1,63 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addUsersTableToDb;
-const serverError_1 = __importDefault(require("./serverError"));
-const DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/DB_HANDLER"));
-const grabUserSchemaData_1 = __importDefault(require("./grabUserSchemaData"));
-const setUserSchemaData_1 = __importDefault(require("./setUserSchemaData"));
-const addDbEntry_1 = __importDefault(require("./db/addDbEntry"));
-const createDbFromSchema_1 = __importDefault(require("../../shell/createDbFromSchema"));
-const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/LOCAL_DB_HANDLER"));
-const grabNewUsersTableSchema_1 = __importDefault(require("./grabNewUsersTableSchema"));
+import serverError from "./serverError";
+import DB_HANDLER from "../../utils/backend/global-db/DB_HANDLER";
+import addDbEntry from "./db/addDbEntry";
+import createDbFromSchema from "../../shell/createDbFromSchema";
+import LOCAL_DB_HANDLER from "../../utils/backend/global-db/LOCAL_DB_HANDLER";
+import grabNewUsersTableSchema from "./grabNewUsersTableSchema";
+import { grabPrimaryRequiredDbSchema, writeUpdatedDbSchema, } from "../../shell/createDbFromSchema/grab-required-database-schemas";
 /**
 * # Add User Table to Database
 */
-function addUsersTableToDb(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ userId, database, payload, }) {
-        try {
-            const dbFullName = database;
-            const userPreset = (0, grabNewUsersTableSchema_1.default)({ payload });
-            if (!userPreset)
-                throw new Error("Couldn't Get User Preset!");
-            const userSchemaData = (0, grabUserSchemaData_1.default)({ userId });
-            if (!userSchemaData)
-                throw new Error("User schema data not found!");
-            let targetDatabase = userSchemaData.find((db) => db.dbFullName === database);
-            if (!targetDatabase) {
-                throw new Error("Couldn't Find Target Database!");
-            }
-            let existingTableIndex = targetDatabase === null || targetDatabase === void 0 ? void 0 : targetDatabase.tables.findIndex((table) => table.tableName === "users");
-            if (typeof existingTableIndex == "number" && existingTableIndex > 0) {
-                targetDatabase.tables[existingTableIndex] = userPreset;
-            }
-            else {
-                targetDatabase.tables.push(userPreset);
-            }
-            (0, setUserSchemaData_1.default)({ schemaData: userSchemaData, userId });
-            const targetDb = global.DSQL_USE_LOCAL
-                ? yield (0, LOCAL_DB_HANDLER_1.default)(`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`, [userId, database])
-                : yield (0, DB_HANDLER_1.default)(`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`, [userId, database]);
-            if (targetDb === null || targetDb === void 0 ? void 0 : targetDb[0]) {
-                const newTableEntry = yield (0, addDbEntry_1.default)({
-                    dbFullName: "datasquirel",
-                    tableName: "user_database_tables",
-                    data: {
-                        user_id: userId,
-                        db_id: targetDb[0].id,
-                        db_slug: targetDatabase.dbSlug,
-                        table_name: "Users",
-                        table_slug: "users",
-                    },
-                });
-            }
-            const dbShellUpdate = yield (0, createDbFromSchema_1.default)({
-                userId,
-                targetDatabase: dbFullName,
-            });
-            return `Done!`;
+export default async function addUsersTableToDb({ userId, database, payload, dbId, }) {
+    try {
+        const dbFullName = database;
+        const userPreset = grabNewUsersTableSchema({ payload });
+        if (!userPreset)
+            throw new Error("Couldn't Get User Preset!");
+        let targetDatabase = grabPrimaryRequiredDbSchema({
+            dbId,
+            userId,
+        });
+        if (!targetDatabase) {
+            throw new Error("Couldn't Find Target Database!");
        }
-        catch ( /** @type {any} */error) {
-            console.log(`addUsersTableToDb.ts ERROR: ${error.message}`);
-            (0, serverError_1.default)({
-                component: "addUsersTableToDb",
-                message: error.message,
-                user: { id: userId },
-            });
-            return error.message;
+        let existingTableIndex = targetDatabase === null || targetDatabase === void 0 ? void 0 : targetDatabase.tables.findIndex((table) => table.tableName === "users");
+        if (typeof existingTableIndex == "number" && existingTableIndex > 0) {
+            targetDatabase.tables[existingTableIndex] = userPreset;
        }
-    });
+        else {
+            targetDatabase.tables.push(userPreset);
+        }
+        writeUpdatedDbSchema({ dbSchema: targetDatabase, userId });
+        const targetDb = global.DSQL_USE_LOCAL
+            ? await LOCAL_DB_HANDLER(`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`, [userId, database])
+            : await DB_HANDLER(`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`, [userId, database]);
+        if (targetDb === null || targetDb === void 0 ? void 0 : targetDb[0]) {
+            const newTableEntry = await addDbEntry({
+                dbFullName: "datasquirel",
+                tableName: "user_database_tables",
+                data: {
+                    user_id: userId,
+                    db_id: targetDb[0].id,
+                    db_slug: targetDatabase.dbSlug,
+                    table_name: "Users",
+                    table_slug: "users",
+                },
+            });
+        }
+        const dbShellUpdate = await createDbFromSchema({
+            userId,
+            targetDatabase: dbFullName,
+        });
+        return `Done!`;
+    }
+    catch ( /** @type {any} */error) {
+        console.log(`addUsersTableToDb.ts ERROR: ${error.message}`);
+        serverError({
+            component: "addUsersTableToDb",
+            message: error.message,
+            user: { id: userId },
+        });
+        return error.message;
+    }
 }
@@ -1,6 +1,4 @@
-import { CheckApiCredentialsFn } from "../../types";
+export {};
 /**
 * # Grap API Credentials
 */
-declare const grabApiCred: CheckApiCredentialsFn;
-export default grabApiCred;
@@ -1,49 +1,47 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const decrypt_1 = __importDefault(require("../dsql/decrypt"));
+export {};
 /**
 * # Grap API Credentials
 */
-const grabApiCred = ({ key, database, table, user_id, media, }) => {
-    var _a, _b;
-    if (!key)
-        return null;
-    if (!user_id)
-        return null;
-    try {
-        const allowedKeysPath = process.env.DSQL_API_KEYS_PATH;
-        if (!allowedKeysPath)
-            throw new Error("process.env.DSQL_API_KEYS_PATH variable not found");
-        const ApiJSON = (0, decrypt_1.default)({ encryptedString: key });
-        const ApiObject = JSON.parse(ApiJSON || "");
-        const isApiKeyValid = fs_1.default.existsSync(`${allowedKeysPath}/${ApiObject.sign}`);
-        if (String(ApiObject.user_id) !== String(user_id))
-            return null;
-        if (!isApiKeyValid)
-            return null;
-        if (!ApiObject.target_database)
-            return ApiObject;
-        if (media)
-            return ApiObject;
-        if (!database && ApiObject.target_database)
-            return null;
-        const isDatabaseAllowed = (_a = ApiObject.target_database) === null || _a === void 0 ? void 0 : _a.split(",").includes(String(database));
-        if (isDatabaseAllowed && !ApiObject.target_table)
-            return ApiObject;
-        if (isDatabaseAllowed && !table && ApiObject.target_table)
-            return null;
-        const isTableAllowed = (_b = ApiObject.target_table) === null || _b === void 0 ? void 0 : _b.split(",").includes(String(table));
-        if (isTableAllowed)
-            return ApiObject;
-        return null;
-    }
-    catch (error) {
-        console.log(`api-cred ERROR: ${error.message}`);
-        return { error: `api-cred ERROR: ${error.message}` };
-    }
-};
-exports.default = grabApiCred;
+// const grabApiCred: CheckApiCredentialsFn = ({
+//     key,
+//     database,
+//     table,
+//     user_id,
+//     media,
+// }) => {
+//     if (!key) return null;
+//     if (!user_id) return null;
+//     try {
+//         const allowedKeysPath = process.env.DSQL_API_KEYS_PATH;
+//         if (!allowedKeysPath)
+//             throw new Error(
+//                 "process.env.DSQL_API_KEYS_PATH variable not found"
+//             );
+//         const ApiJSON = decrypt({ encryptedString: key });
+//         const ApiObject: import("../../types").ApiKeyObject = JSON.parse(
+//             ApiJSON || ""
+//         );
+//         const isApiKeyValid = fs.existsSync(
+//             `${allowedKeysPath}/${ApiObject.sign}`
+//         );
+//         if (String(ApiObject.user_id) !== String(user_id)) return null;
+//         if (!isApiKeyValid) return null;
+//         if (!ApiObject.target_database) return ApiObject;
+//         if (media) return ApiObject;
+//         if (!database && ApiObject.target_database) return null;
+//         const isDatabaseAllowed = ApiObject.target_database
+//             ?.split(",")
+//             .includes(String(database));
+//         if (isDatabaseAllowed && !ApiObject.target_table) return ApiObject;
+//         if (isDatabaseAllowed && !table && ApiObject.target_table) return null;
+//         const isTableAllowed = ApiObject.target_table
+//             ?.split(",")
+//             .includes(String(table));
+//         if (isTableAllowed) return ApiObject;
+//         return null;
+//     } catch (error: any) {
+//         console.log(`api-cred ERROR: ${error.message}`);
+//         return { error: `api-cred ERROR: ${error.message}` };
+//     }
+// };
+// export default grabApiCred;
@@ -1,33 +1,26 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAuthFile = exports.deleteAuthFile = exports.getAuthFile = exports.cleanupUserAuthFiles = exports.writeAuthFile = exports.initAuthFiles = exports.grabAuthDirs = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const ejson_1 = __importDefault(require("../../../utils/ejson"));
-const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log"));
+import fs from "fs";
+import path from "path";
+import EJSON from "../../../utils/ejson";
+import debugLog from "../../../utils/logging/debug-log";
 function debugFn(log, label) {
-    (0, debug_log_1.default)({ log, addTime: true, title: "write-auth-files", label });
+    debugLog({ log, addTime: true, title: "write-auth-files", label });
 }
-const grabAuthDirs = () => {
+export const grabAuthDirs = () => {
    const DSQL_AUTH_DIR = process.env.DSQL_AUTH_DIR;
    const ROOT_DIR = (DSQL_AUTH_DIR === null || DSQL_AUTH_DIR === void 0 ? void 0 : DSQL_AUTH_DIR.match(/./))
        ? DSQL_AUTH_DIR
-        : path_1.default.resolve(process.cwd(), "./.tmp");
-    const AUTH_DIR = path_1.default.join(ROOT_DIR, "logins");
+        : path.resolve(process.cwd(), "./.tmp");
+    const AUTH_DIR = path.join(ROOT_DIR, "logins");
    return { root: ROOT_DIR, auth: AUTH_DIR };
 };
-exports.grabAuthDirs = grabAuthDirs;
-const initAuthFiles = () => {
+export const initAuthFiles = () => {
    var _a;
    try {
-        const authDirs = (0, exports.grabAuthDirs)();
-        if (!fs_1.default.existsSync(authDirs.root))
-            fs_1.default.mkdirSync(authDirs.root, { recursive: true });
-        if (!fs_1.default.existsSync(authDirs.auth))
-            fs_1.default.mkdirSync(authDirs.auth, { recursive: true });
+        const authDirs = grabAuthDirs();
+        if (!fs.existsSync(authDirs.root))
+            fs.mkdirSync(authDirs.root, { recursive: true });
+        if (!fs.existsSync(authDirs.auth))
+            fs.mkdirSync(authDirs.auth, { recursive: true });
        return true;
    }
    catch (error) {
@@ -36,18 +29,17 @@ const initAuthFiles = () => {
        return false;
    }
 };
-exports.initAuthFiles = initAuthFiles;
 /**
 * # Write Auth Files
 */
-const writeAuthFile = (name, data, cleanup) => {
-    (0, exports.initAuthFiles)();
+export const writeAuthFile = (name, data, cleanup) => {
+    initAuthFiles();
    try {
-        const { auth } = (0, exports.grabAuthDirs)();
+        const { auth } = grabAuthDirs();
        if (cleanup) {
-            (0, exports.cleanupUserAuthFiles)(cleanup.userId);
+            cleanupUserAuthFiles(cleanup.userId);
        }
-        fs_1.default.writeFileSync(path_1.default.join(auth, name), data);
+        fs.writeFileSync(path.join(auth, name), data);
        return true;
    }
    catch (error) {
@@ -55,22 +47,21 @@ const writeAuthFile = (name, data, cleanup) => {
        return false;
    }
 };
-exports.writeAuthFile = writeAuthFile;
 /**
 * # Clean up User Auth Files
 */
-const cleanupUserAuthFiles = (userId) => {
-    (0, exports.initAuthFiles)();
+export const cleanupUserAuthFiles = (userId) => {
+    initAuthFiles();
    try {
-        const { auth } = (0, exports.grabAuthDirs)();
-        const loginFiles = fs_1.default.readdirSync(auth);
+        const { auth } = grabAuthDirs();
+        const loginFiles = fs.readdirSync(auth);
        for (let i = 0; i < loginFiles.length; i++) {
            const loginFile = loginFiles[i];
-            const loginFilePath = path_1.default.join(auth, loginFile);
+            const loginFilePath = path.join(auth, loginFile);
            try {
-                const authPayload = ejson_1.default.parse(fs_1.default.readFileSync(loginFilePath, "utf-8"));
+                const authPayload = EJSON.parse(fs.readFileSync(loginFilePath, "utf-8"));
                if (authPayload.id == userId) {
-                    fs_1.default.unlinkSync(loginFilePath);
+                    fs.unlinkSync(loginFilePath);
                }
            }
            catch (error) { }
@@ -82,42 +73,39 @@ const cleanupUserAuthFiles = (userId) => {
        return false;
    }
 };
-exports.cleanupUserAuthFiles = cleanupUserAuthFiles;
 /**
 * # Get Auth Files
 */
-const getAuthFile = (name) => {
+export const getAuthFile = (name) => {
    try {
-        const authFilePath = path_1.default.join((0, exports.grabAuthDirs)().auth, name);
-        return fs_1.default.readFileSync(authFilePath, "utf-8");
+        const authFilePath = path.join(grabAuthDirs().auth, name);
+        return fs.readFileSync(authFilePath, "utf-8");
    }
    catch (error) {
        console.log(`Error getting Auth File: ${error.message}`);
        return null;
    }
 };
-exports.getAuthFile = getAuthFile;
 /**
 * # Delete Auth Files
 * @param {string} name
 */
-const deleteAuthFile = (name) => {
+export const deleteAuthFile = (name) => {
    try {
-        return fs_1.default.rmSync(path_1.default.join((0, exports.grabAuthDirs)().auth, name));
+        return fs.rmSync(path.join(grabAuthDirs().auth, name));
    }
    catch (error) {
        console.log(`Error deleting Auth File: ${error.message}`);
        return null;
    }
 };
-exports.deleteAuthFile = deleteAuthFile;
 /**
 * # Delete Auth Files
 * @param {string} name
 */
-const checkAuthFile = (name) => {
+export const checkAuthFile = (name) => {
    try {
-        return fs_1.default.existsSync(path_1.default.join((0, exports.grabAuthDirs)().auth, name));
+        return fs.existsSync(path.join(grabAuthDirs().auth, name));
        return true;
    }
    catch (error) {
@@ -125,4 +113,3 @@ const checkAuthFile = (name) => {
        return false;
    }
 };
-exports.checkAuthFile = checkAuthFile;
@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getAuthCookieNames;
-const get_csrf_header_name_1 = __importDefault(require("../../../actions/get-csrf-header-name"));
+import getCsrfHeaderName from "../../../actions/get-csrf-header-name";
+import { AppNames } from "../../../dict/app-names";
 /**
 * # Grab Auth Cookie Names
 */
-function getAuthCookieNames(params) {
+export default function getAuthCookieNames(params) {
    var _a, _b;
    const cookiesPrefix = process.env.DSQL_COOKIES_PREFIX || "dsql_";
    const cookiesKeyName = process.env.DSQL_COOKIES_KEY_NAME || "key";
-    const cookiesCSRFName = (0, get_csrf_header_name_1.default)();
+    const cookiesCSRFName = getCsrfHeaderName();
    const cookieOneTimeCodeName = process.env.DSQL_COOKIES_ONE_TIME_CODE_NAME || "one-time-code";
-    const targetDatabase = ((_a = params === null || params === void 0 ? void 0 : params.database) === null || _a === void 0 ? void 0 : _a.replace(/^datasquirel_user_\d+_/, "")) ||
-        ((_b = process.env.DSQL_DB_NAME) === null || _b === void 0 ? void 0 : _b.replace(/^datasquirel_user_\d+_/, ""));
+    const targetDatabase = ((_a = params === null || params === void 0 ? void 0 : params.database) === null || _a === void 0 ? void 0 : _a.replace(new RegExp(`^${AppNames["DsqlDbPrefix"]}\\d+_`), "")) ||
+        ((_b = process.env.DSQL_DB_NAME) === null || _b === void 0 ? void 0 : _b.replace(new RegExp(`^${AppNames["DsqlDbPrefix"]}\\d+_`), ""));
    let keyCookieName = cookiesPrefix;
    if (params === null || params === void 0 ? void 0 : params.userId)
        keyCookieName += `user_${params.userId}_`;
@@ -2,6 +2,7 @@ import { DSQL_DATASQUIREL_USER_DATABASES } from "../../types/dsql";
 type Params = {
    userId: number | string;
    database: DSQL_DATASQUIREL_USER_DATABASES;
+    dbId?: string | number;
 };
-export default function createDbSchemaFromDb({ userId, database, }: Params): Promise<boolean | undefined>;
+export default function createDbSchemaFromDb({ userId, database, dbId, }: Params): Promise<boolean | undefined>;
 export {};
@@ -1,132 +1,120 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = createDbSchemaFromDb;
-const varDatabaseDbHandler_1 = __importDefault(require("../../functions/backend/varDatabaseDbHandler"));
-const grabUserSchemaData_1 = __importDefault(require("../../functions/backend/grabUserSchemaData"));
-const setUserSchemaData_1 = __importDefault(require("../../functions/backend/setUserSchemaData"));
-const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEntry"));
-const slugToCamelTitle_1 = __importDefault(require("../../shell/utils/slugToCamelTitle"));
-function createDbSchemaFromDb(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ userId, database, }) {
-        var _b, _c, _d, _e, _f, _g;
-        try {
-            if (!userId) {
-                console.log("No user Id provided");
-                return;
-            }
-            const userSchemaData = (0, grabUserSchemaData_1.default)({ userId });
-            if (!userSchemaData)
-                throw new Error("User schema data not found!");
-            const targetDb = userSchemaData.filter((dbObject) => dbObject.dbFullName === database.db_full_name)[0];
-            const existingTables = yield (0, varDatabaseDbHandler_1.default)({
-                database: database.db_full_name,
-                queryString: `SHOW TABLES FROM ${database.db_full_name}`,
+import varDatabaseDbHandler from "../../functions/backend/varDatabaseDbHandler";
+import addDbEntry from "../../functions/backend/db/addDbEntry";
+import slugToCamelTitle from "../../shell/utils/slugToCamelTitle";
+import grabDSQLSchemaIndexComment from "../../shell/utils/grab-dsql-schema-index-comment";
+import { grabPrimaryRequiredDbSchema, writeUpdatedDbSchema, } from "../../shell/createDbFromSchema/grab-required-database-schemas";
+import _n from "../../utils/numberfy";
+import dataTypeParser from "../../utils/db/schema/data-type-parser";
+import dataTypeConstructor from "../../utils/db/schema/data-type-constructor";
+export default async function createDbSchemaFromDb({ userId, database, dbId, }) {
+    var _a, _b, _c, _d, _e, _f;
+    try {
+        if (!userId) {
+            console.log("No user Id provided");
+            return;
+        }
+        const targetDb = grabPrimaryRequiredDbSchema({
+            userId,
+            dbId: database.db_schema_id || dbId,
+        });
+        if (!targetDb)
+            throw new Error(`Target Db not found!`);
+        const existingTables = await varDatabaseDbHandler({
+            database: database.db_full_name,
+            queryString: `SHOW TABLES FROM ${database.db_full_name}`,
+        });
+        if (!existingTables)
+            throw new Error("No Existing Tables");
+        for (let i = 0; i < existingTables.length; i++) {
+            const table = existingTables[i];
+            const tableName = Object.values(table)[0];
+            const tableInsert = await addDbEntry({
+                dbFullName: "datasquirel",
+                tableName: "user_database_tables",
+                data: {
+                    user_id: _n(userId),
+                    db_id: database.id,
+                    db_slug: database.db_slug,
+                    table_name: slugToCamelTitle(tableName) || undefined,
+                    table_slug: tableName,
+                },
            });
-            if (!existingTables)
-                throw new Error("No Existing Tables");
-            for (let i = 0; i < existingTables.length; i++) {
-                const table = existingTables[i];
-                const tableName = Object.values(table)[0];
-                const tableInsert = yield (0, addDbEntry_1.default)({
-                    dbFullName: "datasquirel",
-                    tableName: "user_database_tables",
-                    data: {
-                        user_id: userId,
-                        db_id: database.id,
-                        db_slug: database.db_slug,
-                        table_name: (0, slugToCamelTitle_1.default)(tableName),
-                        table_slug: tableName,
-                    },
-                });
-                const tableObject = {
-                    tableName: tableName,
-                    tableFullName: (0, slugToCamelTitle_1.default)(tableName) || "",
-                    fields: [],
-                    indexes: [],
-                };
-                const tableColumns = yield (0, varDatabaseDbHandler_1.default)({
-                    database: database.db_full_name,
-                    queryString: `SHOW COLUMNS FROM ${database.db_full_name}.${tableName}`,
-                });
-                if (tableColumns) {
-                    for (let k = 0; k < tableColumns.length; k++) {
-                        const tableColumn = tableColumns[k];
-                        const { Field, Type, Null, Key, Default, Extra } = tableColumn;
-                        const fieldObject = {
-                            fieldName: Field,
-                            dataType: Type.toUpperCase(),
-                        };
-                        if (Null === null || Null === void 0 ? void 0 : Null.match(/^no$/i))
-                            fieldObject.notNullValue = true;
-                        if (Key === null || Key === void 0 ? void 0 : Key.match(/^pri$/i))
-                            fieldObject.primaryKey = true;
-                        if ((_b = Default === null || Default === void 0 ? void 0 : Default.toString()) === null || _b === void 0 ? void 0 : _b.match(/./))
-                            fieldObject.defaultValue = Default;
-                        if ((_c = Default === null || Default === void 0 ? void 0 : Default.toString()) === null || _c === void 0 ? void 0 : _c.match(/timestamp/i)) {
-                            delete fieldObject.defaultValue;
-                            fieldObject.defaultValueLiteral = Default;
-                        }
-                        if ((_d = Extra === null || Extra === void 0 ? void 0 : Extra.toString()) === null || _d === void 0 ? void 0 : _d.match(/auto_increment/i))
-                            fieldObject.autoIncrement = true;
-                        tableObject.fields.push(fieldObject);
+            const tableObject = {
+                tableName: tableName,
+                fields: [],
+                indexes: [],
+            };
+            const tableColumns = await varDatabaseDbHandler({
+                database: database.db_full_name,
+                queryString: `SHOW COLUMNS FROM ${database.db_full_name}.${tableName}`,
+            });
+            if (tableColumns) {
+                for (let k = 0; k < tableColumns.length; k++) {
+                    const tableColumn = tableColumns[k];
+                    const { Field, Type, Null, Key, Default, Extra } = tableColumn;
+                    const parsedDataType = dataTypeParser(Type.toUpperCase());
+                    const fieldObject = {
+                        fieldName: Field,
+                        dataType: dataTypeConstructor(parsedDataType.type, parsedDataType.limit, parsedDataType.decimal),
+                    };
+                    if (Null === null || Null === void 0 ? void 0 : Null.match(/^no$/i))
+                        fieldObject.notNullValue = true;
+                    if (Key === null || Key === void 0 ? void 0 : Key.match(/^pri$/i))
+                        fieldObject.primaryKey = true;
+                    if ((_a = Default === null || Default === void 0 ? void 0 : Default.toString()) === null || _a === void 0 ? void 0 : _a.match(/./))
+                        fieldObject.defaultValue = Default;
+                    if ((_b = Default === null || Default === void 0 ? void 0 : Default.toString()) === null || _b === void 0 ? void 0 : _b.match(/timestamp/i)) {
+                        delete fieldObject.defaultValue;
+                        fieldObject.defaultValueLiteral = Default;
                    }
+                    if ((_c = Extra === null || Extra === void 0 ? void 0 : Extra.toString()) === null || _c === void 0 ? void 0 : _c.match(/auto_increment/i))
+                        fieldObject.autoIncrement = true;
+                    tableObject.fields.push(fieldObject);
                }
-                const tableIndexes = yield (0, varDatabaseDbHandler_1.default)({
-                    database: database.db_full_name,
-                    queryString: `SHOW INDEXES FROM ${database.db_full_name}.${tableName}`,
-                });
-                if (tableIndexes) {
-                    for (let m = 0; m < tableIndexes.length; m++) {
-                        const indexObject = tableIndexes[m];
-                        const { Table, Key_name, Column_name, Null, Index_type, Index_comment, } = indexObject;
-                        if (!(Index_comment === null || Index_comment === void 0 ? void 0 : Index_comment.match(/^schema_index$/)))
-                            continue;
-                        const indexNewObject = {
-                            indexType: (Index_type === null || Index_type === void 0 ? void 0 : Index_type.match(/fulltext/i))
-                                ? "fullText"
-                                : "regular",
-                            indexName: Key_name,
-                            indexTableFields: [],
-                        };
-                        const targetTableFieldObject = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter((col) => col.Field === Column_name)[0];
-                        const existingIndexField = (_e = tableObject.indexes) === null || _e === void 0 ? void 0 : _e.filter((indx) => indx.indexName == Key_name);
-                        if (existingIndexField && existingIndexField[0]) {
-                            (_f = existingIndexField[0].indexTableFields) === null || _f === void 0 ? void 0 : _f.push({
+            }
+            const tableIndexes = await varDatabaseDbHandler({
+                database: database.db_full_name,
+                queryString: `SHOW INDEXES FROM ${database.db_full_name}.${tableName}`,
+            });
+            if (tableIndexes) {
+                for (let m = 0; m < tableIndexes.length; m++) {
+                    const indexObject = tableIndexes[m];
+                    const { Table, Key_name, Column_name, Null, Index_type, Index_comment, } = indexObject;
+                    if (!(Index_comment === null || Index_comment === void 0 ? void 0 : Index_comment.match(new RegExp(grabDSQLSchemaIndexComment()))))
+                        continue;
+                    const indexNewObject = {
+                        indexType: (Index_type === null || Index_type === void 0 ? void 0 : Index_type.match(/fulltext/i))
+                            ? "full_text"
+                            : "regular",
+                        indexName: Key_name,
+                        indexTableFields: [],
+                    };
+                    const targetTableFieldObject = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter((col) => col.Field === Column_name)[0];
+                    const existingIndexField = (_d = tableObject.indexes) === null || _d === void 0 ? void 0 : _d.filter((indx) => indx.indexName == Key_name);
+                    if (existingIndexField && existingIndexField[0]) {
+                        (_e = existingIndexField[0].indexTableFields) === null || _e === void 0 ? void 0 : _e.push({
+                            value: Column_name,
+                            dataType: targetTableFieldObject.Type.toUpperCase(),
+                        });
+                    }
+                    else {
+                        indexNewObject.indexTableFields = [
+                            {
                                value: Column_name,
                                dataType: targetTableFieldObject.Type.toUpperCase(),
-                            });
-                        }
-                        else {
-                            indexNewObject.indexTableFields = [
-                                {
-                                    value: Column_name,
-                                    dataType: targetTableFieldObject.Type.toUpperCase(),
-                                },
-                            ];
-                            (_g = tableObject.indexes) === null || _g === void 0 ? void 0 : _g.push(indexNewObject);
-                        }
+                            },
+                        ];
+                        (_f = tableObject.indexes) === null || _f === void 0 ? void 0 : _f.push(indexNewObject);
                    }
                }
-                targetDb.tables.push(tableObject);
            }
-            (0, setUserSchemaData_1.default)({ schemaData: userSchemaData, userId });
-            return true;
+            targetDb.tables.push(tableObject);
        }
-        catch (error) {
-            console.log(error);
-            return false;
-        }
-    });
+        writeUpdatedDbSchema({ dbSchema: targetDb, userId });
+        return true;
+    }
+    catch (error) {
+        console.log(error);
+        return false;
+    }
 }
@@ -1,16 +1,21 @@
 import { DbContextsArray } from "./runQuery";
-import { PostInsertReturn } from "../../../types";
-type Param<T extends {
+import { APIResponseObject, DSQL_TableSchemaType, PostInsertReturn } from "../../../types";
+export type AddDbEntryParam<T extends {
    [k: string]: any;
-} = any> = {
+} = any, K extends string = string> = {
    dbContext?: (typeof DbContextsArray)[number];
    paradigm?: "Read Only" | "Full Access";
    dbFullName?: string;
-    tableName: string;
-    data: T;
-    tableSchema?: import("../../../types").DSQL_TableSchemaType;
-    duplicateColumnName?: string;
-    duplicateColumnValue?: string;
+    tableName: K;
+    data?: T;
+    batchData?: T[];
+    tableSchema?: DSQL_TableSchemaType;
+    duplicateColumnName?: keyof T;
+    duplicateColumnValue?: string | number;
+    /**
+     * Update Entry if a duplicate is found.
+     * Requires `duplicateColumnName` and `duplicateColumnValue` parameters
+     */
    update?: boolean;
    encryptionKey?: string;
    encryptionSalt?: string;
@@ -22,5 +27,4 @@ type Param<T extends {
 */
 export default function addDbEntry<T extends {
    [k: string]: any;
-} = any>({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }: Param<T>): Promise<PostInsertReturn | null>;
-export {};
+} = any, K extends string = string>({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }: AddDbEntryParam<T, K>): Promise<APIResponseObject<PostInsertReturn>>;
@@ -1,100 +1,89 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addDbEntry;
-const sanitize_html_1 = __importDefault(require("sanitize-html"));
-const sanitizeHtmlOptions_1 = __importDefault(require("../html/sanitizeHtmlOptions"));
-const updateDbEntry_1 = __importDefault(require("./updateDbEntry"));
-const encrypt_1 = __importDefault(require("../../dsql/encrypt"));
-const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-handler"));
-const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is-master"));
-const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log"));
+import sanitizeHtml from "sanitize-html";
+import sanitizeHtmlOptions from "../html/sanitizeHtmlOptions";
+import updateDbEntry from "./updateDbEntry";
+import _ from "lodash";
+import encrypt from "../../dsql/encrypt";
+import connDbHandler from "../../../utils/db/conn-db-handler";
+import checkIfIsMaster from "../../../utils/check-if-is-master";
+import debugLog from "../../../utils/logging/debug-log";
+import purgeDefaultFields from "../../../utils/purge-default-fields";
 /**
 * Add a db Entry Function
 */
-function addDbEntry(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }) {
-        var _b, _c, _d;
-        const isMaster = forceLocal
-            ? true
-            : (0, check_if_is_master_1.default)({ dbContext, dbFullName });
-        if (debug) {
-            (0, debug_log_1.default)({
-                log: isMaster,
-                addTime: true,
-                label: "isMaster",
+export default async function addDbEntry({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }) {
+    const isMaster = forceLocal
+        ? true
+        : checkIfIsMaster({ dbContext, dbFullName });
+    if (debug) {
+        debugLog({
+            log: isMaster,
+            addTime: true,
+            label: "isMaster",
+        });
+    }
+    const DB_CONN = isMaster
+        ? global.DSQL_DB_CONN
+        : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
+    const DB_RO_CONN = isMaster
+        ? global.DSQL_DB_CONN
+        : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
+    let newData = _.cloneDeep(data);
+    if (newData) {
+        newData = purgeDefaultFields(newData);
+    }
+    let newBatchData = _.cloneDeep(batchData);
+    if (newBatchData) {
+        newBatchData = purgeDefaultFields(newBatchData);
+    }
+    if (duplicateColumnName &&
+        typeof duplicateColumnName === "string" &&
+        newData) {
+        const checkDuplicateQuery = `SELECT * FROM ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${duplicateColumnName}\`=?`;
+        const duplicateValue = await connDbHandler(DB_RO_CONN, checkDuplicateQuery, [duplicateColumnValue]);
+        if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) {
+            return {
+                success: false,
+                payload: undefined,
+                msg: "Duplicate entry found",
+            };
+        }
+        else if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && update) {
+            return await updateDbEntry({
+                dbContext,
+                dbFullName,
+                tableName,
+                data: newData,
+                tableSchema,
+                encryptionKey,
+                encryptionSalt,
+                identifierColumnName: duplicateColumnName,
+                identifierValue: duplicateColumnValue || "",
            });
        }
-        const DB_CONN = isMaster
-            ? global.DSQL_DB_CONN
-            : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-        const DB_RO_CONN = isMaster
-            ? global.DSQL_DB_CONN
-            : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
-        if (data === null || data === void 0 ? void 0 : data["date_created_timestamp"])
-            delete data["date_created_timestamp"];
-        if (data === null || data === void 0 ? void 0 : data["date_updated_timestamp"])
-            delete data["date_updated_timestamp"];
-        if (data === null || data === void 0 ? void 0 : data["date_updated"])
-            delete data["date_updated"];
-        if (data === null || data === void 0 ? void 0 : data["date_updated_code"])
-            delete data["date_updated_code"];
-        if (data === null || data === void 0 ? void 0 : data["date_created"])
-            delete data["date_created"];
-        if (data === null || data === void 0 ? void 0 : data["date_created_code"])
-            delete data["date_created_code"];
-        if (duplicateColumnName && typeof duplicateColumnName === "string") {
-            const checkDuplicateQuery = `SELECT * FROM ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${duplicateColumnName}\`=?`;
-            const duplicateValue = yield (0, conn_db_handler_1.default)(DB_RO_CONN, checkDuplicateQuery, [duplicateColumnValue]);
-            if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) {
-                return null;
-            }
-            else if (duplicateValue && duplicateValue[0] && update) {
-                return yield (0, updateDbEntry_1.default)({
-                    dbContext,
-                    dbFullName,
-                    tableName,
-                    data,
-                    tableSchema,
-                    encryptionKey,
-                    encryptionSalt,
-                    identifierColumnName: duplicateColumnName,
-                    identifierValue: duplicateColumnValue || "",
-                });
-            }
-        }
+    }
+    function generateQuery(data) {
+        var _a, _b, _c;
        const dataKeys = Object.keys(data);
        let insertKeysArray = [];
        let insertValuesArray = [];
        for (let i = 0; i < dataKeys.length; i++) {
            try {
                const dataKey = dataKeys[i];
-                let value = data === null || data === void 0 ? void 0 : data[dataKey];
+                let value = data[dataKey];
                const targetFieldSchemaArray = tableSchema
-                    ? (_b = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields) === null || _b === void 0 ? void 0 : _b.filter((field) => field.fieldName == dataKey)
+                    ? (_a = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields) === null || _a === void 0 ? void 0 : _a.filter((field) => field.fieldName == dataKey)
                    : null;
                const targetFieldSchema = targetFieldSchemaArray && targetFieldSchemaArray[0]
                    ? targetFieldSchemaArray[0]
                    : null;
                if (value == null || value == undefined)
                    continue;
-                if (((_c = targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.dataType) === null || _c === void 0 ? void 0 : _c.match(/int$/i)) &&
+                if (((_b = targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.dataType) === null || _b === void 0 ? void 0 : _b.match(/int$/i)) &&
                    typeof value == "string" &&
                    !(value === null || value === void 0 ? void 0 : value.match(/./)))
                    continue;
                if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.encrypted) {
-                    value = (0, encrypt_1.default)({
+                    value = encrypt({
                        data: value,
                        encryptionKey,
                        encryptionSalt,
@@ -102,8 +91,9 @@ function addDbEntry(_a) {
                    console.log("DSQL: Encrypted value =>", value);
                }
                const htmlRegex = /<[^>]+>/g;
-                if ((targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.richText) || String(value).match(htmlRegex)) {
-                    value = (0, sanitize_html_1.default)(value, sanitizeHtmlOptions_1.default);
+                if ((targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.richText) ||
+                    String(value).match(htmlRegex)) {
+                    value = sanitizeHtml(value, sanitizeHtmlOptions);
                }
                if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.pattern) {
                    const pattern = new RegExp(targetFieldSchema.pattern, targetFieldSchema.patternFlags || "");
@@ -125,55 +115,74 @@ function addDbEntry(_a) {
            }
            catch (error) {
                console.log("DSQL: Error in parsing data keys =>", error.message);
-                (_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error parsing Data Keys`, error);
+                (_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Error parsing Data Keys`, error);
                continue;
            }
        }
-        if (!(data === null || data === void 0 ? void 0 : data["date_created"])) {
-            insertKeysArray.push("`date_created`");
-            insertValuesArray.push(Date());
-        }
-        if (!(data === null || data === void 0 ? void 0 : data["date_created_code"])) {
-            insertKeysArray.push("`date_created_code`");
-            insertValuesArray.push(Date.now());
-        }
-        if (!(data === null || data === void 0 ? void 0 : data["date_updated"])) {
-            insertKeysArray.push("`date_updated`");
-            insertValuesArray.push(Date());
-        }
-        if (!(data === null || data === void 0 ? void 0 : data["date_updated_code"])) {
-            insertKeysArray.push("`date_updated_code`");
-            insertValuesArray.push(Date.now());
-        }
-        const query = `INSERT INTO ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray
-            .map(() => "?")
-            .join(",")})`;
+        insertKeysArray.push("`date_created`");
+        insertValuesArray.push(Date());
+        insertKeysArray.push("`date_created_code`");
+        insertValuesArray.push(Date.now());
+        insertKeysArray.push("`date_updated`");
+        insertValuesArray.push(Date());
+        insertKeysArray.push("`date_updated_code`");
+        insertValuesArray.push(Date.now());
        const queryValuesArray = insertValuesArray;
-        if (debug) {
-            (0, debug_log_1.default)({
-                log: DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.getConfig(),
-                addTime: true,
-                label: "DB_CONN Config",
-            });
-            (0, debug_log_1.default)({
-                log: query,
-                addTime: true,
-                label: "query",
-            });
-            (0, debug_log_1.default)({
-                log: queryValuesArray,
-                addTime: true,
-                label: "queryValuesArray",
-            });
+        return { queryValuesArray, insertValuesArray, insertKeysArray };
+    }
+    if (newData) {
+        const { insertKeysArray, insertValuesArray, queryValuesArray } = generateQuery(newData);
+        const query = `INSERT INTO ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
+        const newInsert = await connDbHandler(DB_CONN, query, queryValuesArray, debug);
+        return {
+            success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId),
+            payload: newInsert,
+            queryObject: {
+                sql: query,
+                params: queryValuesArray,
+            },
+        };
+    }
+    else if (newBatchData) {
+        let batchInsertKeysArray;
+        let batchInsertValuesArray = [];
+        let batchQueryValuesArray = [];
+        for (let i = 0; i < newBatchData.length; i++) {
+            const singleBatchData = newBatchData[i];
+            const { insertKeysArray, insertValuesArray, queryValuesArray } = generateQuery(singleBatchData);
+            if (!batchInsertKeysArray) {
+                batchInsertKeysArray = insertKeysArray;
+            }
+            batchInsertValuesArray.push(insertValuesArray);
+            batchQueryValuesArray.push(queryValuesArray);
        }
-        const newInsert = yield (0, conn_db_handler_1.default)(DB_CONN, query, queryValuesArray, debug);
+        const query = `INSERT INTO ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` (${batchInsertKeysArray === null || batchInsertKeysArray === void 0 ? void 0 : batchInsertKeysArray.join(",")}) VALUES ${batchInsertValuesArray
+            .map((vl) => `(${vl.map(() => "?").join(",")})`)
+            .join(",")}`;
+        console.log("query", query);
+        console.log("batchQueryValuesArray", batchQueryValuesArray);
+        const newInsert = await connDbHandler(DB_CONN, query, batchQueryValuesArray.flat(), debug);
        if (debug) {
-            (0, debug_log_1.default)({
+            debugLog({
                log: newInsert,
                addTime: true,
                label: "newInsert",
            });
        }
-        return newInsert;
-    });
+        return {
+            success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId),
+            payload: newInsert,
+            queryObject: {
+                sql: query,
+                params: batchQueryValuesArray.flat(),
+            },
+        };
+    }
+    else {
+        return {
+            success: false,
+            payload: undefined,
+            msg: "No data provided",
+        };
+    }
 }
@@ -1,10 +1,13 @@
+import { DSQL_TableSchemaType, PostInsertReturn } from "../../../types";
 import { DbContextsArray } from "./runQuery";
-type Param = {
+type Param<T extends {
+    [k: string]: any;
+} = any, K extends string = string> = {
    dbContext?: (typeof DbContextsArray)[number];
-    dbFullName: string;
-    tableName: string;
-    tableSchema?: import("../../../types").DSQL_TableSchemaType;
-    identifierColumnName: string;
+    dbFullName?: string;
+    tableName: K;
+    tableSchema?: DSQL_TableSchemaType;
+    identifierColumnName: keyof T;
    identifierValue: string | number;
    forceLocal?: boolean;
 };
@@ -12,5 +15,7 @@ type Param = {
 * # Delete DB Entry Function
 * @description
 */
-export default function deleteDbEntry({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }: Param): Promise<object | null>;
+export default function deleteDbEntry<T extends {
+    [k: string]: any;
+} = any, K extends string = string>({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }: Param<T, K>): Promise<PostInsertReturn | null>;
 export {};
@@ -1,54 +1,34 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = deleteDbEntry;
-const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is-master"));
-const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-handler"));
+import checkIfIsMaster from "../../../utils/check-if-is-master";
+import connDbHandler from "../../../utils/db/conn-db-handler";
 /**
 * # Delete DB Entry Function
 * @description
 */
-function deleteDbEntry(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }) {
-        var _b;
-        try {
-            const isMaster = forceLocal
-                ? true
-                : (0, check_if_is_master_1.default)({ dbContext, dbFullName });
-            const DB_CONN = isMaster
-                ? global.DSQL_DB_CONN
-                : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-            const DB_RO_CONN = isMaster
-                ? global.DSQL_DB_CONN
-                : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
-            /**
-             * Execution
-             *
-             * @description
-             */
-            const query = `DELETE FROM ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${identifierColumnName}\`=?`;
-            const deletedEntry = yield (0, conn_db_handler_1.default)(DB_CONN, query, [
-                identifierValue,
-            ]);
-            /**
-             * Return statement
-             */
-            return deletedEntry;
-        }
-        catch (error) {
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Deleting Entry`, error);
-            return null;
-        }
-    });
+export default async function deleteDbEntry({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }) {
+    var _a;
+    try {
+        const isMaster = forceLocal
+            ? true
+            : checkIfIsMaster({ dbContext, dbFullName });
+        const DB_CONN = isMaster
+            ? global.DSQL_DB_CONN
+            : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
+        /**
+         * Execution
+         *
+         * @description
+         */
+        const query = `DELETE FROM ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${identifierColumnName.toString()}\`=?`;
+        const deletedEntry = await connDbHandler(DB_CONN, query, [
+            identifierValue,
+        ]);
+        /**
+         * Return statement
+         */
+        return deletedEntry;
+    }
+    catch (error) {
+        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Deleting Entry`, error);
+        return null;
+    }
 }
@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = pathTraversalCheck;
 /**
 * # Path Traversal Check
 * @returns {string}
 */
-function pathTraversalCheck(text) {
+export default function pathTraversalCheck(text) {
    return text.toString().replace(/\//g, "");
 }
@@ -1,155 +1,137 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbContextsArray = void 0;
-exports.default = runQuery;
-const fullAccessDbHandler_1 = __importDefault(require("../fullAccessDbHandler"));
-const varReadOnlyDatabaseDbHandler_1 = __importDefault(require("../varReadOnlyDatabaseDbHandler"));
-const serverError_1 = __importDefault(require("../serverError"));
-const addDbEntry_1 = __importDefault(require("./addDbEntry"));
-const updateDbEntry_1 = __importDefault(require("./updateDbEntry"));
-const deleteDbEntry_1 = __importDefault(require("./deleteDbEntry"));
-const trim_sql_1 = __importDefault(require("../../../utils/trim-sql"));
-exports.DbContextsArray = ["Master", "Dsql User"];
+import fullAccessDbHandler from "../fullAccessDbHandler";
+import varReadOnlyDatabaseDbHandler from "../varReadOnlyDatabaseDbHandler";
+import serverError from "../serverError";
+import addDbEntry from "./addDbEntry";
+import updateDbEntry from "./updateDbEntry";
+import deleteDbEntry from "./deleteDbEntry";
+import trimSql from "../../../utils/trim-sql";
+export const DbContextsArray = ["Master", "Dsql User"];
 /**
 * # Run DSQL users queries
 */
-function runQuery(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, forceLocal, }) {
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
-        let result;
-        let error;
-        let tableSchema;
-        if (dbSchema) {
-            try {
-                const table = tableName
-                    ? tableName
-                    : typeof query == "string"
-                        ? null
-                        : query
-                            ? query === null || query === void 0 ? void 0 : query.table
-                            : null;
-                if (!table)
-                    throw new Error("No table name provided");
-                tableSchema = dbSchema.tables.filter((tb) => (tb === null || tb === void 0 ? void 0 : tb.tableName) === table)[0];
-            }
-            catch (_err) {
-                // console.log("ERROR getting tableSchema: ", _err.message);
-            }
-        }
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
+export default async function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, forceLocal, }) {
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    let result;
+    let error;
+    let tableSchema;
+    if (dbSchema) {
        try {
-            if (typeof query === "string") {
-                const formattedQuery = (0, trim_sql_1.default)(query);
-                if (debug && global.DSQL_USE_LOCAL) {
-                    console.log("runQuery:formattedQuery", formattedQuery);
-                }
-                /**
-                 * Input Validation
-                 *
-                 * @description Input Validation
-                 */
-                if (readOnly && formattedQuery.match(/^alter|^delete|^create/i)) {
-                    throw new Error("Wrong Input!");
-                }
-                if (readOnly) {
-                    result = yield (0, varReadOnlyDatabaseDbHandler_1.default)({
-                        queryString: formattedQuery,
-                        queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
-                        tableSchema,
-                        forceLocal,
-                    });
-                }
-                else {
-                    result = yield (0, fullAccessDbHandler_1.default)({
-                        queryString: formattedQuery,
-                        queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
-                        tableSchema,
-                        forceLocal,
-                    });
-                }
-            }
-            else if (typeof query === "object") {
-                /**
-                 * Declare variables
-                 *
-                 * @description Declare "results" variable
-                 */
-                const { data, action, table, identifierColumnName, identifierValue, update, duplicateColumnName, duplicateColumnValue, } = query;
-                switch (action.toLowerCase()) {
-                    case "insert":
-                        result = yield (0, addDbEntry_1.default)({
-                            dbContext,
-                            dbFullName: dbFullName,
-                            tableName: table,
-                            data: data,
-                            update,
-                            duplicateColumnName,
-                            duplicateColumnValue,
-                            tableSchema,
-                            debug,
-                        });
-                        if (!(result === null || result === void 0 ? void 0 : result.insertId)) {
-                            error = "Couldn't insert data";
-                        }
-                        break;
-                    case "update":
-                        result = yield (0, updateDbEntry_1.default)({
-                            dbContext,
-                            dbFullName: dbFullName,
-                            tableName: table,
-                            data: data,
-                            identifierColumnName,
-                            identifierValue,
-                            tableSchema,
-                        });
-                        break;
-                    case "delete":
-                        result = yield (0, deleteDbEntry_1.default)({
-                            dbContext,
-                            dbFullName: dbFullName,
-                            tableName: table,
-                            identifierColumnName,
-                            identifierValue,
-                            tableSchema,
-                        });
-                        break;
-                    default:
-                        result = null;
-                        break;
-                }
-            }
+            const table = tableName
+                ? tableName
+                : typeof query == "string"
+                    ? null
+                    : query
+                        ? query === null || query === void 0 ? void 0 : query.table
+                        : null;
+            if (!table)
+                throw new Error("No table name provided");
+            tableSchema = dbSchema.tables.filter((tb) => (tb === null || tb === void 0 ? void 0 : tb.tableName) === table)[0];
        }
-        catch (err) {
-            (0, serverError_1.default)({
-                component: "functions/backend/runQuery",
-                message: err.message,
-            });
+        catch (_err) {
+            // console.log("ERROR getting tableSchema: ", _err.message);
+        }
+    }
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    try {
+        if (typeof query === "string") {
+            const formattedQuery = trimSql(query);
            if (debug && global.DSQL_USE_LOCAL) {
-                console.log("runQuery:error", err.message);
+                console.log("runQuery:formattedQuery", formattedQuery);
+            }
+            /**
+             * Input Validation
+             *
+             * @description Input Validation
+             */
+            if (readOnly && formattedQuery.match(/^alter|^delete|^create/i)) {
+                throw new Error("Wrong Input!");
+            }
+            if (readOnly) {
+                result = await varReadOnlyDatabaseDbHandler({
+                    queryString: formattedQuery,
+                    queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
+                    tableSchema,
+                    forceLocal,
+                });
+            }
+            else {
+                result = await fullAccessDbHandler({
+                    queryString: formattedQuery,
+                    queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
+                    tableSchema,
+                    forceLocal,
+                });
            }
-            result = null;
-            error = err.message;
        }
-        return { result, error };
-    });
+        else if (typeof query === "object") {
+            /**
+             * Declare variables
+             *
+             * @description Declare "results" variable
+             */
+            const { data, action, table, identifierColumnName, identifierValue, update, duplicateColumnName, duplicateColumnValue, } = query;
+            switch (action.toLowerCase()) {
+                case "insert":
+                    result = await addDbEntry({
+                        dbContext,
+                        dbFullName,
+                        tableName: table,
+                        data: data,
+                        update,
+                        duplicateColumnName,
+                        duplicateColumnValue,
+                        tableSchema,
+                        debug,
+                    });
+                    if (!(result === null || result === void 0 ? void 0 : result.insertId)) {
+                        error = "Couldn't insert data";
+                    }
+                    break;
+                case "update":
+                    result = await updateDbEntry({
+                        dbContext,
+                        dbFullName,
+                        tableName: table,
+                        data: data,
+                        identifierColumnName,
+                        identifierValue,
+                        tableSchema,
+                    });
+                    break;
+                case "delete":
+                    result = await deleteDbEntry({
+                        dbContext,
+                        dbFullName,
+                        tableName: table,
+                        identifierColumnName,
+                        identifierValue,
+                        tableSchema,
+                    });
+                    break;
+                default:
+                    result = null;
+                    break;
+            }
+        }
+    }
+    catch (err) {
+        serverError({
+            component: "functions/backend/runQuery",
+            message: err.message,
+        });
+        if (debug && global.DSQL_USE_LOCAL) {
+            console.log("runQuery:error", err.message);
+        }
+        result = null;
+        error = err.message;
+    }
+    return { result, error };
 }
@@ -1,9 +1,4 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
+import _ from "lodash";
 /**
 * Sanitize SQL function
 * ==============================================================================
@@ -89,7 +84,7 @@ function sanitizeObjects(object, spaces) {
 * @returns {string[]|number[]|object[]}
 */
 function sanitizeArrays(array, spaces) {
-    let arrayUpdated = lodash_1.default.cloneDeep(array);
+    let arrayUpdated = _.cloneDeep(array);
    arrayUpdated.forEach((item, index) => {
        const value = item;
        if (!value) {
@@ -108,4 +103,4 @@ function sanitizeArrays(array, spaces) {
    });
    return arrayUpdated;
 }
-exports.default = sanitizeSql;
+export default sanitizeSql;
@@ -1,5 +1,5 @@
 import { DbContextsArray } from "./runQuery";
-import { PostInsertReturn } from "../../../types";
+import { APIResponseObject, DSQL_TableSchemaType, PostInsertReturn } from "../../../types";
 type Param<T extends {
    [k: string]: any;
 } = any> = {
@@ -8,8 +8,8 @@ type Param<T extends {
    tableName: string;
    encryptionKey?: string;
    encryptionSalt?: string;
-    data: any;
-    tableSchema?: import("../../../types").DSQL_TableSchemaType;
+    data?: T;
+    tableSchema?: DSQL_TableSchemaType;
    identifierColumnName: keyof T;
    identifierValue: string | number;
    forceLocal?: boolean;
@@ -20,5 +20,5 @@ type Param<T extends {
 */
 export default function updateDbEntry<T extends {
    [k: string]: any;
-} = any>({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, }: Param<T>): Promise<PostInsertReturn | null>;
+} = any>({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, }: Param<T>): Promise<APIResponseObject<PostInsertReturn>>;
 export {};
@@ -1,129 +1,127 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = updateDbEntry;
-const sanitize_html_1 = __importDefault(require("sanitize-html"));
-const sanitizeHtmlOptions_1 = __importDefault(require("../html/sanitizeHtmlOptions"));
-const encrypt_1 = __importDefault(require("../../dsql/encrypt"));
-const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is-master"));
-const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-handler"));
+import sanitizeHtml from "sanitize-html";
+import sanitizeHtmlOptions from "../html/sanitizeHtmlOptions";
+import encrypt from "../../dsql/encrypt";
+import checkIfIsMaster from "../../../utils/check-if-is-master";
+import connDbHandler from "../../../utils/db/conn-db-handler";
+import _ from "lodash";
+import purgeDefaultFields from "../../../utils/purge-default-fields";
 /**
 * # Update DB Function
 * @description
 */
-function updateDbEntry(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, }) {
-        var _b;
-        /**
-         * Check if data is valid
-         */
-        if (!data || !Object.keys(data).length)
-            return null;
-        const isMaster = forceLocal
-            ? true
-            : (0, check_if_is_master_1.default)({ dbContext, dbFullName });
-        const DB_CONN = isMaster
-            ? global.DSQL_DB_CONN
-            : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
-        const dataKeys = Object.keys(data);
-        let updateKeyValueArray = [];
-        let updateValues = [];
-        for (let i = 0; i < dataKeys.length; i++) {
-            try {
-                const dataKey = dataKeys[i];
-                // @ts-ignore
-                let value = data[dataKey];
-                const targetFieldSchemaArray = tableSchema
-                    ? (_b = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields) === null || _b === void 0 ? void 0 : _b.filter((field) => field.fieldName === dataKey)
-                    : null;
-                const targetFieldSchema = targetFieldSchemaArray && targetFieldSchemaArray[0]
-                    ? targetFieldSchemaArray[0]
-                    : null;
-                if (value == null || value == undefined)
-                    continue;
-                const htmlRegex = /<[^>]+>/g;
-                if ((targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.richText) || String(value).match(htmlRegex)) {
-                    value = (0, sanitize_html_1.default)(value, sanitizeHtmlOptions_1.default);
-                }
-                if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.encrypted) {
-                    value = (0, encrypt_1.default)({
-                        data: value,
-                        encryptionKey,
-                        encryptionSalt,
-                    });
-                }
-                if (typeof value === "object") {
-                    value = JSON.stringify(value);
-                }
-                if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.pattern) {
-                    const pattern = new RegExp(targetFieldSchema.pattern, targetFieldSchema.patternFlags || "");
-                    if (!pattern.test(value)) {
-                        console.log("DSQL: Pattern not matched =>", value);
-                        value = "";
-                    }
-                }
-                if (typeof value === "string" && value.match(/^null$/i)) {
-                    value = {
-                        toSqlString: function () {
-                            return "NULL";
-                        },
-                    };
-                }
-                if (typeof value === "string" && !value.match(/./i)) {
-                    value = {
-                        toSqlString: function () {
-                            return "NULL";
-                        },
-                    };
-                }
-                updateKeyValueArray.push(`\`${dataKey}\`=?`);
-                if (typeof value == "number") {
-                    updateValues.push(String(value));
-                }
-                else {
-                    updateValues.push(value);
-                }
-                ////////////////////////////////////////
-                ////////////////////////////////////////
-            }
-            catch ( /** @type {any} */error) {
-                ////////////////////////////////////////
-                ////////////////////////////////////////
-                console.log("DSQL: Error in parsing data keys in update function =>", error.message);
+export default async function updateDbEntry({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, }) {
+    var _a;
+    /**
+     * Check if data is valid
+     */
+    if (!data || !Object.keys(data).length) {
+        return {
+            success: false,
+            payload: undefined,
+            msg: "No data provided",
+        };
+    }
+    const isMaster = forceLocal
+        ? true
+        : checkIfIsMaster({ dbContext, dbFullName });
+    const DB_CONN = isMaster
+        ? global.DSQL_DB_CONN
+        : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    let newData = _.cloneDeep(data);
+    newData = purgeDefaultFields(newData);
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    const dataKeys = Object.keys(newData);
+    let updateKeyValueArray = [];
+    let updateValues = [];
+    for (let i = 0; i < dataKeys.length; i++) {
+        try {
+            const dataKey = dataKeys[i];
+            let value = newData[dataKey];
+            const targetFieldSchemaArray = tableSchema
+                ? (_a = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields) === null || _a === void 0 ? void 0 : _a.filter((field) => field.fieldName === dataKey)
+                : null;
+            const targetFieldSchema = targetFieldSchemaArray && targetFieldSchemaArray[0]
+                ? targetFieldSchemaArray[0]
+                : null;
+            if (value == null || value == undefined)
                continue;
+            const htmlRegex = /<[^>]+>/g;
+            if ((targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.richText) || String(value).match(htmlRegex)) {
+                value = sanitizeHtml(value, sanitizeHtmlOptions);
            }
+            if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.encrypted) {
+                value = encrypt({
+                    data: value,
+                    encryptionKey,
+                    encryptionSalt,
+                });
+            }
+            if (typeof value === "object") {
+                value = JSON.stringify(value);
+            }
+            if (targetFieldSchema === null || targetFieldSchema === void 0 ? void 0 : targetFieldSchema.pattern) {
+                const pattern = new RegExp(targetFieldSchema.pattern, targetFieldSchema.patternFlags || "");
+                if (!pattern.test(value)) {
+                    console.log("DSQL: Pattern not matched =>", value);
+                    value = "";
+                }
+            }
+            if (typeof value === "string" && value.match(/^null$/i)) {
+                value = {
+                    toSqlString: function () {
+                        return "NULL";
+                    },
+                };
+            }
+            if (typeof value === "string" && !value.match(/./i)) {
+                value = {
+                    toSqlString: function () {
+                        return "NULL";
+                    },
+                };
+            }
+            updateKeyValueArray.push(`\`${dataKey}\`=?`);
+            if (typeof value == "number") {
+                updateValues.push(String(value));
+            }
+            else {
+                updateValues.push(value);
+            }
+            ////////////////////////////////////////
+            ////////////////////////////////////////
        }
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        updateKeyValueArray.push(`date_updated='${Date()}'`);
-        updateKeyValueArray.push(`date_updated_code='${Date.now()}'`);
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        const query = `UPDATE ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` SET ${updateKeyValueArray.join(",")} WHERE \`${identifierColumnName}\`=?`;
-        updateValues.push(identifierValue);
-        const updatedEntry = yield (0, conn_db_handler_1.default)(DB_CONN, query, updateValues);
-        /**
-         * Return statement
-         */
-        return updatedEntry;
-    });
+        catch ( /** @type {any} */error) {
+            ////////////////////////////////////////
+            ////////////////////////////////////////
+            console.log("DSQL: Error in parsing data keys in update function =>", error.message);
+            continue;
+        }
+    }
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    updateKeyValueArray.push(`date_updated='${Date()}'`);
+    updateKeyValueArray.push(`date_updated_code='${Date.now()}'`);
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    const query = `UPDATE ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` SET ${updateKeyValueArray.join(",")} WHERE \`${identifierColumnName}\`=?`;
+    updateValues.push(identifierValue);
+    const updatedEntry = await connDbHandler(DB_CONN, query, updateValues);
+    /**
+     * Return statement
+     */
+    return {
+        success: Boolean(updatedEntry === null || updatedEntry === void 0 ? void 0 : updatedEntry.affectedRows),
+        payload: updatedEntry,
+        queryObject: {
+            sql: query,
+            params: updateValues,
+        },
+    };
 }
@@ -1,4 +1,11 @@
+type Param = {
+    query: string;
+    values?: string[] | object;
+    noErrorLogs?: boolean;
+};
 /**
 * # Main DB Handler Function
+ * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
 */
-export default function dbHandler(...args: any[]): Promise<any>;
+export default function dbHandler({ query, values, noErrorLogs, }: Param): Promise<any[] | object | null>;
+export {};
@@ -1,74 +1,47 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = dbHandler;
-const fs_1 = __importDefault(require("fs"));
-const serverError_1 = __importDefault(require("./serverError"));
-const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-connection"));
-const path_1 = __importDefault(require("path"));
+import fs from "fs";
+import path from "path";
+import grabDSQLConnection from "../../utils/grab-dsql-connection";
 /**
 * # Main DB Handler Function
+ * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
 */
-function dbHandler(...args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
-            fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8");
-        const CONNECTION = (0, grab_dsql_connection_1.default)();
-        let results;
-        /**
-         * Fetch from db
-         *
-         * @description Fetch data from db if no cache
-         */
-        try {
-            results = yield new Promise((resolve, reject) => {
-                CONNECTION.query(...args, (error, result, fields) => {
-                    if (error) {
-                        resolve({ error: error.message });
-                    }
-                    else {
-                        resolve(result);
-                    }
-                });
-            });
-        }
-        catch (error) {
-            const tmpFolder = path_1.default.resolve(process.cwd(), "./.tmp");
-            if (!fs_1.default.existsSync(tmpFolder))
-                fs_1.default.mkdirSync(tmpFolder, { recursive: true });
-            fs_1.default.appendFileSync(path_1.default.resolve(tmpFolder, "./dbErrorLogs.txt"), JSON.stringify(error, null, 4) + "\n" + Date() + "\n\n\n", "utf8");
-            results = null;
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `DB Handler Error`, error);
-            (0, serverError_1.default)({
-                component: "dbHandler",
-                message: error.message,
-            });
-        }
-        finally {
-            yield (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
-        }
-        /**
-         * Return results
-         *
-         * @description Return results add to cache if "req" param is passed
-         */
-        if (results) {
-            return JSON.parse(JSON.stringify(results));
+export default async function dbHandler({ query, values, noErrorLogs, }) {
+    var _a;
+    const CONNECTION = grabDSQLConnection();
+    let results;
+    try {
+        if (query && values) {
+            results = await CONNECTION.query(query, values);
        }
        else {
+            results = await CONNECTION.query(query);
+        }
+    }
+    catch (error) {
+        if (!noErrorLogs) {
+            (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `DB Handler Error...`, error);
+        }
+        if (process.env.FIRST_RUN) {
            return null;
        }
-    });
+        if (!noErrorLogs) {
+            console.log("ERROR in dbHandler =>", error.message);
+            console.log(error);
+            console.log(CONNECTION.config());
+            const tmpFolder = path.resolve(process.cwd(), "./.tmp");
+            if (!fs.existsSync(tmpFolder))
+                fs.mkdirSync(tmpFolder, { recursive: true });
+            fs.appendFileSync(path.resolve(tmpFolder, "./dbErrorLogs.txt"), JSON.stringify(error, null, 4) + "\n" + Date() + "\n\n\n", "utf8");
+        }
+        results = null;
+    }
+    finally {
+        await (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
+    }
+    if (results) {
+        return JSON.parse(JSON.stringify(results));
+    }
+    else {
+        return null;
+    }
 }
@@ -1,7 +0,0 @@
-/**
- * Regular expression to match default fields
- *
- * @description Regular expression to match default fields
- */
-declare const defaultFieldsRegexp: RegExp;
-export default defaultFieldsRegexp;
@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Regular expression to match default fields
- *
- * @description Regular expression to match default fields
- */
-const defaultFieldsRegexp = /^id$|^uuid$|^date_created$|^date_created_code$|^date_created_timestamp$|^date_updated$|^date_updated_code$|^date_updated_timestamp$/;
-exports.default = defaultFieldsRegexp;
@@ -1,78 +1,61 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = fullAccessDbHandler;
-const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handler"));
-const parseDbResults_1 = __importDefault(require("./parseDbResults"));
-const serverError_1 = __importDefault(require("./serverError"));
+import connDbHandler from "../../utils/db/conn-db-handler";
+import parseDbResults from "./parseDbResults";
+import serverError from "./serverError";
 /**
 * # Full Access Db Handler
 */
-function fullAccessDbHandler(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queryString, tableSchema, queryValuesArray, forceLocal, }) {
-        var _b;
+export default async function fullAccessDbHandler({ queryString, tableSchema, queryValuesArray, forceLocal, }) {
+    var _a;
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    let results;
+    const DB_CONN = forceLocal
+        ? global.DSQL_DB_CONN
+        : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
+    /**
+     * Fetch from db
+     *
+     * @description Fetch data from db if no cache
+     */
+    try {
+        results = await connDbHandler(DB_CONN, queryString, queryValuesArray);
+        ////////////////////////////////////////
+    }
+    catch (error) {
+        ////////////////////////////////////////
+        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Full Access DB Handler Error`, error);
+        serverError({
+            component: "fullAccessDbHandler",
+            message: error.message,
+        });
        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
+         * Return error
         */
-        let results;
-        const DB_CONN = forceLocal
-            ? global.DSQL_DB_CONN
-            : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-        /**
-         * Fetch from db
-         *
-         * @description Fetch data from db if no cache
-         */
-        try {
-            results = yield (0, conn_db_handler_1.default)(DB_CONN, queryString, queryValuesArray);
-            ////////////////////////////////////////
-        }
-        catch (error) {
-            ////////////////////////////////////////
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Full Access DB Handler Error`, error);
-            (0, serverError_1.default)({
-                component: "fullAccessDbHandler",
-                message: error.message,
-            });
-            /**
-             * Return error
-             */
-            return error.message;
-        }
-        finally {
-            DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
-        }
-        /**
-         * Return results
-         *
-         * @description Return results add to cache if "req" param is passed
-         */
-        if (results && tableSchema) {
-            const unparsedResults = results;
-            const parsedResults = yield (0, parseDbResults_1.default)({
-                unparsedResults: unparsedResults,
-                tableSchema: tableSchema,
-            });
-            return parsedResults;
-        }
-        else if (results) {
-            return results;
-        }
-        else {
-            return null;
-        }
-    });
+        return error.message;
+    }
+    finally {
+        DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
+    }
+    /**
+     * Return results
+     *
+     * @description Return results add to cache if "req" param is passed
+     */
+    if (results && tableSchema) {
+        const unparsedResults = results;
+        const parsedResults = await parseDbResults({
+            unparsedResults: unparsedResults,
+            tableSchema: tableSchema,
+        });
+        return parsedResults;
+    }
+    else if (results) {
+        return results;
+    }
+    else {
+        return null;
+    }
 }
@@ -0,0 +1,12 @@
+import { UserType } from "../../types";
+type Params = {
+    user: UserType;
+};
+type Return = {
+    fullName?: string;
+    host?: string;
+    username?: string;
+    password?: string;
+};
+export default function grabMariadbMainUserForUser({ user, }: Params): Promise<Return>;
+export {};
@@ -0,0 +1,41 @@
+import dbHandler from "./dbHandler";
+import dsqlCrud from "../../utils/data-fetching/crud";
+import decrypt from "../dsql/decrypt";
+import createUserSQLUser from "../../utils/create-user-sql-user";
+import grabUserMainSqlUserName from "../../utils/grab-user-main-sql-user-name";
+export default async function grabMariadbMainUserForUser({ user, }) {
+    var _a;
+    const { fullName, host, username: mariaDBUsername, webHost, } = grabUserMainSqlUserName({ user });
+    const existingWebAppUser = (await dbHandler({
+        query: `SELECT * FROM mysql.user WHERE user=? AND host=?`,
+        values: [mariaDBUsername, webHost],
+    }));
+    if (!(existingWebAppUser === null || existingWebAppUser === void 0 ? void 0 : existingWebAppUser[0])) {
+        return await createUserSQLUser(user);
+    }
+    else {
+        const existingUserRecord = await dsqlCrud({
+            action: "get",
+            table: "users",
+            query: {
+                query: {
+                    id: {
+                        value: String(user.id),
+                    },
+                },
+            },
+        });
+        const targetUser = (_a = existingUserRecord === null || existingUserRecord === void 0 ? void 0 : existingUserRecord.payload) === null || _a === void 0 ? void 0 : _a[0];
+        if (!(targetUser === null || targetUser === void 0 ? void 0 : targetUser.id)) {
+            return {};
+        }
+        return {
+            fullName,
+            host,
+            username: mariaDBUsername,
+            password: decrypt({
+                encryptedString: targetUser.mariadb_pass || "",
+            }),
+        };
+    }
+}
@@ -1,20 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = grabNewUsersTableSchema;
-const grabSchemaFieldsFromData_1 = __importDefault(require("./grabSchemaFieldsFromData"));
-const serverError_1 = __importDefault(require("./serverError"));
+import grabSchemaFieldsFromData from "./grabSchemaFieldsFromData";
+import serverError from "./serverError";
 /**
 * # Add User Table to Database
 */
-function grabNewUsersTableSchema(params) {
+export default function grabNewUsersTableSchema(params) {
    try {
        const userPreset = require("../../data/presets/users.json");
        const defaultFields = require("../../data/defaultFields.json");
        const supplementalFields = (params === null || params === void 0 ? void 0 : params.payload)
-            ? (0, grabSchemaFieldsFromData_1.default)({
+            ? grabSchemaFieldsFromData({
                data: params === null || params === void 0 ? void 0 : params.payload,
                excludeData: defaultFields,
                excludeFields: userPreset.fields,
@@ -33,7 +27,7 @@ function grabNewUsersTableSchema(params) {
    }
    catch ( /** @type {any} */error) {
        console.log(`grabNewUsersTableSchema.ts ERROR: ${error.message}`);
-        (0, serverError_1.default)({
+        serverError({
            component: "grabNewUsersTableSchema",
            message: error.message,
        });
@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = grabSchemaFieldsFromData;
-const serverError_1 = __importDefault(require("./serverError"));
+import serverError from "./serverError";
 /**
 * # Add User Table to Database
 */
-function grabSchemaFieldsFromData({ data, fields, excludeData, excludeFields, }) {
+export default function grabSchemaFieldsFromData({ data, fields, excludeData, excludeFields, }) {
    var _a;
    try {
        /** @type {DSQL_FieldSchemaType[]} */
@@ -55,7 +49,7 @@ function grabSchemaFieldsFromData({ data, fields, excludeData, excludeFields, })
    }
    catch ( /** @type {any} */error) {
        console.log(`grabSchemaFieldsFromData.ts ERROR: ${error.message}`);
-        (0, serverError_1.default)({
+        serverError({
            component: "grabSchemaFieldsFromData.ts",
            message: error.message,
        });
@@ -1,9 +0,0 @@
-import { DSQL_DatabaseSchemaType } from "../../types";
-type Params = {
-    userId?: string | number;
-};
-/**
- * # Grab User Schema Data
- */
-export default function grabUserSchemaData({ userId, }: Params): DSQL_DatabaseSchemaType[] | null;
-export {};
@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = grabUserSchemaData;
-const serverError_1 = __importDefault(require("./serverError"));
-const fs_1 = __importDefault(require("fs"));
-const grab_dir_names_1 = __importDefault(require("../../utils/backend/names/grab-dir-names"));
-const ejson_1 = __importDefault(require("../../utils/ejson"));
-/**
- * # Grab User Schema Data
- */
-function grabUserSchemaData({ userId, }) {
-    var _a;
-    try {
-        const { userSchemaMainJSONFilePath } = (0, grab_dir_names_1.default)({ userId });
-        const schemaJSON = fs_1.default.readFileSync(userSchemaMainJSONFilePath || "", "utf-8");
-        const schemaObj = ejson_1.default.parse(schemaJSON);
-        return schemaObj;
-    }
-    catch (error) {
-        (0, serverError_1.default)({
-            component: "grabUserSchemaData",
-            message: error.message,
-        });
-        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Grabbing User Schema Data`, error);
-        return null;
-    }
-}
@@ -1,67 +1,50 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = handleNodemailer;
-const fs_1 = __importDefault(require("fs"));
-const lodash_1 = __importDefault(require("lodash"));
-const nodemailer_1 = __importDefault(require("nodemailer"));
+import fs from "fs";
+import _ from "lodash";
+import nodemailer from "nodemailer";
 /**
 * # Handle mails With Nodemailer
 */
-function handleNodemailer(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        if (!process.env.DSQL_MAIL_HOST ||
-            !process.env.DSQL_MAIL_EMAIL ||
-            !process.env.DSQL_MAIL_PASSWORD) {
-            return undefined;
-        }
-        let transporter = nodemailer_1.default.createTransport(Object.assign({ host: process.env.DSQL_MAIL_HOST, port: 465, secure: true, auth: {
-                user: process.env.DSQL_MAIL_EMAIL,
-                pass: process.env.DSQL_MAIL_PASSWORD,
-            } }, params.options));
-        const sender = (() => {
-            var _a;
-            if ((_a = params.alias) === null || _a === void 0 ? void 0 : _a.match(/support/i))
-                return process.env.DSQL_MAIL_EMAIL;
-            return process.env.DSQL_MAIL_EMAIL;
-        })();
-        const mailRootPath = process.env.DSQL_MAIL_ROOT || "./email/index.html";
-        let mailRoot = fs_1.default.existsSync(mailRootPath)
-            ? fs_1.default.readFileSync(mailRootPath, "utf8")
-            : undefined;
-        let finalHtml = mailRoot
-            ? mailRoot
-                .replace(/{{email_body}}/, ((_a = params.html) === null || _a === void 0 ? void 0 : _a.toString()) || "")
-                .replace(/{{issue_date}}/, Date().substring(0, 24))
-            : (_b = params.html) === null || _b === void 0 ? void 0 : _b.toString();
-        try {
-            let mailObject = {};
-            mailObject["from"] = `"${params.senderName || "Datasquirel"}" <${sender}>`;
-            mailObject["sender"] = sender;
-            if (params.alias)
-                mailObject["replyTo"] = sender;
-            mailObject["to"] = params.to;
-            mailObject["subject"] = params.subject;
-            mailObject["text"] = params.text;
-            mailObject["html"] = finalHtml;
-            let info = yield transporter.sendMail(Object.assign(Object.assign({}, lodash_1.default.omit(mailObject, ["alias", "senderName", "options"])), mailObject));
-            return info;
-        }
-        catch (error) {
-            console.log("ERROR in handleNodemailer Function =>", error.message);
-        }
+export default async function handleNodemailer(params) {
+    var _a, _b;
+    if (!process.env.DSQL_MAIL_HOST ||
+        !process.env.DSQL_MAIL_EMAIL ||
+        !process.env.DSQL_MAIL_PASSWORD) {
        return undefined;
-    });
+    }
+    let transporter = nodemailer.createTransport(Object.assign({ host: process.env.DSQL_MAIL_HOST, port: 465, secure: true, auth: {
+            user: process.env.DSQL_MAIL_EMAIL,
+            pass: process.env.DSQL_MAIL_PASSWORD,
+        } }, params.options));
+    const sender = (() => {
+        var _a;
+        if ((_a = params.alias) === null || _a === void 0 ? void 0 : _a.match(/support/i))
+            return process.env.DSQL_MAIL_EMAIL;
+        return process.env.DSQL_MAIL_EMAIL;
+    })();
+    const mailRootPath = process.env.DSQL_MAIL_ROOT || "./email/index.html";
+    let mailRoot = fs.existsSync(mailRootPath)
+        ? fs.readFileSync(mailRootPath, "utf8")
+        : undefined;
+    let finalHtml = mailRoot
+        ? mailRoot
+            .replace(/{{email_body}}/, ((_a = params.html) === null || _a === void 0 ? void 0 : _a.toString()) || "")
+            .replace(/{{issue_date}}/, Date().substring(0, 24))
+        : (_b = params.html) === null || _b === void 0 ? void 0 : _b.toString();
+    try {
+        let mailObject = {};
+        mailObject["from"] = `"${params.senderName || "Datasquirel"}" <${sender}>`;
+        mailObject["sender"] = sender;
+        if (params.alias)
+            mailObject["replyTo"] = sender;
+        mailObject["to"] = params.to;
+        mailObject["subject"] = params.subject;
+        mailObject["text"] = params.text;
+        mailObject["html"] = finalHtml;
+        let info = await transporter.sendMail(Object.assign(Object.assign({}, _.omit(mailObject, ["alias", "senderName", "options"])), mailObject));
+        return info;
+    }
+    catch (error) {
+        console.log("ERROR in handleNodemailer Function =>", error.message);
+    }
+    return undefined;
 }
@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const sanitizeHtmlOptions = {
    allowedTags: [
        "b",
@@ -31,4 +29,4 @@ const sanitizeHtmlOptions = {
        "*": ["style", "class", "title"],
    },
 };
-exports.default = sanitizeHtmlOptions;
+export default sanitizeHtmlOptions;
@@ -1,19 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = httpsRequest;
-const https_1 = __importDefault(require("https"));
-const http_1 = __importDefault(require("http"));
-const url_1 = require("url");
+import https from "https";
+import http from "http";
+import { URL } from "url";
 /**
 * # Make Https Request
 */
-function httpsRequest({ url, method, hostname, path, headers, body, port, scheme, }) {
+export default function httpsRequest({ url, method, hostname, path, headers, body, port, scheme, }) {
    var _a;
    const reqPayloadString = body ? JSON.stringify(body) : null;
-    const PARSED_URL = url ? new url_1.URL(url) : null;
+    const PARSED_URL = url ? new URL(url) : null;
    ////////////////////////////////////////////////
    ////////////////////////////////////////////////
    ////////////////////////////////////////////////
@@ -49,10 +43,10 @@ function httpsRequest({ url, method, hostname, path, headers, body, port, scheme
    return new Promise((res, rej) => {
        var _a;
        const httpsRequest = ((scheme === null || scheme === void 0 ? void 0 : scheme.match(/https/i))
-            ? https_1.default
+            ? https
            : ((_a = PARSED_URL === null || PARSED_URL === void 0 ? void 0 : PARSED_URL.protocol) === null || _a === void 0 ? void 0 : _a.match(/https/i))
-                ? https_1.default
-                : http_1.default).request(
+                ? https
+                : http).request(
        /* ====== Request Options object ====== */
        requestOptions, 
        ////////////////////////////////////////////////
@@ -1,64 +1,47 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = noDatabaseDbHandler;
-const fs_1 = __importDefault(require("fs"));
-const serverError_1 = __importDefault(require("./serverError"));
-const NO_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/NO_DB_HANDLER"));
+import fs from "fs";
+import serverError from "./serverError";
+import NO_DB_HANDLER from "../../utils/backend/global-db/NO_DB_HANDLER";
 /**
 * # No Database DB Handler
 */
-function noDatabaseDbHandler(queryString) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
-            fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", queryString + "\n" + Date() + "\n\n\n", "utf8");
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
-        let results;
-        /**
-         * Fetch from db
-         *
-         * @description Fetch data from db if no cache
-         */
-        try {
-            /** ********************* Run Query */
-            results = yield (0, NO_DB_HANDLER_1.default)(queryString);
-            ////////////////////////////////////////
-            ////////////////////////////////////////
-            ////////////////////////////////////////
-        }
-        catch ( /** @type {any} */error) {
-            (0, serverError_1.default)({
-                component: "noDatabaseDbHandler",
-                message: error.message,
-            });
-            console.log("ERROR in noDatabaseDbHandler =>", error.message);
-        }
-        /**
-         * Return results
-         *
-         * @description Return results add to cache if "req" param is passed
-         */
-        if (results) {
-            return results;
-        }
-        else {
-            return null;
-        }
-    });
+export default async function noDatabaseDbHandler(queryString) {
+    var _a;
+    ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
+        fs.appendFileSync("./.tmp/sqlQuery.sql", queryString + "\n" + Date() + "\n\n\n", "utf8");
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    let results;
+    /**
+     * Fetch from db
+     *
+     * @description Fetch data from db if no cache
+     */
+    try {
+        /** ********************* Run Query */
+        results = await NO_DB_HANDLER(queryString);
+        ////////////////////////////////////////
+        ////////////////////////////////////////
+        ////////////////////////////////////////
+    }
+    catch ( /** @type {any} */error) {
+        serverError({
+            component: "noDatabaseDbHandler",
+            message: error.message,
+        });
+        console.log("ERROR in noDatabaseDbHandler =>", error.message);
+    }
+    /**
+     * Return results
+     *
+     * @description Return results add to cache if "req" param is passed
+     */
+    if (results) {
+        return results;
+    }
+    else {
+        return null;
+    }
 }
@@ -1,21 +1,6 @@
-"use strict";
 // @ts-check
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = parseDbResults;
-const decrypt_1 = __importDefault(require("../dsql/decrypt"));
-const defaultFieldsRegexp_1 = __importDefault(require("./defaultFieldsRegexp"));
+import decrypt from "../dsql/decrypt";
+import defaultFieldsRegexp from "../dsql/default-fields-regexp";
 /**
 * Parse Database results
 * ==============================================================================
@@ -23,54 +8,52 @@ const defaultFieldsRegexp_1 = __importDefault(require("./defaultFieldsRegexp"));
 * function, decrypts encrypted fields, and returns an updated array with no encrypted
 * fields
 */
-function parseDbResults(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ unparsedResults, tableSchema, }) {
+export default async function parseDbResults({ unparsedResults, tableSchema, }) {
+    /**
+     * Declare variables
+     *
+     * @description Declare "results" variable
+     */
+    let parsedResults = [];
+    try {
        /**
         * Declare variables
         *
         * @description Declare "results" variable
         */
-        let parsedResults = [];
-        try {
-            /**
-             * Declare variables
-             *
-             * @description Declare "results" variable
-             */
-            for (let pr = 0; pr < unparsedResults.length; pr++) {
-                let result = unparsedResults[pr];
-                let resultFieldNames = Object.keys(result);
-                for (let i = 0; i < resultFieldNames.length; i++) {
-                    const resultFieldName = resultFieldNames[i];
-                    let resultFieldSchema = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields[i];
-                    if (resultFieldName === null || resultFieldName === void 0 ? void 0 : resultFieldName.match(defaultFieldsRegexp_1.default)) {
-                        continue;
-                    }
-                    let value = result[resultFieldName];
-                    if (typeof value !== "number" && !value) {
-                        // parsedResults.push(result);
-                        continue;
-                    }
-                    if (resultFieldSchema === null || resultFieldSchema === void 0 ? void 0 : resultFieldSchema.encrypted) {
-                        if (value === null || value === void 0 ? void 0 : value.match(/./)) {
-                            result[resultFieldName] = (0, decrypt_1.default)({
-                                encryptedString: value,
-                            });
-                        }
+        for (let pr = 0; pr < unparsedResults.length; pr++) {
+            let result = unparsedResults[pr];
+            let resultFieldNames = Object.keys(result);
+            for (let i = 0; i < resultFieldNames.length; i++) {
+                const resultFieldName = resultFieldNames[i];
+                let resultFieldSchema = tableSchema === null || tableSchema === void 0 ? void 0 : tableSchema.fields[i];
+                if (resultFieldName === null || resultFieldName === void 0 ? void 0 : resultFieldName.match(defaultFieldsRegexp)) {
+                    continue;
+                }
+                let value = result[resultFieldName];
+                if (typeof value !== "number" && !value) {
+                    // parsedResults.push(result);
+                    continue;
+                }
+                if (resultFieldSchema === null || resultFieldSchema === void 0 ? void 0 : resultFieldSchema.encrypted) {
+                    if (value === null || value === void 0 ? void 0 : value.match(/./)) {
+                        result[resultFieldName] = decrypt({
+                            encryptedString: value,
+                        });
                    }
                }
-                parsedResults.push(result);
            }
-            /**
-             * Declare variables
-             *
-             * @description Declare "results" variable
-             */
-            return parsedResults;
+            parsedResults.push(result);
        }
-        catch ( /** @type {any} */error) {
-            console.log("ERROR in parseDbResults Function =>", error.message);
-            return unparsedResults;
-        }
-    });
+        /**
+         * Declare variables
+         *
+         * @description Declare "results" variable
+         */
+        return parsedResults;
+    }
+    catch ( /** @type {any} */error) {
+        console.log("ERROR in parseDbResults Function =>", error.message);
+        return unparsedResults;
+    }
 }
@@ -4,5 +4,5 @@ type Param = {
    userId: string | number;
    dummy?: boolean;
 };
-export default function addQueue({ queue, userId, dummy }: Param): Promise<import("../../../utils/data-fetching/crud").DsqlCrudReturn | undefined>;
+export default function addQueue({ queue, userId, dummy }: Param): Promise<import("../../../types").APIResponseObject | undefined>;
 export {};
@@ -1,46 +1,29 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addQueue;
-const get_queue_1 = __importDefault(require("./get-queue"));
-const crud_1 = __importDefault(require("../../../utils/data-fetching/crud"));
-const numberfy_1 = __importDefault(require("../../../utils/numberfy"));
-function addQueue(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queue, userId, dummy }) {
-        const tableName = "process_queue";
-        const existingQueueRes = dummy
-            ? undefined
-            : (yield (0, get_queue_1.default)({
+import getQueue from "./get-queue";
+import dsqlCrud from "../../../utils/data-fetching/crud";
+import numberfy from "../../../utils/numberfy";
+export default async function addQueue({ queue, userId, dummy }) {
+    const tableName = "process_queue";
+    const existingQueueRes = dummy
+        ? undefined
+        : (await getQueue({
+            query: {
                query: {
-                    query: {
-                        user_id: {
-                            value: String(userId),
-                        },
-                        job_type: {
-                            value: String(queue.job_type),
-                        },
+                    user_id: {
+                        value: String(userId),
+                    },
+                    job_type: {
+                        value: String(queue.job_type),
                    },
                },
-            }));
-        const existingQueue = existingQueueRes === null || existingQueueRes === void 0 ? void 0 : existingQueueRes[0];
-        if ((existingQueue === null || existingQueue === void 0 ? void 0 : existingQueue.id) && !dummy)
-            return undefined;
-        const addQueueRes = yield (0, crud_1.default)({
-            action: "insert",
-            table: tableName,
-            data: Object.assign(Object.assign({}, queue), { user_id: (0, numberfy_1.default)(userId) }),
-        });
-        return addQueueRes;
+            },
+        }));
+    const existingQueue = existingQueueRes === null || existingQueueRes === void 0 ? void 0 : existingQueueRes[0];
+    if ((existingQueue === null || existingQueue === void 0 ? void 0 : existingQueue.id) && !dummy)
+        return undefined;
+    const addQueueRes = await dsqlCrud({
+        action: "insert",
+        table: tableName,
+        data: Object.assign(Object.assign({}, queue), { user_id: numberfy(userId) }),
    });
+    return addQueueRes;
 }
@@ -1,31 +1,14 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = deleteQueue;
-const crud_1 = __importDefault(require("../../../utils/data-fetching/crud"));
-const get_queue_1 = __importDefault(require("./get-queue"));
-function deleteQueue(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queueId, userId }) {
-        const tableName = "process_queue";
-        const existingQueue = (yield (0, get_queue_1.default)({ userId, queueId }));
-        if (!(existingQueue === null || existingQueue === void 0 ? void 0 : existingQueue.id))
-            return false;
-        const deleteQueueRes = yield (0, crud_1.default)({
-            action: "delete",
-            table: tableName,
-            targetId: existingQueue.id,
-        });
-        return Boolean(deleteQueueRes === null || deleteQueueRes === void 0 ? void 0 : deleteQueueRes.success);
+import dsqlCrud from "../../../utils/data-fetching/crud";
+import getQueue from "./get-queue";
+export default async function deleteQueue({ queueId, userId }) {
+    const tableName = "process_queue";
+    const existingQueue = (await getQueue({ userId, queueId }));
+    if (!(existingQueue === null || existingQueue === void 0 ? void 0 : existingQueue.id))
+        return false;
+    const deleteQueueRes = await dsqlCrud({
+        action: "delete",
+        table: tableName,
+        targetId: existingQueue.id,
    });
+    return Boolean(deleteQueueRes === null || deleteQueueRes === void 0 ? void 0 : deleteQueueRes.success);
 }
@@ -1,35 +1,18 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getQueue;
-const crud_1 = __importDefault(require("../../../utils/data-fetching/crud"));
-function getQueue(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queueId, userId, query, single, }) {
-        const tableName = "process_queue";
-        let queryQuery = {};
-        if (queueId) {
-            queryQuery = Object.assign(Object.assign({}, queryQuery), { id: { value: String(queueId) } });
-        }
-        if (userId) {
-            queryQuery = Object.assign(Object.assign({}, queryQuery), { user_id: { value: String(userId) } });
-        }
-        const getQueue = yield (0, crud_1.default)({
-            action: "get",
-            table: tableName,
-            query: Object.assign(Object.assign({}, query), { query: Object.assign(Object.assign({}, query === null || query === void 0 ? void 0 : query.query), queryQuery) }),
-        });
-        const queuePayload = getQueue === null || getQueue === void 0 ? void 0 : getQueue.payload;
-        return queueId || single ? queuePayload === null || queuePayload === void 0 ? void 0 : queuePayload[0] : queuePayload;
+import dsqlCrud from "../../../utils/data-fetching/crud";
+export default async function getQueue({ queueId, userId, query, single, }) {
+    const tableName = "process_queue";
+    let queryQuery = {};
+    if (queueId) {
+        queryQuery = Object.assign(Object.assign({}, queryQuery), { id: { value: String(queueId) } });
+    }
+    if (userId) {
+        queryQuery = Object.assign(Object.assign({}, queryQuery), { user_id: { value: String(userId) } });
+    }
+    const getQueue = await dsqlCrud({
+        action: "get",
+        table: tableName,
+        query: Object.assign(Object.assign({}, query), { query: Object.assign(Object.assign({}, query === null || query === void 0 ? void 0 : query.query), queryQuery) }),
    });
+    const queuePayload = getQueue === null || getQueue === void 0 ? void 0 : getQueue.payload;
+    return queueId || single ? queuePayload === null || queuePayload === void 0 ? void 0 : queuePayload[0] : queuePayload;
 }
@@ -1,28 +1,11 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = updateQueue;
-const crud_1 = __importDefault(require("../../../utils/data-fetching/crud"));
-function updateQueue(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queueId, queue }) {
-        const tableName = "process_queue";
-        const updateQueueRes = yield (0, crud_1.default)({
-            action: "update",
-            table: tableName,
-            targetId: queueId,
-            data: queue,
-        });
-        return Boolean(updateQueueRes === null || updateQueueRes === void 0 ? void 0 : updateQueueRes.success);
+import dsqlCrud from "../../../utils/data-fetching/crud";
+export default async function updateQueue({ queueId, queue }) {
+    const tableName = "process_queue";
+    const updateQueueRes = await dsqlCrud({
+        action: "update",
+        table: tableName,
+        targetId: queueId,
+        data: queue,
    });
+    return Boolean(updateQueueRes === null || updateQueueRes === void 0 ? void 0 : updateQueueRes.success);
 }
@@ -1,76 +1,59 @@
-"use strict";
 // @ts-check
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = serverError;
-const fs_1 = __importDefault(require("fs"));
+import fs from "fs";
 /**
 * # Server Error
 */
-function serverError(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ user, message, component, noMail, req, }) {
-        const date = new Date();
-        const reqIp = (() => {
-            if (!req)
-                return null;
-            try {
-                const forwarded = req.headers["x-forwarded-for"];
-                const realIp = req.headers["x-real-ip"];
-                const cloudflareIp = req.headers["cf-connecting-ip"];
-                // Convert forwarded IPs to string and get the first IP if multiple exist
-                const forwardedIp = Array.isArray(forwarded)
-                    ? forwarded[0]
-                    : forwarded === null || forwarded === void 0 ? void 0 : forwarded.split(",")[0];
-                const clientIp = cloudflareIp ||
-                    forwardedIp ||
-                    realIp ||
-                    req.socket.remoteAddress;
-                if (!clientIp)
-                    return null;
-                return String(clientIp);
-            }
-            catch (error) {
-                return null;
-            }
-        })();
+export default async function serverError({ user, message, component, noMail, req, }) {
+    const date = new Date();
+    const reqIp = (() => {
+        if (!req)
+            return null;
        try {
-            let log = `🚀 SERVER ERROR ===========================\nError Message: ${message}\nComponent: ${component}`;
-            if ((user === null || user === void 0 ? void 0 : user.id) && (user === null || user === void 0 ? void 0 : user.first_name) && (user === null || user === void 0 ? void 0 : user.last_name) && (user === null || user === void 0 ? void 0 : user.email)) {
-                log += `\nUser Id: ${user === null || user === void 0 ? void 0 : user.id}\nUser Name: ${user === null || user === void 0 ? void 0 : user.first_name} ${user === null || user === void 0 ? void 0 : user.last_name}\nUser Email: ${user === null || user === void 0 ? void 0 : user.email}`;
-            }
-            if (req === null || req === void 0 ? void 0 : req.url) {
-                log += `\nURL: ${req.url}`;
-            }
-            if (req === null || req === void 0 ? void 0 : req.body) {
-                log += `\nRequest Body: ${JSON.stringify(req.body, null, 4)}`;
-            }
-            if (reqIp) {
-                log += `\nIP: ${reqIp}`;
-            }
-            log += `\nDate: ${date.toDateString()}`;
-            log += "\n========================================";
-            if (!fs_1.default.existsSync(`./.tmp/error.log`)) {
-                fs_1.default.writeFileSync(`./.tmp/error.log`, "", "utf-8");
-            }
-            const initialText = fs_1.default.readFileSync(`./.tmp/error.log`, "utf-8");
-            fs_1.default.writeFileSync(`./.tmp/error.log`, log);
-            fs_1.default.appendFileSync(`./.tmp/error.log`, `\n\n\n\n\n${initialText}`);
+            const forwarded = req.headers["x-forwarded-for"];
+            const realIp = req.headers["x-real-ip"];
+            const cloudflareIp = req.headers["cf-connecting-ip"];
+            // Convert forwarded IPs to string and get the first IP if multiple exist
+            const forwardedIp = Array.isArray(forwarded)
+                ? forwarded[0]
+                : forwarded === null || forwarded === void 0 ? void 0 : forwarded.split(",")[0];
+            const clientIp = cloudflareIp ||
+                forwardedIp ||
+                realIp ||
+                req.socket.remoteAddress;
+            if (!clientIp)
+                return null;
+            return String(clientIp);
        }
-        catch ( /** @type {any} */error) {
-            console.log("Server Error Reporting Error:", error.message);
+        catch (error) {
+            return null;
        }
-    });
+    })();
+    try {
+        let log = `🚀 SERVER ERROR ===========================\nError Message: ${message}\nComponent: ${component}`;
+        if ((user === null || user === void 0 ? void 0 : user.id) && (user === null || user === void 0 ? void 0 : user.first_name) && (user === null || user === void 0 ? void 0 : user.last_name) && (user === null || user === void 0 ? void 0 : user.email)) {
+            log += `\nUser Id: ${user === null || user === void 0 ? void 0 : user.id}\nUser Name: ${user === null || user === void 0 ? void 0 : user.first_name} ${user === null || user === void 0 ? void 0 : user.last_name}\nUser Email: ${user === null || user === void 0 ? void 0 : user.email}`;
+        }
+        if (req === null || req === void 0 ? void 0 : req.url) {
+            log += `\nURL: ${req.url}`;
+        }
+        if (req === null || req === void 0 ? void 0 : req.body) {
+            log += `\nRequest Body: ${JSON.stringify(req.body, null, 4)}`;
+        }
+        if (reqIp) {
+            log += `\nIP: ${reqIp}`;
+        }
+        log += `\nDate: ${date.toDateString()}`;
+        log += "\n========================================";
+        if (!fs.existsSync(`./.tmp/error.log`)) {
+            fs.writeFileSync(`./.tmp/error.log`, "", "utf-8");
+        }
+        const initialText = fs.readFileSync(`./.tmp/error.log`, "utf-8");
+        fs.writeFileSync(`./.tmp/error.log`, log);
+        fs.appendFileSync(`./.tmp/error.log`, `\n\n\n\n\n${initialText}`);
+    }
+    catch ( /** @type {any} */error) {
+        console.log("Server Error Reporting Error:", error.message);
+    }
 }
 ////////////////////////////////////////
 ////////////////////////////////////////
@@ -1,10 +0,0 @@
-import { DSQL_DatabaseSchemaType } from "../../types";
-type Param = {
-    userId: string | number;
-    schemaData: DSQL_DatabaseSchemaType[];
-};
-/**
- * # Set User Schema Data
- */
-export default function setUserSchemaData({ userId, schemaData, }: Param): boolean;
-export {};
@@ -1,31 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = setUserSchemaData;
-const serverError_1 = __importDefault(require("./serverError"));
-const fs_1 = __importDefault(require("fs"));
-const grab_dir_names_1 = __importDefault(require("../../utils/backend/names/grab-dir-names"));
-/**
- * # Set User Schema Data
- */
-function setUserSchemaData({ userId, schemaData, }) {
-    var _a;
-    try {
-        const { userSchemaMainJSONFilePath } = (0, grab_dir_names_1.default)({ userId });
-        if (!userSchemaMainJSONFilePath) {
-            throw new Error(`No User Schema JSON found!`);
-        }
-        fs_1.default.writeFileSync(userSchemaMainJSONFilePath, JSON.stringify(schemaData), "utf8");
-        return true;
-    }
-    catch (error) {
-        (0, serverError_1.default)({
-            component: "/functions/backend/setUserSchemaData",
-            message: error.message,
-        });
-        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Setting User Schema`, error);
-        return false;
-    }
-}
@@ -0,0 +1,9 @@
+import { UserType } from "../../types";
+type Params = {
+    query?: string;
+    values?: any[];
+    database?: string;
+    user: UserType;
+};
+export default function suDbHandler({ query, database, user, values, }: Params): Promise<any>;
+export {};
@@ -0,0 +1,15 @@
+import mysql from "serverless-mysql";
+import connDbHandler from "../../utils/db/conn-db-handler";
+export default async function suDbHandler({ query, database, user, values, }) {
+    const connection = mysql({
+        config: {
+            host: process.env.DSQL_DB_HOST,
+            user: process.env.DSQL_DB_USERNAME,
+            password: process.env.DSQL_DB_PASSWORD,
+            database: database,
+            charset: "utf8mb4",
+        },
+    });
+    const results = await connDbHandler(connection, query);
+    return results;
+}
@@ -1,47 +1,30 @@
-"use strict";
 // @ts-check
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies"));
-const decrypt_1 = __importDefault(require("../dsql/decrypt"));
-const get_auth_cookie_names_1 = __importDefault(require("./cookies/get-auth-cookie-names"));
-function default_1(req) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { keyCookieName, csrfCookieName } = (0, get_auth_cookie_names_1.default)();
-        const suKeyName = `${keyCookieName}_su`;
-        const cookies = (0, parseCookies_1.default)({ request: req });
-        if (!(cookies === null || cookies === void 0 ? void 0 : cookies[suKeyName])) {
-            return null;
-        }
-        /** ********************* Grab the payload */
-        let userPayload = (0, decrypt_1.default)({
-            encryptedString: cookies[suKeyName],
-        });
-        /** ********************* Return if no payload */
-        if (!userPayload)
-            return null;
-        /** ********************* Parse the payload */
-        let userObject = JSON.parse(userPayload);
-        if (userObject.password !== process.env.DSQL_USER_KEY)
-            return null;
-        if (userObject.authKey !== process.env.DSQL_SPECIAL_KEY)
-            return null;
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        /** ********************* return user object */
-        return userObject;
+import parseCookies from "../../utils/backend/parseCookies";
+import decrypt from "../dsql/decrypt";
+import getAuthCookieNames from "./cookies/get-auth-cookie-names";
+export default async function (req) {
+    const { keyCookieName, csrfCookieName } = getAuthCookieNames();
+    const suKeyName = `${keyCookieName}_su`;
+    const cookies = parseCookies({ request: req });
+    if (!(cookies === null || cookies === void 0 ? void 0 : cookies[suKeyName])) {
+        return null;
+    }
+    /** ********************* Grab the payload */
+    let userPayload = decrypt({
+        encryptedString: cookies[suKeyName],
    });
+    /** ********************* Return if no payload */
+    if (!userPayload)
+        return null;
+    /** ********************* Parse the payload */
+    let userObject = JSON.parse(userPayload);
+    if (userObject.password !== process.env.DSQL_USER_KEY)
+        return null;
+    if (userObject.authKey !== process.env.DSQL_SPECIAL_KEY)
+        return null;
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    /** ********************* return user object */
+    return userObject;
 }
@@ -5,9 +5,10 @@ type Param = {
    newPayload?: {
        [s: string]: any;
    };
+    dbId: string | number;
 };
 /**
 * # Add User Table to Database
 */
-export default function updateUsersTableSchema({ userId, database, newFields, newPayload, }: Param): Promise<any>;
+export default function updateUsersTableSchema({ userId, database, newFields, newPayload, dbId, }: Param): Promise<any>;
 export {};
@@ -1,64 +1,46 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = updateUsersTableSchema;
-const serverError_1 = __importDefault(require("./serverError"));
-const grabUserSchemaData_1 = __importDefault(require("./grabUserSchemaData"));
-const setUserSchemaData_1 = __importDefault(require("./setUserSchemaData"));
-const createDbFromSchema_1 = __importDefault(require("../../shell/createDbFromSchema"));
-const grabSchemaFieldsFromData_1 = __importDefault(require("./grabSchemaFieldsFromData"));
+import serverError from "./serverError";
+import createDbFromSchema from "../../shell/createDbFromSchema";
+import grabSchemaFieldsFromData from "./grabSchemaFieldsFromData";
+import { grabPrimaryRequiredDbSchema, writeUpdatedDbSchema, } from "../../shell/createDbFromSchema/grab-required-database-schemas";
 /**
 * # Add User Table to Database
 */
-function updateUsersTableSchema(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ userId, database, newFields, newPayload, }) {
-        var _b, _c, _d;
-        try {
-            const dbFullName = database;
-            const userSchemaData = (0, grabUserSchemaData_1.default)({ userId });
-            if (!userSchemaData)
-                throw new Error("User schema data not found!");
-            let targetDatabaseIndex = userSchemaData.findIndex((db) => db.dbFullName === database);
-            if (targetDatabaseIndex < 0) {
-                throw new Error("Couldn't Find Target Database!");
-            }
-            let existingTableIndex = (_b = userSchemaData[targetDatabaseIndex]) === null || _b === void 0 ? void 0 : _b.tables.findIndex((table) => table.tableName === "users");
-            const usersTable = userSchemaData[targetDatabaseIndex].tables[existingTableIndex];
-            if (!((_c = usersTable === null || usersTable === void 0 ? void 0 : usersTable.fields) === null || _c === void 0 ? void 0 : _c[0]))
-                throw new Error("Users Table Not Found!");
-            const additionalFields = (0, grabSchemaFieldsFromData_1.default)({
-                fields: newFields,
-                data: newPayload,
-            });
-            const spliceStartIndex = usersTable.fields.findIndex((field) => field.fieldName === "date_created");
-            const finalSpliceStartIndex = spliceStartIndex >= 0 ? spliceStartIndex : 0;
-            usersTable.fields.splice(finalSpliceStartIndex, 0, ...additionalFields);
-            (0, setUserSchemaData_1.default)({ schemaData: userSchemaData, userId });
-            const dbShellUpdate = yield (0, createDbFromSchema_1.default)({
-                userId,
-                targetDatabase: dbFullName,
-            });
-            return `Done!`;
+export default async function updateUsersTableSchema({ userId, database, newFields, newPayload, dbId, }) {
+    var _a, _b;
+    try {
+        const dbFullName = database;
+        let targetDatabase = grabPrimaryRequiredDbSchema({
+            dbId,
+            userId,
+        });
+        if (!targetDatabase) {
+            throw new Error("Couldn't Find Target Database!");
        }
-        catch (error) {
-            (_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error Updating User Table Schema`, error);
-            (0, serverError_1.default)({
-                component: "addUsersTableToDb",
-                message: error.message,
-                user: { id: userId },
-            });
-            return error.message;
-        }
-    });
+        let existingTableIndex = targetDatabase === null || targetDatabase === void 0 ? void 0 : targetDatabase.tables.findIndex((table) => table.tableName === "users");
+        const usersTable = targetDatabase.tables[existingTableIndex];
+        if (!((_a = usersTable === null || usersTable === void 0 ? void 0 : usersTable.fields) === null || _a === void 0 ? void 0 : _a[0]))
+            throw new Error("Users Table Not Found!");
+        const additionalFields = grabSchemaFieldsFromData({
+            fields: newFields,
+            data: newPayload,
+        });
+        const spliceStartIndex = usersTable.fields.findIndex((field) => field.fieldName === "date_created");
+        const finalSpliceStartIndex = spliceStartIndex >= 0 ? spliceStartIndex : 0;
+        usersTable.fields.splice(finalSpliceStartIndex, 0, ...additionalFields);
+        writeUpdatedDbSchema({ dbSchema: targetDatabase, userId });
+        const dbShellUpdate = await createDbFromSchema({
+            userId,
+            targetDatabase: dbFullName,
+        });
+        return `Done!`;
+    }
+    catch (error) {
+        (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Updating User Table Schema`, error);
+        serverError({
+            component: "addUsersTableToDb",
+            message: error.message,
+            user: { id: userId },
+        });
+        return error.message;
+    }
 }
@@ -0,0 +1,11 @@
+import { DSQL_TableSchemaType, UserType } from "../../types";
+type Params = {
+    query?: string;
+    values?: any[];
+    database?: string;
+    tableSchema?: DSQL_TableSchemaType;
+    debug?: boolean;
+    user: UserType;
+};
+export default function userDbHandler({ query, user, database, debug, tableSchema, values, }: Params): Promise<any>;
+export {};
@@ -0,0 +1,17 @@
+import mysql from "serverless-mysql";
+import grabMariadbMainUserForUser from "./grab-mariadb-main-user-for-user";
+import connDbHandler from "../../utils/db/conn-db-handler";
+export default async function userDbHandler({ query, user, database, debug, tableSchema, values, }) {
+    const { fullName, host, username, password } = await grabMariadbMainUserForUser({ user });
+    const connection = mysql({
+        config: {
+            host,
+            user: username,
+            password: password,
+            database: database,
+            charset: "utf8mb4",
+        },
+    });
+    const results = await connDbHandler(connection, query);
+    return results;
+}
@@ -1,8 +1,9 @@
+import { DSQL_TableSchemaType } from "../../types";
 type Param = {
    queryString: string;
    queryValuesArray?: any[];
    database?: string;
-    tableSchema?: import("../../types").DSQL_TableSchemaType;
+    tableSchema?: DSQL_TableSchemaType;
    debug?: boolean;
 };
 /**
@@ -1,66 +1,49 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = varDatabaseDbHandler;
-const parseDbResults_1 = __importDefault(require("./parseDbResults"));
-const serverError_1 = __importDefault(require("./serverError"));
-const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-connection"));
-const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handler"));
+import parseDbResults from "./parseDbResults";
+import serverError from "./serverError";
+import grabDSQLConnection from "../../utils/grab-dsql-connection";
+import connDbHandler from "../../utils/db/conn-db-handler";
 /**
 * # DB handler for specific database
 */
-function varDatabaseDbHandler(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, database, tableSchema, debug, }) {
-        var _b;
-        let CONNECTION = (0, grab_dsql_connection_1.default)({ fa: true });
-        if (global.DSQL_USE_LOCAL)
-            CONNECTION = (0, grab_dsql_connection_1.default)({ local: true });
-        if (database === null || database === void 0 ? void 0 : database.match(/^datasquirel$/))
-            CONNECTION = (0, grab_dsql_connection_1.default)();
-        if (debug) {
-            console.log(`varDatabaseDbHandler:query:`, queryString);
-            console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
-            console.log(`varDatabaseDbHandler:CONNECTION:`, CONNECTION.getConfig());
+export default async function varDatabaseDbHandler({ queryString, queryValuesArray, database, tableSchema, debug, }) {
+    var _a;
+    let CONNECTION = grabDSQLConnection({ fa: true });
+    if (global.DSQL_USE_LOCAL)
+        CONNECTION = grabDSQLConnection({ local: true });
+    if (database === null || database === void 0 ? void 0 : database.match(/^datasquirel$/))
+        CONNECTION = grabDSQLConnection();
+    if (debug) {
+        console.log(`varDatabaseDbHandler:query:`, queryString);
+        console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
+        console.log(`varDatabaseDbHandler:CONNECTION:`, CONNECTION.getConfig());
+    }
+    let results = await connDbHandler(CONNECTION, queryString, queryValuesArray);
+    if (debug) {
+        console.log(`varDatabaseDbHandler:results:`, results);
+    }
+    if (results && tableSchema) {
+        try {
+            const unparsedResults = results;
+            const parsedResults = await parseDbResults({
+                unparsedResults: unparsedResults,
+                tableSchema: tableSchema,
+            });
+            return parsedResults;
        }
-        let results = yield (0, conn_db_handler_1.default)(CONNECTION, queryString, queryValuesArray);
-        if (debug) {
-            console.log(`varDatabaseDbHandler:results:`, results);
-        }
-        if (results && tableSchema) {
-            try {
-                const unparsedResults = results;
-                const parsedResults = yield (0, parseDbResults_1.default)({
-                    unparsedResults: unparsedResults,
-                    tableSchema: tableSchema,
-                });
-                return parsedResults;
-            }
-            catch (error) {
-                console.log("\x1b[31mvarDatabaseDbHandler ERROR\x1b[0m =>", database, error);
-                (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarDb Handler Error`, error);
-                (0, serverError_1.default)({
-                    component: "varDatabaseDbHandler/lines-52-53",
-                    message: error.message,
-                });
-                return null;
-            }
-        }
-        else if (results) {
-            return results;
-        }
-        else {
+        catch (error) {
+            console.log("\x1b[31mvarDatabaseDbHandler ERROR\x1b[0m =>", database, error);
+            (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `VarDb Handler Error`, error);
+            serverError({
+                component: "varDatabaseDbHandler/lines-52-53",
+                message: error.message,
+            });
            return null;
        }
-    });
+    }
+    else if (results) {
+        return results;
+    }
+    else {
+        return null;
+    }
 }
@@ -1,57 +1,40 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = varReadOnlyDatabaseDbHandler;
-const serverError_1 = __importDefault(require("./serverError"));
-const parseDbResults_1 = __importDefault(require("./parseDbResults"));
-const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handler"));
+import serverError from "./serverError";
+import parseDbResults from "./parseDbResults";
+import connDbHandler from "../../utils/db/conn-db-handler";
 /**
 * # Read Only Db Handler with Varaibles
 * @returns
 */
-function varReadOnlyDatabaseDbHandler(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, forceLocal, }) {
-        var _b;
-        let results;
-        const DB_CONN = forceLocal
-            ? global.DSQL_DB_CONN
-            : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
-        try {
-            results = yield (0, conn_db_handler_1.default)(DB_CONN, queryString, queryValuesArray);
-        }
-        catch (error) {
-            (0, serverError_1.default)({
-                component: "varReadOnlyDatabaseDbHandler",
-                message: error.message,
-                noMail: true,
-            });
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarReadOnlyDB Handler Error`, error);
-            return error.message;
-        }
-        finally {
-            DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
-        }
-        if (results) {
-            const unparsedResults = results;
-            const parsedResults = yield (0, parseDbResults_1.default)({
-                unparsedResults: unparsedResults,
-                tableSchema: tableSchema,
-            });
-            return parsedResults;
-        }
-        else {
-            return null;
-        }
-    });
+export default async function varReadOnlyDatabaseDbHandler({ queryString, queryValuesArray, tableSchema, forceLocal, }) {
+    var _a;
+    let results;
+    const DB_CONN = forceLocal
+        ? global.DSQL_DB_CONN
+        : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
+    try {
+        results = await connDbHandler(DB_CONN, queryString, queryValuesArray);
+    }
+    catch (error) {
+        serverError({
+            component: "varReadOnlyDatabaseDbHandler",
+            message: error.message,
+            noMail: true,
+        });
+        (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `VarReadOnlyDB Handler Error`, error);
+        return error.message;
+    }
+    finally {
+        DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
+    }
+    if (results) {
+        const unparsedResults = results;
+        const parsedResults = await parseDbResults({
+            unparsedResults: unparsedResults,
+            tableSchema: tableSchema,
+        });
+        return parsedResults;
+    }
+    else {
+        return null;
+    }
 }