cogsbox-state 0.5.456 → 0.5.458

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogsbox-state",
-  "version": "0.5.456",
+  "version": "0.5.458",
   "description": "React state management library with form controls and server sync",
   "type": "module",
   "main": "./dist/index.js",

package/src/CogsState.tsx

@@ -426,7 +426,7 @@ export type OptionsType<T extends unknown = unknown, TApiParams = never> = {
   syncUpdate?: Partial<UpdateTypeDetail>;
 
   defaultState?: T;
-  apiParams?: TApiParams;
+
   dependencies?: any[];
 };
 
@@ -535,15 +535,6 @@ export function addStateOptions<T extends unknown>(
 ) {
   return { initialState: initialState, formElements, validation } as T;
 }
-type UseCogsStateHook<
-  T extends Record<string, any>,
-  apiParams extends Record<string, any> = never,
-> = <StateKey extends keyof TransformedStateType<T>>(
-  stateKey: StateKey,
-  options?: Prettify<
-    OptionsType<TransformedStateType<T>[StateKey]> & { apiParams?: apiParams }
-  >
-) => StateObject<TransformedStateType<T>[StateKey]>;
 
 // Define the type for the options setter using the Transformed state
 type SetCogsOptionsFunc<T extends Record<string, any>> = <
@@ -553,14 +544,6 @@ type SetCogsOptionsFunc<T extends Record<string, any>> = <
   options: OptionsType<TransformedStateType<T>[StateKey]>
 ) => void;
 
-// Define the final API object shape
-type CogsApi<
-  T extends Record<string, any>,
-  apiParams extends Record<string, any> = never,
-> = {
-  useCogsState: UseCogsStateHook<T, apiParams>;
-  setCogsOptions: SetCogsOptionsFunc<T>;
-};
 export const createCogsState = <State extends Record<StateKeys, unknown>>(
   initialState: State,
   opt?: {
@@ -694,14 +677,40 @@ export const createCogsState = <State extends Record<StateKeys, unknown>>(
 
   return { useCogsState, setCogsOptions } as CogsApi<State>;
 };
+// Fix for UseCogsStateHook to support per-key apiParams
+type UseCogsStateHook<
+  T extends Record<string, any>,
+  TApiParamsMap extends Record<string, any> = Record<string, never>,
+> = <StateKey extends keyof TransformedStateType<T>>(
+  stateKey: StateKey,
+  options?: Prettify<
+    OptionsType<TransformedStateType<T>[StateKey]> & {
+      apiParams?: StateKey extends keyof TApiParamsMap
+        ? TApiParamsMap[StateKey]
+        : never;
+    }
+  >
+) => StateObject<TransformedStateType<T>[StateKey]>;
 
+// Updated CogsApi type
+type CogsApi<
+  T extends Record<string, any>,
+  TApiParamsMap extends Record<string, any> = Record<string, never>,
+> = {
+  useCogsState: UseCogsStateHook<T, TApiParamsMap>;
+  setCogsOptions: SetCogsOptionsFunc<T>;
+};
+
+// Fixed createCogsStateFromSync return type
 export function createCogsStateFromSync<
   TSyncSchema extends {
     schemas: Record<
       string,
       {
         schemas: { defaultValues: any };
-        apiParamsSchema?: any; // This contains the zod schema for params
+        api?: {
+          queryData?: any;
+        };
         [key: string]: any;
       }
     >;
@@ -714,10 +723,14 @@ export function createCogsStateFromSync<
     [K in keyof TSyncSchema['schemas']]: TSyncSchema['schemas'][K]['schemas']['defaultValues'];
   },
   {
-    [K in keyof TSyncSchema['schemas']]: TSyncSchema['schemas'][K]['apiParamsSchema'] extends z.ZodObject<any>
-      ? z.infer<TSyncSchema['schemas'][K]['apiParamsSchema']>
+    [K in keyof TSyncSchema['schemas']]: TSyncSchema['schemas'][K]['api'] extends {
+      queryData: infer Q;
+    }
+      ? Q extends { _paramType: infer P }
+        ? P
+        : never
       : never;
-  }[keyof TSyncSchema['schemas']]
+  }
 > {
   const schemas = syncSchema.schemas;
   const initialState: any = {};
@@ -728,9 +741,9 @@ export function createCogsStateFromSync<
     const entry = schemas[key];
     initialState[key] = entry?.schemas?.defaultValues || {};
 
-    // Store the apiParamsSchema for each key
-    if (entry?.apiParamsSchema) {
-      apiParamsMap[key] = entry.apiParamsSchema;
+    // Extract apiParams from the api.queryData._paramType
+    if (entry?.api?.queryData?._paramType) {
+      apiParamsMap[key] = entry.api.queryData._paramType;
     }
   }
 
@@ -738,10 +751,9 @@ export function createCogsStateFromSync<
   return createCogsState(initialState, {
     __fromSyncSchema: true,
     __syncNotifications: syncSchema.notifications,
-    __apiParamsMap: apiParamsMap, // Pass the apiParams schemas
+    __apiParamsMap: apiParamsMap,
   }) as any;
 }
-
 const {
   getInitialOptions,
   getValidationErrors,