Fixed a error, that occurred in the Classic mode during removing the embedded host objects and types

Author: Taritsyn

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -32,7 +32,7 @@ internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 		/// <summary>
 		/// List of host items
 		/// </summary>
-		private readonly Dictionary<string, object> _hostItems = new Dictionary<string, object>();
+		protected readonly Dictionary<string, object> _hostItems = new Dictionary<string, object>();
 
 		/// <summary>
 		/// Last Active Script exception
@@ -403,7 +403,7 @@ private object InnerGetVariableValue(string variableName)
 		/// </summary>
 		/// <param name="variableName">Name of variable</param>
 		/// <param name="value">Value of variable</param>
-		private void InnerSetVariableValue(string variableName, object value)
+		protected void InnerSetVariableValue(string variableName, object value)
 		{
 			object[] args = { value };
 
@@ -425,6 +425,12 @@ private void InnerSetVariableValue(string variableName, object value)
 			}
 		}
 
+		/// <summary>
+		/// Removes a variable
+		/// </summary>
+		/// <param name="variableName">Name of variable</param>
+		protected abstract void InnerRemoveVariable(string variableName);
+
 		private void InnerEmbedHostItem(string itemName, object value)
 		{
 			object oldValue = null;
@@ -719,12 +725,7 @@ public override void RemoveVariable(string variableName)
 
 				try
 				{
-					InnerSetVariableValue(variableName, null);
-
-					if (_hostItems.ContainsKey(variableName))
-					{
-						_hostItems.Remove(variableName);
-					}
+					InnerRemoveVariable(variableName);
 				}
 				catch (ActiveScriptException e)
 				{

src/MsieJavaScriptEngine/ActiveScript/ChakraActiveScriptJsEngine.cs

@@ -58,6 +58,16 @@ protected override void InitScriptContext()
 			_interruptRequested = false;
 		}
 
+		protected override void InnerRemoveVariable(string variableName)
+		{
+			InnerSetVariableValue(variableName, null);
+
+			if (_hostItems.ContainsKey(variableName))
+			{
+				_hostItems.Remove(variableName);
+			}
+		}
+
 		#region IInnerJsEngine implementation
 
 		public override void Interrupt()

src/MsieJavaScriptEngine/ActiveScript/ClassicActiveScriptJsEngine.cs

@@ -118,6 +118,18 @@ protected override ScriptSiteBase CreateScriptSite()
 			return new ScriptSite(this);
 		}
 
+		protected override void InnerRemoveVariable(string variableName)
+		{
+			if (_hostItems.ContainsKey(variableName))
+			{
+				_hostItems.Remove(variableName);
+			}
+			else
+			{
+				InnerSetVariableValue(variableName, null);
+			}
+		}
+
 		#region IInnerJsEngine implementation
 
 		public override void Interrupt()

src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

@@ -24,7 +24,8 @@
 		<RepositoryUrl>https://github.com/Taritsyn/MsieJavaScriptEngine</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
-		<PackageReleaseNotes>Added support of .NET Standard 2.0.</PackageReleaseNotes>
+		<PackageReleaseNotes>1. Added support of .NET Standard 2.0;
+2. Fixed a error, that occurred in the `Classic` mode during removing the embedded host objects and types.</PackageReleaseNotes>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageOutputPath>../../nuget</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/MsieJavaScriptEngine/readme.txt

@@ -21,7 +21,9 @@
    =============
    RELEASE NOTES
    =============
-   Added support of .NET Standard 2.0.
+   1. Added support of .NET Standard 2.0;
+   2. Fixed a error, that occurred in the `Classic` mode during removing the
+      embedded host objects and types.
 
    ============
    PROJECT SITE

test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs

@@ -593,6 +593,37 @@ public virtual void InteractionOfEmbeddedCustomValueTypeAndDelegateInstancesIsCo
 
 		#endregion
 
+		#region Removal
+
+		[Test]
+		public virtual void RemovingOfEmbeddedInstanceOfCustomReferenceTypeIsCorrect()
+		{
+			// Arrange
+			var person = new Person("Vasya", "Pupkin");
+
+			// Act
+			Exception currentException = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.EmbedHostObject("person", person);
+
+				try
+				{
+					jsEngine.RemoveVariable("person");
+				}
+				catch (Exception e)
+				{
+					currentException = e;
+				}
+			}
+
+			// Assert
+			Assert.Null(currentException);
+		}
+
+		#endregion
+
 		#endregion
 
 
@@ -1080,6 +1111,37 @@ public virtual void EmbeddingOfCustomReferenceTypeWithMethodIsCorrect()
 
 		#endregion
 
+		#region Removal
+
+		[Test]
+		public virtual void RemovingOfEmbeddedCustomReferenceTypeIsCorrect()
+		{
+			// Arrange
+			Type personType = typeof(Person);
+
+			// Act
+			Exception currentException = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.EmbedHostType("Person", personType);
+
+				try
+				{
+					jsEngine.RemoveVariable("Person");
+				}
+				catch (Exception e)
+				{
+					currentException = e;
+				}
+			}
+
+			// Assert
+			Assert.Null(currentException);
+		}
+
+		#endregion
+
 		#endregion
 	}
 }