@oimdb/react 1.0.8 → 1.1.1

package/README.md

@@ -29,8 +29,8 @@ npm install @oimdb/react @oimdb/core
 import { OIMEventQueue, OIMRICollection, OIMReactiveIndexManual } from '@oimdb/core';
 import { 
   useSelectEntitiesByPks, 
-  selectEntitiesByIndexKey,
-  selectEntityByPk 
+  useSelectEntitiesByIndexKey,
+  useSelectEntityByPk 
 } from '@oimdb/react';
 
 // Create event queue and reactive collections
@@ -46,7 +46,7 @@ const usersCollection = new OIMRICollection(queue, {
 
 ```typescript
 function UserProfile({ userId }: { userId: string }) {
-  const user = selectEntityByPk(usersCollection, userId);
+  const user = useSelectEntityByPk(usersCollection, userId);
 
   if (!user) return <div>Loading...</div>;
 
@@ -81,7 +81,7 @@ function UserList({ userIds }: { userIds: string[] }) {
 
 ```typescript
 function TeamMembers({ teamId }: { teamId: string }) {
-  const teamUsers = selectEntitiesByIndexKey(
+  const teamUsers = useSelectEntitiesByIndexKey(
     usersCollection,
     usersCollection.indexes.byTeam,
     teamId
@@ -108,8 +108,7 @@ For applications with multiple collections, use the React Context pattern for ce
 ```typescript
 import { 
   OIMRICollectionsProvider, 
-  useOIMCollectionsContext,
-  StrictCollectionsDictionary 
+  useOIMCollectionsContext
 } from '@oimdb/react';
 
 interface User {
@@ -140,9 +139,148 @@ function createCollections() {
   return { users: usersCollection, teams: teamsCollection } as const;
 }
 
-type AppCollections = StrictCollectionsDictionary<ReturnType<typeof createCollections>>;
+type AppCollections = ReturnType<typeof createCollections>;
 ```
 
+## TypeScript Typing Strategies
+
+For maximum type safety, you should properly type your collections dictionary. There are two main approaches, similar to how Redux handles state typing:
+
+### Approach 1: Using `typeof` (Recommended for Simple Cases)
+
+The simplest approach is to use TypeScript's `typeof` operator to infer types from your collection instances:
+
+```typescript
+import { OIMEventQueue, OIMRICollection, OIMReactiveIndexManual } from '@oimdb/core';
+
+interface User {
+  id: string;
+  name: string;
+  teamId: string;
+}
+
+interface Team {
+  id: string;
+  name: string;
+}
+
+// Create collections
+const queue = new OIMEventQueue();
+const userTeamIndex = new OIMReactiveIndexManual<string, string>(queue);
+const usersCollection = new OIMRICollection(queue, {
+  collectionOpts: { selectPk: (user: User) => user.id },
+  indexes: { byTeam: userTeamIndex },
+});
+
+const teamsCollection = new OIMRICollection(queue, {
+  collectionOpts: { selectPk: (team: Team) => team.id },
+  indexes: {},
+});
+
+// Infer types using typeof
+const collections = {
+  users: usersCollection,
+  teams: teamsCollection,
+} as const;
+
+// Extract the type
+type AppCollections = typeof collections;
+```
+
+**Usage:**
+```typescript
+function MyComponent() {
+  const { users, teams } = useOIMCollectionsContext<AppCollections>();
+  // users and teams are fully typed with all their generics preserved
+}
+```
+
+### Approach 2: Creating Explicit Types (Recommended for Complex Projects)
+
+For larger applications or when you need more control, create explicit type definitions similar to Redux's approach:
+
+```typescript
+import { OIMEventQueue, OIMRICollection, OIMReactiveIndexManual } from '@oimdb/core';
+import type { TOIMPk, OIMIndex, OIMReactiveIndex } from '@oimdb/core';
+
+interface User {
+  id: string;
+  name: string;
+  teamId: string;
+}
+
+interface Team {
+  id: string;
+  name: string;
+}
+
+// Define your collection types explicitly
+type UserCollection = OIMRICollection<
+  User,
+  string,
+  'byTeam',
+  string,
+  OIMIndex<string, string>,
+  OIMReactiveIndex<string, string, OIMIndex<string, string>>
+>;
+
+type TeamCollection = OIMRICollection<
+  Team,
+  string,
+  never,
+  never,
+  OIMIndex<never, never>,
+  OIMReactiveIndex<never, never, OIMIndex<never, never>>
+>;
+
+// Define your collections dictionary type
+interface AppCollections {
+  users: UserCollection;
+  teams: TeamCollection;
+}
+
+// Factory function that returns properly typed collections
+function createCollections(): AppCollections {
+  const queue = new OIMEventQueue();
+  const userTeamIndex = new OIMReactiveIndexManual<string, string>(queue);
+  
+  return {
+    users: new OIMRICollection(queue, {
+      collectionOpts: { selectPk: (user: User) => user.id },
+      indexes: { byTeam: userTeamIndex },
+    }) as UserCollection,
+    
+    teams: new OIMRICollection(queue, {
+      collectionOpts: { selectPk: (team: Team) => team.id },
+      indexes: {},
+    }) as TeamCollection,
+  };
+}
+```
+
+**Usage:**
+```typescript
+function MyComponent() {
+  const { users, teams } = useOIMCollectionsContext<AppCollections>();
+  // Full type safety with explicit types
+}
+```
+
+### When to Use Each Approach
+
+- **Use `typeof`** when:
+  - You have simple collection setups
+  - You want TypeScript to infer everything automatically
+  - You prefer less boilerplate
+  - Your collections are created in one place
+
+- **Use explicit types** when:
+  - You need to share types across multiple files
+  - You want to document your data structure explicitly
+  - You're building a library or shared module
+  - You need to ensure type consistency across your application
+  - You prefer Redux-style explicit typing patterns
+
 ### Provider Setup
 
 ```typescript
@@ -165,7 +303,7 @@ function UserDashboard() {
   
   // Use collections with hooks
   const allUsers = useSelectEntitiesByPks(users, []);
-  const teamMembers = selectEntitiesByIndexKey(
+  const teamMembers = useSelectEntitiesByIndexKey(
     users,
     users.indexes.byTeam,
     'team1'
@@ -205,7 +343,7 @@ function UserComponent() {
 
 ## API Reference
 
-### `selectEntityByPk(reactiveCollection, pk)`
+### `useSelectEntityByPk(reactiveCollection, pk)`
 
 Subscribes to a single entity from a reactive collection.
 
@@ -227,7 +365,7 @@ Subscribes to multiple entities from a reactive collection.
 **Returns:**
 - `(TEntity | undefined)[]` - Array of entities (undefined for missing entities)
 
-### `selectEntitiesByIndexKey(reactiveCollection, reactiveIndex, key)`
+### `useSelectEntitiesByIndexKey(reactiveCollection, reactiveIndex, key)`
 
 Subscribes to entities indexed by a specific key.
 
@@ -239,7 +377,7 @@ Subscribes to entities indexed by a specific key.
 **Returns:**
 - `(TEntity | undefined)[]` - Array of entities for the given index key
 
-### `selectEntitiesByIndexKeys(reactiveCollection, reactiveIndex, keys)`
+### `useSelectEntitiesByIndexKeys(reactiveCollection, reactiveIndex, keys)`
 
 Subscribes to entities indexed by multiple keys.
 
@@ -306,17 +444,9 @@ Creates a custom collections context with specific typing.
 
 ### Type Utilities
 
-#### `StrictCollectionsDictionary<T>`
-
-Ensures collections dictionary maintains exact types.
-
 #### `CollectionsDictionary`
 
-Base type for any collections dictionary.
-
-#### `ExtractEntityType<T>`, `ExtractPkType<T>`, etc.
-
-Type utilities for extracting specific types from collections.
+Base type for any collections dictionary. Use `typeof` to extract types from your collection instances, or define explicit types using `OIMRICollection` generics.
 
 ## Architecture
 
@@ -326,8 +456,8 @@ The hooks work directly with OIMDB reactive objects:
 
 ```typescript
 // Use reactive collections and indexes directly
-const user = selectEntityByPk(reactiveCollection, 'user123');
-const posts = selectEntitiesByIndexKey(reactiveCollection, reactiveIndex, 'tech');
+const user = useSelectEntityByPk(reactiveCollection, 'user123');
+const posts = useSelectEntitiesByIndexKey(reactiveCollection, reactiveIndex, 'tech');
 ```
 
 ### Event Subscription
@@ -354,7 +484,7 @@ Hooks automatically subscribe to OIMDB reactive events using `useSyncExternalSto
 ```typescript
 import React from 'react';
 import { OIMEventQueue, OIMRICollection, OIMReactiveIndexManual } from '@oimdb/core';
-import { selectEntityByPk, useSelectEntitiesByPks, selectEntitiesByIndexKey } from '@oimdb/react';
+import { useSelectEntityByPk, useSelectEntitiesByPks, useSelectEntitiesByIndexKey } from '@oimdb/react';
 
 interface User {
   id: string;
@@ -378,7 +508,7 @@ const usersCollection = createUserCollection();
 
 // Component
 function UserProfile({ userId }: { userId: string }) {
-  const user = selectEntityByPk(usersCollection, userId);
+  const user = useSelectEntityByPk(usersCollection, userId);
   
   if (!user) return <div>Loading...</div>;
   
@@ -386,7 +516,7 @@ function UserProfile({ userId }: { userId: string }) {
 }
 
 function TeamDashboard({ teamId }: { teamId: string }) {
-  const teamMembers = selectEntitiesByIndexKey(
+  const teamMembers = useSelectEntitiesByIndexKey(
     usersCollection,
     usersCollection.indexes.byTeam,
     teamId
@@ -445,9 +575,9 @@ const users = useEntities(userStorage, userIds);
 const posts = useIndex(postStorage, categoryIndex, 'tech');
 
 // v1.x - Reactive collections
-const user = selectEntityByPk(reactiveCollection, 'user123');
+const user = useSelectEntityByPk(reactiveCollection, 'user123');
 const users = useSelectEntitiesByPks(reactiveCollection, userIds);
-const posts = selectEntitiesByIndexKey(reactiveCollection, reactiveIndex, 'tech');
+const posts = useSelectEntitiesByIndexKey(reactiveCollection, reactiveIndex, 'tech');
 ```
 
 ### Collection Creation
@@ -464,7 +594,7 @@ const usersCollection = new OIMRICollection(queue, {
   collectionOpts: { selectPk: (user: User) => user.id },
   indexes: {},
 });
-const user = selectEntityByPk(usersCollection, userId);
+const user = useSelectEntityByPk(usersCollection, userId);
 ```
 
 ### Context API
@@ -481,7 +611,7 @@ const collections = { users: usersCollection };
 
 ### Key Changes
 
-- **Hook naming**: More explicit names like `selectEntityByPk` vs `useEntity`
+- **Hook naming**: More explicit names like `useSelectEntityByPk` vs `useEntity`
 - **Parameters**: Direct reactive collection objects instead of storage abstractions
 - **Context**: New context API for centralized collection management
 - **Type safety**: Enhanced TypeScript support with better inference

package/dist/index.cjs

@@ -23,11 +23,11 @@ __export(index_exports, {
   OIMRICollectionsContext: () => OIMRICollectionsContext,
   OIMRICollectionsProvider: () => OIMRICollectionsProvider,
   createOIMCollectionsContext: () => createOIMCollectionsContext,
-  selectEntitiesByIndexKey: () => selectEntitiesByIndexKey,
-  selectEntitiesByIndexKeys: () => selectEntitiesByIndexKeys,
-  selectEntityByPk: () => selectEntityByPk,
   useOIMCollectionsContext: () => useOIMCollectionsContext,
+  useSelectEntitiesByIndexKey: () => useSelectEntitiesByIndexKey,
+  useSelectEntitiesByIndexKeys: () => useSelectEntitiesByIndexKeys,
   useSelectEntitiesByPks: () => useSelectEntitiesByPks,
+  useSelectEntityByPk: () => useSelectEntityByPk,
   useSelectPksByIndexKey: () => useSelectPksByIndexKey,
   useSelectPksByIndexKeys: () => useSelectPksByIndexKeys
 });
@@ -38,6 +38,7 @@ var import_react = require("react");
 var import_react2 = require("react");
 var EMPTY_ARRAY = [];
 var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
+  const isInitialized = (0, import_react.useRef)(false);
   const snapshotValueRef = (0, import_react.useRef)(
     keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat()
   );
@@ -56,6 +57,12 @@ var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
       osc.current();
     };
     reactiveIndex.updateEventEmitter.subscribeOnKeys(keys, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
+      osc.current();
+    }
     return () => {
       reactiveIndex.updateEventEmitter.unsubscribeFromKeys(keys, list);
     };
@@ -73,6 +80,7 @@ var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
   return snapshot;
 };
 var useSelectPksByIndexKey = (reactiveIndex, key) => {
+  const isInitialized = (0, import_react.useRef)(false);
   const snapshotValueRef = (0, import_react.useRef)(
     Array.from(reactiveIndex.getPksByKey(key))
   );
@@ -93,6 +101,14 @@ var useSelectPksByIndexKey = (reactiveIndex, key) => {
       osc.current();
     };
     reactiveIndex.updateEventEmitter.subscribeOnKey(key, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = Array.from(
+        reactiveIndex.getPksByKey(key)
+      );
+      osc.current();
+    }
     return () => {
       reactiveIndex.updateEventEmitter.unsubscribeFromKey(key, list);
     };
@@ -109,7 +125,8 @@ var useSelectPksByIndexKey = (reactiveIndex, key) => {
   );
   return snapshot;
 };
-var selectEntityByPk = (reactiveCollection, pk) => {
+var useSelectEntityByPk = (reactiveCollection, pk) => {
+  const isInitialized = (0, import_react.useRef)(false);
   const snapshotValueRef = (0, import_react.useRef)(
     reactiveCollection.getOneByPk(pk)
   );
@@ -128,6 +145,12 @@ var selectEntityByPk = (reactiveCollection, pk) => {
       osc.current();
     };
     reactiveCollection.updateEventEmitter.subscribeOnKey(pk, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = reactiveCollection.getOneByPk(pk);
+      osc.current();
+    }
     return () => {
       reactiveCollection.updateEventEmitter.unsubscribeFromKey(pk, list);
     };
@@ -141,6 +164,7 @@ var selectEntityByPk = (reactiveCollection, pk) => {
   return snapshot;
 };
 var useSelectEntitiesByPks = (reactiveCollection, pks) => {
+  const isInitialized = (0, import_react.useRef)(false);
   const snapshotValueRef = (0, import_react.useRef)(
     pks.map((pk) => reactiveCollection.getOneByPk(pk))
   );
@@ -161,6 +185,14 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
       osc.current();
     };
     reactiveCollection.updateEventEmitter.subscribeOnKeys(pks, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = pks.map(
+        (pk) => reactiveCollection.getOneByPk(pk)
+      );
+      osc.current();
+    }
     return () => {
       reactiveCollection.updateEventEmitter.unsubscribeFromKeys(
         pks,
@@ -180,7 +212,7 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
   );
   return snapshot;
 };
-var selectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
+var useSelectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
   const pks = useSelectPksByIndexKey(reactiveIndex, key);
   return useSelectEntitiesByPks(
     reactiveCollection,
@@ -190,7 +222,7 @@ var selectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
 var unique = (array) => {
   return Array.from(new Set(array));
 };
-var selectEntitiesByIndexKeys = (reactiveCollection, reactiveIndex, keys) => {
+var useSelectEntitiesByIndexKeys = (reactiveCollection, reactiveIndex, keys) => {
   const pks = useSelectPksByIndexKeys(reactiveIndex, keys) || EMPTY_ARRAY;
   return useSelectEntitiesByPks(reactiveCollection, unique(Array.from(pks)));
 };
@@ -225,11 +257,11 @@ function useOIMCollectionsContext(context) {
   OIMRICollectionsContext,
   OIMRICollectionsProvider,
   createOIMCollectionsContext,
-  selectEntitiesByIndexKey,
-  selectEntitiesByIndexKeys,
-  selectEntityByPk,
   useOIMCollectionsContext,
+  useSelectEntitiesByIndexKey,
+  useSelectEntitiesByIndexKeys,
   useSelectEntitiesByPks,
+  useSelectEntityByPk,
   useSelectPksByIndexKey,
   useSelectPksByIndexKeys
 });

package/dist/index.d.cts

@@ -5,14 +5,12 @@ import { ReactNode } from 'react';
 
 declare const useSelectPksByIndexKeys: <TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TPk[] | null;
 declare const useSelectPksByIndexKey: <TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TPk[] | null;
-declare const selectEntityByPk: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pk: TPk) => TEntity | undefined;
+declare const useSelectEntityByPk: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pk: TPk) => TEntity | undefined;
 declare const useSelectEntitiesByPks: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pks: readonly TPk[]) => readonly TEntity[] | null;
-declare const selectEntitiesByIndexKey: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TEntity[] | null;
-declare const selectEntitiesByIndexKeys: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TEntity[] | null;
+declare const useSelectEntitiesByIndexKey: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TEntity[] | null;
+declare const useSelectEntitiesByIndexKeys: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TEntity[] | null;
 
-type AnyOIMRICollection = OIMRICollection<object, TOIMPk, string, TOIMPk, any, any>;
-type CollectionsDictionary = Record<string, AnyOIMRICollection>;
-type TypedCollectionsDictionary<T extends CollectionsDictionary> = T;
+type CollectionsDictionary = Record<string, OIMRICollection<object, string, string, string, never, never>>;
 type OIMContextValue<T extends CollectionsDictionary = CollectionsDictionary> = T | null;
 declare const OIMRICollectionsContext: React.Context<OIMContextValue<CollectionsDictionary>>;
 declare function createOIMCollectionsContext<T extends CollectionsDictionary>(): React.Context<OIMContextValue<T>>;
@@ -23,23 +21,5 @@ interface OIMRICollectionsProviderProps<T extends CollectionsDictionary> {
 }
 declare function OIMRICollectionsProvider<T extends CollectionsDictionary>({ collections, children, context, }: OIMRICollectionsProviderProps<T>): react_jsx_runtime.JSX.Element;
 declare function useOIMCollectionsContext<T extends CollectionsDictionary = CollectionsDictionary>(context?: React.Context<OIMContextValue<T>>): T;
-type ExtractEntityType<T> = T extends OIMRICollection<infer E, TOIMPk, string, TOIMPk, any, any> ? E : never;
-type ExtractPkType<T> = T extends OIMRICollection<object, infer P, string, TOIMPk, any, any> ? P : never;
-type ExtractIndexNameType<T> = T extends OIMRICollection<object, TOIMPk, infer IN, TOIMPk, any, any> ? IN : never;
-type ExtractIndexKeyType<T> = T extends OIMRICollection<object, TOIMPk, string, infer IK, any, any> ? IK : never;
-type CreateCollectionsDictionary<T extends Record<string, AnyOIMRICollection>> = {
-    [K in keyof T]: T[K];
-};
-type ExtractCollectionSignature<T> = T extends OIMRICollection<infer E, infer P, infer IN, infer IK, infer I, infer RI> ? {
-    entity: E;
-    pk: P;
-    indexName: IN;
-    indexKey: IK;
-    index: I;
-    reactiveIndex: RI;
-} : never;
-type StrictCollectionsDictionary<T> = {
-    [K in keyof T]: T[K] extends OIMRICollection<infer E, infer P, infer IN, infer IK, infer I, infer RI> ? OIMRICollection<E, P, IN, IK, I, RI> : never;
-};
 
-export { type AnyOIMRICollection, type CollectionsDictionary, type CreateCollectionsDictionary, type ExtractCollectionSignature, type ExtractEntityType, type ExtractIndexKeyType, type ExtractIndexNameType, type ExtractPkType, type OIMContextValue, OIMRICollectionsContext, OIMRICollectionsProvider, type OIMRICollectionsProviderProps, type StrictCollectionsDictionary, type TypedCollectionsDictionary, createOIMCollectionsContext, selectEntitiesByIndexKey, selectEntitiesByIndexKeys, selectEntityByPk, useOIMCollectionsContext, useSelectEntitiesByPks, useSelectPksByIndexKey, useSelectPksByIndexKeys };
+export { type CollectionsDictionary, type OIMContextValue, OIMRICollectionsContext, OIMRICollectionsProvider, type OIMRICollectionsProviderProps, createOIMCollectionsContext, useOIMCollectionsContext, useSelectEntitiesByIndexKey, useSelectEntitiesByIndexKeys, useSelectEntitiesByPks, useSelectEntityByPk, useSelectPksByIndexKey, useSelectPksByIndexKeys };

package/dist/index.d.ts

@@ -5,14 +5,12 @@ import { ReactNode } from 'react';
 
 declare const useSelectPksByIndexKeys: <TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TPk[] | null;
 declare const useSelectPksByIndexKey: <TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TPk[] | null;
-declare const selectEntityByPk: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pk: TPk) => TEntity | undefined;
+declare const useSelectEntityByPk: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pk: TPk) => TEntity | undefined;
 declare const useSelectEntitiesByPks: <TEntity extends object, TPk extends TOIMPk>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, pks: readonly TPk[]) => readonly TEntity[] | null;
-declare const selectEntitiesByIndexKey: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TEntity[] | null;
-declare const selectEntitiesByIndexKeys: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TEntity[] | null;
+declare const useSelectEntitiesByIndexKey: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, key: TKey) => readonly TEntity[] | null;
+declare const useSelectEntitiesByIndexKeys: <TEntity extends object, TPk extends TOIMPk, TKey extends TOIMPk, TIndex extends OIMIndex<TKey, TPk>>(reactiveCollection: OIMReactiveCollection<TEntity, TPk>, reactiveIndex: OIMReactiveIndex<TKey, TPk, TIndex>, keys: readonly TKey[]) => readonly TEntity[] | null;
 
-type AnyOIMRICollection = OIMRICollection<object, TOIMPk, string, TOIMPk, any, any>;
-type CollectionsDictionary = Record<string, AnyOIMRICollection>;
-type TypedCollectionsDictionary<T extends CollectionsDictionary> = T;
+type CollectionsDictionary = Record<string, OIMRICollection<object, string, string, string, never, never>>;
 type OIMContextValue<T extends CollectionsDictionary = CollectionsDictionary> = T | null;
 declare const OIMRICollectionsContext: React.Context<OIMContextValue<CollectionsDictionary>>;
 declare function createOIMCollectionsContext<T extends CollectionsDictionary>(): React.Context<OIMContextValue<T>>;
@@ -23,23 +21,5 @@ interface OIMRICollectionsProviderProps<T extends CollectionsDictionary> {
 }
 declare function OIMRICollectionsProvider<T extends CollectionsDictionary>({ collections, children, context, }: OIMRICollectionsProviderProps<T>): react_jsx_runtime.JSX.Element;
 declare function useOIMCollectionsContext<T extends CollectionsDictionary = CollectionsDictionary>(context?: React.Context<OIMContextValue<T>>): T;
-type ExtractEntityType<T> = T extends OIMRICollection<infer E, TOIMPk, string, TOIMPk, any, any> ? E : never;
-type ExtractPkType<T> = T extends OIMRICollection<object, infer P, string, TOIMPk, any, any> ? P : never;
-type ExtractIndexNameType<T> = T extends OIMRICollection<object, TOIMPk, infer IN, TOIMPk, any, any> ? IN : never;
-type ExtractIndexKeyType<T> = T extends OIMRICollection<object, TOIMPk, string, infer IK, any, any> ? IK : never;
-type CreateCollectionsDictionary<T extends Record<string, AnyOIMRICollection>> = {
-    [K in keyof T]: T[K];
-};
-type ExtractCollectionSignature<T> = T extends OIMRICollection<infer E, infer P, infer IN, infer IK, infer I, infer RI> ? {
-    entity: E;
-    pk: P;
-    indexName: IN;
-    indexKey: IK;
-    index: I;
-    reactiveIndex: RI;
-} : never;
-type StrictCollectionsDictionary<T> = {
-    [K in keyof T]: T[K] extends OIMRICollection<infer E, infer P, infer IN, infer IK, infer I, infer RI> ? OIMRICollection<E, P, IN, IK, I, RI> : never;
-};
 
-export { type AnyOIMRICollection, type CollectionsDictionary, type CreateCollectionsDictionary, type ExtractCollectionSignature, type ExtractEntityType, type ExtractIndexKeyType, type ExtractIndexNameType, type ExtractPkType, type OIMContextValue, OIMRICollectionsContext, OIMRICollectionsProvider, type OIMRICollectionsProviderProps, type StrictCollectionsDictionary, type TypedCollectionsDictionary, createOIMCollectionsContext, selectEntitiesByIndexKey, selectEntitiesByIndexKeys, selectEntityByPk, useOIMCollectionsContext, useSelectEntitiesByPks, useSelectPksByIndexKey, useSelectPksByIndexKeys };
+export { type CollectionsDictionary, type OIMContextValue, OIMRICollectionsContext, OIMRICollectionsProvider, type OIMRICollectionsProviderProps, createOIMCollectionsContext, useOIMCollectionsContext, useSelectEntitiesByIndexKey, useSelectEntitiesByIndexKeys, useSelectEntitiesByPks, useSelectEntityByPk, useSelectPksByIndexKey, useSelectPksByIndexKeys };

package/dist/index.js

@@ -3,6 +3,7 @@ import { useMemo, useRef, useEffect } from "react";
 import { useSyncExternalStore } from "react";
 var EMPTY_ARRAY = [];
 var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
+  const isInitialized = useRef(false);
   const snapshotValueRef = useRef(
     keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat()
   );
@@ -21,6 +22,12 @@ var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
       osc.current();
     };
     reactiveIndex.updateEventEmitter.subscribeOnKeys(keys, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
+      osc.current();
+    }
     return () => {
       reactiveIndex.updateEventEmitter.unsubscribeFromKeys(keys, list);
     };
@@ -38,6 +45,7 @@ var useSelectPksByIndexKeys = (reactiveIndex, keys) => {
   return snapshot;
 };
 var useSelectPksByIndexKey = (reactiveIndex, key) => {
+  const isInitialized = useRef(false);
   const snapshotValueRef = useRef(
     Array.from(reactiveIndex.getPksByKey(key))
   );
@@ -58,6 +66,14 @@ var useSelectPksByIndexKey = (reactiveIndex, key) => {
       osc.current();
     };
     reactiveIndex.updateEventEmitter.subscribeOnKey(key, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = Array.from(
+        reactiveIndex.getPksByKey(key)
+      );
+      osc.current();
+    }
     return () => {
       reactiveIndex.updateEventEmitter.unsubscribeFromKey(key, list);
     };
@@ -74,7 +90,8 @@ var useSelectPksByIndexKey = (reactiveIndex, key) => {
   );
   return snapshot;
 };
-var selectEntityByPk = (reactiveCollection, pk) => {
+var useSelectEntityByPk = (reactiveCollection, pk) => {
+  const isInitialized = useRef(false);
   const snapshotValueRef = useRef(
     reactiveCollection.getOneByPk(pk)
   );
@@ -93,6 +110,12 @@ var selectEntityByPk = (reactiveCollection, pk) => {
       osc.current();
     };
     reactiveCollection.updateEventEmitter.subscribeOnKey(pk, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = reactiveCollection.getOneByPk(pk);
+      osc.current();
+    }
     return () => {
       reactiveCollection.updateEventEmitter.unsubscribeFromKey(pk, list);
     };
@@ -106,6 +129,7 @@ var selectEntityByPk = (reactiveCollection, pk) => {
   return snapshot;
 };
 var useSelectEntitiesByPks = (reactiveCollection, pks) => {
+  const isInitialized = useRef(false);
   const snapshotValueRef = useRef(
     pks.map((pk) => reactiveCollection.getOneByPk(pk))
   );
@@ -126,6 +150,14 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
       osc.current();
     };
     reactiveCollection.updateEventEmitter.subscribeOnKeys(pks, list);
+    if (!isInitialized.current) {
+      isInitialized.current = true;
+    } else {
+      snapshotValueRef.current = pks.map(
+        (pk) => reactiveCollection.getOneByPk(pk)
+      );
+      osc.current();
+    }
     return () => {
       reactiveCollection.updateEventEmitter.unsubscribeFromKeys(
         pks,
@@ -145,7 +177,7 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
   );
   return snapshot;
 };
-var selectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
+var useSelectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
   const pks = useSelectPksByIndexKey(reactiveIndex, key);
   return useSelectEntitiesByPks(
     reactiveCollection,
@@ -155,7 +187,7 @@ var selectEntitiesByIndexKey = (reactiveCollection, reactiveIndex, key) => {
 var unique = (array) => {
   return Array.from(new Set(array));
 };
-var selectEntitiesByIndexKeys = (reactiveCollection, reactiveIndex, keys) => {
+var useSelectEntitiesByIndexKeys = (reactiveCollection, reactiveIndex, keys) => {
   const pks = useSelectPksByIndexKeys(reactiveIndex, keys) || EMPTY_ARRAY;
   return useSelectEntitiesByPks(reactiveCollection, unique(Array.from(pks)));
 };
@@ -189,11 +221,11 @@ export {
   OIMRICollectionsContext,
   OIMRICollectionsProvider,
   createOIMCollectionsContext,
-  selectEntitiesByIndexKey,
-  selectEntitiesByIndexKeys,
-  selectEntityByPk,
   useOIMCollectionsContext,
+  useSelectEntitiesByIndexKey,
+  useSelectEntitiesByIndexKeys,
   useSelectEntitiesByPks,
+  useSelectEntityByPk,
   useSelectPksByIndexKey,
   useSelectPksByIndexKeys
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oimdb/react",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "React integration for OIMDB - Hooks for selection and subscription with external storage",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -24,22 +24,28 @@
   },
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
+    "test": "jest",
+    "type-check": "tsc --noEmit",
     "clean": "rimraf dist",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run type-check && npm test && npm run build"
   },
   "files": [
     "dist"
   ],
   "peerDependencies": {
-    "@oimdb/core": "^1.0.6",
+    "@oimdb/core": "^1.1.0",
     "react": "^18.0.0"
   },
   "devDependencies": {
-    "tsup": "^8.5.0",
-    "typescript": "^5.2.2",
-    "rimraf": "^5.0.5",
+    "@types/jest": "^29.5.8",
+    "@types/react": "^18.0.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^18.0.0",
-    "@types/react": "^18.0.0"
+    "rimraf": "^5.0.5",
+    "ts-jest": "^29.1.1",
+    "tsup": "^8.5.0",
+    "typescript": "^5.2.2"
   },
   "author": "Andrei Baikov",
   "license": "MIT"