@lobehub/chat 0.41.0 → 0.41.1

package/.eslintrc.js

@@ -8,5 +8,6 @@ config.rules['unicorn/prefer-logical-operator-over-ternary'] = 0;
 config.rules['unicorn/no-null'] = 0;
 config.rules['unicorn/no-typeof-undefined'] = 0;
 config.rules['unicorn/explicit-length-check'] = 0;
+config.rules['unicorn/prefer-code-point'] = 0;
 
 module.exports = config;

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.41.1](https://github.com/lobehub/lobe-chat/compare/v0.41.0...v0.41.1)
+
+<sup>Released on **2023-08-10**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: 重构 settings store 代码写法.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: 重构 settings store 代码写法 ([4b6f917](https://github.com/lobehub/lobe-chat/commit/4b6f917))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.41.0](https://github.com/lobehub/lobe-chat/compare/v0.40.7...v0.41.0)
 
 <sup>Released on **2023-08-10**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/pages/chat/[id]/Conversation/ChatList/index.tsx

@@ -5,12 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
-import {
-  agentSelectors,
-  chatSelectors,
-  useSessionHydrated,
-  useSessionStore,
-} from '@/store/session';
+import { agentSelectors, chatSelectors, useSessionStore } from '@/store/session';
 import { ChatMessage } from '@/types/chatMessage';
 import { ErrorType } from '@/types/fetch';
 import { isFunctionMessage } from '@/utils/message';
@@ -34,9 +29,8 @@ const renderErrorMessage: RenderErrorMessage = (error, message) => {
 
 const List = () => {
   const { t } = useTranslation('common');
-  const hydrated = useSessionHydrated();
+
   const data = useSessionStore(chatSelectors.currentChats, isEqual);
-  console.log(hydrated, data);
   const [displayMode, chatLoadingId, deleteMessage, resendMessage, dispatchMessage] =
     useSessionStore(
       (s) => [

package/src/store/session/store.ts

@@ -10,6 +10,8 @@ import { AgentAction, createAgentSlice } from './slices/agentConfig';
 import { ChatAction, createChatSlice } from './slices/chat';
 import { SessionAction, createSessionSlice } from './slices/session';
 
+//  ===============  聚合 createStoreFn ============ //
+
 export type SessionStore = SessionAction & AgentAction & ChatAction & SessionStoreState;
 
 const createStore: StateCreator<SessionStore, [['zustand/devtools', never]]> = (...parameters) => ({
@@ -19,6 +21,8 @@ const createStore: StateCreator<SessionStore, [['zustand/devtools', never]]> = (
   ...createChatSlice(...parameters),
 });
 
+//  ===============  persist 本地缓存中间件配置 ============ //
+
 type SessionPersist = Pick<SessionStore, 'sessions'>;
 
 const LOBE_CHAT = 'LOBE_CHAT';
@@ -36,6 +40,8 @@ const persistOptions: PersistOptions<SessionStore, SessionPersist> = {
   // version: Migration.targetVersion,
 };
 
+//  ===============  实装 useStore ============ //
+
 export const useSessionStore = createWithEqualityFn<SessionStore>()(
   persist(
     devtools(createStore, {

package/src/store/settings/index.ts

@@ -1,27 +1,3 @@
-import equal from 'fast-deep-equal';
-import { type PersistOptions, devtools, persist } from 'zustand/middleware';
-import { createWithEqualityFn } from 'zustand/traditional';
-
-import { isDev } from '@/utils/env';
-
-import { type SettingsStore, createStore } from './store';
-
-export const LOBE_SETTINGS = 'LOBE_SETTINGS';
-
-const persistOptions: PersistOptions<SettingsStore> = {
-  name: LOBE_SETTINGS,
-  skipHydration: true,
-};
-
-export const useSettings = createWithEqualityFn<SettingsStore>()(
-  persist(
-    devtools(createStore, {
-      name: LOBE_SETTINGS + (isDev ? '_DEV' : ''),
-    }),
-    persistOptions,
-  ),
-  equal,
-);
-
 export * from './selectors';
 export type { SettingsStore } from './store';
+export { useSettings } from './store';

package/src/store/settings/store.ts

@@ -1,15 +1,43 @@
+import equal from 'fast-deep-equal';
+import { PersistOptions, devtools, persist } from 'zustand/middleware';
+import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
+import { isDev } from '@/utils/env';
+
 import { type AppSettingsState, initialState } from './initialState';
 import { type AgentAction, createAgentSlice } from './slices/agent';
 import { type CommonAction, createCommonSlice } from './slices/common';
 
+//  ===============  聚合 createStoreFn ============ //
+
 export type SettingsStore = CommonAction & AppSettingsState & AgentAction;
 
-export const createStore: StateCreator<SettingsStore, [['zustand/devtools', never]]> = (
+const createStore: StateCreator<SettingsStore, [['zustand/devtools', never]]> = (
   ...parameters
 ) => ({
   ...initialState,
   ...createCommonSlice(...parameters),
   ...createAgentSlice(...parameters),
 });
+
+//  ===============  persist 本地缓存中间件配置 ============ //
+
+const LOBE_SETTINGS = 'LOBE_SETTINGS';
+
+const persistOptions: PersistOptions<SettingsStore> = {
+  name: LOBE_SETTINGS,
+  skipHydration: true,
+};
+
+//  ===============  实装 useStore ============ //
+
+export const useSettings = createWithEqualityFn<SettingsStore>()(
+  persist(
+    devtools(createStore, {
+      name: LOBE_SETTINGS + (isDev ? '_DEV' : ''),
+    }),
+    persistOptions,
+  ),
+  equal,
+);