Skip to content

Commit 9c144b2

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Jint:
 1. Jint was updated to version 3.0.0 Beta 1598; 2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.
1 parent 6b53daa commit 9c144b2

15 files changed

Lines changed: 67 additions & 52 deletions

File tree

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/App_Start/JsEngineSwitcherConfig.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using JavaScriptEngineSwitcher.ChakraCore;
22
using JavaScriptEngineSwitcher.Core;
3-
using JavaScriptEngineSwitcher.Jint;
43
using JavaScriptEngineSwitcher.Jurassic;
54
using JavaScriptEngineSwitcher.Msie;
65
using JavaScriptEngineSwitcher.NiL;
@@ -14,7 +13,6 @@ public static void Configure(IJsEngineSwitcher engineSwitcher)
1413
{
1514
engineSwitcher.EngineFactories
1615
.AddChakraCore()
17-
.AddJint()
1816
.AddJurassic()
1917
.AddMsie(new MsieSettings
2018
{

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@
120120
<Project>{13559975-f99d-4b93-bf46-227c0b6e0dfb}</Project>
121121
<Name>JavaScriptEngineSwitcher.Core</Name>
122122
</ProjectReference>
123-
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jint\JavaScriptEngineSwitcher.Jint.csproj">
124-
<Project>{22d73c6e-5f35-497b-a93b-f9eaaae4ddaa}</Project>
125-
<Name>JavaScriptEngineSwitcher.Jint</Name>
126-
</ProjectReference>
127123
<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.csproj">
128124
<Project>{d31b5a77-8018-4d76-b372-325564385b2d}</Project>
129125
<Name>JavaScriptEngineSwitcher.Jurassic</Name>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
3636
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
37-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
3837
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
3938
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
4039
<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Startup.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
using JavaScriptEngineSwitcher.ChakraCore;
99
using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;
10-
using JavaScriptEngineSwitcher.Jint;
1110
using JavaScriptEngineSwitcher.Msie;
1211
using JavaScriptEngineSwitcher.NiL;
1312
using JavaScriptEngineSwitcher.Sample.Logic.Services;
@@ -55,7 +54,6 @@ public void ConfigureServices(IServiceCollection services)
5554
options.DefaultEngineName = ChakraCoreJsEngine.EngineName
5655
)
5756
.AddChakraCore()
58-
.AddJint()
5957
.AddMsie(options =>
6058
{
6159
options.EngineMode = JsEngineMode.ChakraIeJsRt;

‎src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Jint</Product>
55
<VersionPrefix>3.1.0</VersionPrefix>
6-
<TargetFrameworks>net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
77
<OutputType>Library</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<NoWarn>$(NoWarn);CS1591;NU5125</NoWarn>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
12-
<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.11.58).</Description>
12+
<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1598).</Description>
1313
<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconUrl>
1414
<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;Jint</PackageTags>
15+
<PackageReleaseNotes>1. Jint was updated to version 3.0.0 Beta 1598;
16+
2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.</PackageReleaseNotes>
1517
</PropertyGroup>
1618

1719
<Import Project="../../build/common.props" />
@@ -21,7 +23,8 @@
2123

2224
<ItemGroup>
2325
<PackageReference Include="AdvancedStringBuilder" Version="0.1.0" />
24-
<PackageReference Include="Jint" Version="2.11.58" />
26+
<PackageReference Include="Esprima" Version="1.0.0-beta-1202" />
27+
<PackageReference Include="Jint" Version="3.0.0-beta-1598" />
2528

2629
<ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
2730
</ItemGroup>

‎src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
using System.Collections.Generic;
33
using System.Text;
44

5+
using Jint;
56
using IOriginalCallable = Jint.Native.ICallable;
67
using OriginalEngine = Jint.Engine;
78
using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
89
using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
9-
using OriginalParser = Jint.Parser.JavaScriptParser;
10-
using OriginalParserException = Jint.Parser.ParserException;
11-
using OriginalParserOptions = Jint.Parser.ParserOptions;
12-
using OriginalProgram = Jint.Parser.Ast.Program;
10+
using OriginalParser = Esprima.JavaScriptParser;
11+
using OriginalParserException = Esprima.ParserException;
12+
using OriginalParserOptions = Esprima.ParserOptions;
13+
using OriginalProgram = Esprima.Ast.Program;
1314
using OriginalRecursionDepthOverflowException = Jint.Runtime.RecursionDepthOverflowException;
1415
using OriginalStatementsCountOverflowException = Jint.Runtime.StatementsCountOverflowException;
1516
using OriginalTypeReference = Jint.Runtime.Interop.TypeReference;
@@ -45,7 +46,7 @@ public sealed class JintJsEngine : JsEngineBase
4546
/// <summary>
4647
/// Version of original JS engine
4748
/// </summary>
48-
private const string EngineVersion = "2.11.58";
49+
private const string EngineVersion = "3.0.0 Beta 1598";
4950

5051
/// <summary>
5152
/// Jint JS engine
@@ -103,6 +104,18 @@ public JintJsEngine(JintSettings settings)
103104
}
104105

105106

107+
private OriginalParserOptions CreateParserOptions(string source)
108+
{
109+
var parserOptions = new OriginalParserOptions(source)
110+
{
111+
AdaptRegexp = true,
112+
Tolerant = true,
113+
Loc = true
114+
};
115+
116+
return parserOptions;
117+
}
118+
106119
#region Mapping
107120

108121
/// <summary>
@@ -151,7 +164,7 @@ private static WrapperCompilationException WrapParserException(OriginalParserExc
151164
{
152165
string description = originalParserException.Description;
153166
string type = JsErrorType.Syntax;
154-
string documentName = originalParserException.Source;
167+
string documentName = originalParserException.SourceText;
155168
int lineNumber = originalParserException.LineNumber;
156169
int columnNumber = originalParserException.Column;
157170
string message = JsErrorHelpers.GenerateScriptErrorMessage(type, description, documentName, lineNumber,
@@ -319,12 +332,9 @@ protected override IPrecompiledScript InnerPrecompile(string code, string docume
319332
{
320333
try
321334
{
322-
var parserOptions = new OriginalParserOptions
323-
{
324-
Source = uniqueDocumentName
325-
};
326-
var parser = new OriginalParser();
327-
program = parser.Parse(code, parserOptions);
335+
var parserOptions = CreateParserOptions(uniqueDocumentName);
336+
var parser = new OriginalParser(code, parserOptions);
337+
program = parser.ParseProgram();
328338
}
329339
catch (OriginalParserException e)
330340
{
@@ -351,10 +361,7 @@ protected override object InnerEvaluate(string expression, string documentName)
351361

352362
try
353363
{
354-
var parserOptions = new OriginalParserOptions
355-
{
356-
Source = uniqueDocumentName
357-
};
364+
var parserOptions = CreateParserOptions(uniqueDocumentName);
358365
resultValue = _jsEngine.Execute(expression, parserOptions).GetCompletionValue();
359366
}
360367
catch (OriginalParserException e)
@@ -409,10 +416,7 @@ protected override void InnerExecute(string code, string documentName)
409416
{
410417
try
411418
{
412-
var parserOptions = new OriginalParserOptions
413-
{
414-
Source = uniqueDocumentName
415-
};
419+
var parserOptions = CreateParserOptions(uniqueDocumentName);
416420
_jsEngine.Execute(code, parserOptions);
417421
}
418422
catch (OriginalParserException e)

‎src/JavaScriptEngineSwitcher.Jint/JintPrecompiledScript.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OriginalProgram = Jint.Parser.Ast.Program;
1+
using OriginalProgram = Esprima.Ast.Program;
22

33
using JavaScriptEngineSwitcher.Core;
44

‎src/JavaScriptEngineSwitcher.Jint/readme.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
DESCRIPTION
1313
===========
1414
JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the
15-
Jint JavaScript Engine (http://github.com/sebastienros/jint) version 2.11.58).
15+
Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1598).
16+
17+
=============
18+
RELEASE NOTES
19+
=============
20+
1. Jint was updated to version 3.0.0 Beta 1598;
21+
2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.
1622

1723
=============
1824
DOCUMENTATION

‎test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
2424
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
25-
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
2625
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
2726
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
2827
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
@@ -34,6 +33,7 @@
3433
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x64" Version="3.1.5" />
3534
<PackageReference Include="JavaScriptEngineSwitcher.V8.Native.win-x86" Version="3.1.5" />
3635

36+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
3737
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
3838
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
3939
</ItemGroup>
@@ -50,6 +50,7 @@
5050
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
5151
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
5252

53+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
5354
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
5455
</ItemGroup>
5556

‎test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
#if !NETCOREAPP1_0
2+
using System;
23

34
using Xunit;
45

@@ -393,4 +394,5 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
393394

394395
#endregion
395396
}
396-
}
397+
}
398+
#endif

0 commit comments

Comments
 (0)