Update Types

package-shared/utils/data-fetching/method-crud.ts

@@ -1,5 +1,11 @@
-import { DsqlMethodCrudParam, ServerQueryParam } from "../../types";
+import {
+    DsqlCrudQueryObject,
+    DsqlMethodCrudParam,
+    ServerQueryParam,
+} from "../../types";
+import deserializeQuery from "../deserialize-query";
 import EJSON from "../ejson";
+import numberfy from "../numberfy";
 import dsqlCrud from "./crud";
 
 export type APIDataCrudQuery = ServerQueryParam & {
@@ -35,7 +41,9 @@ export default async function dsqlMethodCrud<
 
     try {
         let finalBody = body;
-        let finalQuery = query;
+        let finalQuery = deserializeQuery(query as any) as
+            | DsqlCrudQueryObject<T>
+            | undefined;
 
         let LIMIT = 10;
         let PAGE = 1;
@@ -55,8 +63,8 @@ export default async function dsqlMethodCrud<
                 }
             });
 
-            LIMIT = finalQuery.limit || 10;
-            PAGE = finalQuery.page || 1;
+            if (finalQuery.limit) LIMIT = numberfy(finalQuery.limit);
+            if (finalQuery.page) PAGE = numberfy(finalQuery.page);
             OFFSET = (PAGE - 1) * LIMIT;
         }
 

package-shared/utils/grab-query-and-values.ts

@@ -1,11 +1,13 @@
 import sqlGenerator from "../functions/dsql/sql/sql-generator";
 import { ApiGetQueryObject } from "../types";
 
-type Param = {
-    query: string | ApiGetQueryObject;
+type Param<T extends { [key: string]: any } = { [key: string]: any }> = {
+    query: string | ApiGetQueryObject<T>;
     values?: (string | number)[];
 };
-export default function apiGetGrabQueryAndValues({ query, values }: Param) {
+export default function apiGetGrabQueryAndValues<
+    T extends { [key: string]: any } = { [key: string]: any }
+>({ query, values }: Param<T>) {
     const queryGenObject =
         typeof query == "string"
             ? undefined