Use ReactNET_transform wrapper function for JSX transformation.

Author: Daniel15

build.proj

@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 	<PropertyGroup>
 		<Major>0</Major>
 		<Minor>2</Minor>
-		<Build>0</Build>
+		<Build>1</Build>
 		<Revision>0</Revision>
 		<DevBuild>true</DevBuild>
 		<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>

src/React.Tests/Core/JsxTransformerTests.cs

@@ -60,15 +60,17 @@ public void ShouldTransformJsxIfAnnotationPresent()
 			_jsxTransformer.TransformJsx(input);
 
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
-				@"global.JSXTransformer.transform(""/** @jsx React.DOM */ <div>Hello World</div>"").code"
+				"ReactNET_transform",
+				"/** @jsx React.DOM */ <div>Hello World</div>"
 			));
 		}
 
 		[Test]
 		public void ShouldWrapExceptionsInJsxExeption()
 		{
 			_environment.Setup(x => x.ExecuteWithLargerStackIfRequired<string>(
-				@"global.JSXTransformer.transform(""/** @jsx React.DOM */ <div>Hello World</div>"").code"
+				"ReactNET_transform",
+				"/** @jsx React.DOM */ <div>Hello World</div>"
 			)).Throws(new Exception("Something broke..."));
 
 			const string input = "/** @jsx React.DOM */ <div>Hello World</div>";
@@ -124,7 +126,8 @@ public void ShouldTransformJsxIfFileCacheHashInvalid()
 
 			_jsxTransformer.TransformJsxFile("foo.jsx");
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
-				@"global.JSXTransformer.transform(""/** @jsx React.DOM */ <div>Hello World</div>"").code"
+				"ReactNET_transform",
+				"/** @jsx React.DOM */ <div>Hello World</div>"
 			));
 		}
 
@@ -137,7 +140,8 @@ public void ShouldTransformJsxIfNoCache()
 
 			_jsxTransformer.TransformJsxFile("foo.jsx");
 			_environment.Verify(x => x.ExecuteWithLargerStackIfRequired<string>(
-				@"global.JSXTransformer.transform(""/** @jsx React.DOM */ <div>Hello World</div>"").code"
+				"ReactNET_transform",
+				"/** @jsx React.DOM */ <div>Hello World</div>"
 			));
 		}
 
@@ -146,7 +150,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>(
-				@"global.JSXTransformer.transform(""/** @jsx React.DOM */ <div>Hello World</div>"").code"
+				"ReactNET_transform",
+				"/** @jsx React.DOM */ <div>Hello World</div>"
 			)).Returns("React.DOM.div('Hello World')");
 
 			string result = null;

src/React.Tests/Core/ReactEnvironmentTest.cs

@@ -23,8 +23,8 @@ public void ExecuteWithLargerStackIfRequiredWithNoNewThread()
 			var mocks = new Mocks();
 			var environment = mocks.CreateReactEnvironment();
 
-			environment.ExecuteWithLargerStackIfRequired<int>("1+1");
-			mocks.Engine.Verify(x => x.Evaluate<int>("1+1"));
+			environment.ExecuteWithLargerStackIfRequired<int>("foo");
+			mocks.Engine.Verify(x => x.CallFunction<int>("foo"), Times.Exactly(1));
 		}
 
 		[Test]
@@ -34,11 +34,11 @@ public void ExecuteWithLargerStackIfRequiredWithNewThread()
 			var environment = mocks.CreateReactEnvironment();
 			// Fail the first time Evaluate is called, succeed the second
 			// http://stackoverflow.com/a/7045636
-			mocks.Engine.Setup(x => x.Evaluate<int>("1+1"))
-				.Callback(() => mocks.Engine.Setup(x => x.Evaluate<int>("1+1")))
+			mocks.Engine.Setup(x => x.CallFunction<int>("foo"))
+				.Callback(() => mocks.Engine.Setup(x => x.CallFunction<int>("foo")))
 				.Throws(new Exception("Out of stack space"));
 
-			environment.ExecuteWithLargerStackIfRequired<int>("1+1");
+			environment.ExecuteWithLargerStackIfRequired<int>("foo");
 			mocks.EngineFactory.Verify(
 				x => x.GetEngineForCurrentThread(It.IsAny<Action<IJsEngine>>()), 
 				Times.Exactly(2),
@@ -57,12 +57,12 @@ public void ExecuteWithLargerStackIfRequiredShouldBubbleExceptions()
 			var mocks = new Mocks();
 			var environment = mocks.CreateReactEnvironment();
 			// Always fail
-			mocks.Engine.Setup(x => x.Evaluate<int>("1+1"))
+			mocks.Engine.Setup(x => x.CallFunction<int>("foobar"))
 				.Throws(new Exception("Something bad happened :("));
 
 			Assert.Throws<Exception>(() =>
 			{
-				environment.ExecuteWithLargerStackIfRequired<int>("1+1");
+				environment.ExecuteWithLargerStackIfRequired<int>("foobar");
 			});
 		}
 

src/React/IReactEnvironment.cs

@@ -49,9 +49,10 @@ public interface IReactEnvironment
 		/// than what ASP.NET allows by default (256 KB).
 		/// </summary>
 		/// <typeparam name="T">Type to return from JavaScript call</typeparam>
-		/// <param name="code">JavaScript code to execute</param>
+		/// <param name="function">JavaScript function to execute</param>
+		/// <param name="args">Arguments to pass to function</param>
 		/// <returns>Result returned from JavaScript code</returns>
-		T ExecuteWithLargerStackIfRequired<T>(string code);
+		T ExecuteWithLargerStackIfRequired<T>(string function, params object[] args);
 
 		/// <summary>
 		/// Determines if the specified variable exists in the JavaScript engine

src/React/JsxTransformer.cs

@@ -9,7 +9,6 @@
 
 using System;
 using System.IO;
-using Newtonsoft.Json;
 using React.Exceptions;
 
 namespace React
@@ -130,11 +129,10 @@ public string TransformJsx(string input)
 			EnsureJsxTransformerSupported();
 			try
 			{
-				var encodedInput = JsonConvert.SerializeObject(input);
-				var output = _environment.ExecuteWithLargerStackIfRequired<string>(string.Format(
-					"global.JSXTransformer.transform({0}, {{ harmony: true }}).code",
-					encodedInput
-				));
+				var output = _environment.ExecuteWithLargerStackIfRequired<string>(
+					"ReactNET_transform",
+					input
+				);
 				return output;
 			}
 			catch (Exception ex)

src/React/ReactEnvironment.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
-using System.Runtime.Remoting.Messaging;
 using System.Text;
 using System.Threading;
 using JavaScriptEngineSwitcher.Core;
@@ -272,13 +271,14 @@ public string TransformJsx(string input)
 		/// than what ASP.NET allows by default (256 KB).
 		/// </summary>
 		/// <typeparam name="T">Type to return from JavaScript call</typeparam>
-		/// <param name="code">JavaScript code to execute</param>
+		/// <param name="function">JavaScript function to execute</param>
+		/// <param name="args">Arguments to pass to function</param>
 		/// <returns>Result returned from JavaScript code</returns>
-		public T ExecuteWithLargerStackIfRequired<T>(string code)
+		public T ExecuteWithLargerStackIfRequired<T>(string function, params object[] args)
 		{
 			try
 			{
-				return Engine.Evaluate<T>(code);
+				return Engine.CallFunction<T>(function, args);
 			}
 			catch (Exception)
 			{
@@ -292,7 +292,7 @@ public T ExecuteWithLargerStackIfRequired<T>(string code)
 					try
 					{
 						// New engine will be created here (as this is a new thread)
-						result = Engine.Evaluate<T>(code);
+						result = Engine.CallFunction<T>(function, args);
 					}
 					catch (Exception threadEx)
 					{

src/React/Resources/shims.js

@@ -17,4 +17,8 @@ var console = console || {
 
 if (!Object.freeze) {
 	Object.freeze = function() { };
+}
+
+function ReactNET_transform(input) {
+	return global.JSXTransformer.transform(input, { harmony: true }).code;
 }