From 2ad17ae682104bddc7a3aa6a06982dc6dc856cb8 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 23 Apr 2025 14:21:14 +0100 Subject: [PATCH] Updates --- dist/package-shared/actions/post.d.ts | 3 ++- dist/package-shared/actions/post.js | 19 +++++++++++++++-- .../functions/api/query/post.d.ts | 3 ++- .../functions/api/query/post.js | 15 ++++++++++++- package-shared/actions/post.ts | 21 ++++++++++++++++++- package-shared/functions/api/query/post.ts | 17 +++++++++++++++ package.json | 2 +- 7 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dist/package-shared/actions/post.d.ts b/dist/package-shared/actions/post.d.ts index 9a1c2d8..50fb6d5 100644 --- a/dist/package-shared/actions/post.d.ts +++ b/dist/package-shared/actions/post.d.ts @@ -7,9 +7,10 @@ type Param = { tableName?: string; user_id?: boolean; forceLocal?: boolean; + debug?: boolean; }; /** * # Make a post request to Datasquirel API */ -export default function post({ key, query, queryValues, database, tableName, user_id, forceLocal, }: Param): Promise; +export default function post({ key, query, queryValues, database, tableName, user_id, forceLocal, debug, }: Param): Promise; export {}; diff --git a/dist/package-shared/actions/post.js b/dist/package-shared/actions/post.js index 8a3852b..0337540 100644 --- a/dist/package-shared/actions/post.js +++ b/dist/package-shared/actions/post.js @@ -18,13 +18,21 @@ const path_1 = __importDefault(require("path")); const fs_1 = __importDefault(require("fs")); const grab_host_names_1 = __importDefault(require("../utils/grab-host-names")); const post_1 = __importDefault(require("../functions/api/query/post")); +const debug_log_1 = __importDefault(require("../utils/logging/debug-log")); /** * # Make a post request to Datasquirel API */ function post(_a) { - return __awaiter(this, arguments, void 0, function* ({ key, query, queryValues, database, tableName, user_id, forceLocal, }) { + return __awaiter(this, arguments, void 0, function* ({ key, query, queryValues, database, tableName, user_id, forceLocal, debug, }) { const grabedHostNames = (0, grab_host_names_1.default)(); const { host, port, scheme } = grabedHostNames; + if (debug) { + (0, debug_log_1.default)({ + log: grabedHostNames, + addTime: true, + label: "grabedHostNames", + }); + } /** * Check for local DB settings * @@ -43,6 +51,12 @@ function post(_a) { dbSchema = JSON.parse(fs_1.default.readFileSync(localDbSchemaPath, "utf8")); } catch (error) { } + if (debug) { + (0, debug_log_1.default)({ + log: "Using Local DB ...", + addTime: true, + }); + } return yield (0, post_1.default)({ dbFullName: DSQL_DB_NAME, query, @@ -50,6 +64,7 @@ function post(_a) { queryValues, tableName, forceLocal, + debug, }); } /** @@ -105,7 +120,7 @@ function post(_a) { try { resolve(JSON.parse(str)); } - catch ( /** @type {any} */error) { + catch (error) { console.log("Route ERROR:", error.message); resolve({ success: false, diff --git a/dist/package-shared/functions/api/query/post.d.ts b/dist/package-shared/functions/api/query/post.d.ts index 9767467..55b1515 100644 --- a/dist/package-shared/functions/api/query/post.d.ts +++ b/dist/package-shared/functions/api/query/post.d.ts @@ -8,9 +8,10 @@ type Param = { dbSchema?: DSQL_DatabaseSchemaType; dbContext?: (typeof DbContextsArray)[number]; forceLocal?: boolean; + debug?: boolean; }; /** * # Post Function For API */ -export default function apiPost({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, }: Param): Promise; +export default function apiPost({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, debug, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/api/query/post.js b/dist/package-shared/functions/api/query/post.js index 47f33e7..1700011 100644 --- a/dist/package-shared/functions/api/query/post.js +++ b/dist/package-shared/functions/api/query/post.js @@ -16,11 +16,12 @@ exports.default = apiPost; const lodash_1 = __importDefault(require("lodash")); const serverError_1 = __importDefault(require("../../backend/serverError")); const runQuery_1 = __importDefault(require("../../backend/db/runQuery")); +const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log")); /** * # Post Function For API */ function apiPost(_a) { - return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, }) { + return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, debug, }) { var _b, _c; if (typeof query === "string" && (query === null || query === void 0 ? void 0 : query.match(/^create |^alter |^drop /i))) { return { success: false, msg: "Wrong Input" }; @@ -45,6 +46,18 @@ function apiPost(_a) { dbContext, forceLocal, }); + if (debug) { + (0, debug_log_1.default)({ + log: result, + addTime: true, + label: "result", + }); + (0, debug_log_1.default)({ + log: query, + addTime: true, + label: "query", + }); + } results = result; if (error) throw error; diff --git a/package-shared/actions/post.ts b/package-shared/actions/post.ts index ade00aa..e3de7fa 100644 --- a/package-shared/actions/post.ts +++ b/package-shared/actions/post.ts @@ -5,6 +5,7 @@ import fs from "fs"; import grabHostNames from "../utils/grab-host-names"; import apiPost from "../functions/api/query/post"; import { PostDataPayload, PostReturn } from "../types"; +import debugLog from "../utils/logging/debug-log"; type Param = { key?: string; @@ -14,6 +15,7 @@ type Param = { tableName?: string; user_id?: boolean; forceLocal?: boolean; + debug?: boolean; }; /** @@ -27,10 +29,19 @@ export default async function post({ tableName, user_id, forceLocal, + debug, }: Param): Promise { const grabedHostNames = grabHostNames(); const { host, port, scheme } = grabedHostNames; + if (debug) { + debugLog({ + log: grabedHostNames, + addTime: true, + label: "grabedHostNames", + }); + } + /** * Check for local DB settings * @@ -57,6 +68,13 @@ export default async function post({ dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8")); } catch (error) {} + if (debug) { + debugLog({ + log: "Using Local DB ...", + addTime: true, + }); + } + return await apiPost({ dbFullName: DSQL_DB_NAME, query, @@ -64,6 +82,7 @@ export default async function post({ queryValues, tableName, forceLocal, + debug, }); } @@ -132,7 +151,7 @@ export default async function post({ response.on("end", function () { try { resolve(JSON.parse(str)); - } catch (/** @type {any} */ error: any) { + } catch (error: any) { console.log("Route ERROR:", error.message); resolve({ diff --git a/package-shared/functions/api/query/post.ts b/package-shared/functions/api/query/post.ts index d850478..404ae06 100644 --- a/package-shared/functions/api/query/post.ts +++ b/package-shared/functions/api/query/post.ts @@ -2,6 +2,7 @@ import _ from "lodash"; import serverError from "../../backend/serverError"; import runQuery, { DbContextsArray } from "../../backend/db/runQuery"; import { DSQL_DatabaseSchemaType, PostReturn } from "../../../types"; +import debugLog from "../../../utils/logging/debug-log"; type Param = { query: any; @@ -11,6 +12,7 @@ type Param = { dbSchema?: DSQL_DatabaseSchemaType; dbContext?: (typeof DbContextsArray)[number]; forceLocal?: boolean; + debug?: boolean; }; /** @@ -24,6 +26,7 @@ export default async function apiPost({ dbSchema, dbContext, forceLocal, + debug, }: Param): Promise { if (typeof query === "string" && query?.match(/^create |^alter |^drop /i)) { return { success: false, msg: "Wrong Input" }; @@ -54,6 +57,20 @@ export default async function apiPost({ forceLocal, }); + if (debug) { + debugLog({ + log: result, + addTime: true, + label: "result", + }); + + debugLog({ + log: query, + addTime: true, + label: "query", + }); + } + results = result; if (error) throw error; diff --git a/package.json b/package.json index 0bd3822..97dc03c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.4.3", + "version": "4.4.4", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {