From e701ae0ea328024f585bdeb90ed345c980c1cf44 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 9 Nov 2022 10:03:14 -0600 Subject: [PATCH] add try-catch around script.main business --- .../qqq/languages/javascript/QJavaScriptExecutor.java | 8 ++++++-- .../qqq/languages/javascript/ExecuteCodeActionTest.java | 9 ++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/qqq-language-support-javascript/src/main/java/com/kingsrook/qqq/languages/javascript/QJavaScriptExecutor.java b/qqq-language-support-javascript/src/main/java/com/kingsrook/qqq/languages/javascript/QJavaScriptExecutor.java index 35dc20ef..b1116f3c 100644 --- a/qqq-language-support-javascript/src/main/java/com/kingsrook/qqq/languages/javascript/QJavaScriptExecutor.java +++ b/qqq-language-support-javascript/src/main/java/com/kingsrook/qqq/languages/javascript/QJavaScriptExecutor.java @@ -90,10 +90,14 @@ public class QJavaScriptExecutor implements QCodeExecutor { %s - if(script && script.main) + try { - return (script.main()); + if(script && script.main) + { + return (script.main()); + } } + catch(e) { } })(); """.formatted(code); diff --git a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/ExecuteCodeActionTest.java b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/ExecuteCodeActionTest.java index 7931cc2b..b9920dde 100644 --- a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/ExecuteCodeActionTest.java +++ b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/ExecuteCodeActionTest.java @@ -108,16 +108,11 @@ class ExecuteCodeActionTest { OneTestOutput oneTestOutput = testOne(4, """ var script = (function (exports) { - - function cooling() { + function main() { output.setD(7); return (output); } - - cooling(); - - exports.cooling = cooling; - + exports.main = main; return exports; })({}); """);