Allow configuration of Babel, and pass file name. Closes #167 and #138

Author: Daniel15

src/Cassette.React/JsxCompiler.cs

@@ -7,6 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
+using System.IO;
 using System.Linq;
 using React;
 
@@ -36,7 +37,10 @@ public JsxCompiler(IReactEnvironment environment)
 		/// <returns>JavaScript</returns>
 		public CompileResult Compile(string source, CompileContext context)
 		{
-			var output = _environment.JsxTransformer.TransformJsx(source);
+			var output = _environment.JsxTransformer.TransformJsx(
+				source, 
+				Path.GetFileName(context.SourceFilePath)
+			);
 			return new CompileResult(output, Enumerable.Empty<string>());
 		}
 	}

src/React.Core/BabelConfig.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace React
+{
+	/// <summary>
+	/// Configuration for Babel (see http://babeljs.io/docs/usage/options/ for detailed 
+	/// documentation).
+	/// </summary>
+	public class BabelConfig
+	{
+		/// <summary>
+		/// Gets or sets whether Babel's "loose mode" is used for all transformers. See 
+		/// http://babeljs.io/docs/advanced/loose/ for more information. Only one of 
+		/// <see cref="AllLoose"/> or <see cref="Loose"/> can be used at a time.
+		/// </summary>
+		public bool AllLoose { get; set; }
+
+		/// <summary>
+		/// Gets or sets whether Babel should use a reference to babelHelpers instead of placing
+		/// helpers at the top of your code. Meant to be used in conjunction with external 
+		/// helpers (http://babeljs.io/docs/advanced/external-helpers/)
+		/// </summary>
+		public bool ExternalHelpers { get; set; }
+
+		/// <summary>
+		/// Gets or sets the transformers to use in Babel's "loose mode". See
+		/// http://babeljs.io/docs/advanced/loose/ for more information. Only one of 
+		/// <see cref="AllLoose"/> or <see cref="Loose"/> can be used at a time.
+		/// </summary>
+		public IEnumerable<string> Loose { get; set; }
+
+		/// <summary>
+		/// Gets or sets an transformers to optionally use. See 
+		/// http://babeljs.io/docs/advanced/transformers/#optional for a full list of transformers
+		/// </summary>
+		public IEnumerable<string> Optional { get; set; }
+
+		/// <summary>
+		/// Gets or sets the experimental proposal stage (http://babeljs.io/docs/usage/experimental/).
+		/// </summary>
+		public int Stage { get; set; }
+
+		/// <summary>
+		/// Creates a new instance of <see cref="BabelConfig" />.
+		/// </summary>
+		public BabelConfig()
+		{
+			Stage = 2;
+		}
+
+		/// <summary>
+		/// Serializes this Babel configuration into the format required for Babel.
+		/// </summary>
+		/// <returns></returns>
+		public string Serialize()
+		{
+			var config = new Dictionary<string, object>
+			{
+				{"externalHelpers", ExternalHelpers},
+				{"optional", Optional},
+				{"stage", Stage},
+			};
+			if (AllLoose)
+			{
+				config.Add("loose", "all");
+			}
+			else if (Loose != null)
+			{
+				config.Add("loose", Loose);
+			}
+			return JsonConvert.SerializeObject(config);
+		}
+	}
+}

src/React.Core/IJsxTransformer.cs

@@ -41,16 +41,18 @@ JavaScriptWithSourceMap TransformJsxFileWithSourceMap(
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <param name="input">JSX</param>
+		/// <param name="filename">Name of the file being transformed</param>
 		/// <returns>JavaScript</returns>
-		string TransformJsx(string input);
-		
+		string TransformJsx(string input, string filename = "unknown");
+
 		/// <summary>
 		/// Transforms JSX to regular JavaScript and also returns a source map to map the compiled
 		/// source to the original version. The result is not cached.
 		/// </summary>
 		/// <param name="input">JSX</param>
+		/// <param name="filename">Name of the file being transformed</param>
 		/// <returns>JavaScript and source map</returns>
-		JavaScriptWithSourceMap TransformJsxWithSourceMap(string input);
+		JavaScriptWithSourceMap TransformJsxWithSourceMap(string input, string filename = "unknown");
 
 		/// <summary>
 		/// Transforms a JSX file to JavaScript, and saves the result into a ".generated.js" file 

src/React.Core/IReactSiteConfiguration.cs

@@ -122,5 +122,15 @@ public interface IReactSiteConfiguration
 		/// </summary>
 		/// <returns>The configuration, for chaining</returns>
 		IReactSiteConfiguration SetLoadReact(bool loadReact);
+
+		/// <summary>
+		/// Gets or sets the Babel configuration to use.
+		/// </summary>
+		BabelConfig BabelConfig { get; set; }
+		/// <summary>
+		/// Sets the Babel configuration to use.
+		/// </summary>
+		/// <returns>The configuration, for chaining</returns>
+		IReactSiteConfiguration SetBabelConfig(BabelConfig value);
 	}
 }

src/React.Core/JsxTransformer.cs

@@ -8,6 +8,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using React.Exceptions;
@@ -56,6 +57,10 @@ public class JsxTransformer : IJsxTransformer
 		/// Site-wide configuration
 		/// </summary>
 		protected readonly IReactSiteConfiguration _config;
+		/// <summary>
+		/// The serialized Babel configuration
+		/// </summary>
+		protected readonly string _babelConfig; 
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsxTransformer"/> class.
@@ -72,6 +77,7 @@ public JsxTransformer(IReactEnvironment environment, ICache cache, IFileSystem f
 			_fileSystem = fileSystem;
 			_fileCacheHash = fileCacheHash;
 			_config = siteConfig;
+			_babelConfig = siteConfig.BabelConfig.Serialize();
 		}
 
 		/// <summary>
@@ -223,7 +229,7 @@ protected virtual JavaScriptWithSourceMap TransformJsxWithHeader(
 				hash = _fileCacheHash.CalculateHash(contents);
 			}
 			var header = GetFileHeader(hash);
-			var result = TransformJsxWithSourceMap(header + contents);
+			var result = TransformJsxWithSourceMap(header + contents, filename);
 			result.Hash = hash;
 			if (result.SourceMap != null)
 			{
@@ -243,14 +249,17 @@ protected virtual JavaScriptWithSourceMap TransformJsxWithHeader(
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <param name="input">JSX</param>
+		/// <param name="filename">Name of the file being transformed</param>
 		/// <returns>JavaScript</returns>
-		public virtual string TransformJsx(string input)
+		public virtual string TransformJsx(string input, string filename = "unknown")
 		{
 			try
 			{
 				var output = _environment.ExecuteWithLargerStackIfRequired<string>(
 					"ReactNET_transform",
-					input
+					input,
+					_babelConfig,
+					filename
 				);
 				return output;
 			}
@@ -265,16 +274,20 @@ public virtual string TransformJsx(string input)
 		/// source to the original version. The result is not cached.
 		/// </summary>
 		/// <param name="input">JSX</param>
+		/// <param name="filename">Name of the file being transformed</param>
 		/// <returns>JavaScript and source map</returns>
 		public virtual JavaScriptWithSourceMap TransformJsxWithSourceMap(
-			string input
+			string input,
+			string filename = "unknown"
 		)
 		{
 			try
 			{
 				return _environment.ExecuteWithLargerStackIfRequired<JavaScriptWithSourceMap>(
 					"ReactNET_transform_sourcemap",
-					input
+					input,
+					_babelConfig,
+					filename
 				);
 			}
 			catch (Exception ex)

src/React.Core/React.Core.csproj

@@ -89,6 +89,7 @@
       <Link>Properties\SharedAssemblyVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AssemblyRegistration.cs" />
+    <Compile Include="BabelConfig.cs" />
     <Compile Include="Exceptions\ReactNotInitialisedException.cs" />
     <Compile Include="FileSystemExtensions.cs" />
     <Compile Include="JavaScriptEngineUtils.cs" />

src/React.Core/ReactSiteConfiguration.cs

@@ -33,6 +33,7 @@ static ReactSiteConfiguration()
 		/// </summary>
 		public ReactSiteConfiguration()
 		{
+			BabelConfig = new BabelConfig();
 			ReuseJavaScriptEngines = true;
 			AllowMsieEngine = true;
 			LoadReact = true;
@@ -218,5 +219,20 @@ public IReactSiteConfiguration SetLoadReact(bool loadReact)
 			LoadReact = loadReact;
 			return this;
 		}
+
+		/// <summary>
+		/// Gets or sets the Babel configuration to use.
+		/// </summary>
+		public BabelConfig BabelConfig { get; set; }
+
+		/// <summary>
+		/// Sets the Babel configuration to use.
+		/// </summary>
+		/// <returns>The configuration, for chaining</returns>
+		public IReactSiteConfiguration SetBabelConfig(BabelConfig value)
+		{
+			BabelConfig = value;
+			return this;
+		}
 	}
 }

src/React.Core/Resources/shims.js

@@ -64,18 +64,23 @@ function ReactNET_initReact() {
 	return false;
 }
 
-function ReactNET_transform(input) {
+function ReactNET_transform(input, babelConfig, filename) {
+	babelConfig = JSON.parse(babelConfig);
+	babelConfig.filename = filename;
 	try {
-		return global.babel.transform(input).code;
+		return global.babel.transform(input, babelConfig).code;
 	} catch (ex) {
 		// Parsing stack is extremely long and not very useful, so just rethrow the message.
 		throw new Error(ex.message);
 	}
 }
 
-function ReactNET_transform_sourcemap(input) {
+function ReactNET_transform_sourcemap(input, babelConfig, filename) {
+	babelConfig = JSON.parse(babelConfig);
+	babelConfig.filename = filename;
+	babelConfig.sourceMap = true;
 	try {
-		var result = global.babel.transform(input);
+		var result = global.babel.transform(input, babelConfig);
 		return JSON.stringify({
 			code: result.code,
 			sourceMap: result.map

src/React.Tests/Core/BabelConfigTests.cs

@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using NUnit.Framework;
+
+namespace React.Tests.Core
+{
+	[TestFixture]
+	public class BabelConfigTests
+	{
+		[Test]
+		public void SerializesAllLoose()
+		{
+			var config = new BabelConfig
+			{
+				AllLoose = true,
+			};
+			var result = config.Serialize();
+			Assert.AreEqual(@"{""externalHelpers"":false,""optional"":null,""stage"":2,""loose"":""all""}", result);
+		}
+
+		[Test]
+		public void SerializesSomeLoose()
+		{
+			var config = new BabelConfig
+			{
+				Loose = new[] { "foo" },
+			};
+			var result = config.Serialize();
+			Assert.AreEqual(@"{""externalHelpers"":false,""optional"":null,""stage"":2,""loose"":[""foo""]}", result);
+		}
+	}
+}

src/React.Tests/Core/JsxTransformerTests.cs

@@ -52,7 +52,9 @@ public void ShouldTransformJsx()
 
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"<div>Hello World</div>"
+				"<div>Hello World</div>",
+				It.IsAny<string>(),
+				"unknown" // file name
 			));
 		}
 
@@ -61,7 +63,9 @@ public void ShouldWrapExceptionsInJsxExeption()
 		{
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
 				"ReactNET_transform",
-				"<div>Hello World</div>"
+				"<div>Hello World</div>",
+				It.IsAny<string>(),
+				"unknown" // file name
 			)).Throws(new Exception("Something broke..."));
 
 			const string input = "<div>Hello World</div>";
@@ -102,7 +106,9 @@ public void ShouldTransformJsxIfFileCacheHashInvalid()
 			_fileCacheHash.Setup(x => x.ValidateHash(It.IsAny<string>(), It.IsAny<string>())).Returns(false);
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<JavaScriptWithSourceMap>(
 				"ReactNET_transform_sourcemap",
-				It.IsAny<string>()
+				It.IsAny<string>(),
+				It.IsAny<string>(), // Babel config
+				"foo.jsx" // File name
 			)).Returns(new JavaScriptWithSourceMap { Code = "React.DOM.div('Hello World')" });
 
 			var result = _jsxTransformer.TransformJsxFile("foo.jsx");
@@ -117,7 +123,9 @@ public void ShouldTransformJsxIfNoCache()
 			_fileSystem.Setup(x => x.ReadAsString("foo.jsx")).Returns("<div>Hello World</div>");
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<JavaScriptWithSourceMap>(
 				"ReactNET_transform_sourcemap",
-				It.IsAny<string>()
+				It.IsAny<string>(),
+				It.IsAny<string>(), // Babel config
+				"foo.jsx" // File name
 			)).Returns(new JavaScriptWithSourceMap { Code = "React.DOM.div('Hello World')" });
 
 			var result = _jsxTransformer.TransformJsxFile("foo.jsx");
@@ -130,7 +138,9 @@ public void ShouldSaveTransformationResult()
 			_fileSystem.Setup(x => x.ReadAsString("foo.jsx")).Returns("<div>Hello World</div>");
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<JavaScriptWithSourceMap>(
 				"ReactNET_transform_sourcemap",
-				It.IsAny<string>()
+				It.IsAny<string>(),
+				It.IsAny<string>(), // Babel config
+				"foo.jsx" // File name
 			)).Returns(new JavaScriptWithSourceMap { Code = "React.DOM.div('Hello World')" });
 
 			string result = null;
@@ -145,7 +155,7 @@ public void ShouldSaveTransformationResult()
 
 		private void SetUpEmptyCache()
 		{
-			_cache.Setup(x => x.Get<JavaScriptWithSourceMap>("JSX_v2_foo.jsx", null)).Returns((JavaScriptWithSourceMap)null);
+			_cache.Setup(x => x.Get<JavaScriptWithSourceMap>("JSX_v3_foo.jsx", null)).Returns((JavaScriptWithSourceMap)null);
 		}
 	}
 }