diff --git a/package.json b/package.json index 5f4b04e4..d733dea4 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,6 @@ "@types/dompurify": "^3.0.5", "@types/libsodium-wrappers-sumo": "^0.7.8", "@types/lodash": "^4.14.202", - "@types/lodash.clonedeep": "^4.5.9", "@types/lodash.isequal": "^4.5.8", "@types/marked": "^5.0.2", "@types/node": "^18.19.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79e98d97..024b1439 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -199,9 +199,6 @@ devDependencies: '@types/lodash': specifier: ^4.14.202 version: 4.14.202 - '@types/lodash.clonedeep': - specifier: ^4.5.9 - version: 4.5.9 '@types/lodash.isequal': specifier: ^4.5.8 version: 4.5.8 @@ -1612,12 +1609,6 @@ packages: resolution: {integrity: sha512-KeAKtlObirLJk/na6jHBFEdTDjDfFS6Vcr0eG2FjiHKn3Nw8axJFfIu0Y9TpwaauRldQBj/pZm/MHtK76r6OWg==} dev: true - /@types/lodash.clonedeep@4.5.9: - resolution: {integrity: sha512-19429mWC+FyaAhOLzsS8kZUsI+/GmBAQ0HFiCPsKGU+7pBXOQWhyrY6xNNDwUSX8SMZMJvuFVMF9O5dQOlQK9Q==} - dependencies: - '@types/lodash': 4.14.202 - dev: true - /@types/lodash.isequal@4.5.8: resolution: {integrity: sha512-uput6pg4E/tj2LGxCZo9+y27JNyB2OZuuI/T5F+ylVDYuqICLG2/ktjxx0v6GvVntAf8TvEzeQLcV0ffRirXuA==} dependencies: diff --git a/src/lang/index.ts b/src/lang/index.ts index 1f50773b..69894642 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -1,4 +1,4 @@ -import { cloneDeep, merge } from "lodash"; +import { merge } from "lodash"; import { languageChinese } from "./cn"; import { languageGerman } from "./de"; import { languageEnglish } from "./en"; @@ -10,16 +10,16 @@ export let language:typeof languageEnglish = languageEnglish export function changeLanguage(lang:string){ if(lang === 'cn'){ - language = merge(cloneDeep(languageEnglish), languageChinese) + language = merge(structuredClone(languageEnglish), languageChinese) } else if(lang === 'de'){ - language = merge(cloneDeep(languageEnglish), languageGerman) + language = merge(structuredClone(languageEnglish), languageGerman) } else if(lang === 'ko'){ - language = merge(cloneDeep(languageEnglish), languageKorean) + language = merge(structuredClone(languageEnglish), languageKorean) } else if(lang === 'vi'){ - language = merge(cloneDeep(languageEnglish), LanguageVietnamese) + language = merge(structuredClone(languageEnglish), LanguageVietnamese) } else{ language = languageEnglish diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index 29481d3c..9ab31232 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -9,9 +9,10 @@ import { translateHTML } from "../../ts/translator/translator"; import { risuChatParser } from "src/ts/process/scripts"; import { get } from "svelte/store"; - import { capitalize, isEqual } from "lodash"; + import { isEqual } from "lodash"; import { sayTTS } from "src/ts/process/tts"; import { getModelShortName } from "src/ts/model/names"; + import { capitalize } from "src/ts/util"; export let message = '' export let name = '' export let largePortrait = false diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 22c3881d..b0e049e7 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -12,7 +12,6 @@ import { isExpTranslator, translate } from "../../ts/translator/translator"; import { alertError, alertNormal, alertWait } from "../../ts/alert"; import sendSound from '../../etc/send.mp3' - import {cloneDeep} from 'lodash' import { processScript } from "src/ts/process/scripts"; import CreatorQuote from "./CreatorQuote.svelte"; import { stopTTS } from "src/ts/process/tts"; @@ -140,7 +139,7 @@ if(Array.isArray(rerolls[rerollid + 1])){ let db = $DataBase rerollid += 1 - let rerollData = cloneDeep(rerolls[rerollid]) + let rerollData = structuredClone(rerolls[rerollid]) let msgs = db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message for(let i = 0; i < rerollData.length; i++){ msgs[msgs.length - rerollData.length + i] = rerollData[i] @@ -151,10 +150,10 @@ return } if(rerolls.length === 0){ - rerolls.push(cloneDeep([$CurrentChat.message.at(-1)])) + rerolls.push(structuredClone([$CurrentChat.message.at(-1)])) rerollid = rerolls.length - 1 } - let cha = cloneDeep($CurrentChat.message) + let cha = structuredClone($CurrentChat.message) if(cha.length === 0 ){ return } @@ -199,7 +198,7 @@ if(Array.isArray(rerolls[rerollid - 1])){ let db = $DataBase rerollid -= 1 - let rerollData = cloneDeep(rerolls[rerollid]) + let rerollData = structuredClone(rerolls[rerollid]) let msgs = db.characters[$selectedCharID].chats[$CurrentCharacter.chatPage].message for(let i = 0; i < rerollData.length; i++){ msgs[msgs.length - rerollData.length + i] = rerollData[i] @@ -222,7 +221,7 @@ continue:continued }) if(previousLength < $CurrentChat.message.length){ - rerolls.push(cloneDeep($CurrentChat.message).slice(previousLength)) + rerolls.push(structuredClone($CurrentChat.message).slice(previousLength)) rerollid = rerolls.length - 1 } } catch (error) { diff --git a/src/lib/Setting/botpreset.svelte b/src/lib/Setting/botpreset.svelte index e6829d22..e94944df 100644 --- a/src/lib/Setting/botpreset.svelte +++ b/src/lib/Setting/botpreset.svelte @@ -3,9 +3,8 @@ import { language } from "../../lang"; import { DataBase, changeToPreset, copyPreset, downloadPreset, importPreset, presetTemplate } from "../../ts/storage/database"; import { CopyIcon, DownloadIcon, EditIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte"; - import { cloneDeep } from "lodash"; - import TextInput from "../UI/GUI/TextInput.svelte"; - import { prebuiltPresets } from "src/ts/process/templates/templates"; + import TextInput from "../UI/GUI/TextInput.svelte"; + import { prebuiltPresets } from "src/ts/process/templates/templates"; let editMode = false export let close = () => {} @@ -74,7 +73,7 @@