From 9b7c98cff681558cbcd066d359f92b57abe87a99 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sun, 1 Jun 2025 11:39:56 +0100 Subject: [PATCH] Updates --- .../functions/backend/queues/add-queue.d.ts | 1 + .../functions/dsql/sql/sql-generator.d.ts | 3 +- .../functions/dsql/sql/sql-generator.js | 15 +++--- .../shell/createDbFromSchema/index.js | 9 ++-- dist/package-shared/types/index.d.ts | 4 +- .../utils/backend/names/grab-dir-names.d.ts | 3 ++ .../utils/backend/names/grab-dir-names.js | 8 +++- .../utils/data-fetching/crud.d.ts | 3 +- .../utils/data-fetching/crud.js | 41 +++++++++++++---- .../utils/db/conn-db-handler.d.ts | 8 ++-- .../utils/db/conn-db-handler.js | 2 +- .../functions/dsql/sql/sql-generator.ts | 17 ++++--- .../shell/createDbFromSchema/index.ts | 14 +++--- package-shared/types/index.ts | 7 ++- .../utils/backend/names/grab-dir-names.ts | 14 +++++- package-shared/utils/data-fetching/crud.ts | 46 ++++++++++++++++--- package-shared/utils/db/conn-db-handler.ts | 8 ++-- package.json | 2 +- 18 files changed, 151 insertions(+), 54 deletions(-) diff --git a/dist/package-shared/functions/backend/queues/add-queue.d.ts b/dist/package-shared/functions/backend/queues/add-queue.d.ts index 1253ea9..3ece844 100644 --- a/dist/package-shared/functions/backend/queues/add-queue.d.ts +++ b/dist/package-shared/functions/backend/queues/add-queue.d.ts @@ -6,5 +6,6 @@ type Param = { }; export default function addQueue({ queue, userId, dummy }: Param): Promise<(import("../../../types").PostReturn & { queryObject?: ReturnType>; + count?: number; }) | null | undefined>; export {}; diff --git a/dist/package-shared/functions/dsql/sql/sql-generator.d.ts b/dist/package-shared/functions/dsql/sql/sql-generator.d.ts index a107975..092b5da 100644 --- a/dist/package-shared/functions/dsql/sql/sql-generator.d.ts +++ b/dist/package-shared/functions/dsql/sql/sql-generator.d.ts @@ -7,6 +7,7 @@ type Param; tableName: string; dbFullName?: string; + count?: boolean; }; type Return = { string: string; @@ -20,5 +21,5 @@ export default function sqlGenerator({ tableName, genObject, dbFullName }: Param): Return; +}>({ tableName, genObject, dbFullName, count }: Param): Return; export {}; diff --git a/dist/package-shared/functions/dsql/sql/sql-generator.js b/dist/package-shared/functions/dsql/sql/sql-generator.js index 5abda09..72d2a14 100644 --- a/dist/package-shared/functions/dsql/sql/sql-generator.js +++ b/dist/package-shared/functions/dsql/sql/sql-generator.js @@ -5,7 +5,7 @@ exports.default = sqlGenerator; * # SQL Query Generator * @description Generates an SQL Query for node module `mysql` or `serverless-mysql` */ -function sqlGenerator({ tableName, genObject, dbFullName }) { +function sqlGenerator({ tableName, genObject, dbFullName, count }) { const finalQuery = (genObject === null || genObject === void 0 ? void 0 : genObject.query) ? genObject.query : undefined; const queryKeys = finalQuery ? Object.keys(finalQuery) : undefined; const sqlSearhValues = []; @@ -109,7 +109,10 @@ function sqlGenerator({ tableName, genObject, dbFullName }) { let queryString = (() => { var _a, _b, _c; let str = "SELECT"; - if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) { + if (count) { + str += ` COUNT(*)`; + } + else if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) { if (genObject.join) { str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => `${finalDbName}${tableName}.${fld}`).join(",")}`; } @@ -125,7 +128,7 @@ function sqlGenerator({ tableName, genObject, dbFullName }) { str += " *"; } } - if (genObject === null || genObject === void 0 ? void 0 : genObject.join) { + if ((genObject === null || genObject === void 0 ? void 0 : genObject.join) && !count) { const existingJoinTableNames = [tableName]; str += "," + @@ -198,13 +201,13 @@ function sqlGenerator({ tableName, genObject, dbFullName }) { const stringOperator = (genObject === null || genObject === void 0 ? void 0 : genObject.searchOperator) || "AND"; queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)}`; } - if (genObject === null || genObject === void 0 ? void 0 : genObject.order) + if ((genObject === null || genObject === void 0 ? void 0 : genObject.order) && !count) queryString += ` ORDER BY ${genObject.join ? `${finalDbName}${tableName}.${String(genObject.order.field)}` : String(genObject.order.field)} ${genObject.order.strategy}`; - if (genObject === null || genObject === void 0 ? void 0 : genObject.limit) + if ((genObject === null || genObject === void 0 ? void 0 : genObject.limit) && !count) queryString += ` LIMIT ${genObject.limit}`; - if (genObject === null || genObject === void 0 ? void 0 : genObject.offset) + if ((genObject === null || genObject === void 0 ? void 0 : genObject.offset) && !count) queryString += ` OFFSET ${genObject.offset}`; return { string: queryString, diff --git a/dist/package-shared/shell/createDbFromSchema/index.js b/dist/package-shared/shell/createDbFromSchema/index.js index abe744e..715d155 100644 --- a/dist/package-shared/shell/createDbFromSchema/index.js +++ b/dist/package-shared/shell/createDbFromSchema/index.js @@ -58,22 +58,23 @@ function createDbFromSchema(_a) { }); for (let tb = 0; tb < allTables.length; tb++) { const { TABLE_NAME } = allTables[tb]; + const targetTableSchema = tables.find((_table) => _table.tableName === TABLE_NAME); /** * @description Check if TABLE_NAME is part of the tables contained * in the user schema JSON. If it's not, the table is either deleted * or the table name has been recently changed */ - if (!tables.filter((_table) => _table.tableName === TABLE_NAME)[0]) { - const oldTableFilteredArray = tables.filter((_table) => _table.tableNameOld && + if (!targetTableSchema) { + const oldTable = tables.find((_table) => _table.tableNameOld && _table.tableNameOld === TABLE_NAME); /** * @description Check if this table has been recently renamed. Rename * table id true. Drop table if false */ - if (oldTableFilteredArray && oldTableFilteredArray[0]) { + if (oldTable) { console.log("Renaming Table"); yield (0, varDatabaseDbHandler_1.default)({ - queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``, + queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTable.tableNameOld}\` TO \`${oldTable.tableName}\``, }); } else { diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 1f35b56..76dd877 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1,5 +1,5 @@ import type { RequestOptions } from "https"; -import { DSQL_DATASQUIREL_PROCESS_QUEUE } from "./dsql"; +import { DSQL_DATASQUIREL_PROCESS_QUEUE, DSQL_DATASQUIREL_USER_DATABASES } from "./dsql"; import { Editor } from "tinymce"; export type DSQL_DatabaseFullName = string; export interface DSQL_DatabaseSchemaType { @@ -1364,6 +1364,7 @@ export type DsqlCrudParam; sanitize?: (data?: T) => T; debug?: boolean; + count?: boolean; }; export type ErrorCallback = (title: string, error: Error, data?: any) => void; export interface MariaDBUser { @@ -1419,6 +1420,7 @@ export type PagePropsType = { user?: UserType | null; pageUrl?: string | null; query?: any; + databases?: DSQL_DATASQUIREL_USER_DATABASES[] | null; }; export type APIResponseObject = { success: boolean; diff --git a/dist/package-shared/utils/backend/names/grab-dir-names.d.ts b/dist/package-shared/utils/backend/names/grab-dir-names.d.ts index 656ea5e..10499d5 100644 --- a/dist/package-shared/utils/backend/names/grab-dir-names.d.ts +++ b/dist/package-shared/utils/backend/names/grab-dir-names.d.ts @@ -25,8 +25,11 @@ export default function grabDirNames(param?: Param): { userPrivateDbImportZipFilePath: string | undefined; dbNginxLoadBalancerConfigFile: string; dockerComposeFile: string; + dockerComposeFileAlt: string; testDockerComposeFile: string; + testDockerComposeFileAlt: string; extraDockerComposeFile: string; + extraDockerComposeFileAlt: string; siteSetupFile: string; envFile: string; testEnvFile: string; diff --git a/dist/package-shared/utils/backend/names/grab-dir-names.js b/dist/package-shared/utils/backend/names/grab-dir-names.js index ffcf240..68fbb23 100644 --- a/dist/package-shared/utils/backend/names/grab-dir-names.js +++ b/dist/package-shared/utils/backend/names/grab-dir-names.js @@ -52,9 +52,12 @@ function grabDirNames(param) { ? path_1.default.join(userPrivateSQLExportsDir, userPrivateDbImportZipFileName) : undefined; const dbNginxLoadBalancerConfigFile = path_1.default.join(appDir, "docker/services/mariadb/load-balancer/config/template/nginx.conf"); - const dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml"); + let dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml"); + let dockerComposeFileAlt = path_1.default.join(appDir, "docker-compose.yaml"); const testDockerComposeFile = path_1.default.join(appDir, "test.docker-compose.yml"); + const testDockerComposeFileAlt = path_1.default.join(appDir, "test.docker-compose.yaml"); const extraDockerComposeFile = path_1.default.join(appDir, "extra.docker-compose.yml"); + const extraDockerComposeFileAlt = path_1.default.join(appDir, "extra.docker-compose.yaml"); const siteSetupFile = path_1.default.join(appDir, "site-setup.json"); const envFile = path_1.default.join(appDir, ".env"); const testEnvFile = path_1.default.join(appDir, "test.env"); @@ -79,8 +82,11 @@ function grabDirNames(param) { userPrivateDbImportZipFilePath, dbNginxLoadBalancerConfigFile, dockerComposeFile, + dockerComposeFileAlt, testDockerComposeFile, + testDockerComposeFileAlt, extraDockerComposeFile, + extraDockerComposeFileAlt, siteSetupFile, envFile, testEnvFile, diff --git a/dist/package-shared/utils/data-fetching/crud.d.ts b/dist/package-shared/utils/data-fetching/crud.d.ts index f00dbf6..df9ec4b 100644 --- a/dist/package-shared/utils/data-fetching/crud.d.ts +++ b/dist/package-shared/utils/data-fetching/crud.d.ts @@ -4,6 +4,7 @@ export default function dsqlCrud({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, }: DsqlCrudParam): Promise<(PostReturn & { +}>({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, count, }: DsqlCrudParam): Promise<(PostReturn & { queryObject?: ReturnType>; + count?: number; }) | null>; diff --git a/dist/package-shared/utils/data-fetching/crud.js b/dist/package-shared/utils/data-fetching/crud.js index f3447af..5252bd0 100644 --- a/dist/package-shared/utils/data-fetching/crud.js +++ b/dist/package-shared/utils/data-fetching/crud.js @@ -13,11 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = dsqlCrud; -const get_1 = __importDefault(require("../../actions/get")); const post_1 = __importDefault(require("../../actions/post")); const sql_generator_1 = __importDefault(require("../../functions/dsql/sql/sql-generator")); +const conn_db_handler_1 = __importDefault(require("../db/conn-db-handler")); function dsqlCrud(_a) { - return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, }) { + return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetValue, query, sanitize, debug, targetField, targetId, count, }) { + var _b, _c; const finalData = sanitize ? sanitize(data) : data; let queryObject; switch (action) { @@ -26,13 +27,35 @@ function dsqlCrud(_a) { tableName: table, genObject: query, }); - const GET_RES = yield (0, get_1.default)({ - query: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.string) || "", - queryValues: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.values) || [], - debug, - forceLocal: true, - }); - return Object.assign(Object.assign({}, GET_RES), { queryObject }); + const DB_CONN = global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN; + const connQueries = [ + { + query: queryObject === null || queryObject === void 0 ? void 0 : queryObject.string, + values: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.values) || [], + }, + ]; + if (count) { + const countQueryObject = (0, sql_generator_1.default)({ + tableName: table, + genObject: query, + count: true, + }); + connQueries.push({ + query: countQueryObject.string, + values: countQueryObject.values, + }); + } + const res = yield (0, conn_db_handler_1.default)(DB_CONN, connQueries); + const isSuccess = Array.isArray(res) && Array.isArray(res[0]); + return { + success: isSuccess, + payload: isSuccess ? res[0] : null, + error: isSuccess ? undefined : res === null || res === void 0 ? void 0 : res.error, + queryObject, + count: isSuccess && ((_c = (_b = res[1]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c["COUNT(*)"]) + ? res[1][0]["COUNT(*)"] + : undefined, + }; case "insert": return yield (0, post_1.default)({ query: { diff --git a/dist/package-shared/utils/db/conn-db-handler.d.ts b/dist/package-shared/utils/db/conn-db-handler.d.ts index 15d0250..a7ee0b3 100644 --- a/dist/package-shared/utils/db/conn-db-handler.d.ts +++ b/dist/package-shared/utils/db/conn-db-handler.d.ts @@ -1,5 +1,5 @@ import { ServerlessMysql } from "serverless-mysql"; -type QueryObject = { +export type ConnDBHandlerQueryObject = { query: string; values?: (string | number | undefined)[]; }; @@ -17,11 +17,11 @@ export default function connDbHandler( */ conn?: ServerlessMysql, /** - * String Or `QueryObject` Array + * String Or `ConnDBHandlerQueryObject` Array */ -query?: QueryObject["query"] | QueryObject[], +query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[], /** * Array of Values to Sanitize and Inject */ -values?: QueryObject["values"], debug?: boolean): Promise>; +values?: ConnDBHandlerQueryObject["values"], debug?: boolean): Promise>; export {}; diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index a2233a4..1bcda12 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -25,7 +25,7 @@ function connDbHandler( */ conn, /** - * String Or `QueryObject` Array + * String Or `ConnDBHandlerQueryObject` Array */ query, /** diff --git a/package-shared/functions/dsql/sql/sql-generator.ts b/package-shared/functions/dsql/sql/sql-generator.ts index 40e0d2b..8011875 100644 --- a/package-shared/functions/dsql/sql/sql-generator.ts +++ b/package-shared/functions/dsql/sql/sql-generator.ts @@ -8,6 +8,7 @@ type Param = { genObject?: ServerQueryParam; tableName: string; dbFullName?: string; + count?: boolean; }; type Return = { @@ -21,7 +22,7 @@ type Return = { */ export default function sqlGenerator< T extends { [key: string]: any } = { [key: string]: any } ->({ tableName, genObject, dbFullName }: Param): Return { +>({ tableName, genObject, dbFullName, count }: Param): Return { const finalQuery = genObject?.query ? genObject.query : undefined; const queryKeys = finalQuery ? Object.keys(finalQuery) : undefined; @@ -162,7 +163,10 @@ export default function sqlGenerator< let queryString = (() => { let str = "SELECT"; - if (genObject?.selectFields?.[0]) { + + if (count) { + str += ` COUNT(*)`; + } else if (genObject?.selectFields?.[0]) { if (genObject.join) { str += ` ${genObject.selectFields ?.map((fld) => `${finalDbName}${tableName}.${fld}`) @@ -178,7 +182,7 @@ export default function sqlGenerator< } } - if (genObject?.join) { + if (genObject?.join && !count) { const existingJoinTableNames: string[] = [tableName]; str += @@ -264,15 +268,16 @@ export default function sqlGenerator< queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)}`; } - if (genObject?.order) + if (genObject?.order && !count) queryString += ` ORDER BY ${ genObject.join ? `${finalDbName}${tableName}.${String(genObject.order.field)}` : String(genObject.order.field) } ${genObject.order.strategy}`; - if (genObject?.limit) queryString += ` LIMIT ${genObject.limit}`; - if (genObject?.offset) queryString += ` OFFSET ${genObject.offset}`; + if (genObject?.limit && !count) queryString += ` LIMIT ${genObject.limit}`; + if (genObject?.offset && !count) + queryString += ` OFFSET ${genObject.offset}`; return { string: queryString, diff --git a/package-shared/shell/createDbFromSchema/index.ts b/package-shared/shell/createDbFromSchema/index.ts index 345587e..4d1191b 100644 --- a/package-shared/shell/createDbFromSchema/index.ts +++ b/package-shared/shell/createDbFromSchema/index.ts @@ -75,15 +75,17 @@ export default async function createDbFromSchema({ for (let tb = 0; tb < allTables.length; tb++) { const { TABLE_NAME } = allTables[tb]; + const targetTableSchema = tables.find( + (_table) => _table.tableName === TABLE_NAME + ); + /** * @description Check if TABLE_NAME is part of the tables contained * in the user schema JSON. If it's not, the table is either deleted * or the table name has been recently changed */ - if ( - !tables.filter((_table) => _table.tableName === TABLE_NAME)[0] - ) { - const oldTableFilteredArray = tables.filter( + if (!targetTableSchema) { + const oldTable = tables.find( (_table) => _table.tableNameOld && _table.tableNameOld === TABLE_NAME @@ -93,10 +95,10 @@ export default async function createDbFromSchema({ * @description Check if this table has been recently renamed. Rename * table id true. Drop table if false */ - if (oldTableFilteredArray && oldTableFilteredArray[0]) { + if (oldTable) { console.log("Renaming Table"); await varDatabaseDbHandler({ - queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``, + queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTable.tableNameOld}\` TO \`${oldTable.tableName}\``, }); } else { console.log(`Dropping Table from ${dbFullName}`); diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 31afcb8..95cc276 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1,5 +1,8 @@ import type { RequestOptions } from "https"; -import { DSQL_DATASQUIREL_PROCESS_QUEUE } from "./dsql"; +import { + DSQL_DATASQUIREL_PROCESS_QUEUE, + DSQL_DATASQUIREL_USER_DATABASES, +} from "./dsql"; import { Editor } from "tinymce"; export type DSQL_DatabaseFullName = string; @@ -1542,6 +1545,7 @@ export type DsqlCrudParam< query?: DsqlCrudQueryObject; sanitize?: (data?: T) => T; debug?: boolean; + count?: boolean; }; export type ErrorCallback = (title: string, error: Error, data?: any) => void; @@ -1600,6 +1604,7 @@ export type PagePropsType = { user?: UserType | null; pageUrl?: string | null; query?: any; + databases?: DSQL_DATASQUIREL_USER_DATABASES[] | null; }; export type APIResponseObject = { diff --git a/package-shared/utils/backend/names/grab-dir-names.ts b/package-shared/utils/backend/names/grab-dir-names.ts index 348e1e5..7d40d3c 100644 --- a/package-shared/utils/backend/names/grab-dir-names.ts +++ b/package-shared/utils/backend/names/grab-dir-names.ts @@ -71,12 +71,21 @@ export default function grabDirNames(param?: Param) { "docker/services/mariadb/load-balancer/config/template/nginx.conf" ); - const dockerComposeFile = path.join(appDir, "docker-compose.yml"); + let dockerComposeFile = path.join(appDir, "docker-compose.yml"); + let dockerComposeFileAlt = path.join(appDir, "docker-compose.yaml"); const testDockerComposeFile = path.join(appDir, "test.docker-compose.yml"); + const testDockerComposeFileAlt = path.join( + appDir, + "test.docker-compose.yaml" + ); const extraDockerComposeFile = path.join( appDir, "extra.docker-compose.yml" ); + const extraDockerComposeFileAlt = path.join( + appDir, + "extra.docker-compose.yaml" + ); const siteSetupFile = path.join(appDir, "site-setup.json"); @@ -104,8 +113,11 @@ export default function grabDirNames(param?: Param) { userPrivateDbImportZipFilePath, dbNginxLoadBalancerConfigFile, dockerComposeFile, + dockerComposeFileAlt, testDockerComposeFile, + testDockerComposeFileAlt, extraDockerComposeFile, + extraDockerComposeFileAlt, siteSetupFile, envFile, testEnvFile, diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 55bc592..b020eee 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -2,6 +2,7 @@ import get from "../../actions/get"; import post from "../../actions/post"; import sqlGenerator from "../../functions/dsql/sql/sql-generator"; import { DsqlCrudParam, PostReturn } from "../../types"; +import connDbHandler, { ConnDBHandlerQueryObject } from "../db/conn-db-handler"; export default async function dsqlCrud< T extends { [key: string]: any } = { [key: string]: any } @@ -15,9 +16,11 @@ export default async function dsqlCrud< debug, targetField, targetId, + count, }: DsqlCrudParam): Promise< | (PostReturn & { queryObject?: ReturnType>; + count?: number; }) | null > { @@ -31,14 +34,43 @@ export default async function dsqlCrud< genObject: query, }); - const GET_RES = await get({ - query: queryObject?.string || "", - queryValues: queryObject?.values || [], - debug, - forceLocal: true, - }); + const DB_CONN = + global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN; - return { ...GET_RES, queryObject }; + const connQueries: ConnDBHandlerQueryObject[] = [ + { + query: queryObject?.string, + values: queryObject?.values || [], + }, + ]; + + if (count) { + const countQueryObject = sqlGenerator({ + tableName: table, + genObject: query, + count: true, + }); + + connQueries.push({ + query: countQueryObject.string, + values: countQueryObject.values, + }); + } + + const res = await connDbHandler(DB_CONN, connQueries); + + const isSuccess = Array.isArray(res) && Array.isArray(res[0]); + + return { + success: isSuccess, + payload: isSuccess ? res[0] : null, + error: isSuccess ? undefined : res?.error, + queryObject, + count: + isSuccess && res[1]?.[0]?.["COUNT(*)"] + ? res[1][0]["COUNT(*)"] + : undefined, + }; case "insert": return await post({ diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index 5a2feb9..5bd8c7e 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -1,7 +1,7 @@ import { ServerlessMysql } from "serverless-mysql"; import debugLog from "../logging/debug-log"; -type QueryObject = { +export type ConnDBHandlerQueryObject = { query: string; values?: (string | number | undefined)[]; }; @@ -19,13 +19,13 @@ export default async function connDbHandler( */ conn?: ServerlessMysql, /** - * String Or `QueryObject` Array + * String Or `ConnDBHandlerQueryObject` Array */ - query?: QueryObject["query"] | QueryObject[], + query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[], /** * Array of Values to Sanitize and Inject */ - values?: QueryObject["values"], + values?: ConnDBHandlerQueryObject["values"], debug?: boolean ): Promise> { try { diff --git a/package.json b/package.json index aa6a4d3..6acdc45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.6.6", + "version": "4.6.7", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {