Skip to content

Commit c3627b1

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Jurassic:
 1. Jurassic was updated to version of May 27, 2021; 2. In configuration settings of the Jurassic JS engine the `EnableDebugging` property has become deprecated.
1 parent d1bc6bd commit c3627b1

File tree

4 files changed

+26
-46
lines changed

4 files changed

+26
-46
lines changed

‎src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<Import Project="../../build/nuget-for-dotnet-lib.props" />
1717

1818
<PropertyGroup>
19-
<Description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of March 19, 2021).</Description>
19+
<Description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of May 27, 2021).</Description>
2020
<PackageTags>$(PackageCommonTags);Jurassic</PackageTags>
2121
<PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Jurassic_Logo128x128.png</PackageIconFullPath>
22-
<PackageReleaseNotes>Jurassic was updated to version of March 19, 2021.</PackageReleaseNotes>
22+
<PackageReleaseNotes>1. Jurassic was updated to version of May 27, 2021;
23+
2. In configuration settings of the Jurassic JS engine the `EnableDebugging` property has become deprecated.</PackageReleaseNotes>
2324
</PropertyGroup>
2425

2526
<ItemGroup>
26-
<PackageReference Include="Jurassic.Unofficial" Version="2021.3.19" />
27+
<PackageReference Include="Jurassic.Unofficial" Version="2021.5.27" />
2728

2829
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
2930
</ItemGroup>

‎src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs‎

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public sealed class JurassicJsEngine : JsEngineBase
4343
/// <summary>
4444
/// Version of original JS engine
4545
/// </summary>
46-
private const string EngineVersion = "Mar 19, 2021";
46+
private const string EngineVersion = "May 27, 2021";
4747

4848
/// <summary>
4949
/// Jurassic JS engine
@@ -83,9 +83,6 @@ public JurassicJsEngine(JurassicSettings settings)
8383
{
8484
CompatibilityMode = OriginalCompatibilityMode.Latest,
8585
DisableClrCollectionsExposingByValue = !jurassicSettings.EnableHostCollectionsEmbeddingByValue,
86-
#if !NETSTANDARD2_0
87-
EnableDebugging = jurassicSettings.EnableDebugging,
88-
#endif
8986
EnableExposedClrTypes = true,
9087
EnableILAnalysis = jurassicSettings.EnableIlAnalysis,
9188
ForceStrictMode = jurassicSettings.StrictMode
@@ -98,26 +95,6 @@ public JurassicJsEngine(JurassicSettings settings)
9895
}
9996

10097

101-
private string GetUniqueDocumentName(string documentName, bool isFile)
102-
{
103-
string uniqueDocumentName;
104-
105-
#if !NETSTANDARD2_0
106-
if (_jsEngine.EnableDebugging)
107-
{
108-
uniqueDocumentName = isFile ? documentName : null;
109-
}
110-
else
111-
{
112-
#endif
113-
uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
114-
#if !NETSTANDARD2_0
115-
}
116-
#endif
117-
118-
return uniqueDocumentName;
119-
}
120-
12198
#region Mapping
12299

123100
/// <summary>
@@ -299,14 +276,14 @@ protected override IPrecompiledScript InnerPrecompile(string code)
299276
protected override IPrecompiledScript InnerPrecompile(string code, string documentName)
300277
{
301278
OriginalCompiledScript compiledScript;
302-
string uniqueDocumentName = GetUniqueDocumentName(documentName, false);
279+
string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
303280

304281
lock (_executionSynchronizer)
305282
{
306283
try
307284
{
308285
var source = new OriginalStringScriptSource(code, uniqueDocumentName);
309-
compiledScript = _jsEngine.Compile(source);
286+
compiledScript = OriginalCompiledScript.Compile(source);
310287
}
311288
catch (OriginalSyntaxException e)
312289
{
@@ -325,7 +302,7 @@ protected override object InnerEvaluate(string expression)
325302
protected override object InnerEvaluate(string expression, string documentName)
326303
{
327304
object result;
328-
string uniqueDocumentName = GetUniqueDocumentName(documentName, false);
305+
string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
329306

330307
lock (_executionSynchronizer)
331308
{
@@ -364,7 +341,7 @@ protected override void InnerExecute(string code)
364341

365342
protected override void InnerExecute(string code, string documentName)
366343
{
367-
string uniqueDocumentName = GetUniqueDocumentName(documentName, false);
344+
string uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
368345

369346
lock (_executionSynchronizer)
370347
{
@@ -633,14 +610,14 @@ public override IPrecompiledScript PrecompileFile(string path, Encoding encoding
633610
}
634611

635612
OriginalCompiledScript compiledScript;
636-
string uniqueDocumentName = GetUniqueDocumentName(path, true);
613+
string uniqueDocumentName = _documentNameManager.GetUniqueName(path);
637614

638615
lock (_executionSynchronizer)
639616
{
640617
try
641618
{
642619
var source = new FileScriptSource(uniqueDocumentName, path, encoding);
643-
compiledScript = _jsEngine.Compile(source);
620+
compiledScript = OriginalCompiledScript.Compile(source);
644621
}
645622
catch (OriginalSyntaxException e)
646623
{
@@ -700,14 +677,14 @@ public override IPrecompiledScript PrecompileResource(string resourceName, Type
700677
string resourceFullName = nameSpace != null ? nameSpace + "." + resourceName : resourceName;
701678

702679
OriginalCompiledScript compiledScript;
703-
string uniqueDocumentName = GetUniqueDocumentName(resourceFullName, false);
680+
string uniqueDocumentName = _documentNameManager.GetUniqueName(resourceFullName);
704681

705682
lock (_executionSynchronizer)
706683
{
707684
try
708685
{
709686
var source = new ResourceScriptSource(uniqueDocumentName, resourceFullName, assembly);
710-
compiledScript = _jsEngine.Compile(source);
687+
compiledScript = OriginalCompiledScript.Compile(source);
711688
}
712689
catch (OriginalSyntaxException e)
713690
{
@@ -759,14 +736,14 @@ public override IPrecompiledScript PrecompileResource(string resourceName, Assem
759736
}
760737

761738
OriginalCompiledScript compiledScript;
762-
string uniqueDocumentName = GetUniqueDocumentName(resourceName, false);
739+
string uniqueDocumentName = _documentNameManager.GetUniqueName(resourceName);
763740

764741
lock (_executionSynchronizer)
765742
{
766743
try
767744
{
768745
var source = new ResourceScriptSource(uniqueDocumentName, resourceName, assembly);
769-
compiledScript = _jsEngine.Compile(source);
746+
compiledScript = OriginalCompiledScript.Compile(source);
770747
}
771748
catch (OriginalSyntaxException e)
772749
{
@@ -809,7 +786,7 @@ public override void ExecuteFile(string path, Encoding encoding = null)
809786
);
810787
}
811788

812-
string uniqueDocumentName = GetUniqueDocumentName(path, true);
789+
string uniqueDocumentName = _documentNameManager.GetUniqueName(path);
813790

814791
lock (_executionSynchronizer)
815792
{
@@ -872,7 +849,7 @@ public override void ExecuteResource(string resourceName, Type type)
872849
#endif
873850
string nameSpace = type.Namespace;
874851
string resourceFullName = nameSpace != null ? nameSpace + "." + resourceName : resourceName;
875-
string uniqueDocumentName = GetUniqueDocumentName(resourceFullName, false);
852+
string uniqueDocumentName = _documentNameManager.GetUniqueName(resourceFullName);
876853

877854
lock (_executionSynchronizer)
878855
{
@@ -928,7 +905,7 @@ public override void ExecuteResource(string resourceName, Assembly assembly)
928905
);
929906
}
930907

931-
string uniqueDocumentName = GetUniqueDocumentName(resourceName, false);
908+
string uniqueDocumentName = _documentNameManager.GetUniqueName(resourceName);
932909

933910
lock (_executionSynchronizer)
934911
{

‎src/JavaScriptEngineSwitcher.Jurassic/JurassicSettings.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace JavaScriptEngineSwitcher.Jurassic
1+
using System;
2+
3+
namespace JavaScriptEngineSwitcher.Jurassic
24
{
35
/// <summary>
46
/// Settings of the Jurassic JS engine
@@ -25,6 +27,7 @@ public bool EnableHostCollectionsEmbeddingByValue
2527
/// Gets or sets a flag for whether to enable script debugging features
2628
/// (allows a generation of debug information)
2729
/// </summary>
30+
[Obsolete("Since the Jurassic version 3.2.1, debugging is no longer supported.")]
2831
public bool EnableDebugging
2932
{
3033
get;
@@ -58,9 +61,6 @@ public bool StrictMode
5861
public JurassicSettings()
5962
{
6063
EnableHostCollectionsEmbeddingByValue = false;
61-
#if !NETSTANDARD2_0
62-
EnableDebugging = false;
63-
#endif
6464
EnableIlAnalysis = false;
6565
StrictMode = false;
6666
}

‎src/JavaScriptEngineSwitcher.Jurassic/readme.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
===========
1414
JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper
1515
for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic)
16-
version of March 19, 2021).
16+
version of May 27, 2021).
1717

1818
=============
1919
RELEASE NOTES
2020
=============
21-
Jurassic was updated to version of March 19, 2021.
21+
1. Jurassic was updated to version of May 27, 2021;
22+
2. In configuration settings of the Jurassic JS engine the `EnableDebugging`
23+
property has become deprecated.
2224

2325
=============
2426
DOCUMENTATION

0 commit comments

Comments
 (0)