Fix after review

Author: medegor44

Src/EmbeddedScripts.CSharp.MonoEvaluator/MonoCSharpRunner.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Data;
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;

Src/EmbeddedScripts.JS.ChakraCore/TypeMapper.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Linq;
 using System.Reflection;
 using ChakraHost.Hosting;
@@ -9,16 +9,15 @@ namespace EmbeddedScripts.JS.ChakraCore
  public class TypeMapper : IDisposable
  {
  private readonly JsContext _context;
- 
+
  // stores registered delegates to prevent their garbage collection
- private readonly List<JavaScriptNativeFunction> _jsNativeFunctions = new();
- private readonly object _listSynchronizer = new();
+ private readonly ConcurrentBag<JavaScriptNativeFunction> _jsNativeFunctions = new();
 
  public TypeMapper(JsContext context)
  {
  _context = context;
  }
- 
+
  private JavaScriptValue MapClrPrimitivesToJs(object value)
  {
  if (value is null)
@@ -32,7 +31,7 @@ private JavaScriptValue MapClrPrimitivesToJs(object value)
  case TypeCode.Int16:
  case TypeCode.Int32:
  return JavaScriptValue.FromInt32(Convert.ToInt32(value));
- 
+
  case TypeCode.UInt32:
  case TypeCode.Int64:
  case TypeCode.UInt64:
@@ -46,19 +45,19 @@ private JavaScriptValue MapClrPrimitivesToJs(object value)
 
  case TypeCode.String:
  return JavaScriptValue.FromString((string) value);
- 
+
  default:
  throw new ArgumentException("Type is not supported");
  }
  }
- 
+
  private object ToNumber(JavaScriptValue value)
  {
  var num = value.ToDouble();
 
  if (Math.Abs(num - Math.Round(num)) < double.Epsilon)
  return (int) num;
- 
+
  return num;
  }
 
@@ -106,26 +105,22 @@ private JavaScriptValue MapDelegate(Delegate func)
  return JavaScriptValue.Undefined;
  });
 
- lock (_listSynchronizer)
- _jsNativeFunctions.Add(callback);
+ _jsNativeFunctions.Add(callback);
 
  var f = JavaScriptValue.CreateFunction(callback, IntPtr.Zero);
 
  return f;
  }
 
  private object Map(JsValue value)
- { 
- object t;
+ {
  using (_context.Scope)
- t = MapJsPrimitivesToClr(value);
-
- return t;
+ return MapJsPrimitivesToClr(value);
  }
- 
- public T Map<T>(JsValue value) => 
- (T)Map(value);
- 
+
+ public T Map<T>(JsValue value) =>
+ (T) Map(value);
+
  public JsValue Map(object value)
  {
  using (_context.Scope)
@@ -139,8 +134,7 @@ public JsValue Map(object value)
 
  public void Dispose()
  {
- lock (_listSynchronizer)
- _jsNativeFunctions.Clear();
+ _jsNativeFunctions.Clear();
  }
  }
 }

Tests/EmbeddedScripts.JS.ChakraCore.Tests/ChakraCoreRunnerTests.cs

@@ -4,7 +4,6 @@
 using EmbeddedScripts.Shared.Exceptions;
 using HelperObjects;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace EmbeddedScripts.JS.ChakraCore.Tests
 {
@@ -224,10 +223,8 @@ public async Task RunWithGlobalVariables_Succeed()
  [Fact]
  public void TryToRegisterUnsupportedType_RunnerThrowsException()
  {
- var runner = new ChakraCoreRunner();
+ using var runner = new ChakraCoreRunner();
  Assert.Throws<ArgumentException>(() => runner.Register(new HelperObject(), "x"));
- 
- runner.Dispose();
  }
 
  [Fact]