Now during the rethrowing of exceptions are preserved the full call stack trace

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>An attempt was made to prevent a blocking of finalizer's thread.</releaseNotes>
+		<releaseNotes>Now during the rethrowing of exceptions are preserved the full call stack trace.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,7 +30,7 @@
    =============
    RELEASE NOTES
    =============
-   An attempt was made to prevent a blocking of finalizer's thread.
+   Now during the rethrowing of exceptions are preserved the full call stack trace.
 
    =============
    DOCUMENTATION

NuGet/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.nuspec

@@ -12,7 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>JavaScript Engine Switcher determines unified interface for access to the basic features of popular JavaScript engines (MSIE JavaScript Engine for .Net, Microsoft ClearScript.V8, Jurassic, Jint and ChakraCore). This library allows you to quickly and easily switch to using of another JavaScript engine.</description>
 		<summary>JavaScript Engine Switcher determines unified interface for access to the basic features of popular JavaScript engines (MSIE JavaScript Engine for .Net, Microsoft ClearScript.V8, Jurassic, Jint and ChakraCore).</summary>
-		<releaseNotes>Added support of identifier names compliant with ECMAScript 5.</releaseNotes>
+		<releaseNotes>Now during the rethrowing of exceptions are preserved the full call stack trace.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript</tags>

NuGet/JavaScriptEngineSwitcher.Core/readme.txt

@@ -19,7 +19,7 @@
    =============
    RELEASE NOTES
    =============
-   Added support of identifier names compliant with ECMAScript 5.
+   Now during the rethrowing of exceptions are preserved the full call stack trace.
 
    =============
    DOCUMENTATION

NuGet/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.nuspec

@@ -17,7 +17,7 @@ This package does not contain the native ClearScript and V8 assemblies. Therefor
  * JavaScriptEngineSwitcher.V8.Native.win-x86
  * JavaScriptEngineSwitcher.V8.Native.win-x64</description>
 		<summary>JavaScriptEngineSwitcher.V8 contains adapter `V8JsEngine` (wrapper for the Microsoft ClearScript.V8 version of May 13, 2017).</summary>
-		<releaseNotes>Microsoft ClearScript.V8 was updated to version of May 13, 2017.</releaseNotes>
+		<releaseNotes>Now during the rethrowing of exceptions are preserved the full call stack trace.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript V8 ClearScript</tags>

NuGet/JavaScriptEngineSwitcher.V8/readme.txt

@@ -25,7 +25,7 @@
    =============
    RELEASE NOTES
    =============
-   Microsoft ClearScript.V8 was updated to version of May 13, 2017.
+   Now during the rethrowing of exceptions are preserved the full call stack trace.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore/ScriptDispatcher.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if NETSTANDARD1_3 || NET45
+using System.Runtime.ExceptionServices;
+#endif
 using System.Threading;
 
 using JavaScriptEngineSwitcher.Core;
@@ -152,9 +155,17 @@ private object InnnerInvoke(Func<object> del)
 				waitHandle.WaitOne();
 			}
 
-			if (task.Exception != null)
+			Exception exception = task.Exception;
+			if (exception != null)
 			{
-				throw task.Exception;
+#if NETSTANDARD1_3 || NET45
+			ExceptionDispatchInfo.Capture(exception).Throw();
+#elif NET40
+			exception.PreserveStackTrace();
+			throw exception;
+#else
+#error No implementation for this target
+#endif
 			}
 
 			return task.Result;
@@ -202,7 +213,7 @@ public void Invoke(Action action)
 			});
 		}
 
-		#region IDisposable implementation
+#region IDisposable implementation
 
 		/// <summary>
 		/// Destroys object
@@ -227,9 +238,9 @@ public void Dispose()
 			}
 		}
 
-		#endregion
+#endregion
 
-		#region Internal types
+#region Internal types
 
 		/// <summary>
 		/// Represents a script task, that must be executed on separate thread
@@ -286,6 +297,6 @@ public ScriptTask(Func<object> del, ManualResetEvent waitHandle)
 			}
 		}
 
-		#endregion
+#endregion
 	}
 }

src/JavaScriptEngineSwitcher.Core.Net4/JavaScriptEngineSwitcher.Core.Net40.csproj

@@ -117,6 +117,7 @@
       <Link>Utilities\Utils.cs</Link>
     </Compile>
     <Compile Include="Utilities\DelegateExtensions.cs" />
+    <Compile Include="Utilities\ExceptionExtensions.cs" />
     <Compile Include="Utilities\TypeInfo.cs" />
   </ItemGroup>
   <ItemGroup>

src/JavaScriptEngineSwitcher.Core.Net4/Utilities/ExceptionExtensions.cs

@@ -0,0 +1,29 @@
+#if NET40
+using System;
+using System.Reflection;
+
+namespace JavaScriptEngineSwitcher.Core.Utilities
+{
+	/// <summary>
+	/// Exception extensions
+	/// </summary>
+	public static class ExceptionExtensions
+	{
+		/// <summary>
+		/// Preserves a stack trace of exception
+		/// </summary>
+		/// <param name="source">The exception</param>
+		public static void PreserveStackTrace(this Exception source)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException("source");
+			}
+
+			MethodInfo preserveStackTraceMethodInfo = typeof(Exception).GetMethod("InternalPreserveStackTrace",
+				BindingFlags.Instance | BindingFlags.NonPublic);
+			preserveStackTraceMethodInfo.Invoke(source, null);
+		}
+	}
+}
+#endif

src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Reflection;
+#if NET45
+using System.Runtime.ExceptionServices;
+#endif
 using System.Text.RegularExpressions;
 
 using Microsoft.ClearScript.V8;
@@ -40,7 +43,7 @@ public sealed class V8JsEngine : JsEngineBase
 		private static OriginalUndefined _originalUndefinedValue;
 
 		/// <summary>
-		/// Information about `InvokeMethod` method of `Microsoft.ClearScript.V8.V8ScriptItem` type
+		/// Information about <code>InvokeMethod</code> method of <see cref="V8ScriptItem"/> class
 		/// </summary>
 		private static MethodInfo _v8ScriptItemInvokeMethodInfo;
 
@@ -340,8 +343,16 @@ protected override object InnerCallFunction(string functionName, params object[]
 						{
 							throw ConvertScriptEngineExceptionToJsRuntimeException(scriptEngineException);
 						}
+#if NET45
 
+						ExceptionDispatchInfo.Capture(innerException).Throw();
+#elif NET40
+
+						innerException.PreserveStackTrace();
 						throw innerException;
+#else
+#error No implementation for this target
+#endif
 					}
 
 					throw;