mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
* set isForced to true on input
* make floating auto-complete follow horizontal scrolling
* add callable closure vars
* changes to /let and /var for callable closures
* fix error message
* fix scope for closure arguments
* if should return the pipe result from closures
* use /run to call closures and no arguments on immediate closures
* throw exception from QRs window-function if no match
* when to show autocomplete vs info only
* autocomplete positioning
* autocomplete styling
* add theming to autocomplete (theme, dark, light)
* improve autocomplete show/hide logic and editor selection
* use blur tint color instead of chat tint color and use blur setting
* cleanup and docs
* use scope macros for QR args
* add enter to select autocomplete
* fix no executor found
* cleanup and comment
* fix alias list in help string
* fallback to empty string piped value if null or undefined
* fix typo
* blur textarea on ctrl+enter execute (and refocus after)
* stop executeSlashCommand if parser throws
* move /let and /var callbacks into functions
* switch textarea to monospace when value starts with slash
* add double pipe a pipe breaker
* fix /? slash
* remove some logging
* add "/:name" as shorthand for "/run name" after all
* move shit around
* fix error message
* use testRunShorthandEnd
* use parseQuotedValue and parseValue to determine name for "/:"
QR labels and set names can include spaces
* add some adjustments to make autocomplete work properly
some hint in there about "/:" would still be nice
* add autocomplete style selector
* only strip quotes from subcommand if they are at both ends
* fix JSDoc
* escaping
* allow open quotes on dry run
* throwing shit at the wall for /: autocomplete
* escapes only for symbols
* clean up autocomplete
* improve performance
* fix scope macros
* remove unescaping of pipes
* fix macros in scope copy
* fix "/? slash"
* don't run parser for getNameAt if text has not changed
* fix options filter
* re-enable blur listener
* restore selection on non-replace select
* fix for escaping first character of value
* add support for {{pipe}} and {{var::}} closures
* add index support to var macro
* add scoped var macro to macro help
* more escape fixes
* reduce autocomplete render debounce
* cleanup
* restore old escape handling and parser flag for strict escaping
* fix "no match" autocomplete message
* add dummy commands for comments and parser flag
* fix type annotations
* somewhat safer macro replacements
* fix autocomplete select on blank / "no match"
* fix cutting off handled part in substitution
* add parser flag REPLACE_GETVAR
Replaces all {{getvar::}} and {{getglobalvar::}} macros with {{var::}}.
Inserts a series of command executors before the command with the macros that:
- save {{pipe}} to a var
- call /getvar or /getglobalvar to get the variable used in the macro
- call /let to save the retrieved variable
- return the saved {{pipe}} value
This helps to avoid double-substitutions when the var values contain text that could be interpreted as macros.
* remove old parser
* fix send on enter when no match
* deal with pipes in quoted values (loose escaping)
* add default parser flags to user settings
* allow quoted values in unnamed argument
* set parser flag without explicit state to "on"
* add click hint on parser error toast
* dirty more detailed cmd defs
* remove name from unnamed arg
* move autocomplete into class and floating with details
* replace jQuery's trigger('input') on #send_textarea with native events because jQuery does not dispatch the native event
* fix ctrl+space
* fix arrow navigation
* add comments
* fix pointer block
* add static fromProps
* fix up dummy commands
* migrate all commands to addCommandObject
* remove commented comment command
* fix alias in details
* add range as argument type
* switch to addCommandObject
* switch to addCommandObject
* fix height
* fix floating details position on left
* re-enable blur event
* use auto width for full details on floating autocomplete
* auto-size floating full details
* fix typo
* re-enable blur listener
* don't prevent enter when selected item is fully typed out
* add autocomplete details tooltips
* add language to slash command examples
* move makeItem into option and command and fix click select
* use autocomplete parts in /? slash
* fix alias formatting
* add language to slash command examples
* fix details position on initial input history
* small screen styles
* replace registerSlashCommand with detailed declarations
* put name on first line
* add missing returns
* fix missing comma
* fix alias display in autocomplete list
* remove args from help string
* move parser settings to its own section
* jsdoc
* hljs stscript lang
* add hljs to autocomplete help examples
* add missing import
* apply autocomplete colors to stscript codeblocks (hljs)
* add fromProps
* cache autocomplete elements
* towards generic autocomplete
* remove unused imports
* fix blanks
* add return types
* re-enable blur
* fix blank check
* Caption messages by id
* add aborting command execution
* fix return type
* fix chat input font reset
* add slash command progress indicator
* add missing return
* mark registerSlashCommand deprecated
* why??
* separate abort logic for commands
* remove parsing of quoted values from unnamed arg
* add adjustable autocomplete width
* revert stop button pulse
* add progress and pause/abort to QR editor
* add resize event on autocomplete width change
* add key= argument to all get vars
* refactoring
* introduce NamedArgumentAsignment
* add TODOs
* refactoring
* record start and end of named arg assignment
* refactoring
* prevent duplicate calls to show
* refactoring
* remove macro ac
* add secondary autocomplete and enum descriptions
* add syntax highlighting to QR editor
* add enum descriptions to /while
* add /let key=... to scope variable names
* add unnamed argument assignment class and unnamed argument splitting
* fix QR editor style
* remove dash before autocomplete help text
* add autocomplete for unnamed enums
* fix remaining dom after holding backslash
* fix for unnamed enums
* fix autocomplete for /parser-flag
* add parser-flag enum help
* fix type annotations
* fix autocomplete result for /:
* add colored autocomplete type icons
* collapse second line autocomplete help if empty
* mark optional named args in autocomplete
* fix when what
* remove duplicate debug buttons
* dispatch input on autocomplete select
* prevent grow from editor syntax layer
* add auto-adjust qr editor caret color
* remove text-shadow from autocomplete
* join value strings in /let and /var
* add /abort syntax highlight
* fix attempting secondary result when there is none
* rename settings headers and split autocomplete / stscript
* add parser flag tooltips
* add tooltips to chat width stops
* fix typo
* return clone of help item
* fix enum string
* don't make optional notice for autocomplete arguments smaller
* avoid scrollbar in chat input
* add rudimentary macro autocomplete
* strip macro from helptext
* finally remove closure delimiters around root
* cleanup
* fix index stuff for removed closure delimiters
* fix type hint
* add child commands to progress indicator
* include sub-separator in macro autocomplete
* remove all mentions of interruptsGeneration and purge
* remove unused imports
* fix syntax highlight with newline at end of input
* cleanup select pointer events
* coalesce onProgress call
* add regex to STscript syntax highlighting
* fix closure end
* fix autocomplete type icon alignment
* adjustments for small screens
* fix removing wrong element
* add missing "at=" arg to /sys, /comment, /sendas
* add font scale setting for autocomplete
* add target=_blank for parser flag links
* fix for searching enums
* remove REGEXP_MODE from hljs
just causes trouble
* fix autocomplete in closures
* fix typo
* fix type hint
* Get rid of scroll bar on load
* Add type hint for /send name argument. Fix 'at' types
* Add 'negative' arg hint to /sd command
* reenable blur event
* Allow /summarize to process any text
* Compact layout of script toggles
* Expand CSS by default
* fix double ranger indicator and adjust to narrow container
* make custom css input fill available vertical space
* reduce scroll lag
* use default cursor on scrollbar
* Clean-up module loading in index.html
* fix tab indent with hljs
---------
Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
166 lines
7.4 KiB
JavaScript
166 lines
7.4 KiB
JavaScript
import { AutoCompleteNameResult } from '../autocomplete/AutoCompleteNameResult.js';
|
|
import { AutoCompleteOption } from '../autocomplete/AutoCompleteOption.js';
|
|
import { AutoCompleteSecondaryNameResult } from '../autocomplete/AutoCompleteSecondaryNameResult.js';
|
|
import { SlashCommand } from './SlashCommand.js';
|
|
import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
|
|
import { SlashCommandClosure } from './SlashCommandClosure.js';
|
|
import { SlashCommandCommandAutoCompleteOption } from './SlashCommandCommandAutoCompleteOption.js';
|
|
import { SlashCommandEnumAutoCompleteOption } from './SlashCommandEnumAutoCompleteOption.js';
|
|
import { SlashCommandExecutor } from './SlashCommandExecutor.js';
|
|
import { SlashCommandNamedArgumentAutoCompleteOption } from './SlashCommandNamedArgumentAutoCompleteOption.js';
|
|
|
|
export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
|
|
/**@type {SlashCommandExecutor}*/ executor;
|
|
|
|
/**
|
|
* @param {SlashCommandExecutor} executor
|
|
* @param {Object.<string,SlashCommand>} commands
|
|
*/
|
|
constructor(executor, commands) {
|
|
super(
|
|
executor.name,
|
|
executor.start,
|
|
Object
|
|
.keys(commands)
|
|
.map(key=>new SlashCommandCommandAutoCompleteOption(commands[key], key))
|
|
,
|
|
false,
|
|
()=>`No matching slash commands for "/${this.name}"`,
|
|
()=>'No slash commands found!',
|
|
);
|
|
this.executor = executor;
|
|
}
|
|
|
|
getSecondaryNameAt(text, index, isSelect) {
|
|
const namedResult = this.getNamedArgumentAt(text, index, isSelect);
|
|
if (!namedResult || namedResult.optionList.length == 0 || !namedResult.isRequired) {
|
|
const unnamedResult = this.getUnnamedArgumentAt(text, index, isSelect);
|
|
if (!namedResult) return unnamedResult;
|
|
if (namedResult && unnamedResult) {
|
|
const combinedResult = new AutoCompleteSecondaryNameResult(
|
|
namedResult.name,
|
|
namedResult.start,
|
|
[...namedResult.optionList, ...unnamedResult.optionList],
|
|
);
|
|
combinedResult.isRequired = namedResult.isRequired || unnamedResult.isRequired;
|
|
return combinedResult;
|
|
}
|
|
}
|
|
return namedResult;
|
|
}
|
|
|
|
getNamedArgumentAt(text, index, isSelect) {
|
|
const notProvidedNamedArguments = this.executor.command.namedArgumentList.filter(arg=>!this.executor.namedArgumentList.find(it=>it.name == arg.name));
|
|
let name;
|
|
let value;
|
|
let start;
|
|
let cmdArg;
|
|
let argAssign;
|
|
const unamedArgLength = this.executor.endUnnamedArgs - this.executor.startUnnamedArgs;
|
|
const namedArgsFollowedBySpace = text[this.executor.endNamedArgs] == ' ';
|
|
if (this.executor.startNamedArgs <= index && this.executor.endNamedArgs + (namedArgsFollowedBySpace ? 1 : 0) >= index) {
|
|
// cursor is somewhere within the named arguments (including final space)
|
|
argAssign = this.executor.namedArgumentList.find(it=>it.start <= index && it.end >= index);
|
|
if (argAssign) {
|
|
const [argName, ...v] = text.slice(argAssign.start, index).split(/(?<==)/);
|
|
name = argName;
|
|
value = v.join('');
|
|
start = argAssign.start;
|
|
cmdArg = this.executor.command.namedArgumentList.find(it=>[it.name, `${it.name}=`].includes(argAssign.name));
|
|
if (cmdArg) notProvidedNamedArguments.push(cmdArg);
|
|
} else {
|
|
name = '';
|
|
start = index;
|
|
}
|
|
} else if (unamedArgLength > 0 && index >= this.executor.startUnnamedArgs && index <= this.executor.endUnnamedArgs) {
|
|
// cursor is somewhere within the unnamed arguments
|
|
//TODO if index is in first array item and that is a string, treat it as an unfinished named arg
|
|
if (typeof this.executor.unnamedArgumentList[0].value == 'string') {
|
|
if (index <= this.executor.startUnnamedArgs + this.executor.unnamedArgumentList[0].value.length) {
|
|
name = this.executor.unnamedArgumentList[0].value.slice(0, index - this.executor.startUnnamedArgs);
|
|
start = this.executor.startUnnamedArgs;
|
|
} else {
|
|
return null;
|
|
}
|
|
} else {
|
|
return null;
|
|
}
|
|
} else {
|
|
return null;
|
|
}
|
|
|
|
if (name.includes('=') && cmdArg) {
|
|
// if cursor is already behind "=" check for enums
|
|
/**@type {SlashCommandNamedArgument} */
|
|
if (cmdArg && cmdArg.enumList?.length) {
|
|
if (isSelect && cmdArg.enumList.includes(value) && argAssign && argAssign.end == index) {
|
|
return null;
|
|
}
|
|
const result = new AutoCompleteSecondaryNameResult(
|
|
value,
|
|
start + name.length,
|
|
cmdArg.enumList.map(it=>new SlashCommandEnumAutoCompleteOption(it)),
|
|
true,
|
|
);
|
|
result.isRequired = true;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
if (notProvidedNamedArguments.length > 0) {
|
|
const result = new AutoCompleteSecondaryNameResult(
|
|
name,
|
|
start,
|
|
notProvidedNamedArguments.map(it=>new SlashCommandNamedArgumentAutoCompleteOption(it, this.executor.command)),
|
|
false,
|
|
);
|
|
result.isRequired = notProvidedNamedArguments.find(it=>it.isRequired) != null;
|
|
return result;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
getUnnamedArgumentAt(text, index, isSelect) {
|
|
const lastArgIsBlank = this.executor.unnamedArgumentList.slice(-1)[0]?.value == '';
|
|
const notProvidedArguments = this.executor.command.unnamedArgumentList.slice(this.executor.unnamedArgumentList.length - (lastArgIsBlank ? 1 : 0));
|
|
let value;
|
|
let start;
|
|
let cmdArg;
|
|
let argAssign;
|
|
if (this.executor.startUnnamedArgs <= index && this.executor.endUnnamedArgs + 1 >= index) {
|
|
// cursor is somwehere in the unnamed args
|
|
const idx = this.executor.unnamedArgumentList.findIndex(it=>it.start <= index && it.end >= index);
|
|
if (idx > -1) {
|
|
argAssign = this.executor.unnamedArgumentList[idx];
|
|
cmdArg = this.executor.command.unnamedArgumentList[idx];
|
|
if (cmdArg && cmdArg.enumList.length > 0) {
|
|
value = argAssign.value.toString().slice(0, index - argAssign.start);
|
|
start = argAssign.start;
|
|
} else {
|
|
return null;
|
|
}
|
|
} else {
|
|
value = '';
|
|
start = index;
|
|
cmdArg = notProvidedArguments[0];
|
|
}
|
|
} else {
|
|
return null;
|
|
}
|
|
|
|
if (cmdArg == null || cmdArg.enumList.length == 0) return null;
|
|
|
|
const result = new AutoCompleteSecondaryNameResult(
|
|
value,
|
|
start,
|
|
cmdArg.enumList.map(it=>new SlashCommandEnumAutoCompleteOption(it)),
|
|
false,
|
|
);
|
|
const isCompleteValue = cmdArg.enumList.find(it=>it.value == value);
|
|
const isSelectedValue = isSelect && isCompleteValue;
|
|
result.isRequired = cmdArg.isRequired && !isSelectedValue && !isCompleteValue;
|
|
return result;
|
|
}
|
|
}
|