@carbonorm/carbonnode 6.0.2 → 6.0.4

package/dist/types/ormInterfaces.d.ts

@@ -3,7 +3,7 @@ import type { Pool } from "mysql2/promise";
 import { eFetchDependencies } from "./dynamicFetching";
 import { Modify } from "./modifyTypes";
 import { JoinType, OrderDirection, SQLComparisonOperator, SQLFunction } from "./mysqlTypes";
-import type { CarbonReact } from "@carbonorm/carbonreact";
+import type { CarbonReact, iStateAdapter } from "@carbonorm/carbonreact";
 import type { OrmGenerics } from "./ormGenerics";
 import { restOrm } from "../api/restOrm";
 type RestOrmFactory = typeof restOrm<OrmGenerics<any>>;
@@ -69,6 +69,12 @@ export type RequestGetPutDeleteBody<T extends {
     JOIN?: Join<T>;
     PAGINATION?: Pagination<T>;
 };
+export type RequestPostBody<T extends {
+    [key: string]: any;
+} = any> = T | {
+    INSERT?: Partial<T>;
+    REPLACE?: Partial<T>;
+};
 export type iAPI<T extends {
     [key: string]: any;
 }> = T & {
@@ -85,7 +91,7 @@ export type RequestQueryBody<Method extends iRestMethods, T extends {
     [key: string]: any;
 } = {}, Overrides extends {
     [key: string]: any;
-} = {}> = Method extends 'GET' | 'PUT' | 'DELETE' ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>> : iAPI<Modify<T, Overrides> & Custom>;
+} = {}> = Method extends 'GET' | 'PUT' | 'DELETE' ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>> : iAPI<RequestPostBody<Modify<T, Overrides> & Custom>>;
 export interface iCacheAPI<ResponseDataType = any> {
     requestArgumentsSerialized: string;
     request: AxiosPromise<ResponseDataType>;
@@ -104,12 +110,15 @@ export interface iChangeC6Data {
 export type C6RestResponse<Method extends iRestMethods, RestData extends {
     [key: string]: any;
 }, Overrides = {}> = {
-    rest: Method extends 'GET' ? Modify<RestData, Overrides>[] : Modify<RestData, Overrides>;
+    rest: Method extends 'GET' ? Modify<RestData, Overrides>[] : never;
     session?: any;
     sql?: any;
 } & (Method extends 'GET' ? {
     next?: () => Promise<DetermineResponseDataType<'GET', RestData, Overrides>>;
-} : {});
+} : {
+    affected: number;
+    insertId?: number | string;
+});
 export interface iC6RestResponse<RestData> {
     rest: RestData;
     session?: any;
@@ -144,6 +153,8 @@ export type iRestWebsocketPayload = {
         METHOD: iRestMethods;
         REQUEST: Record<string, any>;
         REQUEST_PRIMARY_KEY: Record<string, any> | null;
+        RESPONSE?: Record<string, any> | Record<string, any>[];
+        RESPONSE_PRIMARY_KEY?: Record<string, any> | null;
     };
 };
 export type tWebsocketBroadcast = (payload: iRestWebsocketPayload) => void | Promise<void>;
@@ -155,6 +166,7 @@ export interface iRest<RestShortTableName extends string = any, RestTableInterfa
     withCredentials?: boolean;
     restModel: C6RestfulModel<RestShortTableName, RestTableInterface, PrimaryKey>;
     reactBootstrap?: CarbonReact<any, any>;
+    stateAdapter?: iStateAdapter<any>;
     requestMethod: iRestMethods;
     clearCache?: () => void;
     skipPrimaryCheck?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonnode",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "browser": "dist/index.umd.js",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "hooksPath": ".githooks"
   },
   "dependencies": {
-    "@carbonorm/carbonreact": "^4.0.25",
+    "@carbonorm/carbonreact": "^6.0.3",
     "buffer": "^6.0.3",
     "geojson": "^0.5.0",
     "handlebars": "^4.7.8",

package/src/__tests__/sakila-db/C6.js

@@ -1342,7 +1342,7 @@ export const TABLES = {
 };
 export const C6 = {
     ...C6Constants,
-    C6VERSION: '6.0.2',
+    C6VERSION: '6.0.4',
     IMPORT: async (tableName) => {
         tableName = tableName.toLowerCase();
         // if tableName is not a key in the TABLES object then throw an error