diff --git a/dist/package-shared/actions/get.js b/dist/package-shared/actions/get.js index 335384b..afba54f 100644 --- a/dist/package-shared/actions/get.js +++ b/dist/package-shared/actions/get.js @@ -31,12 +31,8 @@ function get(_a) { * * @description Look for local db settings in `.env` file and by pass the http request if available */ - const { DSQL_DB_HOST, DSQL_DB_USERNAME, DSQL_DB_PASSWORD, DSQL_DB_NAME } = process.env; - if ((DSQL_DB_HOST === null || DSQL_DB_HOST === void 0 ? void 0 : DSQL_DB_HOST.match(/./)) && - (DSQL_DB_USERNAME === null || DSQL_DB_USERNAME === void 0 ? void 0 : DSQL_DB_USERNAME.match(/./)) && - (DSQL_DB_PASSWORD === null || DSQL_DB_PASSWORD === void 0 ? void 0 : DSQL_DB_PASSWORD.match(/./)) && - (DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) && - global.DSQL_USE_LOCAL) { + const { DSQL_DB_NAME } = process.env; + if ((DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) && global.DSQL_USE_LOCAL) { let dbSchema; try { const localDbSchemaPath = path_1.default.resolve(process.cwd(), "dsql.schema.json"); diff --git a/dist/package-shared/functions/backend/db/runQuery.d.ts b/dist/package-shared/functions/backend/db/runQuery.d.ts index 05ba4fd..74ea02e 100644 --- a/dist/package-shared/functions/backend/db/runQuery.d.ts +++ b/dist/package-shared/functions/backend/db/runQuery.d.ts @@ -9,8 +9,12 @@ type Param = { queryValuesArray?: (string | number)[]; tableName?: string; }; +type Return = { + result: any; + error?: string; +}; /** * # Run DSQL users queries */ -export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }: Param): Promise; +export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/backend/db/runQuery.js b/dist/package-shared/functions/backend/db/runQuery.js index 87cd0e9..0238914 100644 --- a/dist/package-shared/functions/backend/db/runQuery.js +++ b/dist/package-shared/functions/backend/db/runQuery.js @@ -106,7 +106,7 @@ function runQuery(_a) { tableSchema, }); if (!(result === null || result === void 0 ? void 0 : result.insertId)) { - error = new Error("Couldn't insert data"); + error = "Couldn't insert data"; } break; case "update": @@ -136,16 +136,16 @@ function runQuery(_a) { } } } - catch (error) { + catch (err) { (0, serverError_1.default)({ component: "functions/backend/runQuery", - message: error.message, + message: err.message, }); if (debug && global.DSQL_USE_LOCAL) { - console.log("runQuery:error", error.message); + console.log("runQuery:error", err.message); } result = null; - error = error.message; + error = err.message; } return { result, error }; }); diff --git a/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js b/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js index 02821e9..364ba87 100644 --- a/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js +++ b/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js @@ -22,42 +22,22 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle */ function varReadOnlyDatabaseDbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, }) { - /** - * Declare variables - * - * @description Declare "results" variable - */ let results; const DB_CONN = global.DSQL_READ_ONLY_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) { - //////////////////////////////////////// (0, serverError_1.default)({ component: "varReadOnlyDatabaseDbHandler", message: error.message, noMail: true, }); - /** - * 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) { const unparsedResults = results; const parsedResults = yield (0, parseDbResults_1.default)({ diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 7b8103d..1e3cac8 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1349,5 +1349,6 @@ export type DsqlCrudParam; sanitize?: (data?: T) => T; + debug?: boolean; }; export {}; diff --git a/dist/package-shared/utils/data-fetching/crud.d.ts b/dist/package-shared/utils/data-fetching/crud.d.ts index 383eab5..1c1b22d 100644 --- a/dist/package-shared/utils/data-fetching/crud.d.ts +++ b/dist/package-shared/utils/data-fetching/crud.d.ts @@ -4,6 +4,6 @@ export default function dsqlCrud({ action, data, table, targetId, query, sanitize, }: DsqlCrudParam): Promise<(PostReturn & { +}>({ action, data, table, targetId, query, sanitize, debug, }: DsqlCrudParam): Promise<(PostReturn & { queryObject?: ReturnType>; }) | null>; diff --git a/dist/package-shared/utils/data-fetching/crud.js b/dist/package-shared/utils/data-fetching/crud.js index fe71ce8..cddcdbd 100644 --- a/dist/package-shared/utils/data-fetching/crud.js +++ b/dist/package-shared/utils/data-fetching/crud.js @@ -17,7 +17,7 @@ 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")); function dsqlCrud(_a) { - return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetId, query, sanitize, }) { + return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetId, query, sanitize, debug, }) { const finalData = sanitize ? sanitize(data) : data; const finalId = targetId; let queryObject; @@ -30,6 +30,7 @@ function dsqlCrud(_a) { 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, }); return Object.assign(Object.assign({}, GET_RES), { queryObject }); case "insert": diff --git a/package-shared/actions/get.ts b/package-shared/actions/get.ts index 2a8cf88..654cbbd 100644 --- a/package-shared/actions/get.ts +++ b/package-shared/actions/get.ts @@ -46,16 +46,9 @@ export default async function get< * * @description Look for local db settings in `.env` file and by pass the http request if available */ - const { DSQL_DB_HOST, DSQL_DB_USERNAME, DSQL_DB_PASSWORD, DSQL_DB_NAME } = - process.env; + const { DSQL_DB_NAME } = process.env; - if ( - DSQL_DB_HOST?.match(/./) && - DSQL_DB_USERNAME?.match(/./) && - DSQL_DB_PASSWORD?.match(/./) && - DSQL_DB_NAME?.match(/./) && - global.DSQL_USE_LOCAL - ) { + if (DSQL_DB_NAME?.match(/./) && global.DSQL_USE_LOCAL) { let dbSchema: DSQL_DatabaseSchemaType | undefined; try { diff --git a/package-shared/functions/backend/db/runQuery.ts b/package-shared/functions/backend/db/runQuery.ts index d5c0cdc..c4b161c 100644 --- a/package-shared/functions/backend/db/runQuery.ts +++ b/package-shared/functions/backend/db/runQuery.ts @@ -20,6 +20,11 @@ type Param = { tableName?: string; }; +type Return = { + result: any; + error?: string; +}; + /** * # Run DSQL users queries */ @@ -32,7 +37,7 @@ export default async function runQuery({ tableName, debug, dbContext, -}: Param): Promise { +}: Param): Promise { /** * Declare variables * @@ -40,7 +45,7 @@ export default async function runQuery({ */ let result: any; - let error: any; + let error: string | undefined; let tableSchema: DSQL_TableSchemaType | undefined; if (dbSchema) { @@ -127,7 +132,7 @@ export default async function runQuery({ }); if (!result?.insertId) { - error = new Error("Couldn't insert data"); + error = "Couldn't insert data"; } break; @@ -162,18 +167,18 @@ export default async function runQuery({ break; } } - } catch (error: any) { + } catch (err: any) { serverError({ component: "functions/backend/runQuery", - message: error.message, + message: err.message, }); if (debug && global.DSQL_USE_LOCAL) { - console.log("runQuery:error", error.message); + console.log("runQuery:error", err.message); } result = null; - error = error.message; + error = err.message; } return { result, error }; diff --git a/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts b/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts index 5f088de..5b22cb1 100644 --- a/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts +++ b/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts @@ -17,46 +17,24 @@ export default async function varReadOnlyDatabaseDbHandler({ queryValuesArray, tableSchema, }: Param) { - /** - * Declare variables - * - * @description Declare "results" variable - */ let results; const DB_CONN = global.DSQL_READ_ONLY_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: any) { - //////////////////////////////////////// - serverError({ component: "varReadOnlyDatabaseDbHandler", message: error.message, noMail: true, }); - /** - * Return error - */ return error.message; } finally { DB_CONN?.end(); } - /** - * Return results - * - * @description Return results add to cache if "req" param is passed - */ if (results) { const unparsedResults = results; const parsedResults = await parseDbResults({ diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 3f8e886..ef9897e 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1521,4 +1521,5 @@ export type DsqlCrudParam< targetId?: string | number; query?: DsqlCrudQueryObject; sanitize?: (data?: T) => T; + debug?: boolean; }; diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 8bd3719..6d03b10 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -12,6 +12,7 @@ export default async function dsqlCrud< targetId, query, sanitize, + debug, }: DsqlCrudParam): Promise< | (PostReturn & { queryObject?: ReturnType>; @@ -32,6 +33,7 @@ export default async function dsqlCrud< const GET_RES = await get({ query: queryObject?.string || "", queryValues: queryObject?.values || [], + debug, }); return { ...GET_RES, queryObject }; diff --git a/package.json b/package.json index 05cb123..cfe5684 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.0.7", + "version": "4.0.8", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {