This commit is contained in:
Benjamin Toby
2025-01-15 22:59:16 +01:00
parent a2feec6f5b
commit b18ec506b3
6 changed files with 89 additions and 23 deletions
+8 -2
View File
@@ -1,14 +1,20 @@
import { GetReturn } from "../package-shared/types";
import { GetReturn, ServerQueryParam } from "../package-shared/types";
export type ApiGetQueryObject = {
query: ServerQueryParam;
table: string;
dbFullName?: string;
};
type Param = {
key?: string;
db?: string;
query: string;
query: string | ApiGetQueryObject;
queryValues?: string[];
tableName?: string;
useLocal?: boolean;
user_id?: string | number;
debug?: boolean;
};
export type ApiGetParams = Param;
/**
* # Make a get request to Datasquirel API
*/
+20 -4
View File
@@ -18,6 +18,7 @@ const fs_1 = __importDefault(require("fs"));
const grab_host_names_1 = __importDefault(require("../package-shared/utils/grab-host-names"));
const get_1 = __importDefault(require("../package-shared/functions/api/query/get"));
const serialize_query_1 = __importDefault(require("../package-shared/utils/serialize-query"));
const sql_generator_1 = __importDefault(require("../package-shared/functions/dsql/sql/sql-generator"));
/**
* # Make a get request to Datasquirel API
*/
@@ -62,12 +63,27 @@ function get(_a) {
* @description make a request to datasquirel.com
*/
const httpResponse = yield new Promise((resolve, reject) => {
const queryGenObject = typeof query == "string"
? undefined
: (0, sql_generator_1.default)({
tableName: query.table,
genObject: query.query,
dbFullName: query.dbFullName || "__db",
});
const queryObject = {
db: process.env.DSQL_API_DB_NAME || String(db),
query: String(query.replace(/\n|\r|\n\r/g, "").replace(/ {2,}/g, " ")),
queryValues: queryValues
? JSON.stringify(queryValues)
: undefined,
query: typeof query == "string"
? String(query
.replace(/\n|\r|\n\r/g, "")
.replace(/ {2,}/g, " "))
: (queryGenObject === null || queryGenObject === void 0 ? void 0 : queryGenObject.string) || "",
queryValues: typeof query == "string"
? queryValues
? JSON.stringify(queryValues)
: undefined
: (queryGenObject === null || queryGenObject === void 0 ? void 0 : queryGenObject.values)
? JSON.stringify(queryGenObject.values)
: undefined,
tableName,
debug,
};