In JavaScriptEngineSwitcher.ChakraCore now the original exception is added to instance of the JsRuntimeException class as an internal exception

Taritsyn · Taritsyn · commit 94b4f1799cd4 · 2017-06-26T21:17:15.000+03:00
diff --git a/NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec b/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>ChakraCore was updated to version 1.5.2.</releaseNotes>
+		<releaseNotes>Now the original exception is added to instance of the `JsRuntimeException` class as an internal exception.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>
diff --git a/NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt b/NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt
@@ -30,7 +30,8 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.5.2.
+   Now the original exception is added to instance of the `JsRuntimeException`
+   class as an internal exception.
 
    =============
    DOCUMENTATION
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs b/src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs
@@ -887,43 +887,47 @@ private static JsRuntimeException ConvertJsExceptionToJsRuntimeException(
 			{
 				category = "Script error";
 				JsValue metadataValue = jsScriptException.Metadata;
-				JsValue errorValue = metadataValue.GetProperty("exception");
 
-				JsPropertyId stackPropertyId = JsPropertyId.FromString("stack");
-				if (errorValue.HasProperty(stackPropertyId))
+				if (metadataValue.IsValid)
 				{
-					JsValue stackPropertyValue = errorValue.GetProperty(stackPropertyId);
-					message = stackPropertyValue.ConvertToString().ToString();
-				}
-				else
-				{
-					JsValue messagePropertyValue = errorValue.GetProperty("message");
-					string scriptMessage = messagePropertyValue.ConvertToString().ToString();
-					if (!string.IsNullOrWhiteSpace(scriptMessage))
+					JsValue errorValue = metadataValue.GetProperty("exception");
+
+					JsPropertyId stackPropertyId = JsPropertyId.FromString("stack");
+					if (errorValue.HasProperty(stackPropertyId))
 					{
-						message = string.Format("{0}: {1}", message.TrimEnd('.'), scriptMessage);
+						JsValue stackPropertyValue = errorValue.GetProperty(stackPropertyId);
+						message = stackPropertyValue.ConvertToString().ToString();
+					}
+					else
+					{
+						JsValue messagePropertyValue = errorValue.GetProperty("message");
+						string scriptMessage = messagePropertyValue.ConvertToString().ToString();
+						if (!string.IsNullOrWhiteSpace(scriptMessage))
+						{
+							message = string.Format("{0}: {1}", message.TrimEnd('.'), scriptMessage);
+						}
 					}
-				}
 
-				JsPropertyId linePropertyId = JsPropertyId.FromString("line");
-				if (metadataValue.HasProperty(linePropertyId))
-				{
-					JsValue linePropertyValue = metadataValue.GetProperty(linePropertyId);
-					lineNumber = linePropertyValue.ConvertToNumber().ToInt32() + 1;
-				}
+					JsPropertyId linePropertyId = JsPropertyId.FromString("line");
+					if (metadataValue.HasProperty(linePropertyId))
+					{
+						JsValue linePropertyValue = metadataValue.GetProperty(linePropertyId);
+						lineNumber = linePropertyValue.ConvertToNumber().ToInt32() + 1;
+					}
 
-				JsPropertyId columnPropertyId = JsPropertyId.FromString("column");
-				if (metadataValue.HasProperty(columnPropertyId))
-				{
-					JsValue columnPropertyValue = metadataValue.GetProperty(columnPropertyId);
-					columnNumber = columnPropertyValue.ConvertToNumber().ToInt32() + 1;
-				}
+					JsPropertyId columnPropertyId = JsPropertyId.FromString("column");
+					if (metadataValue.HasProperty(columnPropertyId))
+					{
+						JsValue columnPropertyValue = metadataValue.GetProperty(columnPropertyId);
+						columnNumber = columnPropertyValue.ConvertToNumber().ToInt32() + 1;
+					}
 
-				JsPropertyId sourcePropertyId = JsPropertyId.FromString("source");
-				if (metadataValue.HasProperty(sourcePropertyId))
-				{
-					JsValue sourcePropertyValue = metadataValue.GetProperty(sourcePropertyId);
-					sourceFragment = sourcePropertyValue.ConvertToString().ToString();
+					JsPropertyId sourcePropertyId = JsPropertyId.FromString("source");
+					if (metadataValue.HasProperty(sourcePropertyId))
+					{
+						JsValue sourcePropertyValue = metadataValue.GetProperty(sourcePropertyId);
+						sourceFragment = sourcePropertyValue.ConvertToString().ToString();
+					}
 				}
 			}
 			else if (jsException is JsUsageException)
@@ -939,7 +943,7 @@ private static JsRuntimeException ConvertJsExceptionToJsRuntimeException(
 				category = "Fatal error";
 			}
 
-			var jsEngineException = new JsRuntimeException(message, EngineName, EngineVersion)
+			var jsEngineException = new JsRuntimeException(message, EngineName, EngineVersion, jsException)
 			{
 				ErrorCode = ((uint)jsException.ErrorCode).ToString(CultureInfo.InvariantCulture),
 				Category = category,
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsEngineException.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsEngineException.cs
@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
-	internal sealed class JsEngineException : JsException
+	public sealed class JsEngineException : JsException
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsEngineException"/> class
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsErrorCode.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsErrorCode.cs
@@ -1,11 +1,9 @@
-﻿using System.Diagnostics.CodeAnalysis;
-
-namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
+﻿namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 {
 	/// <summary>
 	/// The error code returned from a Chakra hosting API
 	/// </summary>
-	internal enum JsErrorCode : uint
+	public enum JsErrorCode : uint
 	{
 		/// <summary>
 		/// Success error code
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsException.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsException.cs
@@ -12,7 +12,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
-	internal class JsException : Exception
+	public class JsException : Exception
 	{
 		/// <summary>
 		/// The error code
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsFatalException.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsFatalException.cs
@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
-	internal sealed class JsFatalException : JsException
+	public sealed class JsFatalException : JsException
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsFatalException"/> class
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsScriptException.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsScriptException.cs
@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
-	internal sealed class JsScriptException : JsException
+	public sealed class JsScriptException : JsException
 	{
 		/// <summary>
 		/// The error metadata
@@ -24,7 +24,7 @@ internal sealed class JsScriptException : JsException
 		/// <summary>
 		/// Gets a JavaScript object representing the error metadata
 		/// </summary>
-		public JsValue Metadata
+		internal JsValue Metadata
 		{
 			get { return _metadata; }
 		}
@@ -34,9 +34,17 @@ public JsValue Metadata
 		/// Initializes a new instance of the <see cref="JsScriptException"/> class
 		/// </summary>
 		/// <param name="errorCode">The error code returned</param>
-		/// <param name="metadata">The JavaScript error metadata</param>
-		public JsScriptException(JsErrorCode errorCode, JsValue metadata)
-			: this(errorCode, metadata, "JavaScript Exception")
+		public JsScriptException(JsErrorCode errorCode)
+			: this(errorCode, "JavaScript Exception")
+		{ }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="JsScriptException"/> class
+		/// </summary>
+		/// <param name="errorCode">The error code returned</param>
+		/// <param name="message">The error message</param>
+		public JsScriptException(JsErrorCode errorCode, string message)
+			: this(errorCode, JsValue.Invalid, message)
 		{ }
 
 		/// <summary>
@@ -46,7 +54,7 @@ public JsScriptException(JsErrorCode errorCode, JsValue metadata)
 		/// <param name="errorCode">The error code returned</param>
 		/// <param name="metadata">The JavaScript error metadata</param>
 		/// <param name="message">The error message</param>
-		public JsScriptException(JsErrorCode errorCode, JsValue metadata, string message)
+		internal JsScriptException(JsErrorCode errorCode, JsValue metadata, string message)
 			: base(errorCode, message)
 		{
 			_metadata = metadata;
diff --git a/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsUsageException.cs b/src/JavaScriptEngineSwitcher.ChakraCore/JsRt/JsUsageException.cs
@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt
 #if !NETSTANDARD1_3
 	[Serializable]
 #endif
-	internal sealed class JsUsageException : JsException
+	public sealed class JsUsageException : JsException
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsUsageException"/> class

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt`
`11`	`11`	`#if !NETSTANDARD1_3`
`12`	`12`	`[Serializable]`
`13`	`13`	`#endif`
`14`		`- internal sealed class JsEngineException : JsException`
	`14`	`+ public sealed class JsEngineException : JsException`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Initializes a new instance of the <see cref="JsEngineException"/> class`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`		`-using System.Diagnostics.CodeAnalysis;`
`2`		`-`
`3`		`-namespace JavaScriptEngineSwitcher.ChakraCore.JsRt`
	`1`	`+namespace JavaScriptEngineSwitcher.ChakraCore.JsRt`
`4`	`2`	`{`
`5`	`3`	`/// <summary>`
`6`	`4`	`/// The error code returned from a Chakra hosting API`
`7`	`5`	`/// </summary>`
`8`		`- internal enum JsErrorCode : uint`
	`6`	`+ public enum JsErrorCode : uint`
`9`	`7`	`{`
`10`	`8`	`/// <summary>`
`11`	`9`	`/// Success error code`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace JavaScriptEngineSwitcher.ChakraCore.JsRt`
`12`	`12`	`#if !NETSTANDARD1_3`
`13`	`13`	`[Serializable]`
`14`	`14`	`#endif`
`15`		`- internal class JsException : Exception`
	`15`	`+ public class JsException : Exception`
`16`	`16`	`{`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// The error code`