Added support of identifier names compliant with ECMAScript 5

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.nuspec

@@ -12,8 +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>1. Added support of .NET Core 1.0.4;
-2. In `IJsEngine` interface was added overloaded versions of the `Evaluate`, `Evaluate&lt;T&gt;` and `Execute` methods, which take the document name as second parameter.</releaseNotes>
+		<releaseNotes>Added support of identifier names compliant with ECMAScript 5.</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,10 +19,7 @@
    =============
    RELEASE NOTES
    =============
-   1. Added support of .NET Core 1.0.4;
-   2. In `IJsEngine` interface was added overloaded versions of the `Evaluate`,
-      `Evaluate<T>` and `Execute` methods, which take the document name as second
-      parameter.
+   Added support of identifier names compliant with ECMAScript 5.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.Core/Helpers/ValidationHelpers.cs

@@ -32,9 +32,10 @@ public static class ValidationHelpers
 		};
 
 		/// <summary>
-		/// Regular expression for working with JS-names
+		/// Regular expression for working with JS names
 		/// </summary>
-		private static readonly Regex _jsNameRegex = new Regex(@"^[A-Za-z_\$][0-9A-Za-z_\$]*$");
+		private static readonly Regex _jsNameRegex = new Regex(@"^[$_\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Lo}\p{Nl}]" +
+			@"[$_\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Lo}\p{Nl}\u200C\u200D\p{Mn}\p{Mc}\p{Nd}\p{Pc}]*$");
 
 
 		/// <summary>

test/JavaScriptEngineSwitcher.Tests.Net4/JavaScriptEngineSwitcher.Tests.Net40.csproj

@@ -192,6 +192,9 @@
     <Compile Include="..\JavaScriptEngineSwitcher.Tests\V8\InteropTests.cs">
       <Link>V8\InteropTests.cs</Link>
     </Compile>
+    <Compile Include="..\JavaScriptEngineSwitcher.Tests\ValidationTests.cs">
+      <Link>ValidationTests.cs</Link>
+    </Compile>
     <Compile Include="..\JavaScriptEngineSwitcher.Tests\Vroom\CommonTests.cs">
       <Link>Vroom\CommonTests.cs</Link>
     </Compile>

test/JavaScriptEngineSwitcher.Tests/CommonTestsBase.cs

@@ -846,6 +846,40 @@ public virtual void SettingAndGettingVariableWithUnicodeStringValueIsCorrect()
 			Assert.Equal(input2, output2);
 		}
 
+		[Fact]
+		public virtual void SettingAndGettingVariableWithNameContainingUnicodeCharactersIsCorrect()
+		{
+			// Arrange
+			const string variableName = "слово";
+
+			const string input1 = "Hip-hip Hooray";
+			const string targetOutput1 = "Hip-hip Hooray!";
+
+			const string input2 = "Hip-hip Hurrah";
+
+			// Act
+			bool variableExists;
+			string output1;
+			string output2;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.SetVariableValue(variableName, input1);
+				variableExists = jsEngine.HasVariable(variableName);
+				jsEngine.Execute(string.Format("{0} += '!';", variableName));
+				output1 = jsEngine.GetVariableValue<string>(variableName);
+
+				jsEngine.SetVariableValue(variableName, input2);
+				output2 = jsEngine.GetVariableValue<string>(variableName);
+			}
+
+			// Assert
+			Assert.True(variableExists);
+			Assert.Equal(targetOutput1, output1);
+
+			Assert.Equal(input2, output2);
+		}
+
 		[Fact]
 		public virtual void RemovingVariableIsCorrect()
 		{

test/JavaScriptEngineSwitcher.Tests/ValidationTests.cs

@@ -0,0 +1,51 @@
+using Xunit;
+
+using JavaScriptEngineSwitcher.Core.Helpers;
+
+namespace JavaScriptEngineSwitcher.Tests
+{
+	public class ValidationTests
+	{
+		[Fact]
+		public void NameFormatIsCorrect()
+		{
+			// Arrange
+
+			// Act
+			bool name1FormatIsCorrect = ValidationHelpers.CheckNameFormat("good_parts");
+			bool name2FormatIsCorrect = ValidationHelpers.CheckNameFormat("i18n");
+			bool name3FormatIsCorrect = ValidationHelpers.CheckNameFormat("fooBar");
+			bool name4FormatIsCorrect = ValidationHelpers.CheckNameFormat("$grid");
+			bool name5FormatIsCorrect = ValidationHelpers.CheckNameFormat("a");
+			bool name6FormatIsCorrect = ValidationHelpers.CheckNameFormat("À_la_maison");
+
+			// Assert
+			Assert.True(name1FormatIsCorrect);
+			Assert.True(name2FormatIsCorrect);
+			Assert.True(name3FormatIsCorrect);
+			Assert.True(name4FormatIsCorrect);
+			Assert.True(name5FormatIsCorrect);
+			Assert.True(name6FormatIsCorrect);
+		}
+
+		[Fact]
+		public void NameFormatIsWrong()
+		{
+			// Arrange
+
+			// Act
+			bool name1FormatIsCorrect = ValidationHelpers.CheckNameFormat("good-parts");
+			bool name2FormatIsCorrect = ValidationHelpers.CheckNameFormat("1sale");
+			bool name3FormatIsCorrect = ValidationHelpers.CheckNameFormat("Foo Bar");
+			bool name4FormatIsCorrect = ValidationHelpers.CheckNameFormat("@grid");
+			bool name5FormatIsCorrect = ValidationHelpers.CheckNameFormat("2");
+
+			// Assert
+			Assert.False(name1FormatIsCorrect);
+			Assert.False(name2FormatIsCorrect);
+			Assert.False(name3FormatIsCorrect);
+			Assert.False(name4FormatIsCorrect);
+			Assert.False(name5FormatIsCorrect);
+		}
+	}
+}