Updates

utils/get.ts

@@ -1,24 +1,17 @@
 import https from "node:https";
 import path from "path";
 import fs from "fs";
-import grabHostNames from "../../package-shared/utils/grab-host-names";
-import apiGet from "../../package-shared/functions/api/query/get";
-import serializeQuery from "../../package-shared/utils/serialize-query";
+import grabHostNames from "../package-shared/utils/grab-host-names";
+import apiGet from "../package-shared/functions/api/query/get";
+import serializeQuery from "../package-shared/utils/serialize-query";
 import {
+    ApiGetQueryObject,
     DSQL_DatabaseSchemaType,
     GetReqQueryObject,
     GetReturn,
     ServerQueryParam,
-} from "../../package-shared/types";
-import apiGetGrabQueryAndValues from "./(utils)/grab-query-and-values";
-
-export type ApiGetQueryObject<
-    T extends { [k: string]: any } = { [k: string]: any }
-> = {
-    query: ServerQueryParam<T>;
-    table: string;
-    dbFullName?: string;
-};
+} from "../package-shared/types";
+import apiGetGrabQueryAndValues from "../package-shared/utils/grab-query-and-values";
 
 type Param<T extends { [k: string]: any } = { [k: string]: any }> = {
     key?: string;

utils/get/(utils)/grab-query-and-values.ts

@@ -1,35 +0,0 @@
-import { ApiGetQueryObject } from "..";
-import sqlGenerator from "../../../package-shared/functions/dsql/sql/sql-generator";
-
-type Param = {
-    query: string | ApiGetQueryObject;
-    values?: (string | number)[];
-};
-export default function apiGetGrabQueryAndValues({ query, values }: Param) {
-    const queryGenObject =
-        typeof query == "string"
-            ? undefined
-            : sqlGenerator({
-                  tableName: query.table,
-                  genObject: query.query,
-                  dbFullName: query.dbFullName || "__db",
-              });
-
-    return {
-        query:
-            typeof query == "string"
-                ? String(
-                      query.replace(/\n|\r|\n\r/g, "").replace(/ {2,}/g, " ")
-                  )
-                : queryGenObject?.string || "",
-        values: values || queryGenObject?.values,
-        valuesString:
-            typeof query == "string"
-                ? values
-                    ? JSON.stringify(values)
-                    : undefined
-                : queryGenObject?.values
-                ? JSON.stringify(queryGenObject.values)
-                : undefined,
-    };
-}