@carbonorm/carbonreact 6.0.1 → 6.0.2

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/CarbonORM/CarbonReact"
   },
   "license": "MIT",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "browser": "dist/index.umd.js",
   "type": "module",
   "main": "./dist/index.cjs",

package/src/core/CarbonReact.tsx

@@ -8,6 +8,7 @@ import {initialRestfulObjectsState, iRestfulObjectArrayTypes} from "schema/C6";
 import CarbonWebSocket, {iCarbonWebSocketProps} from "components/WebSocket/CarbonWebSocket";
 import updateRestfulObjectArrays, {iUpdateRestfulObjectArrays} from "state/updateRestfulObjectArrays";
 import deleteRestfulObjectArrays, {iDeleteRestfulObjectArrays} from "state/deleteRestfulObjectArrays";
+import { iStateAdapter } from "state/stateAdapter";
 import {BrowserRouter, HashRouter, MemoryRouter} from "react-router-dom";
 
 export type tStatefulApiData<T extends { [key: string]: any } = {}> = T[] | undefined | null;
@@ -56,7 +57,8 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     instanceId?: string,
     persistentState?: boolean,
     routerType?: eRouterType,
-    websocket?: Omit<iCarbonWebSocketProps<P, S>, "instance"> | false
+    websocket?: Omit<iCarbonWebSocketProps<P, S>, "instance"> | false,
+    stateAdapter?: iStateAdapter<S>
 } & P, S> {
 
     private static allInstances = new Map<string, CarbonReact<any, any>>();
@@ -114,6 +116,7 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         websocket?: boolean | iCarbonWebSocketProps<P, S> | undefined;
         instanceId?: string; // Optional instanceId from props
         persistentState?: boolean; // Optional persistentState from props
+        stateAdapter?: iStateAdapter<S>;
     } & P) {
         super(props);
 
@@ -128,6 +131,7 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         }
 
         this.target = new.target;
+        this.stateAdapter = props.stateAdapter;
         console.log('CarbonORM TSX CONSTRUCTOR');
 
         Object.assign(this.target, {
@@ -135,6 +139,8 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         });
     }
 
+    public stateAdapter?: iStateAdapter<S>;
+
     private static generateIdentifier(instanceId?: string): string {
         const className = this.name;
         return instanceId ? `${className}-${instanceId}` : className;

package/src/index.ts

@@ -44,6 +44,7 @@ export * from "./routing/GlobalHistory";
 export * from "./schema/C6";
 export { default as deleteRestfulObjectArrays } from "./state/deleteRestfulObjectArrays";
 export * from "./state/deleteRestfulObjectArrays";
+export * from "./state/stateAdapter";
 export { default as updateRestfulObjectArrays } from "./state/updateRestfulObjectArrays";
 export * from "./state/updateRestfulObjectArrays";
 export { default as getStyles } from "./styles/getStyles";

package/src/state/deleteRestfulObjectArrays.tsx

@@ -1,5 +1,6 @@
 import CarbonReact, { iCarbonReactState, tStatefulApiData } from "core/CarbonReact";
 import { KeysMatching } from "types/KeysMatching";
+import { iStateAdapter } from "./stateAdapter";
 
 export interface iDeleteRestfulObjectArrays<
     ObjectType extends {
@@ -12,7 +13,8 @@ export interface iDeleteRestfulObjectArrays<
     dataOrCallback: ObjectType[] | ((state: Readonly<S>, props: Readonly<P>) => ObjectType[] | null),
     stateKey: KeysMatching<S, tStatefulApiData<ObjectType>>,
     uniqueObjectId: keyof ObjectType | (keyof ObjectType)[],
-    callback?: () => void
+    callback?: () => void,
+    stateAdapter?: iStateAdapter<S>
 }
 
 export default function deleteRestfulObjectArrays<
@@ -26,12 +28,14 @@ export default function deleteRestfulObjectArrays<
       dataOrCallback,
       stateKey,
       uniqueObjectId,
-      callback
+      callback,
+      stateAdapter
   }: iDeleteRestfulObjectArrays<ObjectType, S, P>): void {
 
     const uniqueObjectIds = Array.isArray(uniqueObjectId) ? uniqueObjectId : [uniqueObjectId];
+    const resolvedStateAdapter = stateAdapter ?? instance.stateAdapter;
 
-    instance.setState((
+    const computeNextState = (
         previousBootstrapState: Readonly<S & iCarbonReactState>,
         props: Readonly<P>
     ): Pick<S & iCarbonReactState, keyof S> | null => {
@@ -72,5 +76,17 @@ export default function deleteRestfulObjectArrays<
             [stateKey]: updatedStateProperty
         } as Pick<S & iCarbonReactState, keyof S>;
 
-    }, callback);
+    };
+
+    if (resolvedStateAdapter) {
+        const previousBootstrapState = resolvedStateAdapter.getState();
+        const nextState = computeNextState(previousBootstrapState, instance.props as Readonly<P>);
+        if (nextState !== null) {
+            resolvedStateAdapter.setState(nextState as Partial<S>);
+            callback?.();
+        }
+        return;
+    }
+
+    instance.setState(computeNextState, callback);
 }

package/src/state/stateAdapter.ts

@@ -0,0 +1,37 @@
+export interface iStateAdapter<S> {
+    getState(): S;
+    setState(partial: Partial<S>): void;
+}
+
+export class InMemoryStateAdapter<S extends Record<string, any>> implements iStateAdapter<S> {
+    private state: S;
+
+    constructor(initialState: S) {
+        this.state = initialState;
+    }
+
+    getState(): S {
+        return this.state;
+    }
+
+    setState(partial: Partial<S>): void {
+        this.state = { ...this.state, ...partial };
+    }
+
+    snapshot(): S {
+        return this.state;
+    }
+
+    hydrate(snapshot: S): void {
+        this.state = snapshot;
+    }
+}
+
+export const serializeStateSnapshot = <S>(state: S): string => JSON.stringify(state);
+
+export const deserializeStateSnapshot = <S>(serialized: string): S => JSON.parse(serialized) as S;
+
+export const getStateSnapshot = <S>(adapter: iStateAdapter<S>): S => adapter.getState();
+
+export const createInMemoryStateAdapter = <S extends Record<string, any>>(initialState: S) =>
+    new InMemoryStateAdapter(initialState);

package/src/state/updateRestfulObjectArrays.tsx

@@ -1,6 +1,7 @@
 import CarbonReact, { iCarbonReactState, tStatefulApiData } from "core/CarbonReact";
 import { KeysMatching } from "types/KeysMatching";
 import { SubsetMatching } from "types/SubsetMatching";
+import { iStateAdapter } from "./stateAdapter";
 
 export enum eUpdateInsertMethod {
     REPLACE,
@@ -21,6 +22,7 @@ export interface iUpdateRestfulObjectArrays<
     uniqueObjectId: keyof ObjectType | (keyof ObjectType)[];
     insertUpdateOrder?: eUpdateInsertMethod;
     callback?: () => void;
+    stateAdapter?: iStateAdapter<S>;
 }
 
 /**
@@ -45,16 +47,18 @@ export default function updateRestfulObjectArrays<
       uniqueObjectId,
       insertUpdateOrder = eUpdateInsertMethod.LAST,
       callback,
+      stateAdapter,
   }: iUpdateRestfulObjectArrays<ObjectType, S, P>): void {
 
     const uniqueObjectIds = Array.isArray(uniqueObjectId) ? uniqueObjectId : [uniqueObjectId];
+    const resolvedStateAdapter = stateAdapter ?? instance.stateAdapter;
 
     type ValidObject = SubsetMatching<S & iCarbonReactState, tStatefulApiData<ObjectType>>;
 
-    instance.setState((
-            previousBootstrapState: Readonly<S>,
-            props: Readonly<P>
-        ): Pick<S & iCarbonReactState, keyof S> | null => {
+    const computeNextState = (
+        previousBootstrapState: Readonly<S>,
+        props: Readonly<P>
+    ): Pick<S & iCarbonReactState, keyof S> | null => {
 
         let newOrReplacementData: ObjectType[] | null = [];
 
@@ -125,7 +129,17 @@ export default function updateRestfulObjectArrays<
             }
 
             return newState as Pick<S & iCarbonReactState, keyof S>;
-        },
-        callback
-    );
+        };
+
+    if (resolvedStateAdapter) {
+        const previousBootstrapState = resolvedStateAdapter.getState();
+        const nextState = computeNextState(previousBootstrapState, instance.props as Readonly<P>);
+        if (nextState !== null) {
+            resolvedStateAdapter.setState(nextState as Partial<S>);
+            callback?.();
+        }
+        return;
+    }
+
+    instance.setState(computeNextState, callback);
 }