The Great JsxTransformer Renaming of 2015

Renamed JsxTransformer and friends to BabelTransformer, now that we're using Babel (which does a whole lot more than JsxTransformer did).

Closes reactjs#168

Author: Daniel15

src/Cassette.React/JsxBundleProcessor.cs src/Cassette.React/BabelBundleProcessor.cs

@@ -14,35 +14,35 @@
 namespace Cassette.React
 {
 	/// <summary>
-	/// Handles processing of script bundles in Cassette. Adds a <see cref="JsxCompiler" />
-	/// for all .jsx files.
+	/// Handles processing of script bundles in Cassette. Adds a <see cref="BabelCompiler" />
+	/// for all .js and .jsx files.
 	/// </summary>
-	public class JsxBundleProcessor : IBundleProcessor<ScriptBundle>
+	public class BabelBundleProcessor : IBundleProcessor<ScriptBundle>
 	{
 		private readonly CassetteSettings _settings;
 		private readonly IReactEnvironment _environment;
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="JsxBundleProcessor"/> class.
+		/// Initializes a new instance of the <see cref="BabelBundleProcessor"/> class.
 		/// </summary>
 		/// <param name="settings">Cassette settings.</param>
 		/// <param name="environment">The ReactJS.NET environment</param>
-		public JsxBundleProcessor(CassetteSettings settings, IReactEnvironment environment)
+		public BabelBundleProcessor(CassetteSettings settings, IReactEnvironment environment)
 		{
 			_settings = settings;
 			_environment = environment;
 		}
 
 		/// <summary>
-		/// Processes the specified bundle. Adds a <see cref="JsxCompiler"/> for all files.
+		/// Processes the specified bundle. Adds a <see cref="BabelCompiler"/> for all files.
 		/// </summary>
 		/// <param name="bundle">The bundle.</param>
 		public void Process(ScriptBundle bundle)
 		{
 			foreach (var asset in bundle.Assets)
 			{
 				asset.AddAssetTransformer(
-					new CompileAsset(new JsxCompiler(_environment), _settings.SourceDirectory)
+					new CompileAsset(new BabelCompiler(_environment), _settings.SourceDirectory)
 				);
 			}
 		}

src/Cassette.React/JsxCompiler.cs src/Cassette.React/BabelCompiler.cs

@@ -14,30 +14,30 @@
 namespace Cassette.React
 {
 	/// <summary>
-	/// Handles compilation of JSX in Cassette
+	/// Handles compilation of JavaScript files via Babel in Cassette
 	/// </summary>
-	public class JsxCompiler : ICompiler
+	public class BabelCompiler : ICompiler
 	{
 		private readonly IReactEnvironment _environment;
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="JsxCompiler"/> class.
+		/// Initializes a new instance of the <see cref="BabelCompiler"/> class.
 		/// </summary>
 		/// <param name="environment">The ReactJS.NET environment</param>
-		public JsxCompiler(IReactEnvironment environment)
+		public BabelCompiler(IReactEnvironment environment)
 		{
 			_environment = environment;
 		}
 
 		/// <summary>
-		/// Compiles the specified JSX file into JavaScript
+		/// Compiles the specified JavaScript file via Babel
 		/// </summary>
 		/// <param name="source">The source.</param>
 		/// <param name="context">The context.</param>
 		/// <returns>JavaScript</returns>
 		public CompileResult Compile(string source, CompileContext context)
 		{
-			var output = _environment.JsxTransformer.TransformJsx(
+			var output = _environment.Babel.Transform(
 				source, 
 				Path.GetFileName(context.SourceFilePath)
 			);

src/Cassette.React/Cassette.React.csproj

@@ -61,8 +61,8 @@
     <Compile Include="AssemblyRegistration.cs" />
     <Compile Include="CassetteMSBuildStartup.cs" />
     <Compile Include="InsertIntoPipelineJsxBundleProcessor.cs" />
-    <Compile Include="JsxBundleProcessor.cs" />
-    <Compile Include="JsxCompiler.cs" />
+    <Compile Include="BabelBundleProcessor.cs" />
+    <Compile Include="BabelCompiler.cs" />
     <Compile Include="JsxFileSearchModifier.cs" />
     <Compile Include="MSBuildUtils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Cassette.React/InsertIntoPipelineJsxBundleProcessor.cs

@@ -13,7 +13,7 @@
 namespace Cassette.React
 {
 	/// <summary>
-	/// Inserts the <see cref="JsxBundleProcessor" /> into the script bundle pipeline
+	/// Inserts the <see cref="BabelBundleProcessor" /> into the script bundle pipeline
 	/// </summary>
 	public class InsertIntoPipelineJsxBundleProcessor : IBundlePipelineModifier<ScriptBundle>
 	{
@@ -25,7 +25,7 @@ public class InsertIntoPipelineJsxBundleProcessor : IBundlePipelineModifier<Scri
 		public IBundlePipeline<ScriptBundle> Modify(IBundlePipeline<ScriptBundle> pipeline)
 		{
 			var index = pipeline.IndexOf<ParseJavaScriptReferences>();
-			pipeline.Insert<JsxBundleProcessor>(index + 1);
+			pipeline.Insert<BabelBundleProcessor>(index + 1);
 			return pipeline;
 		}
 	}

src/React.AspNet/JsxFileMiddleware.cs src/React.AspNet/BabelFileMiddleware.cs

@@ -19,23 +19,23 @@
 namespace React.AspNet
 {
 	/// <summary>
-	/// Enables serving static JSX files transformed to pure JavaScript. Wraps around StaticFileMiddleware.
+	/// Enables serving static JavaScript files compiled via Babel. Wraps around StaticFileMiddleware.
 	/// </summary>
-	public class JsxFileMiddleware
+	public class BabelFileMiddleware
 	{
 		private readonly RequestDelegate _next;
 		private readonly IHostingEnvironment _hostingEnv;
 		private readonly ILoggerFactory _loggerFactory;
-		private readonly JsxFileOptions _options;
+		private readonly BabelFileOptions _options;
 
 		/// <summary>
-		/// Creates a new instance of the JsxFileMiddleware.
+		/// Creates a new instance of the BabelFileMiddleware.
 		/// </summary>
 		/// <param name="next">The next middleware in the pipeline.</param>
 		/// <param name="options">The configuration options.</param>
 		/// <param name="hostingEnv">The hosting environment.</param>
 		/// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
-		public JsxFileMiddleware(RequestDelegate next, JsxFileOptions options, IHostingEnvironment hostingEnv, ILoggerFactory loggerFactory)
+		public BabelFileMiddleware(RequestDelegate next, BabelFileOptions options, IHostingEnvironment hostingEnv, ILoggerFactory loggerFactory)
 		{
 			if (next == null)
 				throw new ArgumentNullException("next");
@@ -45,33 +45,34 @@ public JsxFileMiddleware(RequestDelegate next, JsxFileOptions options, IHostingE
 			_loggerFactory = loggerFactory;
 
 			// Default values
-			_options = options ?? new JsxFileOptions();
+			_options = options ?? new BabelFileOptions();
 		}
 
 		/// <summary>
-		/// Processes a request to determine if it matches a known JSX file, and if so, serves it compiled to JavaScript.
+		/// Processes a request to determine if it matches a known JavaScript file, and if so, transforms
+		/// it via Babel and serves it
 		/// </summary>
 		/// <param name="context">ASP.NET HTTP context</param>
 		public async Task Invoke(HttpContext context)
 		{
 			if (!context.Request.Path.HasValue || !_options.Extensions.Any(context.Request.Path.Value.EndsWith))
 			{
-				// Not a request for a JSX file, so just pass through to the next middleware
+				// Not a request for a JavaScript file, so just pass through to the next middleware
 				await _next(context);
 				return;
 			}
 
 			var reactEnvironment = React.AssemblyRegistration.Container.Resolve<IReactEnvironment>();
-			var internalStaticMiddleware = CreateFileMiddleware(reactEnvironment.JsxTransformer);
+			var internalStaticMiddleware = CreateFileMiddleware(reactEnvironment.Babel);
 			await internalStaticMiddleware.Invoke(context);
 		}
 
 		/// <summary>
-		/// Creates the internal <see cref="StaticFileMiddleware"/> used to serve JSX files.
+		/// Creates the internal <see cref="StaticFileMiddleware"/> used to serve files.
 		/// </summary>
-		/// <param name="jsxTransformer"></param>
+		/// <param name="babel"></param>
 		/// <returns></returns>
-		private StaticFileMiddleware CreateFileMiddleware(IJsxTransformer jsxTransformer)
+		private StaticFileMiddleware CreateFileMiddleware(IBabel babel)
 		{
 			return new StaticFileMiddleware(
 				_next,
@@ -83,8 +84,8 @@ private StaticFileMiddleware CreateFileMiddleware(IJsxTransformer jsxTransformer
 					OnPrepareResponse = _options.StaticFileOptions.OnPrepareResponse,
 					RequestPath = _options.StaticFileOptions.RequestPath,
 					ServeUnknownFileTypes = _options.StaticFileOptions.ServeUnknownFileTypes,
-					FileProvider = new JsxFileSystem(
-						jsxTransformer, 
+					FileProvider = new BabelFileSystem(
+						babel, 
 						_options.StaticFileOptions.FileProvider ?? _hostingEnv.WebRootFileProvider,
 						_options.Extensions
 					)

src/React.AspNet/JsxFileOptions.cs src/React.AspNet/BabelFileOptions.cs

@@ -21,24 +21,24 @@ namespace React.AspNet
 #endif
 {
 	/// <summary>
-	/// Options for serving JSX files.
+	/// Options for serving JavaScript files transformed via Babel.
 	/// </summary>
-	public class JsxFileOptions
+	public class BabelFileOptions
 	{
 		/// <summary>
-		/// Collection of extensions that will be treated as JSX files. Defaults to ".jsx" and ".js".
+		/// Collection of extensions that will be handled. Defaults to ".jsx" and ".js".
 		/// </summary>
 		public IEnumerable<string> Extensions { get; set; }
 
 		/// <summary>
-		/// Options for static file middleware used to server JSX files.
+		/// Options for static file middleware used to serve JavaScript files.
 		/// </summary>
 		public StaticFileOptions StaticFileOptions { get; set; }
 
 		/// <summary>
-		/// Creates a new instance of the <see cref="JsxFileOptions"/> class.
+		/// Creates a new instance of the <see cref="BabelFileOptions"/> class.
 		/// </summary>
-		public JsxFileOptions()
+		public BabelFileOptions()
 		{
 			Extensions = new[] { ".jsx", ".js" };
 			StaticFileOptions = new StaticFileOptions();

src/React.AspNet/JsxFileSystem.cs src/React.AspNet/BabelFileSystem.cs

@@ -29,32 +29,32 @@ namespace React.AspNet
 #endif
 {
 	/// <summary>
-	/// File system that serves transformed JSX files.
+	/// File system that serves transformed JavaScript files.
 	/// </summary>
-	public class JsxFileSystem : IOwinFileSystem
+	public class BabelFileSystem : IOwinFileSystem
 	{
-		private readonly IJsxTransformer _transformer;
+		private readonly IBabel _transformer;
 		private readonly IOwinFileSystem _physicalFileSystem;
 		private readonly string[] _extensions;
 
 		/// <summary>
-		/// Creates a new instance of the JsxFileSystem.
+		/// Creates a new instance of the BabelFileSystem.
 		/// </summary>
-		/// <param name="transformer">JSX transformer used to compile JSX files</param>
+		/// <param name="transformer">Babel transformer used to compile files</param>
 		/// <param name="root">The root directory</param>
-		/// <param name="extensions">Extensions of files that will be treated as JSX files</param>
-		public JsxFileSystem(IJsxTransformer transformer, string root, IEnumerable<string> extensions)
+		/// <param name="extensions">Extensions of files that will be treated as JavaScript files</param>
+		public BabelFileSystem(IBabel transformer, string root, IEnumerable<string> extensions)
 			: this(transformer, new PhysicalFileSystem(root), extensions)
 		{            
 		}
 
 		/// <summary>
-		/// Creates a new instance of the JsxFileSystem.
+		/// Creates a new instance of the BabelFileSystem.
 		/// </summary>
-		/// <param name="transformer">JSX transformer used to compile JSX files</param>
+		/// <param name="transformer">Babel transformer used to compile files</param>
 		/// <param name="fileSystem">File system used to look up files</param>
-		/// <param name="extensions">Extensions of files that will be treated as JSX files</param>
-		public JsxFileSystem(IJsxTransformer transformer, IOwinFileSystem fileSystem, IEnumerable<string> extensions)
+		/// <param name="extensions">Extensions of files that will be treated as JavaScript files</param>
+		public BabelFileSystem(IBabel transformer, IOwinFileSystem fileSystem, IEnumerable<string> extensions)
 		{
 			_transformer = transformer;
 			_physicalFileSystem = fileSystem;
@@ -68,12 +68,12 @@ public JsxFileSystem(IJsxTransformer transformer, IOwinFileSystem fileSystem, IE
 
 #if OWIN
 		/// <summary>
-		/// Locate a JSX file at the given path. 
+		/// Locate a JavaScript file at the given path. 
 		/// </summary>
 		/// <param name="subpath">The path that identifies the file</param>
 		/// <param name="fileInfo">The discovered file if any</param>
 		/// <returns>
-		/// True if a JSX file was located at the given path
+		/// True if a JavaScript file was located at the given path
 		/// </returns>
 		public bool TryGetFileInfo(string subpath, out IFileInfo fileInfo)
 		{
@@ -89,7 +89,7 @@ public bool TryGetFileInfo(string subpath, out IFileInfo fileInfo)
 			if (internalFileInfo.IsDirectory)
 				return false;
 
-			fileInfo = new JsxFileInfo(_transformer, internalFileInfo);
+			fileInfo = new BabelFileInfo(_transformer, internalFileInfo);
 			return true;
 		}
 
@@ -108,14 +108,14 @@ public bool TryGetDirectoryContents(string subpath, out IEnumerable<IFileInfo> c
 #else
 
 		/// <summary>
-		/// Locate a JSX file at the given path. 
+		/// Locate a file at the given path. 
 		/// </summary>
 		/// <param name="subpath">The path that identifies the file</param>
 		/// <returns>The discovered file if any</returns>
 		public IFileInfo GetFileInfo(string subpath)
 		{
 			var internalFileInfo = _physicalFileSystem.GetFileInfo(subpath);
-			return new JsxFileInfo(_transformer, internalFileInfo);
+			return new BabelFileInfo(_transformer, internalFileInfo);
 		}
 
 		/// <summary>
@@ -143,19 +143,19 @@ IExpirationTrigger IOwinFileSystem.Watch(string filter)
 		}
 #endif
 
-        	private class JsxFileInfo : IFileInfo
+        	private class BabelFileInfo : IFileInfo
 		{
-			private readonly IJsxTransformer _jsxTransformer;
+			private readonly IBabel _babel;
 			private readonly IFileInfo _fileInfo;
 			private readonly Lazy<byte[]> _content;
 
-			public JsxFileInfo(IJsxTransformer jsxTransformer, IFileInfo fileInfo)
+			public BabelFileInfo(IBabel babel, IFileInfo fileInfo)
 			{
-				_jsxTransformer = jsxTransformer;
+				_babel = babel;
 				_fileInfo = fileInfo;
 
 				_content = new Lazy<byte[]>(
-					() => Encoding.UTF8.GetBytes(_jsxTransformer.TransformJsxFile(fileInfo.PhysicalPath))
+					() => Encoding.UTF8.GetBytes(_babel.TransformFile(fileInfo.PhysicalPath))
 				);
 			}
 

src/React.AspNet/ReactBuilderExtensions.cs

@@ -27,12 +27,12 @@ public static class ReactBuilderExtensions
 		/// </summary>
 		/// <param name="app">ASP.NET application builder</param>
 		/// <param name="configure">ReactJS.NET configuration</param>
-		/// <param name="fileOptions">Options to use for serving JSX files</param>
+		/// <param name="fileOptions">Options to use for serving files</param>
 		/// <returns>The application builder (for chaining)</returns>
 		public static IApplicationBuilder UseReact(
 			this IApplicationBuilder app,
 			Action<IReactSiteConfiguration> configure,
-			JsxFileOptions fileOptions = null
+			BabelFileOptions fileOptions = null
 		)
 		{
 			EnsureServicesRegistered(app);
@@ -47,7 +47,7 @@ public static IApplicationBuilder UseReact(
 			configure(ReactSiteConfiguration.Configuration);
 
 			// Allow serving of .jsx files
-			app.UseMiddleware<JsxFileMiddleware>(fileOptions ?? new JsxFileOptions());
+			app.UseMiddleware<BabelFileMiddleware>(fileOptions ?? new BabelFileOptions());
 
 			return app;
 		}