Tabs and usage of UseHarmony

Author: Alxandr

src/React.Tests/Core/JsxTransformerTests.cs

@@ -62,8 +62,8 @@ public void ShouldTransformJsxIfAnnotationPresent()
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
 				"/** @jsx React.DOM */ <div>Hello World</div>",
-                false
-            ));
+				false
+			));
 		}
 
 		[Test]
@@ -72,8 +72,8 @@ public void ShouldWrapExceptionsInJsxExeption()
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
 				"/** @jsx React.DOM */ <div>Hello World</div>",
-                false
-            )).Throws(new Exception("Something broke..."));
+				false
+			)).Throws(new Exception("Something broke..."));
 
 			const string input = "/** @jsx React.DOM */ <div>Hello World</div>";
 			Assert.Throws<JsxException>(() => _jsxTransformer.TransformJsx(input));
@@ -98,7 +98,7 @@ public void ShouldUseCacheProvider()
 				/*slidingExpiration*/ It.IsAny<TimeSpan>(),
 				/*getData*/ It.IsAny<Func<string>>(),
 				/*cacheDependencyKeys*/ It.IsAny<IEnumerable<string>>(),
-				/*cacheDependencyFiles*/ It.IsAny<IEnumerable<string>>()				
+				/*cacheDependencyFiles*/ It.IsAny<IEnumerable<string>>()                
 			)).Returns("/* cached */");
 
 			var result = _jsxTransformer.TransformJsxFile("foo.jsx");
@@ -130,8 +130,8 @@ public void ShouldTransformJsxIfFileCacheHashInvalid()
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
 				"/** @jsx React.DOM */ <div>Hello World</div>",
-                false
-            ));
+				false
+			));
 		}
 
 		[Test]
@@ -145,8 +145,8 @@ public void ShouldTransformJsxIfNoCache()
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
 				"/** @jsx React.DOM */ <div>Hello World</div>",
-                false
-            ));
+				false
+			));
 		}
 
 		[Test]
@@ -156,7 +156,7 @@ public void ShouldSaveTransformationResult()
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
 				"/** @jsx React.DOM */ <div>Hello World</div>",
-                false
+				false
 			)).Returns("React.DOM.div('Hello World')");
 
 			string result = null;

src/React/IJsxTransformer.cs

@@ -20,7 +20,7 @@ public interface IJsxTransformer
 		/// <param name="filename">Name of the file to load</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>JavaScript</returns>
-		string TransformJsxFile(string filename, bool useHarmony = false);
+		string TransformJsxFile(string filename, bool? useHarmony = null);
 
 		/// <summary>
 		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
@@ -29,7 +29,7 @@ public interface IJsxTransformer
 		/// <param name="input">JSX</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>JavaScript</returns>
-		string TransformJsx(string input, bool useHarmony = false);
+		string TransformJsx(string input, bool? useHarmony = null);
 
 		/// <summary>
 		/// Transforms a JSX file to JavaScript, and saves the result into a ".generated.js" file 
@@ -38,7 +38,7 @@ public interface IJsxTransformer
 		/// <param name="filename">Name of the file to load</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>File contents</returns>
-		string TransformAndSaveJsxFile(string filename, bool useHarmony = false);
+		string TransformAndSaveJsxFile(string filename, bool? useHarmony = null);
 
 		/// <summary>
 		/// Returns the path the specified JSX file's compilation will be cached to

src/React/IReactEnvironment.cs

@@ -70,6 +70,12 @@ public interface IReactEnvironment
 		/// <returns>The component</returns>
 		IReactComponent CreateComponent<T>(string componentName, T props);
 
+		/// <summary>
+		/// The current site configuration.
+		/// </summary>
+		/// <returns>The current site configuration.</returns>
+		IReactSiteConfiguration SiteConfiguration { get; }
+
 		/// <summary>
 		/// Renders the JavaScript required to initialise all components client-side. This will 
 		/// attach event handlers to the server-rendered HTML.

src/React/JsxTransformer.cs

@@ -65,7 +65,7 @@ public JsxTransformer(IReactEnvironment environment, ICache cache, IFileSystem f
 		/// <param name="filename">Name of the file to load</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>JavaScript</returns>
-		public string TransformJsxFile(string filename, bool useHarmony = false)
+		public string TransformJsxFile(string filename, bool? useHarmony = null)
 		{
 			var fullPath = _fileSystem.MapPath(filename);
 
@@ -105,7 +105,7 @@ public string TransformJsxFile(string filename, bool useHarmony = false)
 		/// <param name="hash">Hash of the input. If null, it will be calculated</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>JavaScript</returns>
-		private string TransformJsxWithHeader(string contents, string hash = null, bool useHarmony = false)
+		private string TransformJsxWithHeader(string contents, string hash = null, bool? useHarmony = null)
 		{
 			if (string.IsNullOrEmpty(hash))
 			{
@@ -121,7 +121,7 @@ private string TransformJsxWithHeader(string contents, string hash = null, bool
 		/// <param name="input">JSX</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>JavaScript</returns>
-		public string TransformJsx(string input, bool useHarmony = false)
+		public string TransformJsx(string input, bool? useHarmony = null)
 		{
 			// Just return directly if there's no JSX annotation
 			if (!input.Contains("@jsx"))
@@ -135,7 +135,7 @@ public string TransformJsx(string input, bool useHarmony = false)
 				var output = _environment.ExecuteWithLargerStackIfRequired<string>(
 					"ReactNET_transform",
 					input,
-					useHarmony
+					useHarmony.HasValue ? useHarmony.Value : _environment.SiteConfiguration.UseHarmony
 				);
 				return output;
 			}
@@ -183,7 +183,7 @@ public string GetJsxOutputPath(string path)
 		/// <param name="filename">Name of the file to load</param>
 		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
 		/// <returns>File contents</returns>
-		public string TransformAndSaveJsxFile(string filename, bool useHarmony = false)
+		public string TransformAndSaveJsxFile(string filename, bool? useHarmony = null)
 		{
 			var outputPath = GetJsxOutputPath(filename);
 			var contents = _fileSystem.ReadAsString(filename);

src/React/ReactEnvironment.cs

@@ -114,6 +114,18 @@ private IJsEngine Engine
 			}
 		}
 
+		/// <summary>
+		/// The current site configuration.
+		/// </summary>
+		/// <returns>The current site configuration.</returns>
+		public IReactSiteConfiguration SiteConfiguration
+		{
+			get
+			{
+				return _config;
+			}
+		}
+
 		/// <summary>
 		/// Gets the JSX Transformer for this environment.
 		/// </summary>