From ef60b4738c2336398d2c9a20a4d52bb956577e89 Mon Sep 17 00:00:00 2001
From: Akash Kava <39438041+ackava@users.noreply.github.com>
Date: Sun, 3 Nov 2024 14:19:35 +0530
Subject: [PATCH] Added global this for eval

---
 YantraJS.Core/Core/JSContext.cs    |   9 +-
 YantraJS.Core/YantraJS.Core.csproj | 158 ++++++++++++++---------------
 2 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/YantraJS.Core/Core/JSContext.cs b/YantraJS.Core/Core/JSContext.cs
index bbb31491..ea2cf19b 100644
--- a/YantraJS.Core/Core/JSContext.cs
+++ b/YantraJS.Core/Core/JSContext.cs
@@ -692,21 +692,18 @@ internal ConcurrentDictionary<long, JSPromise> PendingPromises
         /// <returns></returns>
         public JSValue Eval(string code, string codeFilePath = null, JSValue @this = null)
         {
+            @this ??= this;
             if (Debugger == null)
             {
                 var fx = CoreScript.Compile(code, codeFilePath, codeCache: CodeCache);
-                return @this == null
-                    ? fx(in Arguments.Empty)
-                    : fx(new Arguments(@this));
+                return fx(new Arguments(@this));
             }
 
             try
             {
                 var f = CoreScript.Compile(code, codeFilePath, codeCache: CodeCache);
                 Debugger.ScriptParsed(this.ID, code, codeFilePath);
-                return @this == null
-                    ? f(in Arguments.Empty)
-                    : f(new Arguments(@this));
+                return f(new Arguments(@this));
             }
             catch (Exception ex) {
                 this.ReportError(ex);
diff --git a/YantraJS.Core/YantraJS.Core.csproj b/YantraJS.Core/YantraJS.Core.csproj
index 874635da..fb2eb00f 100644
--- a/YantraJS.Core/YantraJS.Core.csproj
+++ b/YantraJS.Core/YantraJS.Core.csproj
@@ -1,79 +1,79 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <AssemblyName>YantraJS.Core</AssemblyName>
-    <PackageId>YantraJS.Core</PackageId>
-    <PackageTags>yantra,yantrajs,javascript,c#,standard,core,framework,.net</PackageTags>
-    <Description>JavaScript Engine Core for .NET Standard</Description>
-    <PackageProjectUrl>http://yantrajs.com/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/yantrajs/yantra</RepositoryUrl>
-	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	  <Version>1.0.1</Version>
-	  <LangVersion>latest</LangVersion>
-	  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-	  <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-	  <IncludeSymbols>true</IncludeSymbols>
-	  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-	  <EmbedAllSources>True</EmbedAllSources>
-	  <DebugType>embedded</DebugType>
-       <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-	<PropertyGroup>
-		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-		<CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
-	</PropertyGroup>
-	<Target Name="AddSourceGeneratedFiles" AfterTargets="CoreCompile">
-		<ItemGroup>
-			<Compile Include="Generated\**" />
-		</ItemGroup>
-	</Target>
-	<Target Name="RemoveSourceGeneratedFiles" BeforeTargets="CoreCompile">
-		<ItemGroup>
-			<Compile Remove="Generated\**" />
-		</ItemGroup>
-	</Target>
-
-  <!-- <ItemGroup>
-    <Compile Include="..\esprima-dotnet\src\Esprima\*.cs">
-      <Link>Esprima\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\esprima-dotnet\src\Esprima\Ast\*.cs">
-      <Link>Esprima\Ast\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-    <Compile Include="..\esprima-dotnet\src\Esprima\Utils\*.cs">
-      <Link>Esprima\Utils\%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-  </ItemGroup> -->
-  
-  <ItemGroup>
-    <PackageReference Include="ErrorProne.NET.Structs" Version="0.3.0-beta.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-	  <PackageReference Include="System.Text.Json" Version="8.0.5" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\YantraJS.ExpressionCompiler\YantraJS.ExpressionCompiler.csproj" />
-    <ProjectReference Include="..\YantraJS.JSClassGenerator\YantraJS.JSClassGenerator.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Tasks.v4.0">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Microsoft.Build.Tasks.v4.0.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <AssemblyName>YantraJS.Core</AssemblyName>
+    <PackageId>YantraJS.Core</PackageId>
+    <PackageTags>yantra,yantrajs,javascript,c#,standard,core,framework,.net</PackageTags>
+    <Description>JavaScript Engine Core for .NET Standard</Description>
+    <PackageProjectUrl>http://yantrajs.com/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/yantrajs/yantra</RepositoryUrl>
+	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	  <Version>1.0.1</Version>
+	  <LangVersion>latest</LangVersion>
+	  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+	  <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+	  <IncludeSymbols>true</IncludeSymbols>
+	  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+	  <EmbedAllSources>True</EmbedAllSources>
+	  <DebugType>embedded</DebugType>
+       <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
+	<PropertyGroup>
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
+	</PropertyGroup>
+	<Target Name="AddSourceGeneratedFiles" AfterTargets="CoreCompile">
+		<ItemGroup>
+			<Compile Include="Generated\**" />
+		</ItemGroup>
+	</Target>
+	<Target Name="RemoveSourceGeneratedFiles" BeforeTargets="CoreCompile">
+		<ItemGroup>
+			<Compile Remove="Generated\**" />
+		</ItemGroup>
+	</Target>
+
+  <!-- <ItemGroup>
+    <Compile Include="..\esprima-dotnet\src\Esprima\*.cs">
+      <Link>Esprima\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\esprima-dotnet\src\Esprima\Ast\*.cs">
+      <Link>Esprima\Ast\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\esprima-dotnet\src\Esprima\Utils\*.cs">
+      <Link>Esprima\Utils\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+  </ItemGroup> -->
+  
+  <ItemGroup>
+    <PackageReference Include="ErrorProne.NET.Structs" Version="0.3.0-beta.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+	  <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\YantraJS.ExpressionCompiler\YantraJS.ExpressionCompiler.csproj" />
+    <ProjectReference Include="..\YantraJS.JSClassGenerator\YantraJS.JSClassGenerator.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Reference Include="Microsoft.Build.Tasks.v4.0">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Microsoft.Build.Tasks.v4.0.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  
+</Project>