Replace cloneDeep to native structuredclone and remove unused import

This commit is contained in:
kwaroran
2024-04-25 01:17:14 +09:00
parent cc744853d2
commit 11b1d4d4f3
22 changed files with 85 additions and 115 deletions

View File

@@ -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

View File

@@ -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) {

View File

@@ -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 @@
<div class="flex mt-2 items-center">
<button class="text-textcolor2 hover:text-green-500 cursor-pointer mr-1" on:click={() => {
let botPresets = $DataBase.botPresets
let newPreset = cloneDeep(prebuiltPresets.OAI2)
let newPreset = structuredClone(prebuiltPresets.OAI2)
newPreset.name = `New Preset`
botPresets.push(newPreset)

View File

@@ -1,19 +1,18 @@
<script lang="ts">
import { language } from "../../lang";
import { tokenize, tokenizeAccurate } from "../../ts/tokenizer";
import { tokenizeAccurate } from "../../ts/tokenizer";
import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database";
import { selectedCharID } from "../../ts/stores";
import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBraces, Volume2Icon, XIcon } from 'lucide-svelte'
import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, User, CurlyBraces, Volume2Icon } from 'lucide-svelte'
import Check from "../UI/GUI/CheckInput.svelte";
import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage } from "../../ts/characters";
import LoreBook from "./LoreBook/LoreBookSetting.svelte";
import { alertConfirm, alertError, alertNormal, alertSelectChar, alertTOS } from "../../ts/alert";
import { alertConfirm, alertNormal, alertSelectChar, alertTOS } from "../../ts/alert";
import BarIcon from "./BarIcon.svelte";
import { findCharacterbyId, getAuthorNoteDefaultText, selectMultipleFile } from "../../ts/util";
import { onDestroy } from "svelte";
import {isEqual, cloneDeep} from 'lodash'
import {isEqual} from 'lodash'
import Help from "../Others/Help.svelte";
import RegexData from "./Scripts/RegexData.svelte";
import { exportChar, shareRisuHub } from "src/ts/characterCards";
import { getElevenTTSVoices, getWebSpeechTTSVoices, getVOICEVOXVoices, oaiVoices, getNovelAIVoices, FixNAITTS } from "src/ts/process/tts";
import { checkCharOrder, getFileSrc } from "src/ts/storage/globalApi";
@@ -92,13 +91,13 @@
if(cha.type === 'character'){
currentChar = {
type: 'character',
data: cloneDeep(cha)
data: structuredClone(cha)
}
}
else{
currentChar = {
type: 'group',
data: cloneDeep(cha)
data: structuredClone(cha)
}
}
}

View File

@@ -26,7 +26,6 @@
FolderIcon,
FolderOpenIcon,
HomeIcon,
MilestoneIcon,
} from "lucide-svelte";
import {
characterFormatUpdate,
@@ -38,18 +37,17 @@
import CharConfig from "./CharConfig.svelte";
import { language } from "../../lang";
import Botpreset from "../Setting/botpreset.svelte";
import { onDestroy, onMount } from "svelte";
import { cloneDeep, isEqual } from "lodash";
import { onDestroy } from "svelte";
import { isEqual } from "lodash";
import SidebarAvatar from "./SidebarAvatar.svelte";
import BaseRoundedButton from "../UI/BaseRoundedButton.svelte";
import { get } from "svelte/store";
import { findCharacterIndexbyId, findCharacterbyId, getCharacterIndexObject, sleep } from "src/ts/util";
import { getCharacterIndexObject } from "src/ts/util";
import { v4 } from "uuid";
import { checkCharOrder } from "src/ts/storage/globalApi";
import { doingChat } from "src/ts/process";
import { BotCreator } from "src/ts/creation/creator";
import Button from "../UI/GUI/Button.svelte";
import { fly } from "svelte/transition";
import { alertAddCharacter, alertInput, alertSelect } from "src/ts/alert";
import SideChatList from "./SideChatList.svelte";
import { joinMultiuserRoom } from "src/ts/sync/multiuser";
@@ -57,7 +55,6 @@
let sideBarMode = 0;
let editMode = false;
let menuMode = 0;
let dragable = navigator.maxTouchPoints <= 1
export let openGrid = () => {};
function createScratch() {
@@ -178,7 +175,7 @@
const da = db.characterOrder[mainIndex.index]
if(typeof(da) !== 'string'){
mainId = da.id
movingFolder = cloneDeep(da)
movingFolder = structuredClone(da)
if(targetIndex.folder){
return
}