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

Let in/nin fall through to string + docs update

Browse Source
This commit is contained in:
Wolfsblvt
2024-09-25 20:10:14 +02:00
parent a11a8fe956
commit dadfc4db98
1 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
public/scripts/variables.js
View File

@ -529,7 +529,7 @@ export function evalBoolean(rule, a, b) {
if (isFalseBoolean(String(a))) return !resultOnTruthy; if (isFalseBoolean(String(a))) return !resultOnTruthy;
return !!a ? resultOnTruthy : !resultOnTruthy; return !!a ? resultOnTruthy : !resultOnTruthy;
default: default:
throw new Error(`Unknown boolean comparison rule for truthy check. If right-hand side is not provided, the rule must not provided or be "not". Provided: ${rule}`); throw new Error(`Unknown boolean comparison rule for truthy check. If right operand is not provided, the rule must not provided or be 'not'. Provided: ${rule}`);
} }
} }
@ -554,6 +554,11 @@ export function evalBoolean(rule, a, b) {
return aNumber === bNumber; return aNumber === bNumber;
case 'neq': case 'neq':
return aNumber !== bNumber; return aNumber !== bNumber;
case 'in':
case 'nin':
// Fall through to string comparison. Otherwise you could not check if 12345 contains 45 for example.
console.debug(`Boolean comparison rule '${rule}' is not supported for type number. Falling back to string comparison.`);
break;
default: default:
throw new Error(`Unknown boolean comparison rule for type number. Accepted: gt, gte, lt, lte, eq, neq. Provided: ${rule}`); throw new Error(`Unknown boolean comparison rule for type number. Accepted: gt, gte, lt, lte, eq, neq. Provided: ${rule}`);
} }
@ -1265,15 +1270,15 @@ export function registerVariableCommands() {
typeList: [ARGUMENT_TYPE.STRING], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: 'eq', defaultValue: 'eq',
enumList: [ enumList: [
new SlashCommandEnumValue('gt', 'a > b'), new SlashCommandEnumValue('eq', 'a == b (strings & numbers)'),
new SlashCommandEnumValue('gte', 'a >= b'), new SlashCommandEnumValue('neq', 'a !== b (strings & numbers)'),
new SlashCommandEnumValue('lt', 'a < b'), new SlashCommandEnumValue('in', 'a includes b (strings & numbers as strings)'),
new SlashCommandEnumValue('lte', 'a <= b'), new SlashCommandEnumValue('nin', 'a not includes b (strings & numbers as strings)'),
new SlashCommandEnumValue('eq', 'a == b'), new SlashCommandEnumValue('gt', 'a > b (numbers)'),
new SlashCommandEnumValue('neq', 'a !== b'), new SlashCommandEnumValue('gte', 'a >= b (numbers)'),
new SlashCommandEnumValue('not', '!a'), new SlashCommandEnumValue('lt', 'a < b (numbers)'),
new SlashCommandEnumValue('in', 'a includes b'), new SlashCommandEnumValue('lte', 'a <= b (numbers)'),
new SlashCommandEnumValue('nin', 'a not includes b'), new SlashCommandEnumValue('not', '!a (truthy)'),
], ],
forceEnum: true, forceEnum: true,
}), }),
@ -1299,22 +1304,25 @@ export function registerVariableCommands() {
Numeric values and string literals for left and right operands supported. Numeric values and string literals for left and right operands supported.
</div> </div>
<div> <div>
If the rule is not provided, it defaults to <code>eq</code>.<br /> If the rule is not provided, it defaults to <code>eq</code>.
</div>
<div>
If no right operand is provided, it defaults to checking the <code>left</code> value to be truthy. If no right operand is provided, it defaults to checking the <code>left</code> value to be truthy.
A non-empty string or non-zero number is considered truthy, as is the value <code>true</code>. A non-empty string or non-zero number is considered truthy, as is the value <code>true</code> or <code>on</code>.<br />
Only acceptable rules for no provided right operand are <code>not</code>, and no provided rule - which default to returning whether it is not or is truthy.
</div> </div>
<div> <div>
<strong>Available rules:</strong> <strong>Available rules:</strong>
<ul> <ul>
<li>gt => a > b</li> <li><code>eq</code> => a == b <small>(strings & numbers)</small></li>
<li>gte => a >= b</li> <li><code>neq</code> => a !== b <small>(strings & numbers)</small></li>
<li>lt => a < b</li> <li><code>in</code> => a includes b <small>(strings & numbers as strings)</small></li>
<li>lte => a <= b</li> <li><code>nin</code> => a not includes b <small>(strings & numbers as strings)</small></li>
<li>eq => a == b</li> <li><code>gt</code> => a > b <small>(numbers)</small></li>
<li>neq => a != b</li> <li><code>gte</code> => a >= b <small>(numbers)</small></li>
<li>not => !a</li> <li><code>lt</code> => a < b <small>(numbers)</small></li>
<li>in (strings) => a includes b</li> <li><code>lte</code> => a <= b <small>(numbers)</small></li>
<li>nin (strings) => a not includes b</li> <li><code>not</code> => !a <small>(truthy)</small></li>
</ul> </ul>
</div> </div>
<div> <div>
@ -1328,9 +1336,13 @@ export function registerVariableCommands() {
<pre><code class="language-stscript">/if left={{lastMessage}} rule=in right=surprise {: /echo SURPISE! :}</code></pre> <pre><code class="language-stscript">/if left={{lastMessage}} rule=in right=surprise {: /echo SURPISE! :}</code></pre>
executes a subcommand defined as a closure if the given value contains a specified word. executes a subcommand defined as a closure if the given value contains a specified word.
<li> <li>
<pre><code class="language-stscript">/if left=myContent {: /echo "My content had some content." :}</code></pre> <pre><code class="language-stscript">/if left=myContent {: /echo My content had some content. :}</code></pre>
executes the defined subcommand, if the provided value of left is truthy (contains some kind of contant that is not empty or false) executes the defined subcommand, if the provided value of left is truthy (contains some kind of contant that is not empty or false)
</li> </li>
<li>
<pre><code class="language-stscript">/if left=tree right={{getvar::object}} {: /echo The object is a tree! :}</code></pre>
executes the defined subcommand, if the left and right values are equals.
</li>
</ul> </ul>
</div> </div>
`, `,
@ -1359,15 +1371,15 @@ export function registerVariableCommands() {
typeList: [ARGUMENT_TYPE.STRING], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: 'eq', defaultValue: 'eq',
enumList: [ enumList: [
new SlashCommandEnumValue('gt', 'a > b'), new SlashCommandEnumValue('eq', 'a == b (strings & numbers)'),
new SlashCommandEnumValue('gte', 'a >= b'), new SlashCommandEnumValue('neq', 'a !== b (strings & numbers)'),
new SlashCommandEnumValue('lt', 'a < b'), new SlashCommandEnumValue('in', 'a includes b (strings & numbers as strings)'),
new SlashCommandEnumValue('lte', 'a <= b'), new SlashCommandEnumValue('nin', 'a not includes b (strings & numbers as strings)'),
new SlashCommandEnumValue('eq', 'a == b'), new SlashCommandEnumValue('gt', 'a > b (numbers)'),
new SlashCommandEnumValue('neq', 'a !== b'), new SlashCommandEnumValue('gte', 'a >= b (numbers)'),
new SlashCommandEnumValue('not', '!a'), new SlashCommandEnumValue('lt', 'a < b (numbers)'),
new SlashCommandEnumValue('in', 'a includes b'), new SlashCommandEnumValue('lte', 'a <= b (numbers)'),
new SlashCommandEnumValue('nin', 'a not includes b'), new SlashCommandEnumValue('not', '!a (truthy)'),
], ],
forceEnum: true, forceEnum: true,
}), }),
@ -1396,15 +1408,15 @@ export function registerVariableCommands() {
<div> <div>
<strong>Available rules:</strong> <strong>Available rules:</strong>
<ul> <ul>
<li>gt => a > b</li> <li><code>eq</code> => a == b <small>(strings & numbers)</small></li>
<li>gte => a >= b</li> <li><code>neq</code> => a !== b <small>(strings & numbers)</small></li>
<li>lt => a < b</li> <li><code>in</code> => a includes b <small>(strings & numbers as strings)</small></li>
<li>lte => a <= b</li> <li><code>nin</code> => a not includes b <small>(strings & numbers as strings)</small></li>
<li>eq => a == b</li> <li><code>gt</code> => a > b <small>(numbers)</small></li>
<li>neq => a != b</li> <li><code>gte</code> => a >= b <small>(numbers)</small></li>
<li>not => !a</li> <li><code>lt</code> => a < b <small>(numbers)</small></li>
<li>in (strings) => a includes b</li> <li><code>lte</code> => a <= b <small>(numbers)</small></li>
<li>nin (strings) => a not includes b</li> <li><code>not</code> => !a <small>(truthy)</small></li>
</ul> </ul>
</div> </div>
<div> <div>