cogsbox-state 0.5.451 → 0.5.453

package/package.json

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

package/src/CogsState.tsx

@@ -38,6 +38,7 @@ import { Operation } from 'fast-json-patch';
 import { useInView } from 'react-intersection-observer';
 import * as z3 from 'zod/v3';
 import z, * as z4 from 'zod/v4';
+import { keyof } from 'zod';
 
 type Prettify<T> = T extends any ? { [K in keyof T]: T[K] } : never;
 
@@ -683,48 +684,7 @@ export const createCogsState = <State extends Record<StateKeys, unknown>>(
 
   return { useCogsState, setCogsOptions } as CogsApi<State>;
 };
-
-// First, let's create a proper type to extract API params from the sync schema
-type ExtractApiParamsFromSchema<T> = T extends {
-  apiParamsSchema: z.ZodObject<infer U>;
-}
-  ? { [K in keyof U]: z.infer<U[K]> }
-  : never;
-
-// Type to check if a schema has API params
-type HasApiParams<T> = T extends { apiParamsSchema: z.ZodObject<any> }
-  ? true
-  : false;
-
-// Create the proper return type for useCogsState
-type UseCogsStateFromSync<
-  TSyncSchema extends {
-    schemas: Record<
-      string,
-      { schemas: { defaultValues: any }; apiParamsSchema?: z.ZodObject<any> }
-    >;
-  },
-> = {
-  // For schemas WITH API params - require apiParams
-  <K extends keyof TSyncSchema['schemas']>(
-    stateKey: K,
-    options: HasApiParams<TSyncSchema['schemas'][K]> extends true
-      ? OptionsType<TSyncSchema['schemas'][K]['schemas']['defaultValues']> & {
-          apiParams: ExtractApiParamsFromSchema<TSyncSchema['schemas'][K]>;
-        }
-      : never
-  ): StateObject<TSyncSchema['schemas'][K]['schemas']['defaultValues']>;
-
-  // For schemas WITHOUT API params - apiParams is optional
-  <K extends keyof TSyncSchema['schemas']>(
-    stateKey: K,
-    options?: HasApiParams<TSyncSchema['schemas'][K]> extends true
-      ? never
-      : OptionsType<TSyncSchema['schemas'][K]['schemas']['defaultValues']>
-  ): StateObject<TSyncSchema['schemas'][K]['schemas']['defaultValues']>;
-};
-// Simplified approach that actually works
-// Fixed version that properly handles the apiParams type
+// Fixed version that properly handles the apiParams type without complex inference
 export function createCogsStateFromSync<
   TSyncSchema extends {
     schemas: Record<
@@ -737,7 +697,20 @@ export function createCogsStateFromSync<
     >;
     notifications: Record<string, any>;
   },
->(syncSchema: TSyncSchema) {
+>(
+  syncSchema: TSyncSchema
+): {
+  useCogsState: <K extends keyof TSyncSchema['schemas']>(
+    stateKey: K,
+    options?: OptionsType<
+      TSyncSchema['schemas'][K]['schemas']['defaultValues'],
+      any
+    > & {
+      apiParams?: any;
+    }
+  ) => StateObject<TSyncSchema['schemas'][K]['schemas']['defaultValues']>;
+  setCogsOptions: any;
+} {
   const schemas = syncSchema.schemas;
   const initialState: any = {};
 
@@ -753,19 +726,19 @@ export function createCogsStateFromSync<
     __syncNotifications: syncSchema.notifications,
   });
 
+  // Create the properly typed useCogsState function
   const useCogsState = <K extends keyof TSyncSchema['schemas']>(
     stateKey: K,
-    options?: Omit<
-      OptionsType<TSyncSchema['schemas'][K]['schemas']['defaultValues']>,
-      'apiParams'
+    options?: OptionsType<
+      TSyncSchema['schemas'][K]['schemas']['defaultValues'],
+      any
     > & {
-      apiParams?: any; // Allow any apiParams, validate at runtime
+      apiParams?: any;
     }
   ): StateObject<TSyncSchema['schemas'][K]['schemas']['defaultValues']> => {
     // Runtime validation of API params
     const schemaEntry = schemas[stateKey as keyof typeof schemas];
     if (schemaEntry?.apiParamsSchema && options?.apiParams) {
-      // Validate the API params at runtime
       const result = schemaEntry.apiParamsSchema.safeParse(options.apiParams);
       if (!result.success) {
         throw new Error(
@@ -774,14 +747,9 @@ export function createCogsStateFromSync<
       }
     }
 
-    // Create options without apiParams for the base call
-    const { apiParams, ...baseOptions } = options || {};
-
-    // Cast to the correct type since we know it's properly typed
-    return baseApi.useCogsState(
-      stateKey as any,
-      baseOptions as any
-    ) as StateObject<TSyncSchema['schemas'][K]['schemas']['defaultValues']>;
+    return baseApi.useCogsState(stateKey as any, options as any) as StateObject<
+      TSyncSchema['schemas'][K]['schemas']['defaultValues']
+    >;
   };
 
   return {