-
+
-
+
@@ -115,8 +113,7 @@
@@ -174,12 +167,10 @@
Kobold Presets - + ?
@@ -127,8 +124,7 @@
-
OpenAI Presets
+Chat Completion Presets
-
+
-
+
@@ -192,8 +183,7 @@
select
-
+
@@ -209,8 +199,7 @@
Unlocked
ATTENTION!
-
+
Only select models support context sizes greater than 2048 tokens.
Proceed only if you know what you're doing.
@@ -244,8 +233,7 @@
-
+
@@ -260,12 +248,10 @@
-
+
-
+
@@ -278,8 +264,7 @@
select
-
+
@@ -293,12 +278,10 @@
-
+
-
+
@@ -310,12 +293,10 @@
select
-
+
-
+
@@ -327,12 +308,10 @@
select
-
+
-
+
@@ -344,12 +323,10 @@
select
-
+
-
+
@@ -361,12 +338,10 @@
select
-
+
-
+
@@ -378,12 +353,10 @@
select
-
+
-
+
@@ -397,12 +370,10 @@
select
-
+
-
+
@@ -414,12 +385,10 @@
select
-
+
-
+
@@ -431,12 +400,10 @@
select
-
+
-
+
@@ -448,13 +415,10 @@
select
-
+
-
+
@@ -466,12 +430,10 @@
select
-
+
-
+
@@ -481,22 +443,19 @@
select
- OpenAI Reverse Proxy
+ OpenAI / Claude 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 +463,7 @@
- + We cannot provide support for problems encountered while using an unofficial OpenAI proxy. @@ -504,8 +463,7 @@
-
+
@@ -517,8 +475,7 @@
-
+
@@ -538,12 +495,10 @@
Enable this if the streaming doesn't work with your proxy.
-
+
-
+
@@ -554,8 +509,7 @@
Max Response Length (tokens)
select
-
+
@@ -565,8 +519,7 @@
-
+
@@ -580,12 +533,10 @@
-
+
-
+
@@ -597,12 +548,10 @@
select
-
+
-
+
@@ -614,12 +563,10 @@
select
-
+
-
+
@@ -632,12 +579,10 @@
It extends the context window in exchange for reply generation speed.
select
-
+
-
@@ -646,19 +591,16 @@
Streaming
-
@@ -2309,13 +2125,10 @@
+
Display bot response text chunks as they are generated.
-
+
@@ -1984,8 +1819,7 @@
Delete non-JB messages from Poe context before sending a new prompt. Prevents
auto-jailbreak message from being pushed out of context.
@@ -668,19 +610,16 @@
Auto-jailbreak
-
+
Send the jailbreak message before first generation after page refresh.
-
-
+
@@ -2125,12 +1957,10 @@
-
+
-
+
@@ -2142,12 +1972,10 @@
select
-
+
-
@@ -2275,13 +2095,10 @@
+
@@ -2161,8 +1989,7 @@
select
Name
-
-
@@ -2291,8 +2108,7 @@
-
+
@@ -2329,8 +2142,7 @@
-
+
Extensions API: SillyTavern-extras @@ -2343,16 +2155,13 @@
-
-
+
+
-
+
@@ -2366,8 +2175,7 @@
-
-
+
@@ -2393,14 +2200,12 @@
-
+
@@ -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) {
+
+
+ Automatically select a background based on the chat context.
+ Respects the "Lock" setting state. + +
+ Respects the "Lock" setting state. + +
Preview
-
`)
+ $('#objective-task-manual-check-menu-item').attr('title', 'Trigger AI check of completed tasks').on('click', checkTaskCompleted)
+}
+
jQuery(() => {
const settingsHtml = `
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/infinity-context/index.js b/public/scripts/extensions/infinity-context/index.js
index e72af6f94..4db2afbbd 100644
--- a/public/scripts/extensions/infinity-context/index.js
+++ b/public/scripts/extensions/infinity-context/index.js
@@ -421,7 +421,7 @@ window.chromadb_interceptGeneration = async (chat) => {
send_date: 0,
}
);
- newChat.push(...queriedMessages.map(m => JSON.parse(m.meta)));
+ newChat.push(...queriedMessages.map(m => m.meta).filter(onlyUnique).map(JSON.parse));
newChat.push(
{
is_name: false,
@@ -437,7 +437,7 @@ window.chromadb_interceptGeneration = async (chat) => {
if (selectedStrategy === 'original') {
//removes .length # messages from the start of 'kept messages'
//replaces them with chromaDB results (with no separator)
- newChat.push(...queriedMessages.map(m => JSON.parse(m.meta)));
+ newChat.push(...queriedMessages.map(m => m.meta).filter(onlyUnique).map(JSON.parse));
chat.splice(0, messagesToStore.length, ...newChat);
}
diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js
index 052f40416..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"
@@ -12,7 +14,7 @@ const MODULE_NAME = "Objective"
let globalObjective = ""
let globalTasks = []
let currentChatId = ""
-let currentTask = {}
+let currentTask = null
let checkCounter = 0
@@ -38,90 +40,70 @@ 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) {
- 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 #//
//###############################//
-// 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(
+ {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 = globalObjective[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()
}
-// 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()
- 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 (Object.keys(currentTask).length == 0) {
+ // Make sure there are tasks
+ if (jQuery.isEmptyObject(currentTask)) {
return
}
checkCounter = $('#objective-check-frequency').val()
@@ -131,8 +113,8 @@ async function checkTaskCompleted() {
// Check response if task complete
if (taskResponse.includes("true")) {
- console.info(`Character determined task '${JSON.stringify(currentTask)} is completed.`)
- completeTask(getTask())
+ 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}`)
} else {
@@ -142,21 +124,26 @@ 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 = {};
- 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) {
+ } else {
+ const { _, index } = getTaskById(taskId)
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 || null;
+
+ // Now update the extension prompt
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, '');
@@ -166,7 +153,114 @@ 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 {
+ id
+ description
+ completed
+ parent
+ children
+ // UI Elements
+ taskHtml
+ descriptionSpan
+ completedCheckbox
+ deleteTaskButton
+ addTaskButton
+
+ 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
+ }
+ }
+
+
+ // 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 = `
+
+ `; + + // 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}`); + this.deleteButton = $(`#objective-task-delete-${this.id}`); + + // Add event listeners and set properties + $(`#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.prop('checked') + setCurrentTask(); + } + + onDescriptionUpdate(){ + this.description = this.descriptionSpan.text(); + } + onDescriptionFocusout(){ + setCurrentTask(); + } + + onDeleteClick(){ + deleteTask(this.id); + } + + onAddClick(){ + const {_, index} = getTaskById(this.id) + addTask("", index + 1); + setCurrentTask(); + updateUiTaskList(); + } + + toSaveState() { + return { + "id":this.id, + "description":this.description, + "completed":this.completed, + "parent": this.parent, + } + } +} //###############################// //# UI AND Settings #// @@ -194,9 +288,12 @@ function saveState() { currentChatId = context.chatId } + // Convert globalTasks for saving + const tasks = globalTasks.map(task => {return task.toSaveState()}) + 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'), @@ -208,11 +305,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)) } @@ -220,55 +317,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 = ` -
`)
- $('#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() {
@@ -338,7 +385,14 @@ function loadSettings() {
// Update globals
globalObjective = chat_metadata['objective'].objective
- globalTasks = chat_metadata['objective'].tasks
+ 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
@@ -352,6 +406,15 @@ function loadSettings() {
setCurrentTask()
}
+function addManualTaskCheckUi() {
+ $('#extensionsMenu').prepend(`
+
+ Manual Task Check
+
+
+ ${this.description}
+
+
+
+ `; + + // 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}`); + this.deleteButton = $(`#objective-task-delete-${this.id}`); + + // Add event listeners and set properties + $(`#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.prop('checked') + setCurrentTask(); + } + + onDescriptionUpdate(){ + this.description = this.descriptionSpan.text(); + } + onDescriptionFocusout(){ + setCurrentTask(); + } + + onDeleteClick(){ + deleteTask(this.id); + } + + onAddClick(){ + const {_, index} = getTaskById(this.id) + addTask("", index + 1); + setCurrentTask(); + updateUiTaskList(); + } + + toSaveState() { + return { + "id":this.id, + "description":this.description, + "completed":this.completed, + "parent": this.parent, + } + } +} //###############################// //# UI AND Settings #// @@ -194,9 +288,12 @@ function saveState() { currentChatId = context.chatId } + // Convert globalTasks for saving + const tasks = globalTasks.map(task => {return task.toSaveState()}) + 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'), @@ -208,11 +305,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)) } @@ -220,55 +317,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
- )
+ if (globalTasks.length > 0){
+ for (const task of globalTasks) {
+ task.addUiElement()
}
} else {
// Show button to add tasks if there are none
@@ -283,14 +338,6 @@ function updateUiTaskList() {
}
}
-function addManualTaskCheck() {
- $('#extensionsMenu').prepend(`
-
- Manual Task Check
-
@@ -364,18 +427,19 @@ jQuery(() => {
+
+ if (isString(this.docs[0])) {
+ this.docs.forEach(function (doc, docIndex) {
+ _this2._addString(doc, docIndex);
+ });
+ } else {
+ // List is Array
-
+
-
+
- Depth
-
+
+
`;
- addManualTaskCheck()
+ addManualTaskCheckUi()
$('#extensions_settings').append(settingsHtml);
$('#objective-generate').on('click', onGenerateObjectiveClick)
$('#objective-chat-depth').on('input', onChatDepthInput)
@@ -412,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/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
+}
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+
+
(0 = disabled)
@@ -386,7 +450,7 @@ jQuery(() => {