Merge pull request #20 from Alxandr/master

Enable configuration of harmony support

Author: Daniel15

src/React.MSBuild/TransformJsx.cs

@@ -30,13 +30,22 @@ public class TransformJsx : Task
 		[Required]
 		public string SourceDir { get; set; }
 
+		/// <summary>
+		/// A value indicating if es6 syntax should be rewritten.
+		/// </summary>
+		/// <returns><c>true</c> if support for es6 syntax should be rewritten.</returns>
+		public bool UseHarmony { get; set; }
+
 		/// <summary>
 		/// Executes the task.
 		/// </summary>
 		/// <returns><c>true</c> on success</returns>
 		public override bool Execute()
 		{
 			MSBuildHost.EnsureInitialized();
+			var config = React.AssemblyRegistration.Container.Resolve<IReactSiteConfiguration>();
+			config.UseHarmony = UseHarmony;
+
 			_environment = React.AssemblyRegistration.Container.Resolve<IReactEnvironment>();
 
 			Log.LogMessage("Starting TransformJsx");

src/React.Sample.Mvc4/App_Start/ReactConfig.cs

@@ -15,7 +15,7 @@ public static class ReactConfig
 	{
 		public static void Configure()
 		{
-			ReactSiteConfiguration.Configuration = new ReactSiteConfiguration()
+			ReactSiteConfiguration.Configuration
 				.AddScript("~/Content/Sample.jsx");
 		}
 	}

src/React.Tests/Core/JsxTransformerTests.cs

@@ -40,7 +40,8 @@ public void SetUp()
 				_environment.Object,
 				_cache.Object,
 				_fileSystem.Object,
-				_fileCacheHash.Object
+				_fileCacheHash.Object,
+				ReactSiteConfiguration.Configuration
 			);
 		}
 
@@ -61,7 +62,8 @@ public void ShouldTransformJsxIfAnnotationPresent()
 
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"/** @jsx React.DOM */ <div>Hello World</div>"
+				"/** @jsx React.DOM */ <div>Hello World</div>",
+				false
 			));
 		}
 
@@ -70,7 +72,8 @@ public void ShouldWrapExceptionsInJsxExeption()
 		{
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"/** @jsx React.DOM */ <div>Hello World</div>"
+				"/** @jsx React.DOM */ <div>Hello World</div>",
+				false
 			)).Throws(new Exception("Something broke..."));
 
 			const string input = "/** @jsx React.DOM */ <div>Hello World</div>";
@@ -96,7 +99,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");
@@ -127,7 +130,8 @@ public void ShouldTransformJsxIfFileCacheHashInvalid()
 			_jsxTransformer.TransformJsxFile("foo.jsx");
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"/** @jsx React.DOM */ <div>Hello World</div>"
+				"/** @jsx React.DOM */ <div>Hello World</div>",
+				false
 			));
 		}
 
@@ -141,7 +145,8 @@ public void ShouldTransformJsxIfNoCache()
 			_jsxTransformer.TransformJsxFile("foo.jsx");
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"/** @jsx React.DOM */ <div>Hello World</div>"
+				"/** @jsx React.DOM */ <div>Hello World</div>",
+				false
 			));
 		}
 
@@ -151,7 +156,8 @@ public void ShouldSaveTransformationResult()
 			_fileSystem.Setup(x => x.ReadAsString("foo.jsx")).Returns("/** @jsx React.DOM */ <div>Hello World</div>");
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"/** @jsx React.DOM */ <div>Hello World</div>"
+				"/** @jsx React.DOM */ <div>Hello World</div>",
+				false
 			)).Returns("React.DOM.div('Hello World')");
 
 			string result = null;

src/React/IJsxTransformer.cs

@@ -18,24 +18,27 @@ public interface IJsxTransformer
 		/// Transforms a JSX file. Results of the JSX to JavaScript transformation are cached.
 		/// </summary>
 		/// <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);
+		string TransformJsxFile(string filename, bool? useHarmony = null);
 
 		/// <summary>
 		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <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);
+		string TransformJsx(string input, bool? useHarmony = null);
 
 		/// <summary>
 		/// Transforms a JSX file to JavaScript, and saves the result into a ".generated.js" file 
 		/// alongside the original file.
 		/// </summary>
 		/// <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);
+		string TransformAndSaveJsxFile(string filename, bool? useHarmony = null);
 
 		/// <summary>
 		/// Returns the path the specified JSX file's compilation will be cached to

src/React/IReactSiteConfiguration.cs

@@ -31,5 +31,11 @@ public interface IReactSiteConfiguration
 		/// Gets a list of all the scripts that have been added to this configuration.
 		/// </summary>
 		IList<string> Scripts { get; }
+
+		/// <summary>
+		/// A value indicating if es6 syntax should be rewritten.
+		/// </summary>
+		/// <returns><c>true</c> if support for es6 syntax should be rewritten.</returns>
+		bool UseHarmony { get; set; }
 	}
 }

src/React/JsxTransformer.cs

@@ -43,6 +43,10 @@ public class JsxTransformer : IJsxTransformer
 		/// Hash algorithm for file-based cache
 		/// </summary>
 		private readonly IFileCacheHash _fileCacheHash;
+		/// <summary>
+		/// Site-wide configuration
+		/// </summary>
+		private readonly IReactSiteConfiguration _config;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsxTransformer"/> class.
@@ -51,20 +55,23 @@ public class JsxTransformer : IJsxTransformer
 		/// <param name="cache">The cache to use for JSX compilation</param>
 		/// <param name="fileSystem">File system wrapper</param>
 		/// <param name="fileCacheHash">Hash algorithm for file-based cache</param>
-		public JsxTransformer(IReactEnvironment environment, ICache cache, IFileSystem fileSystem, IFileCacheHash fileCacheHash)
+		/// <param name="siteConfig">Site-wide configuration</param>
+		public JsxTransformer(IReactEnvironment environment, ICache cache, IFileSystem fileSystem, IFileCacheHash fileCacheHash, IReactSiteConfiguration siteConfig)
 		{
 			_environment = environment;
 			_cache = cache;
 			_fileSystem = fileSystem;
 			_fileCacheHash = fileCacheHash;
+			_config = siteConfig;
 		}
 
 		/// <summary>
 		/// Transforms a JSX file. Results of the JSX to JavaScript transformation are cached.
 		/// </summary>
 		/// <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)
+		public string TransformJsxFile(string filename, bool? useHarmony = null)
 		{
 			var fullPath = _fileSystem.MapPath(filename);
 
@@ -91,7 +98,7 @@ public string TransformJsxFile(string filename)
 					}
 
 					// 3. Not cached, perform the transformation
-					return TransformJsxWithHeader(contents, hash);
+					return TransformJsxWithHeader(contents, hash, useHarmony);
 				}
 			);
 		}
@@ -102,23 +109,25 @@ public string TransformJsxFile(string filename)
 		/// </summary>
 		/// <param name="contents">Contents of the input file</param>
 		/// <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)
+		private string TransformJsxWithHeader(string contents, string hash = null, bool? useHarmony = null)
 		{
 			if (string.IsNullOrEmpty(hash))
 			{
 				hash = _fileCacheHash.CalculateHash(contents);
 			}
-			return GetFileHeader(hash) + TransformJsx(contents);
+			return GetFileHeader(hash) + TransformJsx(contents, useHarmony);
 		}
 
 		/// <summary>
 		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <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)
+		public string TransformJsx(string input, bool? useHarmony = null)
 		{
 			// Just return directly if there's no JSX annotation
 			if (!input.Contains("@jsx"))
@@ -131,7 +140,8 @@ public string TransformJsx(string input)
 			{
 				var output = _environment.ExecuteWithLargerStackIfRequired<string>(
 					"ReactNET_transform",
-					input
+					input,
+					useHarmony.HasValue ? useHarmony.Value : _config.UseHarmony
 				);
 				return output;
 			}
@@ -177,12 +187,13 @@ public string GetJsxOutputPath(string path)
 		/// alongside the original file.
 		/// </summary>
 		/// <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)
+		public string TransformAndSaveJsxFile(string filename, bool? useHarmony = null)
 		{
 			var outputPath = GetJsxOutputPath(filename);
 			var contents = _fileSystem.ReadAsString(filename);
-			var result = TransformJsxWithHeader(contents);
+			var result = TransformJsxWithHeader(contents, useHarmony: useHarmony);
 			_fileSystem.WriteAsString(outputPath, result);
 			return outputPath;
 		}

src/React/ReactEnvironment.cs

@@ -98,7 +98,7 @@ IFileCacheHash fileCacheHash
 			_fileSystem = fileSystem;
 			_fileCacheHash = fileCacheHash;
 			_jsxTransformer = new Lazy<IJsxTransformer>(() => 
-				new JsxTransformer(this, _cache, _fileSystem, _fileCacheHash)
+				new JsxTransformer(this, _cache, _fileSystem, _fileCacheHash, _config)
 			);
 		}
 

src/React/ReactSiteConfiguration.cs

@@ -17,6 +17,8 @@ namespace React
 	/// </summary>
 	public class ReactSiteConfiguration : IReactSiteConfiguration
 	{
+		private static IReactSiteConfiguration _instance = new ReactSiteConfiguration();
+
 		/// <summary>
 		/// All the scripts that have been added to this configuration
 		/// </summary>
@@ -25,7 +27,13 @@ public class ReactSiteConfiguration : IReactSiteConfiguration
 		/// <summary>
 		/// Gets or sets the site-side configuration
 		/// </summary>
-		public static IReactSiteConfiguration Configuration { get; set; }
+		public static IReactSiteConfiguration Configuration
+		{
+			get
+			{
+				return _instance;
+			}
+		}
 
 		/// <summary>
 		/// Adds a script to the list of scripts that are executed. This should be called for all
@@ -48,6 +56,12 @@ public IReactSiteConfiguration AddScript(string filename)
 		public IList<string> Scripts
 		{
 			get { return new ReadOnlyCollection<string>(_scriptFiles); }
-		} 
+		}
+
+		/// <summary>
+		/// A value indicating if es6 syntax should be rewritten.
+		/// </summary>
+		/// <returns><c>true</c> if support for es6 syntax should be rewritten.</returns>
+		public bool UseHarmony { get; set; }
 	}
 }

src/React/Resources/shims.js

@@ -19,6 +19,6 @@ if (!Object.freeze) {
 	Object.freeze = function() { };
 }
 
-function ReactNET_transform(input) {
-	return global.JSXTransformer.transform(input, { harmony: true }).code;
+function ReactNET_transform(input, harmony) {
+	return global.JSXTransformer.transform(input, { harmony: !!harmony }).code;
 }