fix: improve script handling in execute commands for better serialization

[goosewobbler]

No description provided.

[github-actions]

Release Preview — @wdio/native-utils 2.3.0

Scope: @wdio/native-utils

This PR is labeled for a minor release.

This PR will trigger the following release when merged:

Packages

Package	Version
@wdio/native-utils	2.3.0

Changelog

@wdio/native-utils wdio-native-utils@v2.2.0 → 2.3.0

Added

• add script detection utilities and tests (native-utils)

Changed

• enhance script detection logic for semicolons and arrow functions (native-utils)
• move script detection utilities to native-utils

Tags

• wdio-native-utils@v2.3.0

---

Updated automatically by ReleaseKit

[greptile-apps]

Greptile Summary

This PR substantially reworks script serialization across the Tauri and Electron execute paths, addressing a wide range of previously flagged issues: the sync/async mismatch on WebKit (WKWebView), double JSON-encoding, incorrect IIFE wrapping, and missing word-boundary checks on keyword detection. Key changes include switching the non-embedded Tauri path to executeAsync with arrow-function .then() callbacks, introducing shared hasSemicolonOutsideQuotes and hasTopLevelArrow utilities, reworking guest-js to split function-like and string-like scripts before invoking the Rust plugin, and fixing the executeTauriCommand closure-capture bug by passing command/args as explicit extra arguments.

Confidence Score: 5/5

Safe to merge; all remaining findings are minor edge-case P2s that do not affect common usage.

All previously flagged P0/P1 issues (double encoding, SyntaxError from concise-body arrows, unawaited Promises on WebKit, missing done-callback slicing, broken executeTauriCommand closure capture) appear addressed. The sole new finding is a return[expr] edge case that is extremely unlikely in real test scripts.

packages/tauri-plugin/src/commands.rs — has_return word-boundary gap for [-prefixed operands; same minor gap exists in the TypeScript hasStatementKeyword regex in service.ts and guest-js/index.ts.

Important Files Changed

Filename	Overview
packages/tauri-plugin/src/commands.rs	Major rewrite of script detection and execution. Introduces has_keyword_prefix, contains_arrow_outside_quotes, has_arrow_outside_parens, and has_semicolon_outside_quotes helpers. The is_function check covers most arrow/function patterns; has_return and has_statement guards correctly use word-boundary strip/starts_with. String-with-args now returns a clear error instead of silently mis-wrapping.
packages/tauri-service/src/service.ts	patchedExecute now correctly uses executeAsync for non-embedded providers for WebKit compatibility. Function path uses Promise.resolve + arrow .then() callbacks; string path uses async function().apply() with correct done-callback slicing. Embedded path now passes original script object directly.
packages/tauri-plugin/guest-js/index.ts	isFunctionLike detection improved: uses hasTopLevelArrow and /^async[\s(]/ to avoid false positives. String path now correctly wraps in named async function with .apply() for arguments access. hasSemicolonOutsideQuotes import resolves the semicolon-in-string-literal false positive.
packages/tauri-service/src/commands/execute.ts	Plugin availability check now uses a function argument (not a string) avoiding the previous patchedExecute string-return bug. executeTauriCommand refactored to pass command/args explicitly as extra arguments instead of via closure, fixing the unbound-variable serialization bug.
packages/native-utils/src/script-detect.ts	New shared utilities hasSemicolonOutsideQuotes and hasTopLevelArrow. Both correctly track bracket depth, quote state (single/double/template), and escape sequences including \. Template literal ${} nesting is handled via a frame stack.
packages/electron-service/src/commands/executeCdp.ts	String scripts now routed through new wrapStringScriptForCdp helper; imports hasSemicolonOutsideQuotes and hasTopLevelArrow from native-utils. isFunctionLike detection uses hasTopLevelArrow to avoid nested-arrow false positives. Old prevChar escape issue resolved by shared utility.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[browser.tauri.execute\nscript, ...args] --> B{isEmbedded?}
    B -- Yes --> C[originalExecute\nscript, ...args\nWDIO handles serialization]
    B -- No --> D{typeof script}
    D -- function --> E[patchedExecute\nFunction Path\nexecuteAsync + Promise.resolve\n+ arrow .then callbacks]
    D -- string --> F[patchedExecute\nString Path\nhasStatementKeyword / hasSemicolonOutsideQuotes\nasync function apply + done callback]
    E --> G[executeWithinTauri runs\nin WebView]
    F --> G
    G --> H[window.wdioTauri.execute\nscriptString, options, argsJson]
    H --> I{guest-js isFunctionLike?}
    I -- Yes --> J[Build IIFE with\n__wdio_tauri injection\nreturn await fn tauri args]
    I -- No --> K[Wrap as async function\nbody with .apply\nfor arguments access]
    J --> L[Rust: is_function=true\npass-through]
    K --> L
    L --> M[script_with_result\nawait __wdio_script\nemit result via Tauri event]
    M --> N[Return result\nto Node.js]

Loading

_{Reviews (75): Last reviewed commit: "refactor(tauri-plugin): improve semicolo..." | Re-trigger Greptile}