From 42a73bd701ebdda0b1f85f6d2173bdbb46aa91de Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 14 May 2023 15:02:22 +0200 Subject: [PATCH] re-allow multiple statements but must use a return --- backend/windmill-worker/src/js_eval.rs | 7 ++++++- .../components/flows/content/DynamicInputHelpBox.svelte | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs index d0e30d80a5..7e4ebbcdef 100644 --- a/backend/windmill-worker/src/js_eval.rs +++ b/backend/windmill-worker/src/js_eval.rs @@ -216,13 +216,18 @@ async function resource(path) {{ (String::new(), String::new()) }; + let f = if expr.contains("return ") { + expr.to_string() + } else { + format!("return {expr}") + }; let code = format!( r#" {api_code} {} {by_id_code} (async () => {{ - return {expr}; + {f}; }})() "#, env.into_iter() diff --git a/frontend/src/lib/components/flows/content/DynamicInputHelpBox.svelte b/frontend/src/lib/components/flows/content/DynamicInputHelpBox.svelte index 568eecf044..eb859dd05e 100644 --- a/frontend/src/lib/components/flows/content/DynamicInputHelpBox.svelte +++ b/frontend/src/lib/components/flows/content/DynamicInputHelpBox.svelte @@ -39,5 +39,6 @@ resource(path): the function returning the resource at a given path as an object + If using multiple statements, the last statement shall finish with a return. e.g: `return x` {/if}