From b80cd5d40152f747508cef8900b6f29c485cdde7 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 15 Apr 2020 10:54:37 +0200 Subject: [PATCH] Another build fix. --- .../Scripting/JintScriptEngine.cs | 5 +++++ .../Squidex.Domain.Apps.Core.Operations.csproj | 2 +- .../Operations/Scripting/JintScriptEngineTests.cs | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index 8512ce30b..265ec3b86 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using Esprima; using Jint; using Jint.Native; using Jint.Native.Date; @@ -121,6 +122,10 @@ namespace Squidex.Domain.Apps.Core.Scripting { throw new ValidationException($"Failed to execute script with javascript syntax error: {ex.Message}", new ValidationError(ex.Message)); } + catch (ParserException ex) + { + throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message)); + } catch (JavaScriptException ex) { throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message)); diff --git a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index 19104863c..aeb1fc39b 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -15,7 +15,7 @@ - + diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs index ac60cd8ff..7b82c9dc6 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs @@ -36,7 +36,7 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting [Fact] public void Should_catch_script_syntax_errors() { - Assert.Throws(() => scriptEngine.Execute(new ScriptContext(), "x => x")); + Assert.Throws(() => scriptEngine.Execute(new ScriptContext(), "x ==> x")); } [Fact] @@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting var content = new NamedContentData(); var context = new ScriptContext { Data = content }; - Assert.Throws(() => scriptEngine.ExecuteAndTransform(context, "x => x")); + Assert.Throws(() => scriptEngine.ExecuteAndTransform(context, "x ==> x")); } [Fact]