dadfc4db · permissionBRICK/SillyTavern

@@ -529,7 +529,7 @@ export function evalBoolean(rule, a, b) {
529	529	if (isFalseBoolean(String(a))) return !resultOnTruthy;
530	530	return !!a ? resultOnTruthy : !resultOnTruthy;
531	531	default:
532	532	throw new Error(`Unknown boolean comparison rule for truthy check. If right-hand sideoperand is not provided, the rule must not provided or be "'not"'. Provided: ${rule}`);
533	533	}
534	534	}
535	535

                 return aNumber === bNumber;
             case 'neq':
                 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:
                 throw new Error(`Unknown boolean comparison rule for type number. Accepted: gt, gte, lt, lte, eq, neq. Provided: ${rule}`);
+        }

                 typeList: [ARGUMENT_TYPE.STRING],
                 defaultValue: 'eq',
                 enumList: [
                     new SlashCommandEnumValue('gteq', 'a >== b (strings & numbers)'),
                     new SlashCommandEnumValue('gteneq', 'a >!== b (strings & numbers)'),
                     new SlashCommandEnumValue('ltin', 'a <includes b (strings & numbers as strings)'),
                     new SlashCommandEnumValue('ltenin', 'a <=not includes b (strings & numbers as strings)'),
                     new SlashCommandEnumValue('eqgt', 'a ==> b (numbers)'),
                     new SlashCommandEnumValue('neqgte', 'a !=>= b (numbers)'),
                     new SlashCommandEnumValue('notlt', '!a < b (numbers)'),
                     new SlashCommandEnumValue('inlte', 'a includes<= b (numbers)'),
                     new SlashCommandEnumValue('ninnot', '!a not includes b(truthy)'),
                 ],
                 forceEnum: true,
             }),

                 Numeric values and string literals for left and right operands supported.
             </div>
             <div>
                 If the rule is not provided, it defaults to <code>eq</code>.<br />
 +            </div>
 +            <div>
                 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> 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>
                 <strong>Available rules:</strong>
                 <ul>
                     <li>gt<code>eq</code> => a >== b <small>(strings & numbers)</small></li>
                     <li>gte<code>neq</code> => a >!== b <small>(strings & numbers)</small></li>
                     <li>lt<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<code>gt</code> => a ==> b <small>(numbers)</small></li>
                     <li>neq<code>gte</code> => a !>= b <small>(numbers)</small></li>
                     <li>not<code>lt</code> => !a < b <small>(numbers)</small></li>
                     <li>in (strings)<code>lte</code> => a includes<= b <small>(numbers)</small></li>
 -                    <li>nin (strings) => a not includes b</li>
 +                    <li><code>not</code> => !a <small>(truthy)</small></li>
                 </ul>
             </div>
             <div>

                         <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.
                     <li>
                         <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)
                     </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>
             </div>
         `,

                 typeList: [ARGUMENT_TYPE.STRING],
                 defaultValue: 'eq',
                 enumList: [
                     new SlashCommandEnumValue('gteq', 'a >== b (strings & numbers)'),
                     new SlashCommandEnumValue('gteneq', 'a >!== b (strings & numbers)'),
                     new SlashCommandEnumValue('ltin', 'a <includes b (strings & numbers as strings)'),
                     new SlashCommandEnumValue('ltenin', 'a <=not includes b (strings & numbers as strings)'),
                     new SlashCommandEnumValue('eqgt', 'a ==> b (numbers)'),
                     new SlashCommandEnumValue('neqgte', 'a !=>= b (numbers)'),
                     new SlashCommandEnumValue('notlt', '!a < b (numbers)'),
                     new SlashCommandEnumValue('inlte', 'a includes<= b (numbers)'),
                     new SlashCommandEnumValue('ninnot', '!a not includes b(truthy)'),
                 ],
                 forceEnum: true,
             }),

             <div>
                 <strong>Available rules:</strong>
                 <ul>
                     <li>gt<code>eq</code> => a >== b <small>(strings & numbers)</small></li>
                     <li>gte<code>neq</code> => a >!== b <small>(strings & numbers)</small></li>
                     <li>lt<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<code>gt</code> => a ==> b <small>(numbers)</small></li>
                     <li>neq<code>gte</code> => a !>= b <small>(numbers)</small></li>
                     <li>not<code>lt</code> => !a < b <small>(numbers)</small></li>
                     <li>in (strings)<code>lte</code> => a includes<= b <small>(numbers)</small></li>
 -                    <li>nin (strings) => a not includes b</li>
 +                    <li><code>not</code> => !a <small>(truthy)</small></li>
                 </ul>
             </div>
             <div>

Let in/nin fall through to string + docs update