rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add /break support in /times and /while

This commit is contained in:
LenAnderson 2024-06-24 08:42:33 -04:00
parent c4c3218424
commit 1de96ce11f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/variables.js
View File

@ -4,6 +4,7 @@ import { executeSlashCommandsWithOptions } from './slash-commands.js';
import { SlashCommand } from './slash-commands/SlashCommand.js'; import { SlashCommand } from './slash-commands/SlashCommand.js';
import { SlashCommandAbortController } from './slash-commands/SlashCommandAbortController.js'; import { SlashCommandAbortController } from './slash-commands/SlashCommandAbortController.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js'; import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
import { SlashCommandBreakController } from './slash-commands/SlashCommandBreakController.js';
import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js'; import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
import { SlashCommandClosureResult } from './slash-commands/SlashCommandClosureResult.js'; import { SlashCommandClosureResult } from './slash-commands/SlashCommandClosureResult.js';
import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js'; import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
@ -348,11 +349,13 @@ async function whileCallback(args, value) {
if (result && command) { if (result && command) {
if (command instanceof SlashCommandClosure) { if (command instanceof SlashCommandClosure) {
command.breakController = new SlashCommandBreakController();
commandResult = await command.execute(); commandResult = await command.execute();
} else { } else {
commandResult = await executeSubCommands(command, args._scope, args._parserFlags, args._abortController); commandResult = await executeSubCommands(command, args._scope, args._parserFlags, args._abortController);
} }
if (commandResult.isAborted) break; if (commandResult.isAborted) break;
if (commandResult.isBreak) break;
} else { } else {
break; break;
} }
@ -390,8 +393,8 @@ async function timesCallback(args, value) {
const iterations = Math.min(Number(repeats), isGuardOff ? Number.MAX_SAFE_INTEGER : MAX_LOOPS); const iterations = Math.min(Number(repeats), isGuardOff ? Number.MAX_SAFE_INTEGER : MAX_LOOPS);
let result; let result;
for (let i = 0; i < iterations; i++) { for (let i = 0; i < iterations; i++) {
/**@type {SlashCommandClosureResult}*/
if (command instanceof SlashCommandClosure) { if (command instanceof SlashCommandClosure) {
command.breakController = new SlashCommandBreakController();
command.scope.setMacro('timesIndex', i); command.scope.setMacro('timesIndex', i);
result = await command.execute(); result = await command.execute();
} }
@ -399,6 +402,7 @@ async function timesCallback(args, value) {
result = await executeSubCommands(command.replace(/\{\{timesIndex\}\}/g, i.toString()), args._scope, args._parserFlags, args._abortController); result = await executeSubCommands(command.replace(/\{\{timesIndex\}\}/g, i.toString()), args._scope, args._parserFlags, args._abortController);
} }
if (result.isAborted) break; if (result.isAborted) break;
if (result.isBreak) break;
} }
return result?.pipe ?? ''; return result?.pipe ?? '';