@lota-sdk/ui 0.4.8 → 0.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lota-sdk/ui",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -25,8 +25,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@lota-sdk/shared": "0.4.8",
-    "ai": "^6.0.145"
+    "@lota-sdk/shared": "0.4.9",
+    "ai": "^6.0.167"
   },
   "peerDependencies": {
     "@ai-sdk/react": "^3.0.118",
@@ -34,9 +34,9 @@
     "react": "^19.2.0"
   },
   "devDependencies": {
-    "@ai-sdk/react": "^3.0.147",
-    "@tanstack/react-query": "^5.96.2",
+    "@ai-sdk/react": "^3.0.169",
+    "@tanstack/react-query": "^5.99.0",
     "@types/react": "^19.2.14",
-    "react": "^19.2.4"
+    "react": "^19.2.5"
   }
 }

package/src/chat/messages.ts

@@ -1,39 +1,71 @@
-import { getMessageCreatedAt, withMessageCreatedAt } from '@lota-sdk/shared'
+import {
+  baseChatMessageSchema,
+  getMessageCreatedAt,
+  normalizeMessageBatch,
+  normalizeMessageList,
+  withMessageCreatedAt,
+} from '@lota-sdk/shared'
+import type { MessageMetadataLike } from '@lota-sdk/shared'
 
 interface TimestampedMessage {
   id: string
-  metadata?: { createdAt?: unknown }
+  metadata?: unknown
 }
 
+interface MetadataCompatibleMessage {
+  id: string
+  metadata?: MessageMetadataLike
+}
+
+type ChatMessageGuard<TMessage extends TimestampedMessage> = (message: unknown) => message is TMessage
+
 function normalizeMessage<TMessage extends TimestampedMessage>(message: TMessage): TMessage {
-  return withMessageCreatedAt(message)
+  return withMessageCreatedAt(message as TMessage & MetadataCompatibleMessage)
+}
+
+function getComparableCreatedAt(message: TimestampedMessage): number {
+  const metadata =
+    message.metadata && typeof message.metadata === 'object' ? (message.metadata as MessageMetadataLike) : undefined
+
+  return getMessageCreatedAt({ metadata }, { fallback: 0 })
 }
 
 function compareChatMessages<TMessage extends TimestampedMessage>(left: TMessage, right: TMessage): number {
-  const leftTime = getMessageCreatedAt(left, { fallback: 0 })
-  const rightTime = getMessageCreatedAt(right, { fallback: 0 })
+  const leftTime = getComparableCreatedAt(left)
+  const rightTime = getComparableCreatedAt(right)
   if (leftTime !== rightTime) return leftTime - rightTime
   return left.id.localeCompare(right.id)
 }
 
-function sortChatMessages<TMessage extends TimestampedMessage>(messages: readonly TMessage[]): TMessage[] {
-  return [...messages].sort(compareChatMessages)
+export function normalizeChatMessages<TMessage extends TimestampedMessage>(messages: readonly TMessage[]): TMessage[] {
+  return normalizeMessageList(messages, {
+    getMessageId: (message) => message.id,
+    normalizeMessage,
+    compareMessages: compareChatMessages,
+  })
 }
 
-export function normalizeChatMessages<TMessage extends TimestampedMessage>(messages: readonly TMessage[]): TMessage[] {
-  return sortChatMessages(messages.map((message) => normalizeMessage(message)))
+export function normalizeHydratedChatMessages<TMessage extends TimestampedMessage>(
+  raw: unknown,
+  isMessage: ChatMessageGuard<TMessage>,
+): TMessage[] {
+  return normalizeMessageBatch(raw, {
+    parseMessage: (entry) => {
+      const parsed = baseChatMessageSchema.safeParse(entry)
+      return parsed.success && isMessage(parsed.data) ? parsed.data : null
+    },
+    getMessageId: (message) => message.id,
+    normalizeMessage,
+    compareMessages: compareChatMessages,
+  })
 }
 
 export function mergeChatMessages<TMessage extends TimestampedMessage>(
   ...messageLists: ReadonlyArray<readonly TMessage[]>
 ): TMessage[] {
-  const messagesById = new Map<string, TMessage>()
-
-  for (const messages of messageLists) {
-    for (const message of messages) {
-      messagesById.set(message.id, message)
-    }
-  }
-
-  return sortChatMessages(Array.from(messagesById.values()))
+  return normalizeMessageList(messageLists.flat(), {
+    getMessageId: (message) => message.id,
+    normalizeMessage,
+    compareMessages: compareChatMessages,
+  })
 }

package/src/runtime/use-session-messages.ts

@@ -2,7 +2,7 @@ import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query'
 import type { InfiniteData } from '@tanstack/react-query'
 import { useCallback, useMemo } from 'react'
 
-import { normalizeChatMessages } from '../chat/messages'
+import { mergeChatMessages, normalizeChatMessages } from '../chat/messages'
 
 export interface SessionMessagesPageResponse {
   messages: unknown[]
@@ -35,12 +35,6 @@ export interface UseSessionMessagesReturn<TMessage> {
   refreshLatestPage: () => Promise<void>
 }
 
-function deduplicateAndSort<TMessage extends { id: string; metadata?: { createdAt?: unknown } }>(
-  messages: TMessage[],
-): TMessage[] {
-  return normalizeChatMessages(Array.from(new Map(messages.map((message) => [message.id, message])).values()))
-}
-
 async function normalizePage<TMessage extends { id: string; metadata?: { createdAt?: unknown } }>(params: {
   response: SessionMessagesPageResponse
   validateMessages?: (messages: unknown[]) => Promise<TMessage[]>
@@ -85,7 +79,7 @@ export function useSessionMessages<TMessage extends { id: string; metadata?: { c
 
   const messages = useMemo(() => {
     if (!infiniteQuery.data) return []
-    return deduplicateAndSort(infiniteQuery.data.pages.flatMap((page) => page.messages))
+    return mergeChatMessages(...infiniteQuery.data.pages.map((page) => page.messages))
   }, [infiniteQuery.data])
 
   const loadOlderMessages = useCallback(async () => {