@magmamath/students-features 0.3.0-rc.7 → 0.3.0-rc.9

package/src/features/chatbot/model/ChatBotModel.ts

@@ -5,7 +5,6 @@ import {
   sample,
   type Store,
   type Effect,
-  combine,
   createStore,
   createEffect,
 } from 'effector'
@@ -18,7 +17,7 @@ import {
   SetHintMessageProps,
   StartConversationFxData,
 } from '../types/model.types'
-import { ChatAnswer, GetAlternativesResponse, PostMessageResponse } from '../types/api.types'
+import { GetAlternativesResponse, PostMessageResponse } from '../types/api.types'
 import { generateRandomId } from '../../../lib/helpers/helpers'
 import { ChatbotAPI } from './api'
 import { ChatbotTranslation } from './translation'
@@ -42,7 +41,7 @@ export class ChatbotModel {
 
   readonly setIsOpen = createEvent<boolean>()
   readonly toggleOpen = createEvent()
-  readonly $isOpen = restore(this.setIsOpen, false).on(this.toggleOpen, isOpen => !isOpen)
+  readonly $isOpen = restore(this.setIsOpen, false).on(this.toggleOpen, (isOpen) => !isOpen)
 
   // separate messages and alternatives class?
   public readonly removeLastMessage = createEvent()
@@ -56,6 +55,10 @@ export class ChatbotModel {
 
   readonly defaultMessages: ChatbotModelProps['messages']
 
+  readonly messages = createEntityFieldStore<ConversationMessage[]>()
+  readonly threadIds = createEntityFieldStore<string>()
+  readonly availableChats = createEntityFieldStore<boolean>()
+
   constructor({ api, messages, $key }: ChatbotModelProps) {
     this.api = new ChatbotAPI(api)
 
@@ -71,34 +74,23 @@ export class ChatbotModel {
       .on(this.setAlternatives, (_, payload) => payload)
       .reset(this.resetAlternatives)
 
-    // TODO: do not pass this, just what you need
-    this.translation = new ChatbotTranslation(this)
+    this.translation = new ChatbotTranslation({
+      defaultMessages: messages,
+      $key: this.$currentKey,
+      api: this.api,
+      messagesModel: this.messages,
+      alternativesModel: {
+        $store: this.$alternatives,
+        set: this.setAlternatives,
+      },
+    })
+
     this.t2s = new ChatTextToSpeechModel({ $isOpen: this.$isOpen, api: this.api })
 
     this.sendHelpRequestFx = this.createSendHelpRequestFx()
     this.initChatReplyWatcher()
   }
 
-  public readonly reinitConversation = createEffect(({ key }: ReinitConversationProps) => {
-    this.messages.setField({
-      key,
-      fn: messages => {
-        if (!messages?.length) return
-        const lastMessage = messages[messages.length - 1]
-        const copy = [...messages]
-        copy.splice(messages.length - 1, 1, {
-          ...lastMessage,
-          options: this.defaultMessages.start.options,
-        })
-        return copy
-      },
-    })
-  })
-
-  readonly messages = createEntityFieldStore<ConversationMessage[]>()
-  readonly threadIds = createEntityFieldStore<string>()
-  readonly availableChats = createEntityFieldStore<boolean>()
-
   private createSendHelpRequestFx() {
     return attach({
       source: [this.$currentKey, this.messages.$state, this.translation.$isTranslated],
@@ -225,13 +217,29 @@ export class ChatbotModel {
     const options = this.$alternatives.getState()?.options.hints ?? message.options
     this.messages.setField({
       key: `${entityId}-${fieldId}`,
-      fn: messages => {
+      fn: (messages) => {
         if (!messages || messages.length > 1) return
         return [{ ...message, options }]
       },
     })
   }
 
+  public readonly reinitConversation = createEffect(({ key }: ReinitConversationProps) => {
+    this.messages.setField({
+      key,
+      fn: (messages) => {
+        if (!messages?.length || messages.length > 1) return
+        const lastMessage = messages[messages.length - 1]
+        const copy = [...messages]
+        copy.splice(messages.length - 1, 1, {
+          ...lastMessage,
+          options: [{ text: 'Give me another hint', promptKey: '' }],
+        })
+        return copy
+      },
+    })
+  })
+
   public bindKey($store: Store<string>) {
     sample({
       source: $store,

package/src/features/chatbot/model/t2s.ts

@@ -1,8 +1,7 @@
-import { restore, createEvent, Store, sample } from 'effector'
+import { restore, createEvent, Store, sample, createEffect } from 'effector'
 import { AUDIO_CONFIG, DEFAULT_VOICE } from '../constants'
 import { AudioProvider, AudioStatus, PlayTextToSpeechProps } from '../types/t2s.types'
 import { ChatbotAPI } from './api'
-import { createEffect } from 'effector/effector.umd'
 
 type ChatTextToSpeechModelProps = {
   $isOpen: Store<boolean>

package/src/features/chatbot/model/translation.ts

@@ -1,17 +1,41 @@
-import { createEvent, restore, attach, createEffect, type Effect, sample } from 'effector'
-import { ChatbotModel } from './ChatBotModel'
-
+import {
+  createEvent,
+  restore,
+  attach,
+  createEffect,
+  type Effect,
+  sample,
+  Store,
+  EventCallable,
+} from 'effector'
 import {
   TranslateAlternativesFxProps,
   TranslateBatchFxProps,
   TranslateMessageFxProps,
 } from '../types/translation.types'
-import { ConversationMessage } from '../types/model.types'
+import { ChatbotModelProps, ConversationMessage } from '../types/model.types'
 import { GetAlternativesResponse } from '../types/api.types'
 import { decodeHTMLEntities } from '../helpers'
+import { ChatbotAPI } from './api'
+import { EntityFieldStore } from '../../../lib/effector/createEntityFieldStore'
+
+type ChatbotTranslationProps = {
+  api: ChatbotAPI
+  $key: Store<string>
+  defaultMessages: ChatbotModelProps['messages']
+  messagesModel: EntityFieldStore<ConversationMessage[]>
+  alternativesModel: {
+    set: EventCallable<GetAlternativesResponse | null>
+    $store: Store<GetAlternativesResponse | null>
+  }
+}
 
 export class ChatbotTranslation {
-  private readonly model: ChatbotModel
+  private readonly api
+  private readonly $key
+  private readonly defaultMessages
+  private readonly messagesModel
+  private readonly alternativesModel
 
   readonly setIsTranslated = createEvent<boolean>()
   readonly $isTranslated = restore(this.setIsTranslated, false)
@@ -23,8 +47,18 @@ export class ChatbotTranslation {
     GetAlternativesResponse | null
   >
 
-  constructor(chatbotModel: ChatbotModel) {
-    this.model = chatbotModel
+  constructor({
+    api,
+    $key,
+    defaultMessages,
+    messagesModel,
+    alternativesModel,
+  }: ChatbotTranslationProps) {
+    this.api = api
+    this.$key = $key
+    this.defaultMessages = defaultMessages
+    this.messagesModel = messagesModel
+    this.alternativesModel = alternativesModel
 
     this.translateAlternativesFx = this.createTranslateAlternativesEffect()
     this.translateMessageFx = this.createTranslateMessageEffect()
@@ -51,15 +85,15 @@ export class ChatbotTranslation {
   private initTranslationSamples() {
     sample({
       clock: this.translateBatchFx.doneData,
-      source: [this.model.$currentKey] as const,
+      source: [this.$key] as const,
       fn: ([key], translatedMessages) => ({ key, data: translatedMessages }),
-      target: this.model.messages.setField,
+      target: this.messagesModel.setField,
     })
   }
 
   private createTranslateAlternativesEffect() {
     return attach({
-      source: [this.model.$alternatives],
+      source: [this.alternativesModel.$store],
       mapParams: (params: TranslateAlternativesFxProps['params'], [alternatives]) => ({
         params,
         alternatives,
@@ -72,7 +106,7 @@ export class ChatbotTranslation {
 
         if (hintAlternatives.length) {
           const hintText = hintAlternatives.map(({ text }) => text)
-          const response = await this.model.api.translateTextFx({
+          const response = await this.api.translateTextFx({
             text: hintText,
             targetLanguage: params.targetLanguage,
           })
@@ -89,7 +123,7 @@ export class ChatbotTranslation {
 
         if (defaultAlternatives.length) {
           const defaultText = defaultAlternatives.map(({ text }) => text)
-          const response = await this.model.api.translateTextFx({
+          const response = await this.api.translateTextFx({
             text: defaultText,
             targetLanguage: params.targetLanguage,
           })
@@ -114,7 +148,7 @@ export class ChatbotTranslation {
   private createTranslateMessageEffect() {
     return createEffect(async ({ message, targetLanguage }: TranslateMessageFxProps) => {
       const optionsText = message.options.map(({ text }) => text)
-      const response = await this.model.api.translateTextFx({
+      const response = await this.api.translateTextFx({
         text: [message.message, ...optionsText],
         targetLanguage,
       })
@@ -136,7 +170,7 @@ export class ChatbotTranslation {
 
   private createTranslateBatchEffect() {
     return attach({
-      source: [this.model.$currentKey, this.model.messages.$state],
+      source: [this.$key, this.messagesModel.$state],
       mapParams: (params: TranslateBatchFxProps['params'], [key, messages]) => ({
         params,
         messages: messages[key] ?? [],
@@ -147,7 +181,7 @@ export class ChatbotTranslation {
         }
 
         const messagesText = messages.map(({ message }) => message)
-        const response = await this.model.api.translateTextFx({
+        const response = await this.api.translateTextFx({
           text: messagesText,
           targetLanguage: params.targetLanguage,
         })
@@ -157,12 +191,12 @@ export class ChatbotTranslation {
           ? await this.translateMessageOptions(lastMessage, params.targetLanguage)
           : undefined
 
-        const errorMessageTranslationResponse = await this.model.api.translateTextFx({
-          text: [this.model.defaultMessages.error.message],
+        const errorMessageTranslationResponse = await this.api.translateTextFx({
+          text: [this.defaultMessages.error.message],
           targetLanguage: params.targetLanguage,
         })
 
-        this.model.defaultMessages.error.translatedMessage = decodeHTMLEntities(
+        this.defaultMessages.error.translatedMessage = decodeHTMLEntities(
           errorMessageTranslationResponse.data.translations[0].translatedText,
         )
 
@@ -189,12 +223,12 @@ export class ChatbotTranslation {
   private async translateMessageOptions(message: ConversationMessage, targetLanguage: string) {
     if (!message?.options?.length) {
       const translatedAlternatives = await this.translateAlternativesFx({ targetLanguage })
-      this.model.setAlternatives(translatedAlternatives)
+      this.alternativesModel.set(translatedAlternatives)
       return
     }
 
     const optionsText = message.options.map(({ text }) => text)
-    const response = await this.model.api.translateTextFx({
+    const response = await this.api.translateTextFx({
       text: optionsText,
       targetLanguage,
     })

package/src/lib/effector/createEntityFieldStore.ts

@@ -4,21 +4,23 @@ type UpdateField<T> = {
   key: string
 } & ({ data: T; fn?: never } | { data?: never; fn: (props: T | void) => T | void })
 
-export function createEntityFieldStore<T>() {
-  const setField = createEvent<UpdateField<T>>()
-  const reset = createEvent()
+export class EntityFieldStore<T> {
+  public readonly setField = createEvent<UpdateField<T>>()
+  public readonly reset = createEvent()
 
-  const $state = createStore<Record<string, T>>({})
-    .on(setField, (state, { key, data }) => {
-      if (typeof data === 'function') {
+  public readonly $state = createStore<Record<string, T>>({})
+    .on(this.setField, (state, { key, data, fn }) => {
+      if (fn) {
         const currentData = state[key]
-        const newData = data(currentData)
+        const newData = fn(currentData)
         if (newData === undefined) return state
         return { ...state, [key]: newData }
       }
       return { ...state, [key]: data }
     })
-    .reset(reset)
+    .reset(this.reset)
+}
 
-  return { $state, setField, reset }
+export function createEntityFieldStore<T>() {
+  return new EntityFieldStore<T>()
 }