react-optimistic-chat 3.0.0 → 3.0.1

package/dist/index.d.mts

@@ -1,7 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React$1 from 'react';
 import * as _tanstack_query_core from '@tanstack/query-core';
-import { InfiniteData } from '@tanstack/react-query';
 
 type ChatRole = "AI" | "USER";
 type BaseMessage = {
@@ -103,24 +102,33 @@ type CommonProps = {
 type Props<Raw> = CommonProps & (MessageProps | RawProps<Raw>);
 declare function ChatContainer<Raw>(props: Props<Raw>): react_jsx_runtime.JSX.Element;
 
-type ExtractCustom$1<Raw> = Omit<Raw, keyof BaseMessage>;
-type Options$2<Raw> = {
+type KeyMap<Raw extends Record<string, unknown>> = {
+    id: keyof Raw;
+    role: keyof Raw;
+    content: keyof Raw;
+};
+type Custom<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>> = Omit<Raw, Map["id" | "role" | "content"]>;
+
+type MessagePage<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>> = Message<Custom<Raw, Map>>[];
+
+type Options$2<Raw extends Record<string, unknown>, Map extends KeyMap<Raw> = KeyMap<Raw>> = {
     queryKey: readonly unknown[];
     queryFn: (pageParam: unknown) => Promise<Raw[]>;
     initialPageParam: unknown;
-    getNextPageParam: (lastPage: Message<ExtractCustom$1<Raw>>[], allPages: Message<ExtractCustom$1<Raw>>[][]) => unknown;
+    getNextPageParam: (lastPage: MessagePage<Raw, Map>, allPages: MessagePage<Raw, Map>[]) => unknown;
     mutationFn: (content: string) => Promise<Raw>;
-    map: (raw: Raw) => MessageCore;
+    keyMap: Map;
+    roleResolver: (value: Raw[Map["role"]]) => MessageCore["role"];
     onError?: (error: unknown) => void;
     staleTime?: number;
     gcTime?: number;
 };
-declare function useChat<Raw extends object>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, map, onError, staleTime, gcTime, }: Options$2<Raw>): {
-    messages: Message<ExtractCustom$1<Raw>>[];
+declare function useChat<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, keyMap, roleResolver, onError, staleTime, gcTime, }: Options$2<Raw, Map>): {
+    messages: Message<Custom<Raw, Map>>[];
     sendUserMessage: (content: string) => void;
     isPending: boolean;
     isInitialLoading: boolean;
-    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<InfiniteData<Message<ExtractCustom$1<Raw>>[], unknown>, Error>>;
+    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<_tanstack_query_core.InfiniteData<MessagePage<Raw, Map>, unknown>, Error>>;
     hasNextPage: boolean;
     isFetchingNextPage: boolean;
 };
@@ -195,26 +203,26 @@ declare function useBrowserSpeechRecognition({ lang, onStart, onEnd, onError, }?
     onTranscript: (text: string) => void;
 };
 
-type ExtractCustom<Raw> = Omit<Raw, keyof BaseMessage>;
-type Options<Raw> = {
+type Options<Raw extends Record<string, unknown>, Map extends KeyMap<Raw> = KeyMap<Raw>> = {
     queryKey: readonly unknown[];
     queryFn: (pageParam: unknown) => Promise<Raw[]>;
     initialPageParam: unknown;
-    getNextPageParam: (lastPage: Message<ExtractCustom<Raw>>[], allPages: Message<ExtractCustom<Raw>>[][]) => unknown;
+    getNextPageParam: (lastPage: MessagePage<Raw, Map>, allPages: MessagePage<Raw, Map>[]) => unknown;
     mutationFn: (content: string) => Promise<Raw>;
-    map: (raw: Raw) => MessageCore;
+    keyMap: Map;
+    roleResolver: (value: Raw[Map["role"]]) => MessageCore["role"];
     voice: VoiceRecognition;
     onError?: (error: unknown) => void;
     staleTime?: number;
     gcTime?: number;
 };
-declare function useVoiceChat<Raw extends object>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, map, voice, onError, staleTime, gcTime, }: Options<Raw>): {
-    messages: Message<ExtractCustom<Raw>>[];
+declare function useVoiceChat<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, keyMap, roleResolver, voice, onError, staleTime, gcTime, }: Options<Raw, Map>): {
+    messages: Message<Custom<Raw, Map>>[];
     isPending: boolean;
     isInitialLoading: boolean;
     startRecording: () => Promise<void>;
     stopRecording: () => void;
-    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<InfiniteData<Message<ExtractCustom<Raw>>[], unknown>, Error>>;
+    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<_tanstack_query_core.InfiniteData<MessagePage<Raw, Map>, unknown>, Error>>;
     hasNextPage: boolean;
     isFetchingNextPage: boolean;
 };

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React$1 from 'react';
 import * as _tanstack_query_core from '@tanstack/query-core';
-import { InfiniteData } from '@tanstack/react-query';
 
 type ChatRole = "AI" | "USER";
 type BaseMessage = {
@@ -103,24 +102,33 @@ type CommonProps = {
 type Props<Raw> = CommonProps & (MessageProps | RawProps<Raw>);
 declare function ChatContainer<Raw>(props: Props<Raw>): react_jsx_runtime.JSX.Element;
 
-type ExtractCustom$1<Raw> = Omit<Raw, keyof BaseMessage>;
-type Options$2<Raw> = {
+type KeyMap<Raw extends Record<string, unknown>> = {
+    id: keyof Raw;
+    role: keyof Raw;
+    content: keyof Raw;
+};
+type Custom<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>> = Omit<Raw, Map["id" | "role" | "content"]>;
+
+type MessagePage<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>> = Message<Custom<Raw, Map>>[];
+
+type Options$2<Raw extends Record<string, unknown>, Map extends KeyMap<Raw> = KeyMap<Raw>> = {
     queryKey: readonly unknown[];
     queryFn: (pageParam: unknown) => Promise<Raw[]>;
     initialPageParam: unknown;
-    getNextPageParam: (lastPage: Message<ExtractCustom$1<Raw>>[], allPages: Message<ExtractCustom$1<Raw>>[][]) => unknown;
+    getNextPageParam: (lastPage: MessagePage<Raw, Map>, allPages: MessagePage<Raw, Map>[]) => unknown;
     mutationFn: (content: string) => Promise<Raw>;
-    map: (raw: Raw) => MessageCore;
+    keyMap: Map;
+    roleResolver: (value: Raw[Map["role"]]) => MessageCore["role"];
     onError?: (error: unknown) => void;
     staleTime?: number;
     gcTime?: number;
 };
-declare function useChat<Raw extends object>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, map, onError, staleTime, gcTime, }: Options$2<Raw>): {
-    messages: Message<ExtractCustom$1<Raw>>[];
+declare function useChat<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, keyMap, roleResolver, onError, staleTime, gcTime, }: Options$2<Raw, Map>): {
+    messages: Message<Custom<Raw, Map>>[];
     sendUserMessage: (content: string) => void;
     isPending: boolean;
     isInitialLoading: boolean;
-    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<InfiniteData<Message<ExtractCustom$1<Raw>>[], unknown>, Error>>;
+    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<_tanstack_query_core.InfiniteData<MessagePage<Raw, Map>, unknown>, Error>>;
     hasNextPage: boolean;
     isFetchingNextPage: boolean;
 };
@@ -195,26 +203,26 @@ declare function useBrowserSpeechRecognition({ lang, onStart, onEnd, onError, }?
     onTranscript: (text: string) => void;
 };
 
-type ExtractCustom<Raw> = Omit<Raw, keyof BaseMessage>;
-type Options<Raw> = {
+type Options<Raw extends Record<string, unknown>, Map extends KeyMap<Raw> = KeyMap<Raw>> = {
     queryKey: readonly unknown[];
     queryFn: (pageParam: unknown) => Promise<Raw[]>;
     initialPageParam: unknown;
-    getNextPageParam: (lastPage: Message<ExtractCustom<Raw>>[], allPages: Message<ExtractCustom<Raw>>[][]) => unknown;
+    getNextPageParam: (lastPage: MessagePage<Raw, Map>, allPages: MessagePage<Raw, Map>[]) => unknown;
     mutationFn: (content: string) => Promise<Raw>;
-    map: (raw: Raw) => MessageCore;
+    keyMap: Map;
+    roleResolver: (value: Raw[Map["role"]]) => MessageCore["role"];
     voice: VoiceRecognition;
     onError?: (error: unknown) => void;
     staleTime?: number;
     gcTime?: number;
 };
-declare function useVoiceChat<Raw extends object>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, map, voice, onError, staleTime, gcTime, }: Options<Raw>): {
-    messages: Message<ExtractCustom<Raw>>[];
+declare function useVoiceChat<Raw extends Record<string, unknown>, Map extends KeyMap<Raw>>({ queryKey, queryFn, initialPageParam, getNextPageParam, mutationFn, keyMap, roleResolver, voice, onError, staleTime, gcTime, }: Options<Raw, Map>): {
+    messages: Message<Custom<Raw, Map>>[];
     isPending: boolean;
     isInitialLoading: boolean;
     startRecording: () => Promise<void>;
     stopRecording: () => void;
-    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<InfiniteData<Message<ExtractCustom<Raw>>[], unknown>, Error>>;
+    fetchNextPage: (options?: _tanstack_query_core.FetchNextPageOptions) => Promise<_tanstack_query_core.InfiniteQueryObserverResult<_tanstack_query_core.InfiniteData<MessagePage<Raw, Map>, unknown>, Error>>;
     hasNextPage: boolean;
     isFetchingNextPage: boolean;
 };

package/dist/index.js

@@ -645,25 +645,37 @@ function ChatContainer(props) {
 // src/hooks/useChat.ts
 var import_react_query = require("@tanstack/react-query");
 var import_react6 = require("react");
-function splitRawToMessage(raw, mapped) {
+
+// src/internal/messageNormalizer.ts
+function buildCore(raw, map, roleResolver) {
+  return {
+    id: raw[map.id],
+    role: roleResolver(raw[map.role]),
+    content: raw[map.content]
+  };
+}
+function buildMessage(raw, map, roleResolver) {
+  const core = buildCore(raw, map, roleResolver);
   const custom = {};
-  const mappedValues = new Set(Object.values(mapped));
-  for (const [key, value] of Object.entries(raw)) {
-    if (!mappedValues.has(value)) {
-      custom[key] = value;
+  for (const key in raw) {
+    if (key !== map.id && key !== map.role && key !== map.content) {
+      custom[key] = raw[key];
     }
   }
-  return __spreadProps(__spreadValues({}, mapped), {
+  return __spreadProps(__spreadValues({}, core), {
     custom
   });
 }
+
+// src/hooks/useChat.ts
 function useChat({
   queryKey,
   queryFn,
   initialPageParam,
   getNextPageParam,
   mutationFn,
-  map,
+  keyMap,
+  roleResolver,
   onError,
   staleTime = 0,
   gcTime = 0
@@ -680,11 +692,10 @@ function useChat({
     queryKey,
     initialPageParam,
     queryFn: async ({ pageParam }) => {
-      const raw = await queryFn(pageParam);
-      return raw.map((r) => {
-        const mapped = map(r);
-        return splitRawToMessage(r, mapped);
-      });
+      const rawList = await queryFn(pageParam);
+      return rawList.map(
+        (raw) => buildMessage(raw, keyMap, roleResolver)
+      );
     },
     getNextPageParam,
     staleTime,
@@ -728,8 +739,7 @@ function useChat({
       return prev ? { prev } : {};
     },
     onSuccess: (rawAiResponse) => {
-      const mapped = map(rawAiResponse);
-      const aiMessage = splitRawToMessage(rawAiResponse, mapped);
+      const aiMessage = buildMessage(rawAiResponse, keyMap, roleResolver);
       queryClient.setQueryData(queryKey, (old) => {
         if (!old) return old;
         const pages = [...old.pages];
@@ -776,25 +786,14 @@ function useChat({
 // src/hooks/useVoiceChat.ts
 var import_react_query2 = require("@tanstack/react-query");
 var import_react7 = require("react");
-function splitRawToMessage2(raw, mapped) {
-  const custom = {};
-  const mappedValues = new Set(Object.values(mapped));
-  for (const [key, value] of Object.entries(raw)) {
-    if (!mappedValues.has(value)) {
-      custom[key] = value;
-    }
-  }
-  return __spreadProps(__spreadValues({}, mapped), {
-    custom
-  });
-}
 function useVoiceChat({
   queryKey,
   queryFn,
   initialPageParam,
   getNextPageParam,
   mutationFn,
-  map,
+  keyMap,
+  roleResolver,
   voice,
   onError,
   staleTime = 0,
@@ -814,11 +813,10 @@ function useVoiceChat({
     queryKey,
     initialPageParam,
     queryFn: async ({ pageParam }) => {
-      const raw = await queryFn(pageParam);
-      return raw.map((r) => {
-        const mapped = map(r);
-        return splitRawToMessage2(r, mapped);
-      });
+      const rawList = await queryFn(pageParam);
+      return rawList.map(
+        (raw) => buildMessage(raw, keyMap, roleResolver)
+      );
     },
     getNextPageParam,
     staleTime,
@@ -856,8 +854,7 @@ function useVoiceChat({
       return prev ? { prev } : {};
     },
     onSuccess: (rawAiResponse) => {
-      const mapped = map(rawAiResponse);
-      const aiMessage = splitRawToMessage2(rawAiResponse, mapped);
+      const aiMessage = buildMessage(rawAiResponse, keyMap, roleResolver);
       queryClient.setQueryData(queryKey, (old) => {
         if (!old) return old;
         const pages = [...old.pages];

package/dist/index.mjs

@@ -604,25 +604,37 @@ function ChatContainer(props) {
 // src/hooks/useChat.ts
 import { useInfiniteQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { useState as useState4 } from "react";
-function splitRawToMessage(raw, mapped) {
+
+// src/internal/messageNormalizer.ts
+function buildCore(raw, map, roleResolver) {
+  return {
+    id: raw[map.id],
+    role: roleResolver(raw[map.role]),
+    content: raw[map.content]
+  };
+}
+function buildMessage(raw, map, roleResolver) {
+  const core = buildCore(raw, map, roleResolver);
   const custom = {};
-  const mappedValues = new Set(Object.values(mapped));
-  for (const [key, value] of Object.entries(raw)) {
-    if (!mappedValues.has(value)) {
-      custom[key] = value;
+  for (const key in raw) {
+    if (key !== map.id && key !== map.role && key !== map.content) {
+      custom[key] = raw[key];
     }
   }
-  return __spreadProps(__spreadValues({}, mapped), {
+  return __spreadProps(__spreadValues({}, core), {
     custom
   });
 }
+
+// src/hooks/useChat.ts
 function useChat({
   queryKey,
   queryFn,
   initialPageParam,
   getNextPageParam,
   mutationFn,
-  map,
+  keyMap,
+  roleResolver,
   onError,
   staleTime = 0,
   gcTime = 0
@@ -639,11 +651,10 @@ function useChat({
     queryKey,
     initialPageParam,
     queryFn: async ({ pageParam }) => {
-      const raw = await queryFn(pageParam);
-      return raw.map((r) => {
-        const mapped = map(r);
-        return splitRawToMessage(r, mapped);
-      });
+      const rawList = await queryFn(pageParam);
+      return rawList.map(
+        (raw) => buildMessage(raw, keyMap, roleResolver)
+      );
     },
     getNextPageParam,
     staleTime,
@@ -687,8 +698,7 @@ function useChat({
       return prev ? { prev } : {};
     },
     onSuccess: (rawAiResponse) => {
-      const mapped = map(rawAiResponse);
-      const aiMessage = splitRawToMessage(rawAiResponse, mapped);
+      const aiMessage = buildMessage(rawAiResponse, keyMap, roleResolver);
       queryClient.setQueryData(queryKey, (old) => {
         if (!old) return old;
         const pages = [...old.pages];
@@ -735,25 +745,14 @@ function useChat({
 // src/hooks/useVoiceChat.ts
 import { useInfiniteQuery as useInfiniteQuery2, useMutation as useMutation2, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
 import { useEffect as useEffect4, useRef as useRef4, useState as useState5 } from "react";
-function splitRawToMessage2(raw, mapped) {
-  const custom = {};
-  const mappedValues = new Set(Object.values(mapped));
-  for (const [key, value] of Object.entries(raw)) {
-    if (!mappedValues.has(value)) {
-      custom[key] = value;
-    }
-  }
-  return __spreadProps(__spreadValues({}, mapped), {
-    custom
-  });
-}
 function useVoiceChat({
   queryKey,
   queryFn,
   initialPageParam,
   getNextPageParam,
   mutationFn,
-  map,
+  keyMap,
+  roleResolver,
   voice,
   onError,
   staleTime = 0,
@@ -773,11 +772,10 @@ function useVoiceChat({
     queryKey,
     initialPageParam,
     queryFn: async ({ pageParam }) => {
-      const raw = await queryFn(pageParam);
-      return raw.map((r) => {
-        const mapped = map(r);
-        return splitRawToMessage2(r, mapped);
-      });
+      const rawList = await queryFn(pageParam);
+      return rawList.map(
+        (raw) => buildMessage(raw, keyMap, roleResolver)
+      );
     },
     getNextPageParam,
     staleTime,
@@ -815,8 +813,7 @@ function useVoiceChat({
       return prev ? { prev } : {};
     },
     onSuccess: (rawAiResponse) => {
-      const mapped = map(rawAiResponse);
-      const aiMessage = splitRawToMessage2(rawAiResponse, mapped);
+      const aiMessage = buildMessage(rawAiResponse, keyMap, roleResolver);
       queryClient.setQueryData(queryKey, (old) => {
         if (!old) return old;
         const pages = [...old.pages];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-optimistic-chat",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",