cogsbox-state 0.5.439 → 0.5.441

package/package.json

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

package/src/CogsState.tsx

@@ -554,44 +554,7 @@ type CogsApi<T extends Record<string, any>> = {
   setCogsOptions: SetCogsOptionsFunc<T>;
 };
 
-type ExtractStateFromSyncSchema<T> = T extends {
-  schemas: infer S;
-  notifications: any;
-}
-  ? S extends Record<string, any>
-    ? {
-        [K in keyof S]: S[K] extends { rawSchema: infer R }
-          ? R
-          : S[K] extends { schemas: { defaults: infer D } }
-            ? D
-            : never;
-      }
-    : never
-  : never;
-
-// Type to extract just the sync schema structure
-type SyncSchemaStructure<T = any> = {
-  schemas: Record<
-    string,
-    {
-      rawSchema?: any;
-      schemas?: {
-        sql?: any;
-        client?: any;
-        validation?: any;
-        defaults?: any;
-      };
-      api?: {
-        initialData?: string;
-        update?: string;
-      };
-      validate?: (data: unknown, ctx: any) => any;
-      validateClient?: (data: unknown) => any;
-      serializable?: any;
-    }
-  >;
-  notifications: Record<string, (state: any, context: any) => any>;
-};
+// Minimal change - just add a second parameter to detect sync schema
 export const createCogsState = <State extends Record<StateKeys, unknown>>(
   initialState: State,
   opt?: {
@@ -614,6 +577,7 @@ export const createCogsState = <State extends Record<StateKeys, unknown>>(
       .getState()
       .setInitialStateOptions('__notifications', opt.__syncNotifications);
   }
+
   // ... rest of your existing createCogsState code unchanged ...
 
   Object.keys(statePart).forEach((key) => {
@@ -712,42 +676,39 @@ export const createCogsState = <State extends Record<StateKeys, unknown>>(
 
   return { useCogsState, setCogsOptions } as CogsApi<State>;
 };
-
-type ExtractStateFromSync<T> = T extends { schemas: infer S }
-  ? S extends Record<string, any>
-    ? {
-        [K in keyof S]: S[K] extends { rawSchema: infer R }
-          ? R
-          : S[K] extends { schemas: { defaults: infer D } }
-            ? D
-            : any;
-      }
-    : never
-  : never;
-
-// Then create a simple helper that extracts state from sync schema
+// or wherever your shape types are
 export function createCogsStateFromSync<
-  TSyncSchema extends { schemas: Record<string, any>; notifications: any },
->(syncSchema: TSyncSchema): CogsApi<ExtractStateFromSync<TSyncSchema>> {
-  // Extract initial state
-  type StateType = ExtractStateFromSync<TSyncSchema>;
-  const initialState = {} as StateType;
-
-  for (const key in syncSchema.schemas) {
-    const entry = syncSchema.schemas[key];
-    if (entry.rawSchema) {
-      initialState[key as keyof StateType] = entry.rawSchema;
-    } else if (entry.schemas?.defaults) {
-      initialState[key as keyof StateType] = entry.schemas.defaults;
-    } else {
-      initialState[key as keyof StateType] = {} as any;
-    }
+  TSyncSchema extends {
+    schemas: Record<
+      string,
+      {
+        schemas: { defaults: any };
+        [key: string]: any;
+      }
+    >;
+    notifications: Record<string, any>;
+  },
+>(
+  syncSchema: TSyncSchema
+): CogsApi<{
+  [K in keyof TSyncSchema['schemas']]: TSyncSchema['schemas'][K]['schemas']['defaults'];
+}> {
+  const schemas = syncSchema.schemas;
+  const initialState: any = {};
+
+  // Extract defaults from each entry
+  for (const key in schemas) {
+    const entry = schemas[key]!;
+    initialState[key] = entry.schemas?.defaults || {};
   }
 
-  return createCogsState(initialState, {
-    __fromSyncSchema: true,
-    __syncNotifications: syncSchema.notifications,
-  });
+  // Store sync metadata
+  // getGlobalStore.getState().setInitialStateOptions('__syncSchema', syncSchema);
+  getGlobalStore
+    .getState()
+    .setInitialStateOptions('__notifications', syncSchema.notifications);
+
+  return createCogsState(initialState);
 }
 
 const {