rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

add callable closure vars

Browse Source
This commit is contained in:
LenAnderson
2024-04-02 08:48:41 -04:00
parent c2ddfdb85d
commit d826eb43d4
3 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
public/scripts/slash-commands/SlashCommandParser.js
View File

@ -1,5 +1,6 @@
import { SlashCommand } from './SlashCommand.js';
import { SlashCommandClosure } from './SlashCommandClosure.js';
import { SlashCommandClosureExecutor } from './SlashCommandClosureExecutor.js';
import { SlashCommandExecutor } from './SlashCommandExecutor.js';
import { SlashCommandParserError } from './SlashCommandParserError.js';
// eslint-disable-next-line no-unused-vars
@ -232,6 +233,9 @@ export class SlashCommandParser {
this.discardWhitespace();
}
while (!this.testClosureEnd()) {
if (this.testClosureCall()) {
closure.executorList.push(this.parseClosureCall());
}
if (this.testCommand()) {
closure.executorList.push(this.parseCommand());
} else {
@ -260,6 +264,37 @@ export class SlashCommandParser {
return closure;
}
testClosureCall() {
return this.char == '/'
&& this.behind.slice(-1) != '\\'
&& !['/', '#'].includes(this.ahead[0])
&& /^\S+\(/.test(this.ahead)
;
}
testClosureCallEnd() {
return this.char == ')' && this.behind.slice(-1) != '\\';
}
parseClosureCall() {
this.take(); // discard /
let name = '';
while (!/\s|\(/.test(this.char)) name += this.take(); // take chars until opening (
this.take(); // discard opening (
const executor = new SlashCommandClosureExecutor();
executor.name = name;
this.discardWhitespace();
while (this.testNamedArgument()) {
const arg = this.parseNamedArgument();
executor.providedArguments[arg.key] = arg.value;
this.discardWhitespace();
}
if (this.testClosureCallEnd()) {
this.take(); // discard closing )
return executor;
} else {
throw new SlashCommandParserError(`Unexpected end of closure call at position ${this.index - 2}`, this.text, this.index);
}
}
testCommand() {
return this.char == '/' && this.behind.slice(-1) != '\\' && !['/', '#'].includes(this.ahead[0]);
}