Commit Graph

5228 Commits

Author SHA1 Message Date
Len 1d75b98393
STscript Parser Rewrite (#1965)
* 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>
2024-05-12 22:15:05 +03:00
Cohee c7d75b7789 llamacpp broke 2024-05-12 21:41:07 +03:00
Cohee 4ccedb939c
Merge pull request #2204 from steve02081504/patch-2
impl `{{char_version}}`
2024-05-12 17:57:37 +03:00
Cohee 4bb463dd56 Remove unused macros 2024-05-12 17:55:00 +03:00
Cohee 0ba600bb2b Code clean-up 2024-05-12 17:53:38 +03:00
Cohee 9ed6ee2161 Sample Character browser to onboarding 2024-05-12 16:43:09 +03:00
Cohee c4ade296ae Rotate Flux the Cat to downloadable content index 2024-05-12 15:09:00 +03:00
Cohee 0ed81e3b1a Rotate Coding Sensei to downloadable content index 2024-05-12 14:49:13 +03:00
steve02081504 d1933be86a remove `{{char_version_url_encoded}}` 2024-05-12 09:04:50 +08:00
steve02081504 15ff8de45c add template 2024-05-12 09:04:03 +08:00
steve02081504 45a080016e move to env 2024-05-12 09:01:30 +08:00
steve02081504 78cf6e9086 Merge branch 'staging' into pr/2204 2024-05-12 08:51:47 +08:00
Cohee 7d65a6e264 Add content manager config notice 2024-05-12 00:44:46 +03:00
Cohee 91945ec77e Fix misleading JSDoc 2024-05-12 00:22:36 +03:00
Cohee 7b472f13af Require a ping call before generation 2024-05-12 00:18:56 +03:00
Cohee a93777e3b7 (chore) JSDoc comment 2024-05-11 23:38:26 +03:00
Cohee 2f310c72fa
Merge pull request #2215 from Hydroerotic/staging
Added {{timeDiff}} macro.
2024-05-11 23:35:55 +03:00
Cohee 6a4ee68113 Message delete highlight color follows theme settings 2024-05-11 17:17:42 +03:00
Cohee e73b5713fd Add types for moment 2024-05-11 14:49:11 +03:00
Hydroerotic 1f81086a21
Update macros.js 2024-05-11 14:13:03 +03:00
Hydroerotic 3e48f4b805
Update macros.html 2024-05-11 13:55:15 +03:00
Hydroerotic 432be2ee57
Update macros.js 2024-05-11 13:52:31 +03:00
steve green f421139402
Create char-data.js for type hint (#2209)
* Create char-data.js for type hint

code from 7df0d1e06d/src/charData.mjs

* add hint

* fixes

* `class` -> JSdoc typedef by AI

* use `import`

* `v2DataWorldInfo`

* Rename book typedef

* Fix type errors

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2024-05-11 12:05:13 +03:00
RossAscends 081223cc8f
Merge pull request #2212 from bdashore3/token-ban-upgrades
min_length and strict string ban for Tabby
2024-05-11 17:39:05 +09:00
Cohee 27ccc6b090 Minor stylistic changes 2024-05-11 11:38:22 +03:00
kingbri 62faddac8d Textgen: Add banned_strings
TabbyAPI supports the ability to ban the presence of strings during
a generation. Add this support in SillyTavern by handling lines
enclosed in quotes as a special case.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-05-11 00:58:29 -04:00
kingbri 6804e4c679 Index: Expose min_tokens for TabbyAPI
Now supports the minimum amount of tokens to generate.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-05-10 23:19:57 -04:00
Cohee 10ee002091
Merge pull request #2208 from Wolfsblvt/global-d-ts-expanded
Expand global.d.ts with code docs
2024-05-10 23:11:08 +03:00
Cohee 1430eb26ea Delete toastr types.
@Wolfsblvt add it back if needed.
2024-05-10 23:05:14 +03:00
Cohee e17a18ad5d #2210 Replace line breaks with <br> in unknown elements 2024-05-10 15:59:01 +03:00
Wolfsblvt eeaa52bf5d Expand global.d.ts with code docs
- docs and syntax for toastr
- docs and syntax for Fuse
- docs and syntax for select2
- docs and syntax for sortable
2024-05-10 04:48:30 +02:00
Cohee 07a6cb1252
Merge pull request #2205 from deffcolony/staging
move expression buttons above Sprite set
2024-05-10 02:24:11 +03:00
steve02081504 7a2f6fb63f `{{char_version_url_encoded}}` and macro replace in `creator_notes_spoiler` 2024-05-10 07:24:05 +08:00
Wolfsblvt bb3ac095c4 WI key input allow click to edit
- Allow click on WI keys to edit
- Removes them from the key list, allowing direct text editing
- Refactor select2 click subscribe some more, fixing a few issues
2024-05-10 00:42:35 +02:00
Wolfsblvt e18d554489 Refactor select2 choice click event to utils 2024-05-09 23:30:18 +02:00
Wolfsblvt a2625ecec6 Merge branch 'staging' into wi-regex-keys 2024-05-09 22:54:27 +02:00
deffcolony 0252b21901 move expression buttons above Sprite set
+moves the buttons above the Sprite set so user does not have to scroll all the way down to find the buttons now it will be directly visiable
2024-05-09 16:33:04 +02:00
steve green f6343436b4
impl `{{char_version}}`
https://github.com/SillyTavern/SillyTavern/issues/2111
2024-05-09 22:29:48 +08:00
Cohee 9db2f1cb91 #2203 Fix copy not working in hidden messages 2024-05-09 16:07:13 +03:00
Cohee 2fd59f5aef
Merge pull request #2201 from Wolfsblvt/wi-no-doube-substitution
Do not double-parse WI content on "always on"
2024-05-09 15:31:14 +03:00
Cohee 18d96bc346 Merge branch 'staging' into wi-no-doube-substitution 2024-05-09 15:11:16 +03:00
Cohee 535da63e52
Merge pull request #2199 from steve02081504/patch-4
remove empty entrys from WIs
2024-05-09 15:05:25 +03:00
Cohee e14c9506b6 Revert entry post-process 2024-05-09 14:55:09 +03:00
Cohee 88aae5978f Simplify condition. Add debug log 2024-05-09 14:53:17 +03:00
Wolfsblvt b9d72bfdf4 Do not double-parse WI content on "always on" 2024-05-09 06:37:14 +02:00
Wolfsblvt f4bb4fe51e Merge branch 'staging' into wi-regex-keys 2024-05-09 04:23:14 +02:00
Wolfsblvt cf77b9e7ee WI regex key syntax highlighting 2024-05-09 03:35:36 +02:00
steve green ff1399d1ba remove empty lines from WIs 2024-05-09 08:30:40 +08:00
Wolfsblvt eb273a1873 WI key dropdown templating shows all keys
- Cache all keys for the loaded lorebook
- Key selection dropdown shows all keys and how often they are used already
- More templating changes
2024-05-08 20:34:53 +02:00
Cohee 0587931cae
Merge pull request #2193 from steve02081504/patch-2
also run regex on worldinfo
2024-05-08 21:15:39 +03:00