@carbonorm/carbonnode 3.0.9 → 3.0.10

package/dist/api/executors/SqlExecutor.d.ts

@@ -1,19 +1,15 @@
-import { iRestMethods } from "@carbonorm/carbonnode";
-import { RowDataPacket } from 'mysql2/promise';
+import { apiReturn, DetermineResponseDataType, iRestMethods } from "@carbonorm/carbonnode";
+import { RowDataPacket, ResultSetHeader } from 'mysql2/promise';
 import { Executor } from "./Executor";
-export declare class SqlExecutor<RequestMethod extends iRestMethods, RestShortTableName extends string = any, RestTableInterface extends {
-    [key: string]: any;
-} = any, PrimaryKey extends Extract<keyof RestTableInterface, string> = Extract<keyof RestTableInterface, string>, CustomAndRequiredFields extends {
-    [key: string]: any;
-} = any, RequestTableOverrides extends {
+export declare class SqlExecutor<RequestMethod extends iRestMethods, RestShortTableName extends string = any, RestTableInterface extends Record<string, any> = any, PrimaryKey extends Extract<keyof RestTableInterface, string> = Extract<keyof RestTableInterface, string>, CustomAndRequiredFields extends Record<string, any> = any, RequestTableOverrides extends {
     [key in keyof RestTableInterface]: any;
 } = {
     [key in keyof RestTableInterface]: any;
 }> extends Executor<RequestMethod, RestShortTableName, RestTableInterface, PrimaryKey, CustomAndRequiredFields, RequestTableOverrides> {
-    execute(): any;
+    execute(): Promise<apiReturn<DetermineResponseDataType<RequestMethod, RestTableInterface>>>;
     private withConnection;
-    select<RestShortTableNames>(table: RestShortTableNames, primary: string | undefined, args: any): Promise<RowDataPacket[]>;
-    insert<RestShortTableNames>(table: RestShortTableNames, data: any): Promise<import("mysql2/promise").QueryResult>;
-    update<RestShortTableNames>(table: RestShortTableNames, primary: string | undefined, data: any): Promise<import("mysql2/promise").QueryResult>;
-    delete<RestShortTableNames>(table: RestShortTableNames, primary: string | undefined, args: any): Promise<import("mysql2/promise").QueryResult>;
+    select<TName extends string>(table: TName, primary: string | undefined, args: any): Promise<RowDataPacket[]>;
+    insert<TName extends string>(table: TName, data: Record<string, any>): Promise<ResultSetHeader>;
+    update<TName extends string>(table: TName, primary: string[], data: Record<string, any>): Promise<ResultSetHeader>;
+    delete<TName extends string>(table: TName, primary: string[], args: Record<string, any>): Promise<ResultSetHeader>;
 }

package/dist/api/restOrm.d.ts

@@ -8,8 +8,5 @@ export declare function restOrm<RestShortTableName extends string = any, RestTab
 } = {
     [key in keyof RestTableInterface]: any;
 }>(config: () => Omit<iRest<RestShortTableName, RestTableInterface, PrimaryKey>, "requestMethod">): {
-    Get: (request: import("./types/ormInterfaces").iAPI<import("./types/ormInterfaces").RequestGetPutDeleteBody<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>>) => Promise<import("./types/ormInterfaces").apiReturn<import("./types/ormInterfaces").iGetC6RestResponse<RestTableInterface, {}>>>;
-    Put: (request: import("./types/ormInterfaces").iAPI<import("./types/ormInterfaces").RequestGetPutDeleteBody<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>>) => Promise<import("./types/ormInterfaces").apiReturn<import("./types/ormInterfaces").iPutC6RestResponse<RestTableInterface, any>>>;
-    Post: (request: import("./types/ormInterfaces").iAPI<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>) => Promise<import("./types/ormInterfaces").apiReturn<import("./types/ormInterfaces").iPostC6RestResponse<RestTableInterface>>>;
-    Delete: (request: import("./types/ormInterfaces").iAPI<import("./types/ormInterfaces").RequestGetPutDeleteBody<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>>) => Promise<import("./types/ormInterfaces").apiReturn<import("./types/ormInterfaces").iDeleteC6RestResponse<RestTableInterface, any>>>;
+    [k: string]: (request: import("./types/ormInterfaces").iAPI<import("./types/ormInterfaces").RequestGetPutDeleteBody<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>> | import("./types/ormInterfaces").iAPI<Omit<RestTableInterface, keyof RequestTableOverrides> & RequestTableOverrides & CustomAndRequiredFields>) => Promise<import("./types/ormInterfaces").apiReturn<import("./types/ormInterfaces").iGetC6RestResponse<RestTableInterface, {}> | import("./types/ormInterfaces").iPostC6RestResponse<RestTableInterface> | import("./types/ormInterfaces").iPutC6RestResponse<RestTableInterface, any> | import("./types/ormInterfaces").iDeleteC6RestResponse<RestTableInterface, any>>>;
 };

package/dist/api/types/ormInterfaces.d.ts

@@ -106,7 +106,7 @@ export interface iC6RestResponse<RestData> {
     sql?: any;
 }
 export type iGetC6RestResponse<ResponseDataType, ResponseDataOverrides = {}> = iC6RestResponse<Modify<ResponseDataType, ResponseDataOverrides> | Modify<ResponseDataType, ResponseDataOverrides>[]>;
-export type apiReturn<Response> = null | undefined | AxiosPromise<Response> | (Response extends iPutC6RestResponse | iDeleteC6RestResponse | iPostC6RestResponse ? null : () => apiReturn<Response>);
+export type apiReturn<Response> = null | undefined | Response | (Response extends iPutC6RestResponse | iDeleteC6RestResponse | iPostC6RestResponse ? null : () => apiReturn<Response>);
 export type DetermineResponseDataType<Method extends iRestMethods, RestTableInterface extends {
     [key: string]: any;
 }> = Method extends 'POST' ? iPostC6RestResponse<RestTableInterface> : Method extends 'GET' ? iGetC6RestResponse<RestTableInterface> : Method extends 'PUT' ? iPutC6RestResponse<RestTableInterface> : Method extends 'DELETE' ? iDeleteC6RestResponse<RestTableInterface> : never;