From 460030d6001f83422d3d5638169cb3716baee980 Mon Sep 17 00:00:00 2001 From: ouoertheo Date: Sat, 3 Jun 2023 13:59:26 -0500 Subject: [PATCH 01/14] task class --- public/scripts/extensions/objective/index.js | 187 ++++++++++++------- 1 file changed, 119 insertions(+), 68 deletions(-) diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js index 74ab41719..8c87f01af 100644 --- a/public/scripts/extensions/objective/index.js +++ b/public/scripts/extensions/objective/index.js @@ -12,7 +12,7 @@ const MODULE_NAME = "Objective" let globalObjective = "" let globalTasks = [] let currentChatId = "" -let currentTask = {} +let currentTask = null let checkCounter = 0 @@ -59,13 +59,13 @@ async function generateQuietPrompt(quiet_prompt) { //# Task Management #// //###############################// -// Accepts optional position. Defaults to adding to end of list. -function addTask(description, position = null) { - position = position != null ? position: position = globalTasks.length - globalTasks.splice(position, 0, { - "description": description, - "completed": false - }) +// Accepts optional index. Defaults to adding to end of list. +function addTask(description, index = null) { + index = index != null ? index: index = globalTasks.length + globalTasks.splice(index, 0, new ObjectiveTask( + index, + description, + )) saveState() } @@ -75,7 +75,7 @@ function getTask(index = null, taskDescription = null) { if (index == null && taskDescription == null) { task = currentTask } else if (index != null) { - task = globalObjective[index] + task = globalTasks[index] } else if (taskDescription != null) { task = globalTasks.find(task => { return task.description == description ? true: false @@ -90,27 +90,21 @@ function deleteTask(index){ updateUiTaskList() } -// Complete the current task, setting next task to next incomplete task -function completeTask(task) { - task.completed = true - console.info(`Task successfully completed: ${JSON.stringify(task)}`) - setCurrentTask() - updateUiTaskList() -} - // Call Quiet Generate to create task list using character context, then convert to tasks. Should not be called much. async function generateTasks() { const prompt = substituteParams(objectivePrompts["createTask"].replace(/{{objective}}/gi, globalObjective)); console.log(`Generating tasks for objective with prompt`) toastr.info('Generating tasks for objective', 'Please wait...'); const taskResponse = await generateQuietPrompt(prompt) + + // Clear all existing global tasks when generating globalTasks = [] const numberedListPattern = /^\d+\./ - // Add numbered tasks, store them without the numbers. + // Create tasks from generated task list for (const task of taskResponse.split('\n').map(x => x.trim())) { if (task.match(numberedListPattern) != null) { - addTask(task.replace(numberedListPattern, '').trim()) + addTask(task.replace(numberedListPattern).trim()) } } updateUiTaskList() @@ -121,7 +115,7 @@ async function generateTasks() { // Call Quiet Generate to check if a task is completed async function checkTaskCompleted() { // Make sure there are tasks - if (Object.keys(currentTask).length == 0) { + if (currentTask == null) { return } checkCounter = $('#objective-check-frequency').val() @@ -166,7 +160,104 @@ function setCurrentTask(index = null) { saveState(); } +class ObjectiveTask { + // Task State + index + description + completed + parent + children + // UI Elements + taskHtml + descriptionSpan + completedCheckbox + deleteTaskButton + addTaskButton + + constructor (index, description, parent=null) { + this.index = index + this.description = description + this.parent = parent + } + + + // Complete the current task, setting next task to next incomplete task + completeTask() { + this.completed = true + console.info(`Task successfully completed: ${JSON.stringify(this.description)}`) + setCurrentTask() + updateUiTaskList() + } + + // Add a single task to the UI and attach event listeners for user edits + addUiElement() { + const template = ` +
+ ${this.index} + + ${this.description} +
+
+

+ `; + + // Add the filled out template + $('#objective-tasks').append(template); + + this.completedCheckbox = $(`#objective-task-complete-${this.index}`); + this.descriptionSpan = $(`#objective-task-description-${this.index}`); + this.addButton = $(`#objective-task-add-${this.index}`); + this.deleteButton = $(`#objective-task-delete-${this.index}`); + + // Add event listeners and set properties + $(`#objective-task-complete-${this.index}`).prop('checked', this.completed); + $(`#objective-task-complete-${this.index}`).on('click', this.onCompleteClick); + $(`#objective-task-description-${this.index}`).on('keyup', this.onDescriptionUpdate); + $(`#objective-task-delete-${this.index}`).on('click', this.onDeleteClick); + $(`#objective-task-add-${this.index}`).on('click', this.onAddClick); + } + + onCompleteClick(){ + this.completed = this.completedCheckbox.val() + setCurrentTask(); + } + + onDescriptionUpdate(){ + this.description = this.descriptionSpan.val(); + } + + onDeleteClick(){ + deleteTask(this.index); + } + + onAddClick(){ + addTask("", this.index + 1); + setCurrentTask(); + updateUiTaskList(); + } + + toString() { + return { + "index":this.index, + "description":this.description, + "completed":this.completed, + } + } +} + +class TaskManager { + tasks = {} + + constructor (){ + } + + addTask (description, index, parent) { + if (this.tasks){} + } + + deleteTask (index) +} //###############################// //# UI AND Settings #// @@ -194,9 +285,12 @@ function saveState() { currentChatId = context.chatId } + // Convert globalTasks for saving + const tasks = globalTasks.map(taskString => {return taskString.toString()}) + chat_metadata['objective'] = { objective: globalObjective, - tasks: globalTasks, + tasks: tasks, checkFrequency: $('#objective-check-frequency').val(), chatDepth: $('#objective-chat-depth').val(), hideTasks: $('#objective-hide-tasks').prop('checked'), @@ -219,56 +313,13 @@ function debugObjectiveExtension() { window.debugObjectiveExtension = debugObjectiveExtension - -// Add a single task to the UI and attach event listeners for user edits -function addUiTask(taskIndex, taskComplete, taskDescription) { - const template = ` -
- ${taskIndex} - - ${taskDescription} -
-
-

- `; - - // Add the filled out template - $('#objective-tasks').append(template); - - // Add event listeners and set properties - $(`#objective-task-complete-${taskIndex}`).prop('checked', taskComplete); - $(`#objective-task-complete-${taskIndex}`).on('click', event => { - const index = Number(event.target.id.split('-').pop()); - globalTasks[index].completed = event.target.checked; - setCurrentTask(); - }); - $(`#objective-task-description-${taskIndex}`).on('keyup', event => { - const index = Number(event.target.id.split('-').pop()); - globalTasks[index].description = event.target.textContent; - }); - $(`#objective-task-delete-${taskIndex}`).on('click', event => { - const index = Number(event.target.id.split('-').pop()); - deleteTask(index) - }); - $(`#objective-task-add-${taskIndex}`).on('click', event => { - const index = Number(event.target.id.split('-').pop()) + 1; - addTask("", index) - setCurrentTask() - updateUiTaskList() - }); -} - // Populate UI task list function updateUiTaskList() { $('#objective-tasks').empty() // Show tasks if there are any if (globalTasks.length > 0){ - for (const index in globalTasks) { - addUiTask( - index, - globalTasks[index].completed, - globalTasks[index].description - ) + for (const task of globalTasks) { + task.addUiElement() } } else { // Show button to add tasks if there are none @@ -283,7 +334,7 @@ function updateUiTaskList() { } } -function addManualTaskCheck() { +function addManualTaskCheckUi() { $('#extensionsMenu').prepend(`
@@ -386,7 +437,7 @@ jQuery(() => {
`; - addManualTaskCheck() + addManualTaskCheckUi() $('#extensions_settings').append(settingsHtml); $('#objective-generate').on('click', onGenerateObjectiveClick) $('#objective-chat-depth').on('input', onChatDepthInput) From 8ac368e2ef438559a4cbb6b267a6e46f40c25ef2 Mon Sep 17 00:00:00 2001 From: ouoertheo Date: Sat, 3 Jun 2023 14:41:59 -0500 Subject: [PATCH 02/14] probably not gonna work well --- public/scripts/extensions/objective/index.js | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js index 8c87f01af..f172ccdbe 100644 --- a/public/scripts/extensions/objective/index.js +++ b/public/scripts/extensions/objective/index.js @@ -38,9 +38,7 @@ const objectivePrompts = { ` } -const injectPrompts = { - "task": "Your current task is [{{task}}]. Balance existing roleplay with completing this task." -} +const extensionPrompt = "Your current task is [{{task}}]. Balance existing roleplay with completing this task." // Background prompt generation async function generateQuietPrompt(quiet_prompt) { @@ -126,7 +124,7 @@ async function checkTaskCompleted() { // Check response if task complete if (taskResponse.includes("true")) { console.info(`Character determined task '${JSON.stringify(currentTask)} is completed.`) - completeTask(getTask()) + currentTask.completeTask() } else if (!(taskResponse.includes("false"))) { console.warn(`checkTaskCompleted response did not contain true or false. taskResponse: ${taskResponse}`) } else { @@ -140,17 +138,23 @@ function setCurrentTask(index = null) { const context = getContext(); currentTask = {}; + // Set current task to either the next incomplete task, or the index if valid value is specified if (index === null) { currentTask = globalTasks.find(task => !task.completed) || {}; - } else if (index >= 0 && index < globalTasks.length) { + } else { + if (index >= 0 && index < globalTasks.length){ + toastr.error(`Invalide task index ${index} specified. Must be between 0 and ${globalTasks.length}`) + return + } currentTask = globalTasks[index]; } - const { description } = currentTask; - const injectPromptsTask = injectPrompts["task"].replace(/{{task}}/gi, description); + // Get the task description and add to extension prompt + const { description } = currentTask.description; if (description) { - context.setExtensionPrompt(MODULE_NAME, injectPromptsTask, 1, $('#objective-chat-depth').val()); + const extensionPromptText = extensionPrompt.replace(/{{task}}/gi, description); + context.setExtensionPrompt(MODULE_NAME, extensionPromptText, 1, $('#objective-chat-depth').val()); console.info(`Current task in context.extensionPrompts.Objective is ${JSON.stringify(context.extensionPrompts.Objective)}`); } else { context.setExtensionPrompt(MODULE_NAME, ''); @@ -212,10 +216,10 @@ class ObjectiveTask { // Add event listeners and set properties $(`#objective-task-complete-${this.index}`).prop('checked', this.completed); - $(`#objective-task-complete-${this.index}`).on('click', this.onCompleteClick); - $(`#objective-task-description-${this.index}`).on('keyup', this.onDescriptionUpdate); - $(`#objective-task-delete-${this.index}`).on('click', this.onDeleteClick); - $(`#objective-task-add-${this.index}`).on('click', this.onAddClick); + $(`#objective-task-complete-${this.index}`).on('click', () => (this.onCompleteClick())); + $(`#objective-task-description-${this.index}`).on('keyup', () => (this.onDescriptionUpdate())); + $(`#objective-task-delete-${this.index}`).on('click', () => (this.onDeleteClick())); + $(`#objective-task-add-${this.index}`).on('click', () => (this.onAddClick())); } onCompleteClick(){ @@ -237,7 +241,7 @@ class ObjectiveTask { updateUiTaskList(); } - toString() { + toSaveState() { return { "index":this.index, "description":this.description, @@ -256,7 +260,7 @@ class TaskManager { if (this.tasks){} } - deleteTask (index) + deleteTask (index) {} } //###############################// @@ -286,7 +290,7 @@ function saveState() { } // Convert globalTasks for saving - const tasks = globalTasks.map(taskString => {return taskString.toString()}) + const tasks = globalTasks.map(task => {return task.toSaveState()}) chat_metadata['objective'] = { objective: globalObjective, @@ -389,7 +393,7 @@ function loadSettings() { // Update globals globalObjective = chat_metadata['objective'].objective - globalTasks = chat_metadata['objective'].tasks + globalTasks = chat_metadata['objective'].tasks.map((task, index) => {return new ObjectiveTask(index, task.description)}) checkCounter = chat_metadata['objective'].checkFrequency // Update UI elements From 9891d0c936f74b0e9b061579c5c0724c851cfb9a Mon Sep 17 00:00:00 2001 From: ouoertheo Date: Mon, 5 Jun 2023 23:52:45 -0500 Subject: [PATCH 03/14] tasks are now a class. fix various bugs --- public/scripts/extensions/objective/index.js | 171 ++++++++++--------- 1 file changed, 94 insertions(+), 77 deletions(-) diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js index f172ccdbe..6366c1ee0 100644 --- a/public/scripts/extensions/objective/index.js +++ b/public/scripts/extensions/objective/index.js @@ -61,28 +61,27 @@ async function generateQuietPrompt(quiet_prompt) { function addTask(description, index = null) { index = index != null ? index: index = globalTasks.length globalTasks.splice(index, 0, new ObjectiveTask( - index, - description, + {description: description} )) saveState() } -// Get a task either by index or task description. Return current task if none specified -function getTask(index = null, taskDescription = null) { - let task = {} - if (index == null && taskDescription == null) { - task = currentTask - } else if (index != null) { - task = globalTasks[index] - } else if (taskDescription != null) { - task = globalTasks.find(task => { - return task.description == description ? true: false - }) + +// Return the task and index or throw an error +function getTaskById(taskId){ + if (taskId == null) { + throw `Null task id` + } + const index = globalTasks.findIndex((task) => task.id === taskId); + if (index !== -1) { + return { task: globalTasks[index], index: index }; + } else { + throw `Cannot find task with ${taskId}` } - return task } -function deleteTask(index){ +function deleteTask(taskId){ + const { task, index } = getTaskById(taskId) globalTasks.splice(index, 1) setCurrentTask() updateUiTaskList() @@ -102,18 +101,18 @@ async function generateTasks() { // Create tasks from generated task list for (const task of taskResponse.split('\n').map(x => x.trim())) { if (task.match(numberedListPattern) != null) { - addTask(task.replace(numberedListPattern).trim()) + addTask(task.replace(numberedListPattern,"").trim()) } } updateUiTaskList() - console.info(`Response for Objective: '${globalObjective}' was \n'${taskResponse}', \nwhich created tasks \n${JSON.stringify(globalTasks, null, 2)} `) + console.info(`Response for Objective: '${globalObjective}' was \n'${taskResponse}', \nwhich created tasks \n${JSON.stringify(globalTasks.map(v => {return v.toSaveState()}), null, 2)} `) toastr.success(`Generated ${globalTasks.length} tasks`, 'Done!'); } // Call Quiet Generate to check if a task is completed async function checkTaskCompleted() { // Make sure there are tasks - if (currentTask == null) { + if (jQuery.isEmptyObject(currentTask)) { return } checkCounter = $('#objective-check-frequency').val() @@ -123,7 +122,7 @@ async function checkTaskCompleted() { // Check response if task complete if (taskResponse.includes("true")) { - console.info(`Character determined task '${JSON.stringify(currentTask)} is completed.`) + console.info(`Character determined task '${JSON.stringify(currentTask.toSaveState())} is completed.`) currentTask.completeTask() } else if (!(taskResponse.includes("false"))) { console.warn(`checkTaskCompleted response did not contain true or false. taskResponse: ${taskResponse}`) @@ -134,23 +133,22 @@ async function checkTaskCompleted() { // Set a task in extensionPrompt context. Defaults to first incomplete -function setCurrentTask(index = null) { +function setCurrentTask(taskId = null) { const context = getContext(); currentTask = {}; - // Set current task to either the next incomplete task, or the index if valid value is specified - if (index === null) { + // Set current task to either the next incomplete task, or the index + if (taskId === null) { currentTask = globalTasks.find(task => !task.completed) || {}; } else { - if (index >= 0 && index < globalTasks.length){ - toastr.error(`Invalide task index ${index} specified. Must be between 0 and ${globalTasks.length}`) - return - } + const { _, index } = getTaskById(taskId) currentTask = globalTasks[index]; } // Get the task description and add to extension prompt - const { description } = currentTask.description; + const description = currentTask.description || null; + + // Now update the extension prompt if (description) { const extensionPromptText = extensionPrompt.replace(/{{task}}/gi, description); @@ -164,9 +162,19 @@ function setCurrentTask(index = null) { saveState(); } +let taskIdCounter = 0 +function getNextTaskId(){ + // Make sure id does not exist + while (globalTasks.find(task => task.id == taskIdCounter) != undefined) { + taskIdCounter += 1 + } + const nextId = taskIdCounter + console.log(`TaskID assigned: ${nextId}`) + taskIdCounter += 1 + return nextId +} class ObjectiveTask { - // Task State - index + id description completed parent @@ -179,10 +187,18 @@ class ObjectiveTask { deleteTaskButton addTaskButton - constructor (index, description, parent=null) { - this.index = index + constructor ({id=undefined, description, completed=false, parent=null}) { this.description = description this.parent = parent + this.children = [] + this.completed = completed + + // Generate a new ID if none specified + if (id==undefined){ + this.id = getNextTaskId() + } else { + this.id=id + } } @@ -197,72 +213,64 @@ class ObjectiveTask { // Add a single task to the UI and attach event listeners for user edits addUiElement() { const template = ` -
- ${this.index} - - ${this.description} -
-
+
+ + ${this.description} +
+

`; // Add the filled out template $('#objective-tasks').append(template); - - this.completedCheckbox = $(`#objective-task-complete-${this.index}`); - this.descriptionSpan = $(`#objective-task-description-${this.index}`); - this.addButton = $(`#objective-task-add-${this.index}`); - this.deleteButton = $(`#objective-task-delete-${this.index}`); + + this.completedCheckbox = $(`#objective-task-complete-${this.id}`); + this.descriptionSpan = $(`#objective-task-description-${this.id}`); + this.addButton = $(`#objective-task-add-${this.id}`); + this.deleteButton = $(`#objective-task-delete-${this.id}`); // Add event listeners and set properties - $(`#objective-task-complete-${this.index}`).prop('checked', this.completed); - $(`#objective-task-complete-${this.index}`).on('click', () => (this.onCompleteClick())); - $(`#objective-task-description-${this.index}`).on('keyup', () => (this.onDescriptionUpdate())); - $(`#objective-task-delete-${this.index}`).on('click', () => (this.onDeleteClick())); - $(`#objective-task-add-${this.index}`).on('click', () => (this.onAddClick())); + $(`#objective-task-complete-${this.id}`).prop('checked', this.completed); + $(`#objective-task-complete-${this.id}`).on('click', () => (this.onCompleteClick())); + $(`#objective-task-description-${this.id}`).on('keyup', () => (this.onDescriptionUpdate())); + $(`#objective-task-description-${this.id}`).on('focusout', () => (this.onDescriptionFocusout())); + $(`#objective-task-delete-${this.id}`).on('click', () => (this.onDeleteClick())); + $(`#objective-task-add-${this.id}`).on('click', () => (this.onAddClick())); } onCompleteClick(){ - this.completed = this.completedCheckbox.val() + this.completed = this.completedCheckbox.prop('checked') setCurrentTask(); } onDescriptionUpdate(){ - this.description = this.descriptionSpan.val(); + this.description = this.descriptionSpan.text(); + } + onDescriptionFocusout(){ + setCurrentTask(); } onDeleteClick(){ - deleteTask(this.index); + deleteTask(this.id); } onAddClick(){ - addTask("", this.index + 1); + const {_, index} = getTaskById(this.id) + addTask("", index + 1); setCurrentTask(); updateUiTaskList(); } toSaveState() { return { - "index":this.index, + "id":this.id, "description":this.description, "completed":this.completed, + "parent": this.parent, } } } -class TaskManager { - tasks = {} - - constructor (){ - } - - addTask (description, index, parent) { - if (this.tasks){} - } - - deleteTask (index) {} -} - //###############################// //# UI AND Settings #// //###############################// @@ -306,11 +314,11 @@ function saveState() { // Dump core state function debugObjectiveExtension() { console.log(JSON.stringify({ - "currentTask": currentTask, + "currentTask": currentTask.toSaveState(), "currentChatId": currentChatId, "checkCounter": checkCounter, "globalObjective": globalObjective, - "globalTasks": globalTasks, + "globalTasks": globalTasks.map(v => {return v.toSaveState()}), "extension_settings": chat_metadata['objective'], }, null, 2)) } @@ -338,14 +346,6 @@ function updateUiTaskList() { } } -function addManualTaskCheckUi() { - $('#extensionsMenu').prepend(` -
-
- Manual Task Check -
`) - $('#objective-task-manual-check-menu-item').attr('title', 'Trigger AI check of completed tasks').on('click', checkTaskCompleted) -} // Trigger creation of new tasks with given objective. async function onGenerateObjectiveClick() { @@ -393,7 +393,14 @@ function loadSettings() { // Update globals globalObjective = chat_metadata['objective'].objective - globalTasks = chat_metadata['objective'].tasks.map((task, index) => {return new ObjectiveTask(index, task.description)}) + globalTasks = chat_metadata['objective'].tasks.map(task => { + return new ObjectiveTask({ + id: task.id, + description: task.description, + completed: task.completed, + parent: task.parent, + }) + }); checkCounter = chat_metadata['objective'].checkFrequency // Update UI elements @@ -407,6 +414,15 @@ function loadSettings() { setCurrentTask() } +function addManualTaskCheckUi() { + $('#extensionsMenu').prepend(` +
+
+ Manual Task Check +
`) + $('#objective-task-manual-check-menu-item').attr('title', 'Trigger AI check of completed tasks').on('click', checkTaskCompleted) +} + jQuery(() => { const settingsHtml = `
@@ -429,7 +445,8 @@ jQuery(() => {
-
+
+
From 645397e355568afce50dd676ea9a203c3fbc2ec0 Mon Sep 17 00:00:00 2001 From: Cohee Date: Tue, 6 Jun 2023 15:06:21 +0300 Subject: [PATCH 04/14] #442 Auto-classify backgrounds based on chat context. Add string fuzzy matching library. --- public/index.html | 1 + public/script.js | 14 + .../scripts/extensions/backgrounds/index.js | 41 + .../scripts/extensions/expressions/index.js | 4 +- .../scripts/extensions/expressions/style.css | 7 +- public/scripts/extensions/objective/index.js | 34 +- public/scripts/fuse.js | 2240 +++++++++++++++++ 7 files changed, 2313 insertions(+), 28 deletions(-) create mode 100644 public/scripts/fuse.js diff --git a/public/index.html b/public/index.html index 24bf7c48b..eb622fd90 100644 --- a/public/index.html +++ b/public/index.html @@ -35,6 +35,7 @@ + diff --git a/public/script.js b/public/script.js index ebf095771..7b91763a3 100644 --- a/public/script.js +++ b/public/script.js @@ -1399,6 +1399,20 @@ function getStoppingStrings(isImpersonate, addSpace) { return addSpace ? result.map(x => `${x} `) : result; } + +// Background prompt generation +export async function generateQuietPrompt(quiet_prompt) { + return await new Promise( + async function promptPromise(resolve, reject) { + try { + await Generate('quiet', { resolve, reject, quiet_prompt, force_name2: true, }); + } + catch { + reject(); + } + }); +} + function processCommands(message, type) { if (type == "regenerate" || type == "swipe" || type == 'quiet') { return null; diff --git a/public/scripts/extensions/backgrounds/index.js b/public/scripts/extensions/backgrounds/index.js index 3c7dbfafb..e5d224d1d 100644 --- a/public/scripts/extensions/backgrounds/index.js +++ b/public/scripts/extensions/backgrounds/index.js @@ -1,4 +1,7 @@ +import { generateQuietPrompt } from "../../../script.js"; import { getContext, saveMetadataDebounced } from "../../extensions.js"; +import { registerSlashCommand } from "../../slash-commands.js"; +import { stringFormat } from "../../utils.js"; export { MODULE_NAME }; const MODULE_NAME = 'backgrounds'; @@ -87,6 +90,30 @@ function onSelectBackgroundClick() { } } +const autoBgPrompt = `Pause your roleplay and choose a location ONLY from the provided list that is the most suitable for the current scene. Do not output any other text:\n{0}`; + +async function autoBackgroundCommand() { + const options = Array.from(document.querySelectorAll('.BGSampleTitle')).map(x => ({ element: x, text: x.innerText.trim() })).filter(x => x.text.length > 0); + if (options.length == 0) { + toastr.warning('No backgrounds to choose from. Please upload some images to the "backgrounds" folder.'); + return; + } + + const list = options.map(option => `- ${option.text}`).join('\n'); + const prompt = stringFormat(autoBgPrompt, list); + const reply = await generateQuietPrompt(prompt); + const fuse = new Fuse(options, { keys: ['text'] }); + const bestMatch = fuse.search(reply, { limit: 1 }); + + if (bestMatch.length == 0) { + toastr.warning('No match found. Please try again.'); + return; + } + + console.debug('Automatically choosing background:', bestMatch); + bestMatch[0].item.element.click(); +} + $(document).ready(function () { function addSettings() { const html = ` @@ -111,6 +138,16 @@ $(document).ready(function () { Any background image selected while lock is engaged will be saved automatically.
+
+ + + Automatically select a background based on the chat context.
+ Respects the "Lock" setting state. + +
Preview
@@ -122,8 +159,12 @@ $(document).ready(function () { $('#lock_background').on('click', onLockBackgroundClick); $('#unlock_background').on('click', onUnlockBackgroundClick); $(document).on("click", ".bg_example", onSelectBackgroundClick); + $('#auto_background').on("click", autoBackgroundCommand); } addSettings(); setInterval(moduleWorker, UPDATE_INTERVAL); + registerSlashCommand('lock', onLockBackgroundClick, [], " – locks a background for the currently selected chat", true, true); + registerSlashCommand('unlock', onUnlockBackgroundClick, [], ' – unlocks a background for the currently selected chat', true, true); + registerSlashCommand('autobg', autoBackgroundCommand, ['bgauto'], ' – automatically changes the background based on the chat context', true, true); }); diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js index c8be40ec9..9768ac4d0 100644 --- a/public/scripts/extensions/expressions/index.js +++ b/public/scripts/extensions/expressions/index.js @@ -904,7 +904,9 @@ function setExpressionOverrideHtml(forceClear = false) {
-

You are in offline mode. Click on the image below to set the expression.

+
+ You are in offline mode. Click on the image below to set the expression. +
diff --git a/public/scripts/extensions/expressions/style.css b/public/scripts/extensions/expressions/style.css index 81b39408a..de1eb9fd2 100644 --- a/public/scripts/extensions/expressions/style.css +++ b/public/scripts/extensions/expressions/style.css @@ -143,11 +143,6 @@ img.expression.default { color: red; } -.expression_settings p { - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} - .expression_settings label { display: flex; align-items: center; @@ -171,4 +166,4 @@ img.expression.default { div.expression { display: none; } -} \ No newline at end of file +} diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js index d2d675e71..3485da1ec 100644 --- a/public/scripts/extensions/objective/index.js +++ b/public/scripts/extensions/objective/index.js @@ -4,7 +4,9 @@ import { substituteParams, eventSource, event_types, + generateQuietPrompt, } from "../../../script.js"; +import { registerSlashCommand } from "../../slash-commands.js"; const MODULE_NAME = "Objective" @@ -40,18 +42,6 @@ const objectivePrompts = { const extensionPrompt = "Your current task is [{{task}}]. Balance existing roleplay with completing this task." -// Background prompt generation -async function generateQuietPrompt(quiet_prompt) { - return await new Promise( - async function promptPromise(resolve, reject) { - try { - await getContext().generate('quiet', { resolve, reject, quiet_prompt, force_name2: true, }); - } - catch { - reject(); - } - }); -} //###############################// //# Task Management #// @@ -112,7 +102,7 @@ async function generateTasks() { // Call Quiet Generate to check if a task is completed async function checkTaskCompleted() { - // Make sure there are tasks + // Make sure there are tasks if (jQuery.isEmptyObject(currentTask)) { return } @@ -146,7 +136,7 @@ function setCurrentTask(taskId = null) { currentTask = globalTasks[index]; } - // Get the task description and add to extension prompt + // Get the task description and add to extension prompt const description = currentTask.description || null; // Now update the extension prompt @@ -201,7 +191,7 @@ class ObjectiveTask { this.id=id } } - + // Complete the current task, setting next task to next incomplete task completeTask() { @@ -221,10 +211,10 @@ class ObjectiveTask {

`; - + // Add the filled out template $('#objective-tasks').append(template); - + this.completedCheckbox = $(`#objective-task-complete-${this.id}`); this.descriptionSpan = $(`#objective-task-description-${this.id}`); this.addButton = $(`#objective-task-add-${this.id}`); @@ -250,7 +240,7 @@ class ObjectiveTask { onDescriptionFocusout(){ setCurrentTask(); } - + onDeleteClick(){ deleteTask(this.id); } @@ -437,16 +427,16 @@ jQuery(() => {
- +
- +
-
+

@@ -486,4 +476,6 @@ jQuery(() => { setCurrentTask(); $('#objective-counter').text(checkCounter) }); + + registerSlashCommand('taskcheck', checkTaskCompleted, [], ' – checks if the current task is completed', true, true); }); diff --git a/public/scripts/fuse.js b/public/scripts/fuse.js new file mode 100644 index 000000000..42e7d3b7f --- /dev/null +++ b/public/scripts/fuse.js @@ -0,0 +1,2240 @@ +/** + * Fuse.js v6.6.2 - Lightweight fuzzy-search (http://fusejs.io) + * + * Copyright (c) 2022 Kiro Risk (http://kiro.me) + * All Rights Reserved. Apache Software License 2.0 + * + * http://www.apache.org/licenses/LICENSE-2.0 + */ + +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Fuse = factory()); +})(this, (function () { 'use strict'; + + function ownKeys(object, enumerableOnly) { + var keys = Object.keys(object); + + if (Object.getOwnPropertySymbols) { + var symbols = Object.getOwnPropertySymbols(object); + enumerableOnly && (symbols = symbols.filter(function (sym) { + return Object.getOwnPropertyDescriptor(object, sym).enumerable; + })), keys.push.apply(keys, symbols); + } + + return keys; + } + + function _objectSpread2(target) { + for (var i = 1; i < arguments.length; i++) { + var source = null != arguments[i] ? arguments[i] : {}; + i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { + _defineProperty(target, key, source[key]); + }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { + Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); + }); + } + + return target; + } + + function _typeof(obj) { + "@babel/helpers - typeof"; + + return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { + return typeof obj; + } : function (obj) { + return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; + }, _typeof(obj); + } + + function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + } + + function _defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + function _createClass(Constructor, protoProps, staticProps) { + if (protoProps) _defineProperties(Constructor.prototype, protoProps); + if (staticProps) _defineProperties(Constructor, staticProps); + Object.defineProperty(Constructor, "prototype", { + writable: false + }); + return Constructor; + } + + function _defineProperty(obj, key, value) { + if (key in obj) { + Object.defineProperty(obj, key, { + value: value, + enumerable: true, + configurable: true, + writable: true + }); + } else { + obj[key] = value; + } + + return obj; + } + + function _inherits(subClass, superClass) { + if (typeof superClass !== "function" && superClass !== null) { + throw new TypeError("Super expression must either be null or a function"); + } + + Object.defineProperty(subClass, "prototype", { + value: Object.create(superClass && superClass.prototype, { + constructor: { + value: subClass, + writable: true, + configurable: true + } + }), + writable: false + }); + if (superClass) _setPrototypeOf(subClass, superClass); + } + + function _getPrototypeOf(o) { + _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { + return o.__proto__ || Object.getPrototypeOf(o); + }; + return _getPrototypeOf(o); + } + + function _setPrototypeOf(o, p) { + _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { + o.__proto__ = p; + return o; + }; + + return _setPrototypeOf(o, p); + } + + function _isNativeReflectConstruct() { + if (typeof Reflect === "undefined" || !Reflect.construct) return false; + if (Reflect.construct.sham) return false; + if (typeof Proxy === "function") return true; + + try { + Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); + return true; + } catch (e) { + return false; + } + } + + function _assertThisInitialized(self) { + if (self === void 0) { + throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); + } + + return self; + } + + function _possibleConstructorReturn(self, call) { + if (call && (typeof call === "object" || typeof call === "function")) { + return call; + } else if (call !== void 0) { + throw new TypeError("Derived constructors may only return object or undefined"); + } + + return _assertThisInitialized(self); + } + + function _createSuper(Derived) { + var hasNativeReflectConstruct = _isNativeReflectConstruct(); + + return function _createSuperInternal() { + var Super = _getPrototypeOf(Derived), + result; + + if (hasNativeReflectConstruct) { + var NewTarget = _getPrototypeOf(this).constructor; + + result = Reflect.construct(Super, arguments, NewTarget); + } else { + result = Super.apply(this, arguments); + } + + return _possibleConstructorReturn(this, result); + }; + } + + function _toConsumableArray(arr) { + return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); + } + + function _arrayWithoutHoles(arr) { + if (Array.isArray(arr)) return _arrayLikeToArray(arr); + } + + function _iterableToArray(iter) { + if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); + } + + function _unsupportedIterableToArray(o, minLen) { + if (!o) return; + if (typeof o === "string") return _arrayLikeToArray(o, minLen); + var n = Object.prototype.toString.call(o).slice(8, -1); + if (n === "Object" && o.constructor) n = o.constructor.name; + if (n === "Map" || n === "Set") return Array.from(o); + if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); + } + + function _arrayLikeToArray(arr, len) { + if (len == null || len > arr.length) len = arr.length; + + for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; + + return arr2; + } + + function _nonIterableSpread() { + throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); + } + + function isArray(value) { + return !Array.isArray ? getTag(value) === '[object Array]' : Array.isArray(value); + } // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/baseToString.js + + var INFINITY = 1 / 0; + function baseToString(value) { + // Exit early for strings to avoid a performance hit in some environments. + if (typeof value == 'string') { + return value; + } + + var result = value + ''; + return result == '0' && 1 / value == -INFINITY ? '-0' : result; + } + function toString(value) { + return value == null ? '' : baseToString(value); + } + function isString(value) { + return typeof value === 'string'; + } + function isNumber(value) { + return typeof value === 'number'; + } // Adapted from: https://github.com/lodash/lodash/blob/master/isBoolean.js + + function isBoolean(value) { + return value === true || value === false || isObjectLike(value) && getTag(value) == '[object Boolean]'; + } + function isObject(value) { + return _typeof(value) === 'object'; + } // Checks if `value` is object-like. + + function isObjectLike(value) { + return isObject(value) && value !== null; + } + function isDefined(value) { + return value !== undefined && value !== null; + } + function isBlank(value) { + return !value.trim().length; + } // Gets the `toStringTag` of `value`. + // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/getTag.js + + function getTag(value) { + return value == null ? value === undefined ? '[object Undefined]' : '[object Null]' : Object.prototype.toString.call(value); + } + + var EXTENDED_SEARCH_UNAVAILABLE = 'Extended search is not available'; + var INCORRECT_INDEX_TYPE = "Incorrect 'index' type"; + var LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY = function LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key) { + return "Invalid value for key ".concat(key); + }; + var PATTERN_LENGTH_TOO_LARGE = function PATTERN_LENGTH_TOO_LARGE(max) { + return "Pattern length exceeds max of ".concat(max, "."); + }; + var MISSING_KEY_PROPERTY = function MISSING_KEY_PROPERTY(name) { + return "Missing ".concat(name, " property in key"); + }; + var INVALID_KEY_WEIGHT_VALUE = function INVALID_KEY_WEIGHT_VALUE(key) { + return "Property 'weight' in key '".concat(key, "' must be a positive integer"); + }; + + var hasOwn = Object.prototype.hasOwnProperty; + + var KeyStore = /*#__PURE__*/function () { + function KeyStore(keys) { + var _this = this; + + _classCallCheck(this, KeyStore); + + this._keys = []; + this._keyMap = {}; + var totalWeight = 0; + keys.forEach(function (key) { + var obj = createKey(key); + totalWeight += obj.weight; + + _this._keys.push(obj); + + _this._keyMap[obj.id] = obj; + totalWeight += obj.weight; + }); // Normalize weights so that their sum is equal to 1 + + this._keys.forEach(function (key) { + key.weight /= totalWeight; + }); + } + + _createClass(KeyStore, [{ + key: "get", + value: function get(keyId) { + return this._keyMap[keyId]; + } + }, { + key: "keys", + value: function keys() { + return this._keys; + } + }, { + key: "toJSON", + value: function toJSON() { + return JSON.stringify(this._keys); + } + }]); + + return KeyStore; + }(); + function createKey(key) { + var path = null; + var id = null; + var src = null; + var weight = 1; + var getFn = null; + + if (isString(key) || isArray(key)) { + src = key; + path = createKeyPath(key); + id = createKeyId(key); + } else { + if (!hasOwn.call(key, 'name')) { + throw new Error(MISSING_KEY_PROPERTY('name')); + } + + var name = key.name; + src = name; + + if (hasOwn.call(key, 'weight')) { + weight = key.weight; + + if (weight <= 0) { + throw new Error(INVALID_KEY_WEIGHT_VALUE(name)); + } + } + + path = createKeyPath(name); + id = createKeyId(name); + getFn = key.getFn; + } + + return { + path: path, + id: id, + weight: weight, + src: src, + getFn: getFn + }; + } + function createKeyPath(key) { + return isArray(key) ? key : key.split('.'); + } + function createKeyId(key) { + return isArray(key) ? key.join('.') : key; + } + + function get(obj, path) { + var list = []; + var arr = false; + + var deepGet = function deepGet(obj, path, index) { + if (!isDefined(obj)) { + return; + } + + if (!path[index]) { + // If there's no path left, we've arrived at the object we care about. + list.push(obj); + } else { + var key = path[index]; + var value = obj[key]; + + if (!isDefined(value)) { + return; + } // If we're at the last value in the path, and if it's a string/number/bool, + // add it to the list + + + if (index === path.length - 1 && (isString(value) || isNumber(value) || isBoolean(value))) { + list.push(toString(value)); + } else if (isArray(value)) { + arr = true; // Search each item in the array. + + for (var i = 0, len = value.length; i < len; i += 1) { + deepGet(value[i], path, index + 1); + } + } else if (path.length) { + // An object. Recurse further. + deepGet(value, path, index + 1); + } + } + }; // Backwards compatibility (since path used to be a string) + + + deepGet(obj, isString(path) ? path.split('.') : path, 0); + return arr ? list : list[0]; + } + + var MatchOptions = { + // Whether the matches should be included in the result set. When `true`, each record in the result + // set will include the indices of the matched characters. + // These can consequently be used for highlighting purposes. + includeMatches: false, + // When `true`, the matching function will continue to the end of a search pattern even if + // a perfect match has already been located in the string. + findAllMatches: false, + // Minimum number of characters that must be matched before a result is considered a match + minMatchCharLength: 1 + }; + var BasicOptions = { + // When `true`, the algorithm continues searching to the end of the input even if a perfect + // match is found before the end of the same input. + isCaseSensitive: false, + // When true, the matching function will continue to the end of a search pattern even if + includeScore: false, + // List of properties that will be searched. This also supports nested properties. + keys: [], + // Whether to sort the result list, by score + shouldSort: true, + // Default sort function: sort by ascending score, ascending index + sortFn: function sortFn(a, b) { + return a.score === b.score ? a.idx < b.idx ? -1 : 1 : a.score < b.score ? -1 : 1; + } + }; + var FuzzyOptions = { + // Approximately where in the text is the pattern expected to be found? + location: 0, + // At what point does the match algorithm give up. A threshold of '0.0' requires a perfect match + // (of both letters and location), a threshold of '1.0' would match anything. + threshold: 0.6, + // Determines how close the match must be to the fuzzy location (specified above). + // An exact letter match which is 'distance' characters away from the fuzzy location + // would score as a complete mismatch. A distance of '0' requires the match be at + // the exact location specified, a threshold of '1000' would require a perfect match + // to be within 800 characters of the fuzzy location to be found using a 0.8 threshold. + distance: 100 + }; + var AdvancedOptions = { + // When `true`, it enables the use of unix-like search commands + useExtendedSearch: false, + // The get function to use when fetching an object's properties. + // The default will search nested paths *ie foo.bar.baz* + getFn: get, + // When `true`, search will ignore `location` and `distance`, so it won't matter + // where in the string the pattern appears. + // More info: https://fusejs.io/concepts/scoring-theory.html#fuzziness-score + ignoreLocation: false, + // When `true`, the calculation for the relevance score (used for sorting) will + // ignore the field-length norm. + // More info: https://fusejs.io/concepts/scoring-theory.html#field-length-norm + ignoreFieldNorm: false, + // The weight to determine how much field length norm effects scoring. + fieldNormWeight: 1 + }; + var Config = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, BasicOptions), MatchOptions), FuzzyOptions), AdvancedOptions); + + var SPACE = /[^ ]+/g; // Field-length norm: the shorter the field, the higher the weight. + // Set to 3 decimals to reduce index size. + + function norm() { + var weight = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1; + var mantissa = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3; + var cache = new Map(); + var m = Math.pow(10, mantissa); + return { + get: function get(value) { + var numTokens = value.match(SPACE).length; + + if (cache.has(numTokens)) { + return cache.get(numTokens); + } // Default function is 1/sqrt(x), weight makes that variable + + + var norm = 1 / Math.pow(numTokens, 0.5 * weight); // In place of `toFixed(mantissa)`, for faster computation + + var n = parseFloat(Math.round(norm * m) / m); + cache.set(numTokens, n); + return n; + }, + clear: function clear() { + cache.clear(); + } + }; + } + + var FuseIndex = /*#__PURE__*/function () { + function FuseIndex() { + var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, + _ref$getFn = _ref.getFn, + getFn = _ref$getFn === void 0 ? Config.getFn : _ref$getFn, + _ref$fieldNormWeight = _ref.fieldNormWeight, + fieldNormWeight = _ref$fieldNormWeight === void 0 ? Config.fieldNormWeight : _ref$fieldNormWeight; + + _classCallCheck(this, FuseIndex); + + this.norm = norm(fieldNormWeight, 3); + this.getFn = getFn; + this.isCreated = false; + this.setIndexRecords(); + } + + _createClass(FuseIndex, [{ + key: "setSources", + value: function setSources() { + var docs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + this.docs = docs; + } + }, { + key: "setIndexRecords", + value: function setIndexRecords() { + var records = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + this.records = records; + } + }, { + key: "setKeys", + value: function setKeys() { + var _this = this; + + var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + this.keys = keys; + this._keysMap = {}; + keys.forEach(function (key, idx) { + _this._keysMap[key.id] = idx; + }); + } + }, { + key: "create", + value: function create() { + var _this2 = this; + + if (this.isCreated || !this.docs.length) { + return; + } + + this.isCreated = true; // List is Array + + if (isString(this.docs[0])) { + this.docs.forEach(function (doc, docIndex) { + _this2._addString(doc, docIndex); + }); + } else { + // List is Array + this.docs.forEach(function (doc, docIndex) { + _this2._addObject(doc, docIndex); + }); + } + + this.norm.clear(); + } // Adds a doc to the end of the index + + }, { + key: "add", + value: function add(doc) { + var idx = this.size(); + + if (isString(doc)) { + this._addString(doc, idx); + } else { + this._addObject(doc, idx); + } + } // Removes the doc at the specified index of the index + + }, { + key: "removeAt", + value: function removeAt(idx) { + this.records.splice(idx, 1); // Change ref index of every subsquent doc + + for (var i = idx, len = this.size(); i < len; i += 1) { + this.records[i].i -= 1; + } + } + }, { + key: "getValueForItemAtKeyId", + value: function getValueForItemAtKeyId(item, keyId) { + return item[this._keysMap[keyId]]; + } + }, { + key: "size", + value: function size() { + return this.records.length; + } + }, { + key: "_addString", + value: function _addString(doc, docIndex) { + if (!isDefined(doc) || isBlank(doc)) { + return; + } + + var record = { + v: doc, + i: docIndex, + n: this.norm.get(doc) + }; + this.records.push(record); + } + }, { + key: "_addObject", + value: function _addObject(doc, docIndex) { + var _this3 = this; + + var record = { + i: docIndex, + $: {} + }; // Iterate over every key (i.e, path), and fetch the value at that key + + this.keys.forEach(function (key, keyIndex) { + var value = key.getFn ? key.getFn(doc) : _this3.getFn(doc, key.path); + + if (!isDefined(value)) { + return; + } + + if (isArray(value)) { + (function () { + var subRecords = []; + var stack = [{ + nestedArrIndex: -1, + value: value + }]; + + while (stack.length) { + var _stack$pop = stack.pop(), + nestedArrIndex = _stack$pop.nestedArrIndex, + _value = _stack$pop.value; + + if (!isDefined(_value)) { + continue; + } + + if (isString(_value) && !isBlank(_value)) { + var subRecord = { + v: _value, + i: nestedArrIndex, + n: _this3.norm.get(_value) + }; + subRecords.push(subRecord); + } else if (isArray(_value)) { + _value.forEach(function (item, k) { + stack.push({ + nestedArrIndex: k, + value: item + }); + }); + } else ; + } + + record.$[keyIndex] = subRecords; + })(); + } else if (isString(value) && !isBlank(value)) { + var subRecord = { + v: value, + n: _this3.norm.get(value) + }; + record.$[keyIndex] = subRecord; + } + }); + this.records.push(record); + } + }, { + key: "toJSON", + value: function toJSON() { + return { + keys: this.keys, + records: this.records + }; + } + }]); + + return FuseIndex; + }(); + function createIndex(keys, docs) { + var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + _ref2$getFn = _ref2.getFn, + getFn = _ref2$getFn === void 0 ? Config.getFn : _ref2$getFn, + _ref2$fieldNormWeight = _ref2.fieldNormWeight, + fieldNormWeight = _ref2$fieldNormWeight === void 0 ? Config.fieldNormWeight : _ref2$fieldNormWeight; + + var myIndex = new FuseIndex({ + getFn: getFn, + fieldNormWeight: fieldNormWeight + }); + myIndex.setKeys(keys.map(createKey)); + myIndex.setSources(docs); + myIndex.create(); + return myIndex; + } + function parseIndex(data) { + var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref3$getFn = _ref3.getFn, + getFn = _ref3$getFn === void 0 ? Config.getFn : _ref3$getFn, + _ref3$fieldNormWeight = _ref3.fieldNormWeight, + fieldNormWeight = _ref3$fieldNormWeight === void 0 ? Config.fieldNormWeight : _ref3$fieldNormWeight; + + var keys = data.keys, + records = data.records; + var myIndex = new FuseIndex({ + getFn: getFn, + fieldNormWeight: fieldNormWeight + }); + myIndex.setKeys(keys); + myIndex.setIndexRecords(records); + return myIndex; + } + + function computeScore$1(pattern) { + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref$errors = _ref.errors, + errors = _ref$errors === void 0 ? 0 : _ref$errors, + _ref$currentLocation = _ref.currentLocation, + currentLocation = _ref$currentLocation === void 0 ? 0 : _ref$currentLocation, + _ref$expectedLocation = _ref.expectedLocation, + expectedLocation = _ref$expectedLocation === void 0 ? 0 : _ref$expectedLocation, + _ref$distance = _ref.distance, + distance = _ref$distance === void 0 ? Config.distance : _ref$distance, + _ref$ignoreLocation = _ref.ignoreLocation, + ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; + + var accuracy = errors / pattern.length; + + if (ignoreLocation) { + return accuracy; + } + + var proximity = Math.abs(expectedLocation - currentLocation); + + if (!distance) { + // Dodge divide by zero error. + return proximity ? 1.0 : accuracy; + } + + return accuracy + proximity / distance; + } + + function convertMaskToIndices() { + var matchmask = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + var minMatchCharLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Config.minMatchCharLength; + var indices = []; + var start = -1; + var end = -1; + var i = 0; + + for (var len = matchmask.length; i < len; i += 1) { + var match = matchmask[i]; + + if (match && start === -1) { + start = i; + } else if (!match && start !== -1) { + end = i - 1; + + if (end - start + 1 >= minMatchCharLength) { + indices.push([start, end]); + } + + start = -1; + } + } // (i-1 - start) + 1 => i - start + + + if (matchmask[i - 1] && i - start >= minMatchCharLength) { + indices.push([start, i - 1]); + } + + return indices; + } + + // Machine word size + var MAX_BITS = 32; + + function search(text, pattern, patternAlphabet) { + var _ref = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}, + _ref$location = _ref.location, + location = _ref$location === void 0 ? Config.location : _ref$location, + _ref$distance = _ref.distance, + distance = _ref$distance === void 0 ? Config.distance : _ref$distance, + _ref$threshold = _ref.threshold, + threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, + _ref$findAllMatches = _ref.findAllMatches, + findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, + _ref$minMatchCharLeng = _ref.minMatchCharLength, + minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$ignoreLocation = _ref.ignoreLocation, + ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; + + if (pattern.length > MAX_BITS) { + throw new Error(PATTERN_LENGTH_TOO_LARGE(MAX_BITS)); + } + + var patternLen = pattern.length; // Set starting location at beginning text and initialize the alphabet. + + var textLen = text.length; // Handle the case when location > text.length + + var expectedLocation = Math.max(0, Math.min(location, textLen)); // Highest score beyond which we give up. + + var currentThreshold = threshold; // Is there a nearby exact match? (speedup) + + var bestLocation = expectedLocation; // Performance: only computer matches when the minMatchCharLength > 1 + // OR if `includeMatches` is true. + + var computeMatches = minMatchCharLength > 1 || includeMatches; // A mask of the matches, used for building the indices + + var matchMask = computeMatches ? Array(textLen) : []; + var index; // Get all exact matches, here for speed up + + while ((index = text.indexOf(pattern, bestLocation)) > -1) { + var score = computeScore$1(pattern, { + currentLocation: index, + expectedLocation: expectedLocation, + distance: distance, + ignoreLocation: ignoreLocation + }); + currentThreshold = Math.min(score, currentThreshold); + bestLocation = index + patternLen; + + if (computeMatches) { + var i = 0; + + while (i < patternLen) { + matchMask[index + i] = 1; + i += 1; + } + } + } // Reset the best location + + + bestLocation = -1; + var lastBitArr = []; + var finalScore = 1; + var binMax = patternLen + textLen; + var mask = 1 << patternLen - 1; + + for (var _i = 0; _i < patternLen; _i += 1) { + // Scan for the best match; each iteration allows for one more error. + // Run a binary search to determine how far from the match location we can stray + // at this error level. + var binMin = 0; + var binMid = binMax; + + while (binMin < binMid) { + var _score2 = computeScore$1(pattern, { + errors: _i, + currentLocation: expectedLocation + binMid, + expectedLocation: expectedLocation, + distance: distance, + ignoreLocation: ignoreLocation + }); + + if (_score2 <= currentThreshold) { + binMin = binMid; + } else { + binMax = binMid; + } + + binMid = Math.floor((binMax - binMin) / 2 + binMin); + } // Use the result from this iteration as the maximum for the next. + + + binMax = binMid; + var start = Math.max(1, expectedLocation - binMid + 1); + var finish = findAllMatches ? textLen : Math.min(expectedLocation + binMid, textLen) + patternLen; // Initialize the bit array + + var bitArr = Array(finish + 2); + bitArr[finish + 1] = (1 << _i) - 1; + + for (var j = finish; j >= start; j -= 1) { + var currentLocation = j - 1; + var charMatch = patternAlphabet[text.charAt(currentLocation)]; + + if (computeMatches) { + // Speed up: quick bool to int conversion (i.e, `charMatch ? 1 : 0`) + matchMask[currentLocation] = +!!charMatch; + } // First pass: exact match + + + bitArr[j] = (bitArr[j + 1] << 1 | 1) & charMatch; // Subsequent passes: fuzzy match + + if (_i) { + bitArr[j] |= (lastBitArr[j + 1] | lastBitArr[j]) << 1 | 1 | lastBitArr[j + 1]; + } + + if (bitArr[j] & mask) { + finalScore = computeScore$1(pattern, { + errors: _i, + currentLocation: currentLocation, + expectedLocation: expectedLocation, + distance: distance, + ignoreLocation: ignoreLocation + }); // This match will almost certainly be better than any existing match. + // But check anyway. + + if (finalScore <= currentThreshold) { + // Indeed it is + currentThreshold = finalScore; + bestLocation = currentLocation; // Already passed `loc`, downhill from here on in. + + if (bestLocation <= expectedLocation) { + break; + } // When passing `bestLocation`, don't exceed our current distance from `expectedLocation`. + + + start = Math.max(1, 2 * expectedLocation - bestLocation); + } + } + } // No hope for a (better) match at greater error levels. + + + var _score = computeScore$1(pattern, { + errors: _i + 1, + currentLocation: expectedLocation, + expectedLocation: expectedLocation, + distance: distance, + ignoreLocation: ignoreLocation + }); + + if (_score > currentThreshold) { + break; + } + + lastBitArr = bitArr; + } + + var result = { + isMatch: bestLocation >= 0, + // Count exact matches (those with a score of 0) to be "almost" exact + score: Math.max(0.001, finalScore) + }; + + if (computeMatches) { + var indices = convertMaskToIndices(matchMask, minMatchCharLength); + + if (!indices.length) { + result.isMatch = false; + } else if (includeMatches) { + result.indices = indices; + } + } + + return result; + } + + function createPatternAlphabet(pattern) { + var mask = {}; + + for (var i = 0, len = pattern.length; i < len; i += 1) { + var _char = pattern.charAt(i); + + mask[_char] = (mask[_char] || 0) | 1 << len - i - 1; + } + + return mask; + } + + var BitapSearch = /*#__PURE__*/function () { + function BitapSearch(pattern) { + var _this = this; + + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref$location = _ref.location, + location = _ref$location === void 0 ? Config.location : _ref$location, + _ref$threshold = _ref.threshold, + threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, + _ref$distance = _ref.distance, + distance = _ref$distance === void 0 ? Config.distance : _ref$distance, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$findAllMatches = _ref.findAllMatches, + findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, + _ref$minMatchCharLeng = _ref.minMatchCharLength, + minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, + _ref$isCaseSensitive = _ref.isCaseSensitive, + isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, + _ref$ignoreLocation = _ref.ignoreLocation, + ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; + + _classCallCheck(this, BitapSearch); + + this.options = { + location: location, + threshold: threshold, + distance: distance, + includeMatches: includeMatches, + findAllMatches: findAllMatches, + minMatchCharLength: minMatchCharLength, + isCaseSensitive: isCaseSensitive, + ignoreLocation: ignoreLocation + }; + this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); + this.chunks = []; + + if (!this.pattern.length) { + return; + } + + var addChunk = function addChunk(pattern, startIndex) { + _this.chunks.push({ + pattern: pattern, + alphabet: createPatternAlphabet(pattern), + startIndex: startIndex + }); + }; + + var len = this.pattern.length; + + if (len > MAX_BITS) { + var i = 0; + var remainder = len % MAX_BITS; + var end = len - remainder; + + while (i < end) { + addChunk(this.pattern.substr(i, MAX_BITS), i); + i += MAX_BITS; + } + + if (remainder) { + var startIndex = len - MAX_BITS; + addChunk(this.pattern.substr(startIndex), startIndex); + } + } else { + addChunk(this.pattern, 0); + } + } + + _createClass(BitapSearch, [{ + key: "searchIn", + value: function searchIn(text) { + var _this$options = this.options, + isCaseSensitive = _this$options.isCaseSensitive, + includeMatches = _this$options.includeMatches; + + if (!isCaseSensitive) { + text = text.toLowerCase(); + } // Exact match + + + if (this.pattern === text) { + var _result = { + isMatch: true, + score: 0 + }; + + if (includeMatches) { + _result.indices = [[0, text.length - 1]]; + } + + return _result; + } // Otherwise, use Bitap algorithm + + + var _this$options2 = this.options, + location = _this$options2.location, + distance = _this$options2.distance, + threshold = _this$options2.threshold, + findAllMatches = _this$options2.findAllMatches, + minMatchCharLength = _this$options2.minMatchCharLength, + ignoreLocation = _this$options2.ignoreLocation; + var allIndices = []; + var totalScore = 0; + var hasMatches = false; + this.chunks.forEach(function (_ref2) { + var pattern = _ref2.pattern, + alphabet = _ref2.alphabet, + startIndex = _ref2.startIndex; + + var _search = search(text, pattern, alphabet, { + location: location + startIndex, + distance: distance, + threshold: threshold, + findAllMatches: findAllMatches, + minMatchCharLength: minMatchCharLength, + includeMatches: includeMatches, + ignoreLocation: ignoreLocation + }), + isMatch = _search.isMatch, + score = _search.score, + indices = _search.indices; + + if (isMatch) { + hasMatches = true; + } + + totalScore += score; + + if (isMatch && indices) { + allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); + } + }); + var result = { + isMatch: hasMatches, + score: hasMatches ? totalScore / this.chunks.length : 1 + }; + + if (hasMatches && includeMatches) { + result.indices = allIndices; + } + + return result; + } + }]); + + return BitapSearch; + }(); + + var BaseMatch = /*#__PURE__*/function () { + function BaseMatch(pattern) { + _classCallCheck(this, BaseMatch); + + this.pattern = pattern; + } + + _createClass(BaseMatch, [{ + key: "search", + value: function + /*text*/ + search() {} + }], [{ + key: "isMultiMatch", + value: function isMultiMatch(pattern) { + return getMatch(pattern, this.multiRegex); + } + }, { + key: "isSingleMatch", + value: function isSingleMatch(pattern) { + return getMatch(pattern, this.singleRegex); + } + }]); + + return BaseMatch; + }(); + + function getMatch(pattern, exp) { + var matches = pattern.match(exp); + return matches ? matches[1] : null; + } + + var ExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(ExactMatch, _BaseMatch); + + var _super = _createSuper(ExactMatch); + + function ExactMatch(pattern) { + _classCallCheck(this, ExactMatch); + + return _super.call(this, pattern); + } + + _createClass(ExactMatch, [{ + key: "search", + value: function search(text) { + var isMatch = text === this.pattern; + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [0, this.pattern.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^="(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^=(.*)$/; + } + }]); + + return ExactMatch; + }(BaseMatch); + + var InverseExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(InverseExactMatch, _BaseMatch); + + var _super = _createSuper(InverseExactMatch); + + function InverseExactMatch(pattern) { + _classCallCheck(this, InverseExactMatch); + + return _super.call(this, pattern); + } + + _createClass(InverseExactMatch, [{ + key: "search", + value: function search(text) { + var index = text.indexOf(this.pattern); + var isMatch = index === -1; + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [0, text.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'inverse-exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^!"(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^!(.*)$/; + } + }]); + + return InverseExactMatch; + }(BaseMatch); + + var PrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(PrefixExactMatch, _BaseMatch); + + var _super = _createSuper(PrefixExactMatch); + + function PrefixExactMatch(pattern) { + _classCallCheck(this, PrefixExactMatch); + + return _super.call(this, pattern); + } + + _createClass(PrefixExactMatch, [{ + key: "search", + value: function search(text) { + var isMatch = text.startsWith(this.pattern); + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [0, this.pattern.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'prefix-exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^\^"(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^\^(.*)$/; + } + }]); + + return PrefixExactMatch; + }(BaseMatch); + + var InversePrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(InversePrefixExactMatch, _BaseMatch); + + var _super = _createSuper(InversePrefixExactMatch); + + function InversePrefixExactMatch(pattern) { + _classCallCheck(this, InversePrefixExactMatch); + + return _super.call(this, pattern); + } + + _createClass(InversePrefixExactMatch, [{ + key: "search", + value: function search(text) { + var isMatch = !text.startsWith(this.pattern); + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [0, text.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'inverse-prefix-exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^!\^"(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^!\^(.*)$/; + } + }]); + + return InversePrefixExactMatch; + }(BaseMatch); + + var SuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(SuffixExactMatch, _BaseMatch); + + var _super = _createSuper(SuffixExactMatch); + + function SuffixExactMatch(pattern) { + _classCallCheck(this, SuffixExactMatch); + + return _super.call(this, pattern); + } + + _createClass(SuffixExactMatch, [{ + key: "search", + value: function search(text) { + var isMatch = text.endsWith(this.pattern); + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [text.length - this.pattern.length, text.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'suffix-exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^"(.*)"\$$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^(.*)\$$/; + } + }]); + + return SuffixExactMatch; + }(BaseMatch); + + var InverseSuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(InverseSuffixExactMatch, _BaseMatch); + + var _super = _createSuper(InverseSuffixExactMatch); + + function InverseSuffixExactMatch(pattern) { + _classCallCheck(this, InverseSuffixExactMatch); + + return _super.call(this, pattern); + } + + _createClass(InverseSuffixExactMatch, [{ + key: "search", + value: function search(text) { + var isMatch = !text.endsWith(this.pattern); + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: [0, text.length - 1] + }; + } + }], [{ + key: "type", + get: function get() { + return 'inverse-suffix-exact'; + } + }, { + key: "multiRegex", + get: function get() { + return /^!"(.*)"\$$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^!(.*)\$$/; + } + }]); + + return InverseSuffixExactMatch; + }(BaseMatch); + + var FuzzyMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(FuzzyMatch, _BaseMatch); + + var _super = _createSuper(FuzzyMatch); + + function FuzzyMatch(pattern) { + var _this; + + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref$location = _ref.location, + location = _ref$location === void 0 ? Config.location : _ref$location, + _ref$threshold = _ref.threshold, + threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, + _ref$distance = _ref.distance, + distance = _ref$distance === void 0 ? Config.distance : _ref$distance, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$findAllMatches = _ref.findAllMatches, + findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, + _ref$minMatchCharLeng = _ref.minMatchCharLength, + minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, + _ref$isCaseSensitive = _ref.isCaseSensitive, + isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, + _ref$ignoreLocation = _ref.ignoreLocation, + ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; + + _classCallCheck(this, FuzzyMatch); + + _this = _super.call(this, pattern); + _this._bitapSearch = new BitapSearch(pattern, { + location: location, + threshold: threshold, + distance: distance, + includeMatches: includeMatches, + findAllMatches: findAllMatches, + minMatchCharLength: minMatchCharLength, + isCaseSensitive: isCaseSensitive, + ignoreLocation: ignoreLocation + }); + return _this; + } + + _createClass(FuzzyMatch, [{ + key: "search", + value: function search(text) { + return this._bitapSearch.searchIn(text); + } + }], [{ + key: "type", + get: function get() { + return 'fuzzy'; + } + }, { + key: "multiRegex", + get: function get() { + return /^"(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^(.*)$/; + } + }]); + + return FuzzyMatch; + }(BaseMatch); + + var IncludeMatch = /*#__PURE__*/function (_BaseMatch) { + _inherits(IncludeMatch, _BaseMatch); + + var _super = _createSuper(IncludeMatch); + + function IncludeMatch(pattern) { + _classCallCheck(this, IncludeMatch); + + return _super.call(this, pattern); + } + + _createClass(IncludeMatch, [{ + key: "search", + value: function search(text) { + var location = 0; + var index; + var indices = []; + var patternLen = this.pattern.length; // Get all exact matches + + while ((index = text.indexOf(this.pattern, location)) > -1) { + location = index + patternLen; + indices.push([index, location - 1]); + } + + var isMatch = !!indices.length; + return { + isMatch: isMatch, + score: isMatch ? 0 : 1, + indices: indices + }; + } + }], [{ + key: "type", + get: function get() { + return 'include'; + } + }, { + key: "multiRegex", + get: function get() { + return /^'"(.*)"$/; + } + }, { + key: "singleRegex", + get: function get() { + return /^'(.*)$/; + } + }]); + + return IncludeMatch; + }(BaseMatch); + + var searchers = [ExactMatch, IncludeMatch, PrefixExactMatch, InversePrefixExactMatch, InverseSuffixExactMatch, SuffixExactMatch, InverseExactMatch, FuzzyMatch]; + var searchersLen = searchers.length; // Regex to split by spaces, but keep anything in quotes together + + var SPACE_RE = / +(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/; + var OR_TOKEN = '|'; // Return a 2D array representation of the query, for simpler parsing. + // Example: + // "^core go$ | rb$ | py$ xy$" => [["^core", "go$"], ["rb$"], ["py$", "xy$"]] + + function parseQuery(pattern) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + return pattern.split(OR_TOKEN).map(function (item) { + var query = item.trim().split(SPACE_RE).filter(function (item) { + return item && !!item.trim(); + }); + var results = []; + + for (var i = 0, len = query.length; i < len; i += 1) { + var queryItem = query[i]; // 1. Handle multiple query match (i.e, once that are quoted, like `"hello world"`) + + var found = false; + var idx = -1; + + while (!found && ++idx < searchersLen) { + var searcher = searchers[idx]; + var token = searcher.isMultiMatch(queryItem); + + if (token) { + results.push(new searcher(token, options)); + found = true; + } + } + + if (found) { + continue; + } // 2. Handle single query matches (i.e, once that are *not* quoted) + + + idx = -1; + + while (++idx < searchersLen) { + var _searcher = searchers[idx]; + + var _token = _searcher.isSingleMatch(queryItem); + + if (_token) { + results.push(new _searcher(_token, options)); + break; + } + } + } + + return results; + }); + } + + // to a singl match + + var MultiMatchSet = new Set([FuzzyMatch.type, IncludeMatch.type]); + /** + * Command-like searching + * ====================== + * + * Given multiple search terms delimited by spaces.e.g. `^jscript .python$ ruby !java`, + * search in a given text. + * + * Search syntax: + * + * | Token | Match type | Description | + * | ----------- | -------------------------- | -------------------------------------- | + * | `jscript` | fuzzy-match | Items that fuzzy match `jscript` | + * | `=scheme` | exact-match | Items that are `scheme` | + * | `'python` | include-match | Items that include `python` | + * | `!ruby` | inverse-exact-match | Items that do not include `ruby` | + * | `^java` | prefix-exact-match | Items that start with `java` | + * | `!^earlang` | inverse-prefix-exact-match | Items that do not start with `earlang` | + * | `.js$` | suffix-exact-match | Items that end with `.js` | + * | `!.go$` | inverse-suffix-exact-match | Items that do not end with `.go` | + * + * A single pipe character acts as an OR operator. For example, the following + * query matches entries that start with `core` and end with either`go`, `rb`, + * or`py`. + * + * ``` + * ^core go$ | rb$ | py$ + * ``` + */ + + var ExtendedSearch = /*#__PURE__*/function () { + function ExtendedSearch(pattern) { + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref$isCaseSensitive = _ref.isCaseSensitive, + isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$minMatchCharLeng = _ref.minMatchCharLength, + minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, + _ref$ignoreLocation = _ref.ignoreLocation, + ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation, + _ref$findAllMatches = _ref.findAllMatches, + findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, + _ref$location = _ref.location, + location = _ref$location === void 0 ? Config.location : _ref$location, + _ref$threshold = _ref.threshold, + threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, + _ref$distance = _ref.distance, + distance = _ref$distance === void 0 ? Config.distance : _ref$distance; + + _classCallCheck(this, ExtendedSearch); + + this.query = null; + this.options = { + isCaseSensitive: isCaseSensitive, + includeMatches: includeMatches, + minMatchCharLength: minMatchCharLength, + findAllMatches: findAllMatches, + ignoreLocation: ignoreLocation, + location: location, + threshold: threshold, + distance: distance + }; + this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); + this.query = parseQuery(this.pattern, this.options); + } + + _createClass(ExtendedSearch, [{ + key: "searchIn", + value: function searchIn(text) { + var query = this.query; + + if (!query) { + return { + isMatch: false, + score: 1 + }; + } + + var _this$options = this.options, + includeMatches = _this$options.includeMatches, + isCaseSensitive = _this$options.isCaseSensitive; + text = isCaseSensitive ? text : text.toLowerCase(); + var numMatches = 0; + var allIndices = []; + var totalScore = 0; // ORs + + for (var i = 0, qLen = query.length; i < qLen; i += 1) { + var searchers = query[i]; // Reset indices + + allIndices.length = 0; + numMatches = 0; // ANDs + + for (var j = 0, pLen = searchers.length; j < pLen; j += 1) { + var searcher = searchers[j]; + + var _searcher$search = searcher.search(text), + isMatch = _searcher$search.isMatch, + indices = _searcher$search.indices, + score = _searcher$search.score; + + if (isMatch) { + numMatches += 1; + totalScore += score; + + if (includeMatches) { + var type = searcher.constructor.type; + + if (MultiMatchSet.has(type)) { + allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); + } else { + allIndices.push(indices); + } + } + } else { + totalScore = 0; + numMatches = 0; + allIndices.length = 0; + break; + } + } // OR condition, so if TRUE, return + + + if (numMatches) { + var result = { + isMatch: true, + score: totalScore / numMatches + }; + + if (includeMatches) { + result.indices = allIndices; + } + + return result; + } + } // Nothing was matched + + + return { + isMatch: false, + score: 1 + }; + } + }], [{ + key: "condition", + value: function condition(_, options) { + return options.useExtendedSearch; + } + }]); + + return ExtendedSearch; + }(); + + var registeredSearchers = []; + function register() { + registeredSearchers.push.apply(registeredSearchers, arguments); + } + function createSearcher(pattern, options) { + for (var i = 0, len = registeredSearchers.length; i < len; i += 1) { + var searcherClass = registeredSearchers[i]; + + if (searcherClass.condition(pattern, options)) { + return new searcherClass(pattern, options); + } + } + + return new BitapSearch(pattern, options); + } + + var LogicalOperator = { + AND: '$and', + OR: '$or' + }; + var KeyType = { + PATH: '$path', + PATTERN: '$val' + }; + + var isExpression = function isExpression(query) { + return !!(query[LogicalOperator.AND] || query[LogicalOperator.OR]); + }; + + var isPath = function isPath(query) { + return !!query[KeyType.PATH]; + }; + + var isLeaf = function isLeaf(query) { + return !isArray(query) && isObject(query) && !isExpression(query); + }; + + var convertToExplicit = function convertToExplicit(query) { + return _defineProperty({}, LogicalOperator.AND, Object.keys(query).map(function (key) { + return _defineProperty({}, key, query[key]); + })); + }; // When `auto` is `true`, the parse function will infer and initialize and add + // the appropriate `Searcher` instance + + + function parse(query, options) { + var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + _ref3$auto = _ref3.auto, + auto = _ref3$auto === void 0 ? true : _ref3$auto; + + var next = function next(query) { + var keys = Object.keys(query); + var isQueryPath = isPath(query); + + if (!isQueryPath && keys.length > 1 && !isExpression(query)) { + return next(convertToExplicit(query)); + } + + if (isLeaf(query)) { + var key = isQueryPath ? query[KeyType.PATH] : keys[0]; + var pattern = isQueryPath ? query[KeyType.PATTERN] : query[key]; + + if (!isString(pattern)) { + throw new Error(LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key)); + } + + var obj = { + keyId: createKeyId(key), + pattern: pattern + }; + + if (auto) { + obj.searcher = createSearcher(pattern, options); + } + + return obj; + } + + var node = { + children: [], + operator: keys[0] + }; + keys.forEach(function (key) { + var value = query[key]; + + if (isArray(value)) { + value.forEach(function (item) { + node.children.push(next(item)); + }); + } + }); + return node; + }; + + if (!isExpression(query)) { + query = convertToExplicit(query); + } + + return next(query); + } + + function computeScore(results, _ref) { + var _ref$ignoreFieldNorm = _ref.ignoreFieldNorm, + ignoreFieldNorm = _ref$ignoreFieldNorm === void 0 ? Config.ignoreFieldNorm : _ref$ignoreFieldNorm; + results.forEach(function (result) { + var totalScore = 1; + result.matches.forEach(function (_ref2) { + var key = _ref2.key, + norm = _ref2.norm, + score = _ref2.score; + var weight = key ? key.weight : null; + totalScore *= Math.pow(score === 0 && weight ? Number.EPSILON : score, (weight || 1) * (ignoreFieldNorm ? 1 : norm)); + }); + result.score = totalScore; + }); + } + + function transformMatches(result, data) { + var matches = result.matches; + data.matches = []; + + if (!isDefined(matches)) { + return; + } + + matches.forEach(function (match) { + if (!isDefined(match.indices) || !match.indices.length) { + return; + } + + var indices = match.indices, + value = match.value; + var obj = { + indices: indices, + value: value + }; + + if (match.key) { + obj.key = match.key.src; + } + + if (match.idx > -1) { + obj.refIndex = match.idx; + } + + data.matches.push(obj); + }); + } + + function transformScore(result, data) { + data.score = result.score; + } + + function format(results, docs) { + var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$includeScore = _ref.includeScore, + includeScore = _ref$includeScore === void 0 ? Config.includeScore : _ref$includeScore; + + var transformers = []; + if (includeMatches) transformers.push(transformMatches); + if (includeScore) transformers.push(transformScore); + return results.map(function (result) { + var idx = result.idx; + var data = { + item: docs[idx], + refIndex: idx + }; + + if (transformers.length) { + transformers.forEach(function (transformer) { + transformer(result, data); + }); + } + + return data; + }); + } + + var Fuse$1 = /*#__PURE__*/function () { + function Fuse(docs) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + var index = arguments.length > 2 ? arguments[2] : undefined; + + _classCallCheck(this, Fuse); + + this.options = _objectSpread2(_objectSpread2({}, Config), options); + + if (this.options.useExtendedSearch && !true) { + throw new Error(EXTENDED_SEARCH_UNAVAILABLE); + } + + this._keyStore = new KeyStore(this.options.keys); + this.setCollection(docs, index); + } + + _createClass(Fuse, [{ + key: "setCollection", + value: function setCollection(docs, index) { + this._docs = docs; + + if (index && !(index instanceof FuseIndex)) { + throw new Error(INCORRECT_INDEX_TYPE); + } + + this._myIndex = index || createIndex(this.options.keys, this._docs, { + getFn: this.options.getFn, + fieldNormWeight: this.options.fieldNormWeight + }); + } + }, { + key: "add", + value: function add(doc) { + if (!isDefined(doc)) { + return; + } + + this._docs.push(doc); + + this._myIndex.add(doc); + } + }, { + key: "remove", + value: function remove() { + var predicate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function + /* doc, idx */ + () { + return false; + }; + var results = []; + + for (var i = 0, len = this._docs.length; i < len; i += 1) { + var doc = this._docs[i]; + + if (predicate(doc, i)) { + this.removeAt(i); + i -= 1; + len -= 1; + results.push(doc); + } + } + + return results; + } + }, { + key: "removeAt", + value: function removeAt(idx) { + this._docs.splice(idx, 1); + + this._myIndex.removeAt(idx); + } + }, { + key: "getIndex", + value: function getIndex() { + return this._myIndex; + } + }, { + key: "search", + value: function search(query) { + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, + _ref$limit = _ref.limit, + limit = _ref$limit === void 0 ? -1 : _ref$limit; + + var _this$options = this.options, + includeMatches = _this$options.includeMatches, + includeScore = _this$options.includeScore, + shouldSort = _this$options.shouldSort, + sortFn = _this$options.sortFn, + ignoreFieldNorm = _this$options.ignoreFieldNorm; + var results = isString(query) ? isString(this._docs[0]) ? this._searchStringList(query) : this._searchObjectList(query) : this._searchLogical(query); + computeScore(results, { + ignoreFieldNorm: ignoreFieldNorm + }); + + if (shouldSort) { + results.sort(sortFn); + } + + if (isNumber(limit) && limit > -1) { + results = results.slice(0, limit); + } + + return format(results, this._docs, { + includeMatches: includeMatches, + includeScore: includeScore + }); + } + }, { + key: "_searchStringList", + value: function _searchStringList(query) { + var searcher = createSearcher(query, this.options); + var records = this._myIndex.records; + var results = []; // Iterate over every string in the index + + records.forEach(function (_ref2) { + var text = _ref2.v, + idx = _ref2.i, + norm = _ref2.n; + + if (!isDefined(text)) { + return; + } + + var _searcher$searchIn = searcher.searchIn(text), + isMatch = _searcher$searchIn.isMatch, + score = _searcher$searchIn.score, + indices = _searcher$searchIn.indices; + + if (isMatch) { + results.push({ + item: text, + idx: idx, + matches: [{ + score: score, + value: text, + norm: norm, + indices: indices + }] + }); + } + }); + return results; + } + }, { + key: "_searchLogical", + value: function _searchLogical(query) { + var _this = this; + + var expression = parse(query, this.options); + + var evaluate = function evaluate(node, item, idx) { + if (!node.children) { + var keyId = node.keyId, + searcher = node.searcher; + + var matches = _this._findMatches({ + key: _this._keyStore.get(keyId), + value: _this._myIndex.getValueForItemAtKeyId(item, keyId), + searcher: searcher + }); + + if (matches && matches.length) { + return [{ + idx: idx, + item: item, + matches: matches + }]; + } + + return []; + } + + var res = []; + + for (var i = 0, len = node.children.length; i < len; i += 1) { + var child = node.children[i]; + var result = evaluate(child, item, idx); + + if (result.length) { + res.push.apply(res, _toConsumableArray(result)); + } else if (node.operator === LogicalOperator.AND) { + return []; + } + } + + return res; + }; + + var records = this._myIndex.records; + var resultMap = {}; + var results = []; + records.forEach(function (_ref3) { + var item = _ref3.$, + idx = _ref3.i; + + if (isDefined(item)) { + var expResults = evaluate(expression, item, idx); + + if (expResults.length) { + // Dedupe when adding + if (!resultMap[idx]) { + resultMap[idx] = { + idx: idx, + item: item, + matches: [] + }; + results.push(resultMap[idx]); + } + + expResults.forEach(function (_ref4) { + var _resultMap$idx$matche; + + var matches = _ref4.matches; + + (_resultMap$idx$matche = resultMap[idx].matches).push.apply(_resultMap$idx$matche, _toConsumableArray(matches)); + }); + } + } + }); + return results; + } + }, { + key: "_searchObjectList", + value: function _searchObjectList(query) { + var _this2 = this; + + var searcher = createSearcher(query, this.options); + var _this$_myIndex = this._myIndex, + keys = _this$_myIndex.keys, + records = _this$_myIndex.records; + var results = []; // List is Array + + records.forEach(function (_ref5) { + var item = _ref5.$, + idx = _ref5.i; + + if (!isDefined(item)) { + return; + } + + var matches = []; // Iterate over every key (i.e, path), and fetch the value at that key + + keys.forEach(function (key, keyIndex) { + matches.push.apply(matches, _toConsumableArray(_this2._findMatches({ + key: key, + value: item[keyIndex], + searcher: searcher + }))); + }); + + if (matches.length) { + results.push({ + idx: idx, + item: item, + matches: matches + }); + } + }); + return results; + } + }, { + key: "_findMatches", + value: function _findMatches(_ref6) { + var key = _ref6.key, + value = _ref6.value, + searcher = _ref6.searcher; + + if (!isDefined(value)) { + return []; + } + + var matches = []; + + if (isArray(value)) { + value.forEach(function (_ref7) { + var text = _ref7.v, + idx = _ref7.i, + norm = _ref7.n; + + if (!isDefined(text)) { + return; + } + + var _searcher$searchIn2 = searcher.searchIn(text), + isMatch = _searcher$searchIn2.isMatch, + score = _searcher$searchIn2.score, + indices = _searcher$searchIn2.indices; + + if (isMatch) { + matches.push({ + score: score, + key: key, + value: text, + idx: idx, + norm: norm, + indices: indices + }); + } + }); + } else { + var text = value.v, + norm = value.n; + + var _searcher$searchIn3 = searcher.searchIn(text), + isMatch = _searcher$searchIn3.isMatch, + score = _searcher$searchIn3.score, + indices = _searcher$searchIn3.indices; + + if (isMatch) { + matches.push({ + score: score, + key: key, + value: text, + norm: norm, + indices: indices + }); + } + } + + return matches; + } + }]); + + return Fuse; + }(); + + Fuse$1.version = '6.6.2'; + Fuse$1.createIndex = createIndex; + Fuse$1.parseIndex = parseIndex; + Fuse$1.config = Config; + + { + Fuse$1.parseQuery = parse; + } + + { + register(ExtendedSearch); + } + + var Fuse = Fuse$1; + + return Fuse; + +})); From 542702d88231a54cce40da84ab22ab7d86f87e6a Mon Sep 17 00:00:00 2001 From: Cohee Date: Tue, 6 Jun 2023 15:39:58 +0300 Subject: [PATCH 05/14] No longer deadnaming Chub --- public/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/script.js b/public/script.js index 7b91763a3..b697a096a 100644 --- a/public/script.js +++ b/public/script.js @@ -349,7 +349,7 @@ const system_messages = { '(Not endorsed, your discretion is advised)', '
    ', '
  1. Pygmalion AI Discord
    2. ', - '
  2. CharacterHub (NSFW)
    3. ', + '
  3. Chub (NSFW)
    4. ', '
', '
', '

Where can I get help?

', From cc61e47ea9cab569029d2c6a32c6b10466ca3d47 Mon Sep 17 00:00:00 2001 From: Cohee Date: Tue, 6 Jun 2023 15:41:29 +0300 Subject: [PATCH 06/14] Fix objective controls display on Firefox --- public/scripts/extensions/objective/style.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/scripts/extensions/objective/style.css b/public/scripts/extensions/objective/style.css index 6d3a132e1..987044604 100644 --- a/public/scripts/extensions/objective/style.css +++ b/public/scripts/extensions/objective/style.css @@ -5,12 +5,15 @@ .objective_block { display: flex; - /* flex-direction: row; */ align-items: center; column-gap: 5px; flex-wrap: wrap; } +.objective_block_control { + align-items: baseline; +} + .objective_block_control small, .objective_block_control label { width: max-content; @@ -39,4 +42,4 @@ #objective-tasks span { margin: unset; margin-bottom: 5px !important; -} \ No newline at end of file +} From eb90ab49f5dc850fde75b0d3631df8fd4151891e Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Tue, 6 Jun 2023 22:48:23 +0900 Subject: [PATCH 07/14] sitewide style tweaks --- public/index.html | 867 ++++++++++------------------- public/scripts/RossAscends-mods.js | 2 +- public/style.css | 136 +++-- 3 files changed, 371 insertions(+), 634 deletions(-) diff --git a/public/index.html b/public/index.html index 24bf7c48b..25e6847e3 100644 --- a/public/index.html +++ b/public/index.html @@ -4,8 +4,7 @@ - + @@ -93,8 +92,7 @@
-
+
@@ -106,8 +104,7 @@
-
+
Click slider numbers to input manually.
@@ -115,8 +112,7 @@

Kobold Presets - + ?

@@ -127,8 +123,7 @@

NovelAI Presets - + ?

@@ -143,12 +138,9 @@ - - - + + +
@@ -174,12 +166,10 @@
- +
-
+
select
@@ -192,8 +182,7 @@
- +
@@ -209,8 +198,7 @@ Unlocked
ATTENTION! - + Only select models support context sizes greater than 2048 tokens. Proceed only if you know what you're doing. @@ -244,8 +232,7 @@
- +
@@ -260,12 +247,10 @@
- +
-
+
select
@@ -278,8 +263,7 @@
- +
@@ -293,12 +277,10 @@
- +
-
+
select
@@ -310,12 +292,10 @@
- +
-
+
select
@@ -327,12 +307,10 @@
- +
-
+
select
@@ -344,12 +322,10 @@
- +
-
+
select
@@ -361,12 +337,10 @@
- +
-
+
select
@@ -378,12 +352,10 @@
- +
-
+
select
@@ -397,12 +369,10 @@
- +
-
+
select
@@ -414,12 +384,10 @@
- +
-
+
select
@@ -431,12 +399,10 @@
- +
-
+
select
@@ -448,13 +414,10 @@
- +
-
+
select
@@ -466,12 +429,10 @@
- +
-
+
select
@@ -484,19 +445,16 @@ OpenAI Reverse Proxy
- + Alternative server URL (leave empty to use the default value).
- + Remove your real OAI API Key from the API panel BEFORE typing anything into this box.
- + We cannot provide support for problems encountered while using an unofficial OpenAI proxy. @@ -504,8 +462,7 @@
- +
@@ -517,8 +474,7 @@
-
+
Enable this if the streaming doesn't work with your proxy.
@@ -538,12 +494,10 @@
- +
-
+
select
@@ -554,8 +508,7 @@ Max Response Length (tokens)
- +
@@ -565,8 +518,7 @@
- +
@@ -580,12 +532,10 @@
- +
-
+
select
@@ -597,12 +547,10 @@
- +
-
+
select
@@ -614,12 +562,10 @@
- +
-
+
select
@@ -632,12 +578,10 @@ It extends the context window in exchange for reply generation speed.
-