Macros 2.0 (v0.5.1) - Delayed Macro Argument Resolution for `{{if}}` Macro (#4934) * Add variable shorthand syntax support for local and global variables - Add VariableShorthandType enum and VariableShorthandDefinitions for `.` (local) and `$` (global) prefixes - Add VariableShorthandAutoCompleteOption class for autocomplete of variable shorthand syntax - Implement variable expression parsing in MacroCstWalker to handle `{{.varName}}` and `{{$varName}}` syntax - Add support for variable operations: get, set (=), increment (++), decrement (--), and add (+=) - Route variable expressions to appropriate macro via handler * Add variable shorthand autocomplete support for variable names and operators - Add `isValidVariableShorthandName()` helper to validate variable names against shorthand pattern - Add `VariableNameAutoCompleteOption` class for suggesting existing and new variable names - Add `VariableOperatorAutoCompleteOption` class for suggesting operators (=, ++, --, +=) - Add `VariableOperatorDefinitions` map with operator metadata (symbol, name, description, needsValue) * Add variable shorthand support to {{if}} macro condition autocomplete - Add variable shorthand (.var, $var) support to {{if}} condition evaluation in core-macros.js - Detect and resolve variable shorthands using getvar/getglobalvar macros before condition check - Update {{if}} description and examples to document variable shorthand syntax - Add variable shorthand autocomplete options when typing {{if}} condition - Show variable prefix options (. and $) when no condition is typed yet - Reuse #buildVariableShorthandOptions * refactor: Add Object.freeze to lexer constants and improve JSDoc documentation - Freeze `modes` and `Tokens` objects to prevent accidental mutations - Convert inline comments to proper JSDoc format for better documentation - Add JSDoc block for `Def` lexer definition object - Improve comment clarity and formatting consistency throughout MacroLexer.js - Remove redundant section separator comments in variable shorthand modes * Add inversion prefix (!) autocomplete support to {{if}} macro condition - Add SimpleAutoCompleteOption class for basic autocomplete items with name, symbol, and description - Add ! inversion prefix as autocomplete option in {{if}} condition with 🔁 icon - Show ! as selectable option when nothing typed, non-selectable when already present - Fix condition parsing to handle ! prefix with whitespace (e.g., "! $myvar") - Update identifier extraction to strip ! and whitespace before detecting variable * fix lint * Fix variable shorthand regex in {{if}} macro to properly capture prefix and variable name * Expand comprehensive e2e tests for variable shorthand syntax in lexer and macro engine - Add MacroLexer tests for variable shorthand edge cases (whitespace, numbers, underscores, operators) - Add MacroEngine tests for variable shorthand operations (hyphens, underscores, non-existent vars, chaining) - Add MacroEngine tests for variable shorthand in {{if}} conditions (truthy/falsy, inversion, else branches) - Test variable names with hyphens, underscores, and numbers in both get/set and conditional contexts * Fix macro flags not being allowed inside variable shorthand macros - Move MANY(flags) block from macroBody to macro rule to parse flags before branching - Fix MacroCstWalker to extract flags from children.flags instead of bodyChildren.flags - Ensures flags are available for both variable expressions and regular macros - Fixes flag extraction in visitMacro and visitBlockMacroClose methods * Implement delayed argument resolution for {{if}} macro to prevent side effects in non-chosen branches - Add `delayArgResolution` flag to MacroDefinition to control when nested macros are evaluated - Modify MacroCstWalker to skip nested macro evaluation when delayArgResolution is true - Update {{if}} macro to use delayArgResolution and manually resolve only the chosen branch - Replace ELSE_MARKER splitting with `splitOnTopLevelElse()` that parses CST to find correct {{else}} at depth 0 * Fix delayed resolve on if/else macros being off when a non-scoped if macro was being used inside - Track argument count in MacroCstWalker.extractMacroInfo() to distinguish inline vs scoped macros - Update splitOnTopLevelElse() to only track scoped {{if}} blocks (1 arg) when finding {{else}} at depth 0 - Update findClosingMacro() to only increment depth for macros that can accept scoped content - Add e2e tests for inline {{if::condition::content}} inside scoped {{if}}/{{else}} blocks * Remove eslint exclusion * Remove duplicate tests * Regenerate package-lock.json in /tests --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

81414724b07ac186547babc12c41ea90352b8cca

Wolfsblvt <wolfsblvt@gmail.com>

Signed

Parents: dbc4fe611c69244b83258880ac58bd0084ded45d

public/scripts/macros/definitions/core-macros.js+65 -20 Viewed

 import { textgenerationwebui_banned_in_macros } from '../../textgen-settings.js';
 import { inject_ids } from '../../constants.js';
 import { MacroRegistry, MacroCategory, MacroValueType } from '../engine/MacroRegistry.js';
-import { MacroEngine } from '../engine/MacroEngine.js';
 import { MACRO_VARIABLE_SHORTHAND_PATTERN } from '../engine/MacroLexer.js';
+import { MacroParser } from '../engine/MacroParser.js';
+import { MacroCstWalker } from '../engine/MacroCstWalker.js';
 /**
  * Marker used by {{else}} to split content in {{if}} blocks.

         },
     });
+    /**
+     * Splits raw content on the first {{else}} macro at nesting depth 0.
+     * Tracks scoped {{if}}/{{/if}} pairs to find the correct top-level else.
+     * Only {{if}} with 1 argument (condition only) are considered scoped blocks.
+     *
+     * @param {string} content - The raw content to split
+     * @returns {{ thenBranch: string, elseBranch: string | undefined }}
+     */
+    function splitOnTopLevelElse(content) {
+        const { cst } = MacroParser.parseDocument(content);
+        const macroNodes = /** @type {import('chevrotain').CstNode[]} */ (cst?.children?.macro || []);
+        let depth = 0;
+        for (const macroNode of macroNodes) {
+            const info = MacroCstWalker.extractMacroInfo(macroNode);
+            if (!info) continue;
+            // Only track scoped {{if}} blocks (1 arg = condition only, expects {{/if}})
+            // Inline {{if condition::content}} has 2 args and doesn't affect depth
+            if (info.name === 'if' && !info.isClosing && info.argCount === 1) {
+                depth++;
+            } else if (info.name === 'if' && info.isClosing) {
+                depth--;
+            } else if (info.name === 'else' && depth === 0) {
+                return {
+                    thenBranch: content.slice(0, info.startOffset),
+                    elseBranch: content.slice(info.endOffset + 1),
+                };
+            }
+        }
+        return { thenBranch: content, elseBranch: undefined };
+    }
     // {{if condition}}content{{/if}} -> conditional content
     // {{if condition}}then-content{{else}}else-content{{/if}} -> conditional with else branch
     // {{if !condition}}content{{/if}} -> inverted conditional (negated)

             '{{if $globalFlag}}Global flag is set{{/if}}',
         ],
         returns: 'The content if condition is truthy, else branch or empty string otherwise.',
-        handler: ({ unnamedArgs: [condition, content], rawArgs: [rawCondition], flags, env, trimContent }) => {
+        // Delay argument resolution so nested macros are only evaluated in the chosen branch
-            // Check if the ORIGINAL condition (before macro resolution) starts with !
+        delayArgResolution: true,
-            // We use raw args to check this, as the resolved value might start with ! from a variable
+        handler: ({ unnamedArgs: [rawCondition, rawContent], flags, resolve, trimContent }) => {
+            // With delayArgResolution: true, args contain raw (unresolved) text.
+            // We resolve the condition first, then only resolve the chosen branch.
+            // Check if the condition starts with ! for inversion
             let inverted = false;
+            let condition = rawCondition;
             if (/^\s*!/.test(rawCondition)) {
                 inverted = true;
-                // Strip the ! from the resolved condition if it was the prefix
+                condition = rawCondition.replace(/^\s*!\s*/, '');
-                condition = condition.replace(/^!\s*/, '');
+            }
+            // Resolve the condition (may contain nested macros like {{getvar::x}})
+            condition = resolve(condition);
             // Check if condition is a variable shorthand (.varname or $varname)
             // If so, resolve it using the appropriate variable macro
             const varShorthandRegex = new RegExp(`^([.$])(${MACRO_VARIABLE_SHORTHAND_PATTERN.source})$`);

             if (varShorthandMatch) {
                 const [, prefix, varName] = varShorthandMatch;
                 const varMacro = prefix === '.' ? 'getvar' : 'getglobalvar';
-                // Resolve the variable using MacroEngine.evaluate
+                condition = resolve(`{{${varMacro}::${varName}}}`);
-                condition = MacroEngine.evaluate(`{{${varMacro}::${varName}}}`, env);
             } else {
                 // Check if condition is a registered macro name (without braces)
                 // If so, resolve it first (only for macros that accept 0 required args)
                 const macroDef = MacroRegistry.getPrimaryMacro(condition);
                 if (macroDef && macroDef.minArgs === 0) {
-                    // Use MacroEngine.evaluate to properly resolve the macro with full context
+                    condition = resolve(`{{${condition}}}`);
-                    // This ensures all handler args (cst, normalize, list, etc.) are correctly provided
-                    condition = MacroEngine.evaluate(`{{${condition}}}`, env);
+                }
+            }

             let isFalsy = condition === '' || isFalseBoolean(condition);
             if (inverted) isFalsy = !isFalsy;
-            // Split content on else marker (if present)
+            // Split raw content on {{else}} macro at the top nesting level
-            const [thenBranch, elseBranch] = content.split(ELSE_MARKER);
+            // We need to track nesting depth to find the correct {{else}} for this if
-            const result = !isFalsy ? thenBranch : elseBranch;
+            const { thenBranch, elseBranch } = splitOnTopLevelElse(rawContent);
+            // Only resolve the chosen branch
+            const chosenBranch = !isFalsy ? thenBranch : elseBranch;
+            if (chosenBranch === undefined) {
+                return '';
+            }
-            // Trim branches unless # flag is set (preserveWhitespace)
+            // Resolve nested macros in the chosen branch
-            // The engine auto-trims the whole scoped content, but we still need to trim
+            // Trim result unless # flag is set (preserveWhitespace)
-            // around the {{else}} marker since that's internal to this macro
+            let result = resolve(chosenBranch);
-            if (flags.preserveWhitespace) {
+            if (!flags.preserveWhitespace) {
-                return result ?? '';
+                result = trimContent(result);
+            }
-            return trimContent(result ?? '');
+            return result;
         },
     });

public/scripts/macros/engine/MacroCstWalker.js+83 -7 Viewed

  */
 /**
+ * @typedef {Object} MacroNodeInfo
+ * @property {string} name - The macro identifier name.
+ * @property {boolean} isClosing - Whether this macro has the closing block flag (/).
+ * @property {number} startOffset - Start position in the source text.
+ * @property {number} endOffset - End position in the source text (inclusive).
+ * @property {number} argCount - Number of arguments provided to the macro.
+ */
+/**
  * The singleton instance of the MacroCstWalker.
+ *
  * @type {MacroCstWalker}

+    }
     /**
+     * Extracts basic info from a macro CST node: name, closing flag, position, and argument count.
+     * Returns null for variable expressions or nodes without valid identifiers.
+     *
+     * @param {CstNode} macroNode - A macro CST node from the parser.
+     * @returns {MacroNodeInfo | null}
+     */
+    extractMacroInfo(macroNode) {
+        const children = macroNode?.children || {};
+        // Variable expressions don't have standard macro identifiers
+        if ((children.variableExpr || [])[0]) {
+            return null;
+        }
+        // Get start/end tokens for position
+        const startToken = /** @type {IToken?} */ ((children['Macro.Start'] || [])[0]);
+        const endToken = /** @type {IToken?} */ ((children['Macro.End'] || [])[0]);
+        if (!startToken || !endToken) {
+            return null;
+        }
+        // Get identifier and arguments from macroBody
+        const macroBodyNode = /** @type {CstNode?} */ ((children.macroBody || [])[0]);
+        const bodyChildren = macroBodyNode?.children || {};
+        const identifierTokens = /** @type {IToken[]} */ (bodyChildren['Macro.identifier'] || []);
+        const name = identifierTokens[0]?.image || '';
+        if (!name) return null;
+        // Count arguments (arguments rule contains argument nodes)
+        const argumentsNode = /** @type {CstNode?} */ ((bodyChildren.arguments || [])[0]);
+        const argumentNodes = /** @type {CstNode[]} */ (argumentsNode?.children?.argument || []);
+        const argCount = argumentNodes.length;
+        // Check for closing block flag
+        const flagTokens = /** @type {IToken[]} */ (children.flags || []);
+        const isClosing = flagTokens.some(token => token.image === MacroFlagType.CLOSING_BLOCK);
+        return {
+            name,
+            isClosing,
+            startOffset: startToken.startOffset,
+            endOffset: endToken.endOffset,
+            argCount,
+        };
+    }
+    /**
      * Finds unclosed scoped macros in a document CST.
      * Used by autocomplete to suggest closing tags.
+     *

         const argumentsNode = /** @type {CstNode?} */ ((bodyChildren.arguments || [])[0]);
         const argumentNodes = /** @type {CstNode[]} */ (argumentsNode?.children?.argument || []);
+        // Check if this macro has delayArgResolution flag - if so, skip nested macro evaluation
+        const macroDef = MacroRegistry.getMacro(name);
+        const delayArgResolution = macroDef?.delayArgResolution === true;
         /** @type {string[]} */
         const args = [];
         /** @type {({ value: string } & TokenRange)[]} */

         const rawArgs = [];
         for (const argNode of argumentNodes) {
-            const argValue = this.#evaluateArgumentNode(argNode, context);
+            const location = this.#getArgumentLocation(argNode);
+            const rawArgText = location ? text.slice(location.startOffset, location.endOffset + 1) : '';
+            rawArgs.push(rawArgText);
+            // If delayArgResolution is true, use raw text; otherwise evaluate nested macros
+            const argValue = delayArgResolution ? rawArgText : this.#evaluateArgumentNode(argNode, context);
             args.push(argValue);
-            const location = this.#getArgumentLocation(argNode);
             if (location) {
                 evaluatedArguments.push({
                     value: argValue,
                     ...location,
                 });
+            }
-            rawArgs.push(location ? text.slice(location.startOffset, location.endOffset + 1) : '');
+        }
         // If this macro has scoped content, evaluate it and append as the last argument

             // Handle empty scoped content (when opening and closing are adjacent)
             if (scopedContent.startOffset > scopedContent.endOffset) {
                 args.push('');
+                rawArgs.push('');
             } else {
-                let scopedValue = this.#evaluateScopedContent(scopedContent, context);
+                const rawScopedText = text.slice(scopedContent.startOffset, scopedContent.endOffset + 1);
+                rawArgs.push(rawScopedText);
+                // If delayArgResolution is true, use raw text; otherwise evaluate nested macros
+                let scopedValue;
+                if (delayArgResolution) {
+                    scopedValue = rawScopedText;
+                } else {
+                    scopedValue = this.#evaluateScopedContent(scopedContent, context);
                     // Auto-trim scoped content unless the '#' (preserveWhitespace) flag is set
                     if (!flags.preserveWhitespace) {
                         scopedValue = trimContent(scopedValue);
+                    }
+                }
                 args.push(scopedValue);

     /**
      * Finds the matching closing macro for an opening macro at the given index.
-     * Handles nested scopes by tracking depth.
+     * Handles nested scopes by tracking depth. Only counts opening macros that
+     * can accept scoped content (inline macros with all args filled don't count).
+     *
      * @param {Array<{ index: number, item: DocumentItemMacro, name: string, isClosing: boolean, matched: boolean }>} macroInfos
      * @param {number} openingIdx - Index in macroInfos array of the opening macro.

@@ -1027,10 +1100,13 @@ class MacroCstWalker {
1027	return i;	1100	return i;
1028	}	1101	}
1029	} else {	1102	} else {
1030	// Another opening macro with the same name increases depth	1103	// Only increment depth for opening macros that can accept scoped content
		1104	// Inline macros (e.g., {{if condition::content}}) don't need closing tags
		1105	if (this.#canAcceptScopedContent(info.item.node, info.name)) {
1031	depth++;	1106	depth++;
1032	}	1107	}
1033	}	1108	}
		1109	}
1034		1110
1035	return -1; // No matching closing macro found	1111	return -1; // No matching closing macro found
1036	}	1112	}

public/scripts/macros/engine/MacroEngine.js+1 -0 Viewed

                 source: { name: 'dynamic', isExtension: false, isThirdParty: false },
                 aliasOf: null,
                 aliasVisible: null,
+                delayArgResolution: false,
                 handler: typeof impl === 'function' ? impl : () => impl,
             };
+        }

public/scripts/macros/engine/MacroRegistry.js+14 -2 Viewed

  * @property {MacroValueType|MacroValueType[]} [returnType=MacroValueType.STRING] - The type(s) this macro returns. Defaults to string.
  * @property {string} [displayOverride] - Override the auto-generated macro signature for display (must include curly braces, e.g. "{{macro::arg}}").
  * @property {string|string[]} [exampleUsage] - Example usage(s) shown in documentation (must include curly braces).
+ * @property {boolean} [delayArgResolution=false] - If true, nested macros in arguments or scope are NOT resolved before calling the handler. The handler receives raw argument text and must call resolve() manually. Use sparingly - only for control-flow macros like {{if}}.
  * @property {MacroHandler} handler - The handler function for the macro.
  */

 /**
  * @typedef {Object} MacroExecutionContext
  * @property {string} name
- * @property {string[]} args - All unnamed arguments passed to the macro.
+ * @property {string[]} args - All unnamed arguments passed to the macro. If delayArgResolution is true, these contain raw (unresolved) text.
  * @property {string[]} unnamedArgs - Unnamed positional arguments (both required and optional, up to the defined count).
  * @property {string[]|null} list - List arguments (after unnamed args), or null if list is not enabled.
  * @property {{ [key: string]: string }|null} namedArgs - Reserved for future named argument support.

  * @property {boolean} isScoped - Whether this macro was invoked using scoped syntax (opening + closing tags).
  * @property {string} raw - The inner macro content with nested macros resolved.
  * @property {string} rawOriginal - The original full macro text including braces, before any resolution.
- * @property {string[]} rawArgs - The original arguments passed to the macro.
+ * @property {string[]} rawArgs - The original arguments passed to the macro (always unresolved).
  * @property {MacroEnv} env
  * @property {CstNode|null} cstNode
  * @property {{ startOffset: number, endOffset: number }|null} range
  * @property {(value: any) => string} normalize - Normalize function to use on unsure macro results to make sure they return strings as expected.
  * @property {(content: string, options?: { trimIndent?: boolean }) => string} trimContent - Trims scoped content with optional indentation dedent. Defaults to trimming indentation.
+ * @property {(text: string) => string} resolve - Evaluates macros in the given text using the same environment. Use when delayArgResolution is true.
  */
 /**

  * @property {MacroValueType|MacroValueType[]} returnType - The type(s) this macro returns.
  * @property {string|null} displayOverride - Override for the auto-generated macro signature display.
  * @property {string[]} exampleUsage - Example usage strings for documentation.
+ * @property {boolean} delayArgResolution - If true, nested macros in arguments are NOT resolved before calling the handler. The handler receives raw argument text and must call resolve() manually. Use sparingly - only for control-flow macros like {{if}}.
  * @property {MacroHandler} handler
  * @property {MacroSource} source
  * @property {string|null} aliasOf - If this is an alias, the primary macro name this is an alias of. Can also be used to check if this is an alias macro.

                 returnType: rawReturnType,
                 displayOverride: rawDisplayOverride,
                 exampleUsage: rawExampleUsage,
+                delayArgResolution: rawDelayArgResolution,
                 handler,
             } = options;

+                }
+            }
+            let delayArgResolution = false;
+            if (rawDelayArgResolution !== undefined) {
+                if (typeof rawDelayArgResolution !== 'boolean') throw new Error(`Macro "${name}" options.delayArgResolution must be a boolean when provided.`);
+                delayArgResolution = rawDelayArgResolution;
+            }
             const nameKey = name.toLowerCase();
             if (this.#macros.has(nameKey)) {
                 logMacroRegisterWarning({ macroName: name, message: `Macro "${name}" is already registered and will be overwritten.` });

                 returnType,
                 displayOverride,
                 exampleUsage,
+                delayArgResolution,
                 handler,
                 source: {
                     name: source,

             range: call.range,
             normalize: MacroEngine.normalizeMacroResult.bind(MacroEngine),
             trimContent: MacroEngine.trimScopedContent.bind(MacroEngine),
+            resolve: (text) => MacroEngine.evaluate(text, call.env),
         };
         const result = def.handler(executionContext);

tests/frontend/MacroEngine.e2e.js+180 -0 Viewed

             expect(output).toBe('Count: 42');
         });
     });
+    const getUniqueVariableId = () => `dt_${Date.now()}_${Math.random().toString(36).slice(2)}`;
+    test.describe('Delayed Argument Resolution ({{if}} branch isolation)', () => {
+        // Core feature: setvar in non-chosen branch should NOT execute
+        test('should NOT execute setvar in false branch', async ({ page }) => {
+            const id = getUniqueVariableId();
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(id);
+                const input = `{{if 0}}{{setvar::${id}::should-not-set}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                // Variable should NOT be set because the branch was not taken
+                const result = ctx.variables.local.get(id);
+                ctx.variables.local.del(id);
+                return result;
+            }, id);
+            expect(output).toBe('');
+        });
+        // setvar in true branch SHOULD execute
+        test('should execute setvar in true branch', async ({ page }) => {
+            const id = getUniqueVariableId();
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(id);
+                const input = `{{if 1}}{{setvar::${id}::was-set}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const result = ctx.variables.local.get(id);
+                ctx.variables.local.del(id);
+                return result;
+            }, id);
+            expect(output).toBe('was-set');
+        });
+        // With else branch: only the chosen branch's setvar should execute
+        test('should only execute setvar in chosen else branch', async ({ page }) => {
+            const id = getUniqueVariableId();
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(id);
+                const input = `{{if 0}}{{setvar::${id}::then-branch}}{{else}}{{setvar::${id}::else-branch}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const result = ctx.variables.local.get(id);
+                ctx.variables.local.del(id);
+                return result;
+            }, id);
+            expect(output).toBe('else-branch');
+        });
+        // Verify then branch setvar executes, not else branch
+        test('should only execute setvar in chosen then branch', async ({ page }) => {
+            const id = getUniqueVariableId();
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(id);
+                const input = `{{if 1}}{{setvar::${id}::then-branch}}{{else}}{{setvar::${id}::else-branch}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const result = ctx.variables.local.get(id);
+                ctx.variables.local.del(id);
+                return result;
+            }, id);
+            expect(output).toBe('then-branch');
+        });
+        // Multiple setvars in branches - only chosen branch's setvars execute
+        test('should execute multiple setvars only in chosen branch', async ({ page }) => {
+            const id = getUniqueVariableId();
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(`${id}_a`);
+                ctx.variables.local.del(`${id}_b`);
+                const input = `{{if 0}}{{setvar::${id}_a::wrong}}{{setvar::${id}_b::wrong}}{{else}}{{setvar::${id}_a::right}}{{setvar::${id}_b::right}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const a = ctx.variables.local.get(`${id}_a`);
+                const b = ctx.variables.local.get(`${id}_b`);
+                ctx.variables.local.del(`${id}_a`);
+                ctx.variables.local.del(`${id}_b`);
+                return `a=${a},b=${b}`;
+            }, id);
+            expect(output).toBe('a=right,b=right');
+        });
+        // Nested if with delayed resolution - inner if should also work correctly
+        test('should handle nested if with delayed resolution', async ({ page }) => {
+            const id = `dt_nested_${Date.now()}_${Math.random().toString(36).slice(2)}`;
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.del(`${id}_outer`);
+                ctx.variables.local.del(`${id}_inner`);
+                // Outer if is true, inner if is false
+                const input = `{{if 1}}{{setvar::${id}_outer::yes}}{{if 0}}{{setvar::${id}_inner::wrong}}{{else}}{{setvar::${id}_inner::correct}}{{/if}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const outer = ctx.variables.local.get(`${id}_outer`);
+                const inner = ctx.variables.local.get(`${id}_inner`);
+                ctx.variables.local.del(`${id}_outer`);
+                ctx.variables.local.del(`${id}_inner`);
+                return `outer=${outer},inner=${inner}`;
+            }, id);
+            expect(output).toBe('outer=yes,inner=correct');
+        });
+        // Variable-based condition with delayed resolution
+        test('should work with variable shorthand condition and delayed resolution', async ({ page }) => {
+            const id = `dt_varsh_${Date.now()}_${Math.random().toString(36).slice(2)}`;
+            const output = await page.evaluate(async (id) => {
+                const { MacroEngine } = await import('./scripts/macros/engine/MacroEngine.js');
+                const { MacroEnvBuilder } = await import('./scripts/macros/engine/MacroEnvBuilder.js');
+                const ctx = SillyTavern.getContext();
+                ctx.variables.local.set(`${id}_flag`, '');
+                ctx.variables.local.del(`${id}_result`);
+                const input = `{{if .${id}_flag}}{{setvar::${id}_result::truthy}}{{else}}{{setvar::${id}_result::falsy}}{{/if}}`;
+                const env = MacroEnvBuilder.buildFromRawEnv({ content: input });
+                MacroEngine.evaluate(input, env);
+                const result = ctx.variables.local.get(`${id}_result`);
+                ctx.variables.local.del(`${id}_flag`);
+                ctx.variables.local.del(`${id}_result`);
+                return result;
+            }, id);
+            expect(output).toBe('falsy');
+        });
+        // Inline {{if}} should not break outer {{else}} detection
+        test('should handle inline if inside scoped if with else', async ({ page }) => {
+            const output = await evaluateWithEngine(page, '{{if 0}}{{if::1::inner}}{{else}}outer-else{{/if}}');
+            expect(output).toBe('outer-else');
+        });
+        // Another inline if scenario - inner inline if should not affect outer else
+        test('should correctly find outer else with multiple inline ifs', async ({ page }) => {
+            const output = await evaluateWithEngine(page, '{{if 0}}{{if::1::a}}{{if::1::b}}{{else}}found{{/if}}');
+            expect(output).toBe('found');
+        });
+    });
 });
 /**

tests/package-lock.json+1 -778 Viewed

             "version": "7.7.1",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
             "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "extraneous": true,
             "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"

                 "node": ">=10"
+            }
         },
-        "node_modules/@sideway/address": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
-            "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0"
-            }
-        },
-        "node_modules/@sideway/formula": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-            "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/@sideway/pinpoint": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-            "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
-            "license": "BSD-3-Clause"
-        },
         "node_modules/@sinclair/typebox": {
             "version": "0.27.8",
             "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",

                 "@sinonjs/commons": "^3.0.0"
+            }
         },
-        "node_modules/@tootallnate/quickjs-emscripten": {
-            "version": "0.23.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-            "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
-            "license": "MIT"
-        },
         "node_modules/@types/babel__core": {
             "version": "7.20.5",
             "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",

             "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
             "license": "MIT"
         },
-        "node_modules/@types/yauzl": {
-            "version": "2.10.3",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-            "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
         "node_modules/@ungap/structured-clone": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",

                 "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
         },
-        "node_modules/agent-base": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-            "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",

                 "sprintf-js": "~1.0.2"
+            }
         },
-        "node_modules/ast-types": {
-            "version": "0.13.4",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-            "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "license": "MIT"
-        },
-        "node_modules/axios": {
-            "version": "1.12.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.0.tgz",
-            "integrity": "sha512-oXTDccv8PcfjZmPGlWsPSwtOJCZ/b6W5jAMCNcfwJbCzDckwG0jrYJFaWH1yvivfCXjVzV/SPDEhMB3Q+DSurg==",
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "node_modules/b4a": {
-            "version": "1.6.7",
-            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
-            "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
-            "license": "Apache-2.0"
-        },
         "node_modules/babel-jest": {
             "version": "29.7.0",
             "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",

             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
             "license": "MIT"
         },
-        "node_modules/bare-events": {
-            "version": "2.5.4",
-            "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
-            "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
-            "license": "Apache-2.0",
-            "optional": true
-        },
-        "node_modules/bare-fs": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.3.tgz",
-            "integrity": "sha512-OeEZYIg+2qepaWLyphaOXHAHKo3xkM8y3BeGAvHdMN8GNWvEAU1Yw6rYpGzu/wDDbKxgEjVeVDpgGhDzaeMpjg==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "dependencies": {
-                "bare-events": "^2.5.4",
-                "bare-path": "^3.0.0",
-                "bare-stream": "^2.6.4"
-            },
-            "engines": {
-                "bare": ">=1.16.0"
-            },
-            "peerDependencies": {
-                "bare-buffer": "*"
-            },
-            "peerDependenciesMeta": {
-                "bare-buffer": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/bare-os": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
-            "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "engines": {
-                "bare": ">=1.14.0"
-            }
-        },
-        "node_modules/bare-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
-            "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "dependencies": {
-                "bare-os": "^3.0.1"
-            }
-        },
-        "node_modules/bare-stream": {
-            "version": "2.6.5",
-            "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
-            "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "dependencies": {
-                "streamx": "^2.21.0"
-            },
-            "peerDependencies": {
-                "bare-buffer": "*",
-                "bare-events": "*"
-            },
-            "peerDependenciesMeta": {
-                "bare-buffer": {
-                    "optional": true
-                },
-                "bare-events": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/basic-ftp": {
-            "version": "5.0.5",
-            "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-            "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.0.0"
-            }
-        },
         "node_modules/brace-expansion": {
             "version": "1.1.12",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",

                 "node-int64": "^0.4.0"
+            }
         },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "license": "MIT",
-            "engines": {
-                "node": "*"
-            }
-        },
         "node_modules/buffer-from": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",

                 "node": ">=10"
+            }
         },
-        "node_modules/chromium-bidi": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-4.1.1.tgz",
-            "integrity": "sha512-biR7t4vF3YluE6RlMSk9IWk+b9U+WWyzHp+N2pL9vRTk+UXHYRTVp7jTK58ZNzMLBgoLMHY4QyJMbeuw3eKxqg==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "mitt": "^3.0.1",
-                "zod": "^3.24.1"
-            },
-            "peerDependencies": {
-                "devtools-protocol": "*"
-            }
-        },
         "node_modules/ci-info": {
             "version": "3.9.0",
             "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",

             "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
             "license": "MIT"
         },
-        "node_modules/cosmiconfig": {
-            "version": "8.3.6",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-            "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
-            "license": "MIT",
-            "dependencies": {
-                "import-fresh": "^3.3.0",
-                "js-yaml": "^4.1.0",
-                "parse-json": "^5.2.0",
-                "path-type": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/d-fischer"
-            },
-            "peerDependencies": {
-                "typescript": ">=4.9.5"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/cosmiconfig/node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "license": "Python-2.0"
-        },
-        "node_modules/cosmiconfig/node_modules/js-yaml": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-            "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
         "node_modules/create-jest": {
             "version": "29.7.0",
             "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",

                 "node": ">= 8"
+            }
         },
-        "node_modules/cwd": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-            "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-            "license": "MIT",
-            "dependencies": {
-                "find-pkg": "^0.1.2",
-                "fs-exists-sync": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/data-uri-to-buffer": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
-            "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/debug": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",

                 "node": ">=0.10.0"
+            }
         },
-        "node_modules/degenerator": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
-            "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ast-types": "^0.13.4",
-                "escodegen": "^2.1.0",
-                "esprima": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
         "node_modules/detect-newline": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",

             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
             "license": "MIT"
         },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "license": "MIT",
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
-        "node_modules/env-paths": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/error-ex": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",

                 "node": ">=8"
+            }
         },
-        "node_modules/escodegen": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "esprima": "^4.0.1",
-                "estraverse": "^5.2.0",
-                "esutils": "^2.0.2"
-            },
-            "bin": {
-                "escodegen": "bin/escodegen.js",
-                "esgenerate": "bin/esgenerate.js"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "optionalDependencies": {
-                "source-map": "~0.6.1"
-            }
-        },
         "node_modules/eslint": {
             "version": "8.57.0",
             "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",

                 "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
         },
-        "node_modules/expect-puppeteer": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-10.0.0.tgz",
-            "integrity": "sha512-E7sE6nVdEbrnpDOBMmcLgyqLJKt876AlBg1A+gsu5R8cWx+SLafreOgJAgzXg5Qko7Tk0cW5oZdRbHQLU738dg==",
-            "engines": {
-                "node": ">=16"
-            }
-        },
-        "node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/extract-zip/node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "license": "MIT",
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
             "license": "MIT"
         },
-        "node_modules/fast-fifo": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-            "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-            "license": "MIT"
-        },
         "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",

                 "bser": "2.1.1"
+            }
         },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "license": "MIT",
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
         "node_modules/file-entry-cache": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",

                 "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "node_modules/get-uri": {
-            "version": "6.0.4",
-            "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
-            "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
-            "license": "MIT",
-            "dependencies": {
-                "basic-ftp": "^5.0.2",
-                "data-uri-to-buffer": "^6.0.2",
-                "debug": "^4.3.4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/glob": {
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",

             "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
             "license": "MIT"
         },
-        "node_modules/http-proxy-agent": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.0",
-                "debug": "^4.3.4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/https-proxy-agent": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.2",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/human-signals": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",

             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
             "license": "ISC"
         },
-        "node_modules/ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "license": "ISC"
-        },
-        "node_modules/ip-address": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-            "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-            "license": "MIT",
-            "dependencies": {
-                "jsbn": "1.1.0",
-                "sprintf-js": "^1.1.3"
-            },
-            "engines": {
-                "node": ">= 12"
-            }
-        },
-        "node_modules/ip-address/node_modules/sprintf-js": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-            "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-            "license": "BSD-3-Clause"
-        },
         "node_modules/is-arrayish": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",

                 "js-yaml": "bin/js-yaml.js"
+            }
         },
-        "node_modules/jsbn": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-            "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-            "license": "MIT"
-        },
         "node_modules/jsesc": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",

                 "node": "*"
+            }
         },
-        "node_modules/minimist": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/mitt": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-            "license": "MIT"
-        },
         "node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

             "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
             "license": "MIT"
         },
-        "node_modules/netmask": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-            "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
         "node_modules/node-int64": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",

                 "node": ">=6"
+            }
         },
-        "node_modules/pac-proxy-agent": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
-            "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
-            "license": "MIT",
-            "dependencies": {
-                "@tootallnate/quickjs-emscripten": "^0.23.0",
-                "agent-base": "^7.1.2",
-                "debug": "^4.3.4",
-                "get-uri": "^6.0.1",
-                "http-proxy-agent": "^7.0.0",
-                "https-proxy-agent": "^7.0.6",
-                "pac-resolver": "^7.0.1",
-                "socks-proxy-agent": "^8.0.5"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/pac-resolver": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
-            "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
-            "license": "MIT",
-            "dependencies": {
-                "degenerator": "^5.0.0",
-                "netmask": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
             "license": "MIT"
         },
-        "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "license": "MIT"
-        },
         "node_modules/picocolors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",

                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
         },
-        "node_modules/progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
         "node_modules/prompts": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",

                 "node": ">= 6"
+            }
         },
-        "node_modules/proxy-agent": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
-            "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.2",
-                "debug": "^4.3.4",
-                "http-proxy-agent": "^7.0.1",
-                "https-proxy-agent": "^7.0.6",
-                "lru-cache": "^7.14.1",
-                "pac-proxy-agent": "^7.1.0",
-                "proxy-from-env": "^1.1.0",
-                "socks-proxy-agent": "^8.0.5"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/proxy-agent/node_modules/lru-cache": {
-            "version": "7.18.3",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-            "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT"
-        },
-        "node_modules/pump": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-            "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
-            "license": "MIT",
-            "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
         "node_modules/punycode": {
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",

                 "node": ">=6"
+            }
         },
-        "node_modules/puppeteer": {
-            "version": "24.7.2",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.7.2.tgz",
-            "integrity": "sha512-ifYqoY6wGs0yZeFuFPn8BE9FhuveXkarF+eO18I2e/axdoCh4Qh1AE+qXdJBhdaeoPt6eRNTY4Dih29Jbq8wow==",
-            "hasInstallScript": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@puppeteer/browsers": "2.10.2",
-                "chromium-bidi": "4.1.1",
-                "cosmiconfig": "^9.0.0",
-                "devtools-protocol": "0.0.1425554",
-                "puppeteer-core": "24.7.2",
-                "typed-query-selector": "^2.12.0"
-            },
-            "bin": {
-                "puppeteer": "lib/cjs/puppeteer/node/cli.js"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/puppeteer-core": {
-            "version": "24.7.2",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.7.2.tgz",
-            "integrity": "sha512-P9pZyTmJqKODFCnkZgemCpoFA4LbAa8+NumHVQKyP5X9IgdNS1ZnAnIh1sMAwhF8/xEUGf7jt+qmNLlKieFw1Q==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@puppeteer/browsers": "2.10.2",
-                "chromium-bidi": "4.1.1",
-                "debug": "^4.4.0",
-                "devtools-protocol": "0.0.1425554",
-                "typed-query-selector": "^2.12.0",
-                "ws": "^8.18.1"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/puppeteer/node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "license": "Python-2.0"
-        },
-        "node_modules/puppeteer/node_modules/cosmiconfig": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-            "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-            "license": "MIT",
-            "dependencies": {
-                "env-paths": "^2.2.1",
-                "import-fresh": "^3.3.0",
-                "js-yaml": "^4.1.0",
-                "parse-json": "^5.2.0"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/d-fischer"
-            },
-            "peerDependencies": {
-                "typescript": ">=4.9.5"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/puppeteer/node_modules/js-yaml": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-            "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
         "node_modules/pure-rand": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",

                 "node": ">=8"
+            }
         },
-        "node_modules/smart-buffer": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6.0.0",
-                "npm": ">= 3.0.0"
-            }
-        },
-        "node_modules/socks": {
-            "version": "2.8.4",
-            "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-            "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ip-address": "^9.0.5",
-                "smart-buffer": "^4.2.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0",
-                "npm": ">= 3.0.0"
-            }
-        },
-        "node_modules/socks-proxy-agent": {
-            "version": "8.0.5",
-            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
-            "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.2",
-                "debug": "^4.3.4",
-                "socks": "^2.8.3"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
         "node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",

                 "node": ">=10"
+            }
         },
-        "node_modules/streamx": {
-            "version": "2.22.0",
-            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
-            "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
-            "license": "MIT",
-            "dependencies": {
-                "fast-fifo": "^1.3.2",
-                "text-decoder": "^1.1.0"
-            },
-            "optionalDependencies": {
-                "bare-events": "^2.2.0"
-            }
-        },
         "node_modules/string-length": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",

                 "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "node_modules/tar-fs": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",
-            "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",
-            "license": "MIT",
-            "dependencies": {
-                "pump": "^3.0.0",
-                "tar-stream": "^3.1.5"
-            },
-            "optionalDependencies": {
-                "bare-fs": "^4.0.1",
-                "bare-path": "^3.0.0"
-            }
-        },
-        "node_modules/tar-stream": {
-            "version": "3.1.7",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-            "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
-            "license": "MIT",
-            "dependencies": {
-                "b4a": "^1.6.4",
-                "fast-fifo": "^1.2.0",
-                "streamx": "^2.15.0"
-            }
-        },
         "node_modules/test-exclude": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",

                 "node": ">=8"
+            }
         },
-        "node_modules/text-decoder": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
-            "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "b4a": "^1.6.4"
-            }
-        },
         "node_modules/text-table": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",

                 "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "node_modules/typed-query-selector": {
-            "version": "2.12.0",
-            "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
-            "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
-            "license": "MIT"
-        },
         "node_modules/undici-types": {
             "version": "5.26.5",
             "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",

                 "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+            }
         },
-        "node_modules/ws": {
-            "version": "8.18.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
-            "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": ">=5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

                 "node": ">=12"
+            }
         },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "license": "MIT",
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        },
         "node_modules/yocto-queue": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",

@@ -5062,15 +4294,6 @@
5062	"funding": {	4294	"funding": {
5063	"url": "https://github.com/sponsors/sindresorhus"	4295	"url": "https://github.com/sponsors/sindresorhus"
5064	}	4296	}
5065	},
5066	"node_modules/zod": {
5067	"version": "3.24.3",
5068	"resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz",
5069	"integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==",
5070	"license": "MIT",
5071	"funding": {
5072	"url": "https://github.com/sponsors/colinhacks"
5073	}
5074	}	4297	}
5075	}	4298	}
5076	}	4299	}