rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-08 07:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up docs and leftover logs

Browse Source
This commit is contained in:
Cohee 2024-03-06 23:10:52 +02:00
parent 9a6824f86c
commit bb53fef531
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ class SlashCommandParser {
/** /**
* Parses a slash command to extract the command name, the (named) arguments and the remaining text * Parses a slash command to extract the command name, the (named) arguments and the remaining text
* @param {string} text - Slash command text * @param {string} text - Slash command text
* @returns { command: string, args: object, value: string } * @returns {{command: string, args: object, value: string}} - The parsed command, its arguments and the remaining text
*/ */
parse(text) { parse(text) {
// Parses a command even when spaces are present in arguments // Parses a command even when spaces are present in arguments
@ -98,15 +98,11 @@ class SlashCommandParser {
if (match !== null && match[1].length > 0) { if (match !== null && match[1].length > 0) {
command = match[1]; command = match[1];
remainingText = match[2]; remainingText = match[2];
console.log('command:' + command); console.debug('command:' + 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 // 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) { 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] // 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 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 scalar like AScalar
@ -145,31 +141,28 @@ class SlashCommandParser {
continue; continue;
} }
// the remainder that matches no named argument is the "unamedArg" previously mentionned // the remainder that matches no named argument is the "unamedArg" previously mentioned
//console.log(' > unnamed arg: ${remainingText}');
unnamedArg = remainingText.trim(); unnamedArg = remainingText.trim();
remainingText = ''; remainingText = '';
} }
// Excluded commands format in their own function // Excluded commands format in their own function
if (!excludedFromRegex.includes(command)) { if (!excludedFromRegex.includes(command)) {
console.log(`parse: !excludedFromRegex.includes(${command}`); console.debug(`parse: !excludedFromRegex.includes(${command}`);
console.log(` parse: unnamedArg before: ${unnamedArg}`); console.debug(` parse: unnamedArg before: ${unnamedArg}`);
unnamedArg = getRegexedString( unnamedArg = getRegexedString(
unnamedArg, unnamedArg,
regex_placement.SLASH_COMMAND, regex_placement.SLASH_COMMAND,
); );
console.log(` parse: unnamedArg after: ${unnamedArg}`); console.debug(` 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 :) // 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 };
} }
return false; return null;
} }
getHelpString() { getHelpString() {