From d7cef415526336705945901c679cff3480639904 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Fri, 26 Dec 2025 09:13:47 +0100 Subject: [PATCH] Updates --- dist/engine/schema-to-typedef.js | 2 +- dist/index.d.ts | 2 +- dist/package-shared/actions/users/get-user.d.ts | 4 ++-- dist/package-shared/actions/users/login-user.d.ts | 4 ++-- dist/package-shared/api/user/local-user.d.ts | 2 +- dist/package-shared/functions/api/query-dsql-api.js | 6 +++--- .../package-shared/functions/api/users/api-get-user.d.ts | 4 ++-- dist/package-shared/functions/backend/db/addDbEntry.js | 8 ++++---- .../package-shared/functions/backend/db/updateDbEntry.js | 2 +- dist/package-shared/types/dsql.d.ts | 4 ++-- dist/package-shared/types/index.d.ts | 2 ++ dist/package-shared/utils/data-fetching/crud-get.js | 7 +++++++ dist/package-shared/utils/data-fetching/crud.js | 5 ++++- engine/schema-to-typedef.ts | 9 +++++++-- package-shared/actions/users/get-user.ts | 8 +++----- package-shared/actions/users/login-user.ts | 8 +------- package-shared/functions/api/query-dsql-api.ts | 6 +++--- package-shared/functions/api/users/api-get-user.ts | 7 ++----- package-shared/functions/backend/db/addDbEntry.ts | 8 ++++---- package-shared/functions/backend/db/updateDbEntry.ts | 2 +- package-shared/types/dsql.ts | 4 ++-- package-shared/types/index.ts | 2 ++ package-shared/utils/data-fetching/crud-get.ts | 7 +++++++ package-shared/utils/data-fetching/crud.ts | 4 +++- package.json | 2 +- 25 files changed, 68 insertions(+), 51 deletions(-) diff --git a/dist/engine/schema-to-typedef.js b/dist/engine/schema-to-typedef.js index 1a3e3e9..cb64714 100644 --- a/dist/engine/schema-to-typedef.js +++ b/dist/engine/schema-to-typedef.js @@ -108,7 +108,7 @@ if (!config.apiConnectionConfig.apiKey) { dbName: config.database || "", apiConnectionConfig: config.apiConnectionConfig, }); - const dbSchema = schemaRes.payload; + const dbSchema = schemaRes.singleRes; if (config.debug) { (0, debug_log_1.default)({ log: schemaRes, diff --git a/dist/index.d.ts b/dist/index.d.ts index e681f98..b75e5db 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -74,7 +74,7 @@ declare const datasquirel: { user: { auth: { login: (_: import("./package-shared/types").LoginUserParam) => Promise; - get: (_: import("./package-shared/types").GetUserParams) => Promise; + get: (_: import("./package-shared/types").GetUserParams) => Promise; signup: (_: import("./package-shared/types").AddUserParams) => Promise; sendEmailCode: (_: import("./package-shared/types").SendEmailCodeParams) => Promise; update: (_: import("./package-shared/types").UpdateUserParams) => Promise; diff --git a/dist/package-shared/actions/users/get-user.d.ts b/dist/package-shared/actions/users/get-user.d.ts index 7a84a77..b6a5758 100644 --- a/dist/package-shared/actions/users/get-user.d.ts +++ b/dist/package-shared/actions/users/get-user.d.ts @@ -1,5 +1,5 @@ -import { GetUserFunctionReturn, GetUserParams } from "../../types"; +import { APIResponseObject, GetUserParams } from "../../types"; /** * # Get User */ -export default function getUser({ apiKey, userId, database, fields, useLocal, apiVersion, dbUserId, selectAll, }: GetUserParams): Promise; +export default function getUser({ apiKey, userId, database, fields, useLocal, apiVersion, dbUserId, selectAll, }: GetUserParams): Promise; diff --git a/dist/package-shared/actions/users/login-user.d.ts b/dist/package-shared/actions/users/login-user.d.ts index 044d579..1ff387f 100644 --- a/dist/package-shared/actions/users/login-user.d.ts +++ b/dist/package-shared/actions/users/login-user.d.ts @@ -1,5 +1,5 @@ -import { APIResponseObject, DATASQUIREL_LoggedInUser, LoginUserParam } from "../../types"; +import { APIResponseObject, LoginUserParam } from "../../types"; /** * # Login A user */ -export default function loginUser({ apiKey, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, useLocal, apiVersion, }: LoginUserParam): Promise; +export default function loginUser({ apiKey, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, useLocal, apiVersion, }: LoginUserParam): Promise; diff --git a/dist/package-shared/api/user/local-user.d.ts b/dist/package-shared/api/user/local-user.d.ts index 3a16972..54863c7 100644 --- a/dist/package-shared/api/user/local-user.d.ts +++ b/dist/package-shared/api/user/local-user.d.ts @@ -5,7 +5,7 @@ import { AddUserParams, GetUserParams, GoogleAuthParams, LoginUserParam, ResetPa declare const localUser: { auth: { login: (_: LoginUserParam) => Promise; - get: (_: GetUserParams) => Promise; + get: (_: GetUserParams) => Promise; signup: (_: AddUserParams) => Promise; sendEmailCode: (_: SendEmailCodeParams) => Promise; update: (_: UpdateUserParams) => Promise; diff --git a/dist/package-shared/functions/api/query-dsql-api.js b/dist/package-shared/functions/api/query-dsql-api.js index 44dfd7e..4f49bfc 100644 --- a/dist/package-shared/functions/api/query-dsql-api.js +++ b/dist/package-shared/functions/api/query-dsql-api.js @@ -103,7 +103,7 @@ function queryDSQLAPI(_a) { response.on("error", (err) => { resolve({ success: false, - payload: undefined, + singleRes: undefined, msg: `An error occurred on the response`, error: err.message, errorData: { requestOptions, grabedHostNames }, @@ -113,7 +113,7 @@ function queryDSQLAPI(_a) { httpsRequest.on("error", (err) => { resolve({ success: false, - payload: undefined, + singleRes: undefined, msg: `An error occurred while making the request`, error: err.message, errorData: { @@ -132,7 +132,7 @@ function queryDSQLAPI(_a) { catch (error) { return { success: false, - payload: undefined, + singleRes: undefined, msg: `Request Failed`, error: error.message, }; diff --git a/dist/package-shared/functions/api/users/api-get-user.d.ts b/dist/package-shared/functions/api/users/api-get-user.d.ts index 80af29b..3446aec 100644 --- a/dist/package-shared/functions/api/users/api-get-user.d.ts +++ b/dist/package-shared/functions/api/users/api-get-user.d.ts @@ -1,5 +1,5 @@ -import { APIGetUserFunctionParams, GetUserFunctionReturn } from "../../../types"; +import { APIGetUserFunctionParams, APIResponseObject } from "../../../types"; /** * # API Get User */ -export default function apiGetUser({ fields, database, userId, dbUserId, selectAll, }: APIGetUserFunctionParams): Promise; +export default function apiGetUser({ fields, database, userId, dbUserId, selectAll, }: APIGetUserFunctionParams): Promise; diff --git a/dist/package-shared/functions/backend/db/addDbEntry.js b/dist/package-shared/functions/backend/db/addDbEntry.js index 687d844..129c20c 100644 --- a/dist/package-shared/functions/backend/db/addDbEntry.js +++ b/dist/package-shared/functions/backend/db/addDbEntry.js @@ -55,7 +55,7 @@ function addDbEntry(_a) { if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "Duplicate entry found", }; } @@ -151,7 +151,7 @@ function addDbEntry(_a) { }); return { success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId), - payload: newInsert, + postInsertReturn: newInsert, queryObject: { sql: query, params: finalQueryValues, @@ -190,7 +190,7 @@ function addDbEntry(_a) { } return { success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId), - payload: newInsert, + postInsertReturn: newInsert, queryObject: { sql: (0, sql_formatter_1.format)(query), params: finalQueryValues, @@ -200,7 +200,7 @@ function addDbEntry(_a) { else { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "No data provided", }; } diff --git a/dist/package-shared/functions/backend/db/updateDbEntry.js b/dist/package-shared/functions/backend/db/updateDbEntry.js index e1a274d..15ebf9d 100644 --- a/dist/package-shared/functions/backend/db/updateDbEntry.js +++ b/dist/package-shared/functions/backend/db/updateDbEntry.js @@ -32,7 +32,7 @@ function updateDbEntry(_a) { if (!data || !Object.keys(data).length) { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "No data provided", }; } diff --git a/dist/package-shared/types/dsql.d.ts b/dist/package-shared/types/dsql.d.ts index 387e057..604ead7 100644 --- a/dist/package-shared/types/dsql.d.ts +++ b/dist/package-shared/types/dsql.d.ts @@ -101,7 +101,7 @@ export type DSQL_DATASQUIREL_USER_DATABASES = { active_clone_parent_db?: string; active_clone_parent_db_id?: number; active_data?: number; - collation?: string; + collation?: "utf8mb4_bin" | "utf8mb4_unicode_520_ci"; last_checked_date_code?: number; date_created?: string; date_created_code?: number; @@ -125,7 +125,7 @@ export type DSQL_DATASQUIREL_USER_DATABASE_TABLES = { child_table_parent_database_schema_id?: number; child_table_parent_table_schema_id?: number; active_data?: 0 | 1; - collation?: string; + collation?: "utf8mb4_bin" | "utf8mb4_unicode_520_ci"; last_checked_date_code?: number; date_created?: string; date_created_code?: number; diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 5f5d24e..3fefa39 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1452,6 +1452,8 @@ export type APIResponseObject { +}: GetUserParams): Promise { /** * Initialize */ @@ -119,5 +117,5 @@ export default async function getUser({ httpsRequest.end(); }); - return httpResponse as GetUserFunctionReturn; + return httpResponse as APIResponseObject; } diff --git a/package-shared/actions/users/login-user.ts b/package-shared/actions/users/login-user.ts index 49fd0e2..8e2f065 100644 --- a/package-shared/actions/users/login-user.ts +++ b/package-shared/actions/users/login-user.ts @@ -1,11 +1,7 @@ -import encrypt from "../../functions/dsql/encrypt"; import apiLoginUser from "../../functions/api/users/api-login"; -import getAuthCookieNames from "../../functions/backend/cookies/get-auth-cookie-names"; -import { writeAuthFile } from "../../functions/backend/auth/write-auth-files"; import { APILoginFunctionParams, APIResponseObject, - DATASQUIREL_LoggedInUser, LoginUserParam, } from "../../types"; import debugLog from "../../utils/logging/debug-log"; @@ -21,9 +17,7 @@ function debugFn(log: any, label?: string) { /** * # Login A user */ -export default async function loginUser< - T extends DATASQUIREL_LoggedInUser = DATASQUIREL_LoggedInUser ->({ +export default async function loginUser({ apiKey, payload, database, diff --git a/package-shared/functions/api/query-dsql-api.ts b/package-shared/functions/api/query-dsql-api.ts index 12a7bbf..d658c8e 100644 --- a/package-shared/functions/api/query-dsql-api.ts +++ b/package-shared/functions/api/query-dsql-api.ts @@ -137,7 +137,7 @@ export default async function queryDSQLAPI({ response.on("error", (err) => { resolve({ success: false, - payload: undefined, + singleRes: undefined, msg: `An error occurred on the response`, error: err.message, errorData: { requestOptions, grabedHostNames }, @@ -149,7 +149,7 @@ export default async function queryDSQLAPI({ httpsRequest.on("error", (err) => { resolve({ success: false, - payload: undefined, + singleRes: undefined, msg: `An error occurred while making the request`, error: err.message, errorData: { @@ -169,7 +169,7 @@ export default async function queryDSQLAPI({ } catch (error: any) { return { success: false, - payload: undefined, + singleRes: undefined, msg: `Request Failed`, error: error.message, }; diff --git a/package-shared/functions/api/users/api-get-user.ts b/package-shared/functions/api/users/api-get-user.ts index 3aa3a39..69a2778 100644 --- a/package-shared/functions/api/users/api-get-user.ts +++ b/package-shared/functions/api/users/api-get-user.ts @@ -1,7 +1,4 @@ -import { - APIGetUserFunctionParams, - GetUserFunctionReturn, -} from "../../../types"; +import { APIGetUserFunctionParams, APIResponseObject } from "../../../types"; import grabDbFullName from "../../../utils/grab-db-full-name"; import dbHandler from "../../backend/dbHandler"; @@ -14,7 +11,7 @@ export default async function apiGetUser({ userId, dbUserId, selectAll, -}: APIGetUserFunctionParams): Promise { +}: APIGetUserFunctionParams): Promise { const finalDbName = grabDbFullName({ dbName: database, userId: dbUserId }); const selectFields = selectAll ? "*" : fields?.[0] ? fields.join(",") : "*"; diff --git a/package-shared/functions/backend/db/addDbEntry.ts b/package-shared/functions/backend/db/addDbEntry.ts index 7561699..5bdce18 100644 --- a/package-shared/functions/backend/db/addDbEntry.ts +++ b/package-shared/functions/backend/db/addDbEntry.ts @@ -101,7 +101,7 @@ export default async function addDbEntry< if (duplicateValue?.[0] && !update) { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "Duplicate entry found", }; } else if (duplicateValue?.[0] && update) { @@ -222,7 +222,7 @@ export default async function addDbEntry< return { success: Boolean(newInsert?.insertId), - payload: newInsert, + postInsertReturn: newInsert, queryObject: { sql: query, params: finalQueryValues, @@ -275,7 +275,7 @@ export default async function addDbEntry< return { success: Boolean(newInsert?.insertId), - payload: newInsert, + postInsertReturn: newInsert, queryObject: { sql: format(query), params: finalQueryValues, @@ -284,7 +284,7 @@ export default async function addDbEntry< } else { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "No data provided", }; } diff --git a/package-shared/functions/backend/db/updateDbEntry.ts b/package-shared/functions/backend/db/updateDbEntry.ts index adab385..a48f8fb 100644 --- a/package-shared/functions/backend/db/updateDbEntry.ts +++ b/package-shared/functions/backend/db/updateDbEntry.ts @@ -56,7 +56,7 @@ export default async function updateDbEntry< if (!data || !Object.keys(data).length) { return { success: false, - payload: undefined, + postInsertReturn: undefined, msg: "No data provided", }; } diff --git a/package-shared/types/dsql.ts b/package-shared/types/dsql.ts index ea153d1..fa9f51a 100644 --- a/package-shared/types/dsql.ts +++ b/package-shared/types/dsql.ts @@ -128,7 +128,7 @@ export type DSQL_DATASQUIREL_USER_DATABASES = { active_clone_parent_db?: string; active_clone_parent_db_id?: number; active_data?: number; - collation?: string; + collation?: "utf8mb4_bin" | "utf8mb4_unicode_520_ci"; last_checked_date_code?: number; date_created?: string; date_created_code?: number; @@ -153,7 +153,7 @@ export type DSQL_DATASQUIREL_USER_DATABASE_TABLES = { child_table_parent_database_schema_id?: number; child_table_parent_table_schema_id?: number; active_data?: 0 | 1; - collation?: string; + collation?: "utf8mb4_bin" | "utf8mb4_unicode_520_ci"; last_checked_date_code?: number; date_created?: string; date_created_code?: number; diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index a57453d..39f1e7c 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1687,6 +1687,8 @@ export type APIResponseObject< success: boolean; payload?: T[] | null; singleRes?: T | null; + stringRes?: string | null; + numberRes?: number | null; postInsertReturn?: PostInsertReturn | null; payloadBase64?: string; payloadThumbnailBase64?: string; diff --git a/package-shared/utils/data-fetching/crud-get.ts b/package-shared/utils/data-fetching/crud-get.ts index 049984f..1a4784e 100644 --- a/package-shared/utils/data-fetching/crud-get.ts +++ b/package-shared/utils/data-fetching/crud-get.ts @@ -125,6 +125,13 @@ export default async function < return { success: isSuccess, payload: isSuccess ? (countOnly ? null : parsedRes) : null, + singleRes: isSuccess + ? countOnly + ? null + : Array.isArray(parsedRes) && parsedRes.length == 1 + ? parsedRes[0] + : null + : null, batchPayload: isSuccess ? (countOnly ? null : parsedBatchRes) : null, error: isSuccess ? undefined diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 9714726..5751fb1 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -48,7 +48,9 @@ export default async function dsqlCrud< }) : undefined; - const whereClause = queryObject?.string.replace(/^.*?( WHERE )/, "$1"); + const whereClause = queryObject?.string?.match(/ WHERE /) + ? queryObject.string.replace(/^.*?( WHERE )/, "$1") + : undefined; const whereClauseObject = whereClause ? { diff --git a/package.json b/package.json index a0e0a99..8e2d6a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.5.8", + "version": "5.5.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {