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

Merge pull request #1886 from parsedone/patch-2

Browse Source 
Fixes [BUG] STscript parser() incorrectly manages spaces
This commit is contained in:
Cohee
2024-03-06 23:04:10 +02:00
committed by GitHub
parent a7aa5fccf9 d217a4e32f
commit 9a6824f86c
1 changed files with 83 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
public/scripts/slash-commands.js
View File

@ -76,43 +76,95 @@ class SlashCommandParser {
this.helpStrings[command] = stringBuilder; this.helpStrings[command] = stringBuilder;
} }
/**
* Parses a slash command to extract the command name, the (named) arguments and the remaining text
* @param {string} text - Slash command text
* @returns { command: string, args: object, value: string }
*/
parse(text) { parse(text) {
// Parses a command even when spaces are present in arguments
// /buttons labels=["OK","I do not accept"] some text
// /fuzzy list=[ "red pink" , "yellow" ] threshold=" 0.6 " he yelled when the color was reddish and not pink | /echo
const excludedFromRegex = ['sendas']; const excludedFromRegex = ['sendas'];
const firstSpace = text.indexOf(' '); let command = '';
const command = firstSpace !== -1 ? text.substring(1, firstSpace) : text.substring(1);
let args = firstSpace !== -1 ? text.substring(firstSpace + 1) : '';
const argObj = {}; const argObj = {};
let unnamedArg; let unnamedArg = '';
if (args.length > 0) { // extract the command " /fuzzy " => "fuzzy"
let match; text = text.trim();
let remainingText = '';
// Match unnamed argument const commandArgPattern = /^\/([^\s]+)\s*(.*)$/s;
const unnamedArgPattern = /(?:\w+=(?:"(?:\\.|[^"\\])*"|\S+)\s*)*(.*)/s; let match = commandArgPattern.exec(text);
match = unnamedArgPattern.exec(args); if (match !== null && match[1].length > 0) {
if (match !== null && match[1].length > 0) { command = match[1];
args = args.slice(0, -match[1].length); remainingText = match[2];
unnamedArg = match[1].trim(); console.log('command:' + command);
}
// Match named arguments
const namedArgPattern = /(\w+)=("(?:\\.|[^"\\])*"|\S+)/g;
while ((match = namedArgPattern.exec(args)) !== null) {
const key = match[1];
const value = match[2];
// Remove the quotes around the value, if any
argObj[key] = value.replace(/(^")|("$)/g, '');
}
// Excluded commands format in their own function
if (!excludedFromRegex.includes(command)) {
unnamedArg = getRegexedString(
unnamedArg,
regex_placement.SLASH_COMMAND,
);
}
} }
// parse the rest of the string to extract named arguments, the remainder is the "unnamedArg" which is usually text, like the prompt to send
let loop = 0;
while (remainingText.length > 0) {
loop++;
//console.log(` > loop: ${loop} : remainingText: ${remainingText}`);
// does the remaining text is like nameArg=[value] or nameArg=[value,value] or nameArg=[ value , value , value]
// where value can be a string like " this is some text " , note previously it was not possible to have have spaces
// where value can be a scalar like AScalar
// where value can be a number like +9 -1005.44
// where value can be a macro like {{getvar::name}}
const namedArrayArgPattern = /^(\w+)=\[\s*(((?<quote>["'])[^"]*(\k<quote>)|{{[^}]*}}|[+-]?\d*\.?\d+|\w*)\s*,?\s*)+\]/s;
match = namedArrayArgPattern.exec(remainingText);
if (match !== null && match[0].length > 0) {
//console.log(`matching: ${match[0]}`);
const posFirstEqual = match[0].indexOf('=');
const key = match[0].substring(0, posFirstEqual).trim();
const value = match[0].substring(posFirstEqual + 1).trim();
// Remove the quotes around the value, if any
argObj[key] = value.replace(/(^")|("$)/g, '');
remainingText = remainingText.slice(match[0].length + 1).trim();
continue;
}
// does the remaining text is like nameArg=value
// where value can be a string like " this is some text " , note previously it was not possible to have have spaces
// where value can be a scalar like AScalar
// where value can be a number like +9 -1005.44
// where value can be a macro like {{getvar::name}}
const namedScalarArgPattern = /^(\w+)=(((?<quote>["'])[^"]*(\k<quote>)|{{[^}]*}}|[+-]?\d*\.?\d+|\w*))/s;
match = namedScalarArgPattern.exec(remainingText);
if (match !== null && match[0].length > 0) {
//console.log(`matching: ${match[0]}`);
const posFirstEqual = match[0].indexOf('=');
const key = match[0].substring(0, posFirstEqual).trim();
const value = match[0].substring(posFirstEqual + 1).trim();
// Remove the quotes around the value, if any
argObj[key] = value.replace(/(^")|("$)/g, '');
remainingText = remainingText.slice(match[0].length + 1).trim();
continue;
}
// the remainder that matches no named argument is the "unamedArg" previously mentionned
//console.log(' > unnamed arg: ${remainingText}');
unnamedArg = remainingText.trim();
remainingText = '';
}
// Excluded commands format in their own function
if (!excludedFromRegex.includes(command)) {
console.log(`parse: !excludedFromRegex.includes(${command}`);
console.log(` parse: unnamedArg before: ${unnamedArg}`);
unnamedArg = getRegexedString(
unnamedArg,
regex_placement.SLASH_COMMAND,
);
console.log(` parse: unnamedArg after: ${unnamedArg}`);
}
//console.log(JSON.stringify( { command: command, args: argObj, value: unnamedArg }));
// your weird complex command is now transformed into a juicy tiny text or something useful :)
if (this.commands[command]) { if (this.commands[command]) {
return { command: this.commands[command], args: argObj, value: unnamedArg }; return { command: this.commands[command], args: argObj, value: unnamedArg };
} }