Switch various methods from private to protected virtual so they can be overridden. References #39

Author: Daniel15

src/React/FileCacheHash.cs

@@ -21,7 +21,7 @@ public class FileCacheHash : IFileCacheHash
 		/// <summary>
 		/// Prefix used for hash line in transformed file. Used for caching.
 		/// </summary>
-		internal const string HASH_PREFIX = "// @hash v2-";
+		private const string HASH_PREFIX = "// @hash v2-";
 
 		/// <summary>
 		/// Althorithm for calculating file hashes
@@ -47,7 +47,7 @@ public string CalculateHash(string input)
 		/// <param name="cacheContents">Contents retrieved from cache</param>
 		/// <param name="hash">Hash of the input</param>
 		/// <returns><c>true</c> if the cache is still valid</returns>
-		public bool ValidateHash(string cacheContents, string hash)
+		public virtual bool ValidateHash(string cacheContents, string hash)
 		{
 			if (string.IsNullOrWhiteSpace(cacheContents))
 			{
@@ -75,7 +75,7 @@ public bool ValidateHash(string cacheContents, string hash)
 		/// </summary>
 		/// <param name="hash">Hash to prepend prefix to</param>
 		/// <returns>Hash with prefix</returns>
-		public string AddPrefix(string hash)
+		public virtual string AddPrefix(string hash)
 		{
 			return HASH_PREFIX + hash;
 		}

src/React/JavaScriptEngineFactory.cs

@@ -17,11 +17,11 @@ public class JavaScriptEngineFactory : IDisposable, IJavaScriptEngineFactory
 		/// <summary>
 		/// Function used to create new JavaScript engine instances.
 		/// </summary>
-		private readonly Func<IJsEngine> _factory; 
+		protected readonly Func<IJsEngine> _factory; 
 		/// <summary>
 		/// Contains all current JavaScript engine instances. One per thread, keyed on thread ID.
 		/// </summary>
-		private readonly ConcurrentDictionary<int, IJsEngine> _engines 
+		protected readonly ConcurrentDictionary<int, IJsEngine> _engines 
 			= new ConcurrentDictionary<int, IJsEngine>();
 
 		/// <summary>
@@ -40,7 +40,7 @@ public JavaScriptEngineFactory(IEnumerable<Registration> availableFactories)
 		/// Should handle initialisation.
 		/// </param>
 		/// <returns>The JavaScript engine</returns>
-		public IJsEngine GetEngineForCurrentThread(Action<IJsEngine> onNewEngine = null)
+		public virtual IJsEngine GetEngineForCurrentThread(Action<IJsEngine> onNewEngine = null)
 		{
 			return _engines.GetOrAdd(Thread.CurrentThread.ManagedThreadId, id =>
 			{
@@ -56,7 +56,7 @@ public IJsEngine GetEngineForCurrentThread(Action<IJsEngine> onNewEngine = null)
 		/// <summary>
 		/// Disposes the JavaScript engine for the current thread.
 		/// </summary>
-		public void DisposeEngineForCurrentThread()
+		public virtual void DisposeEngineForCurrentThread()
 		{
 			IJsEngine engine;
 			if (_engines.TryRemove(Thread.CurrentThread.ManagedThreadId, out engine))
@@ -112,7 +112,7 @@ private static Func<IJsEngine> GetFactory(IEnumerable<Registration> availableFac
 		/// <summary>
 		/// Clean up all engines
 		/// </summary>
-		public void Dispose()
+		public virtual void Dispose()
 		{
 			foreach (var engine in _engines)
 			{

src/React/JsxTransformer.cs

@@ -22,40 +22,40 @@ public class JsxTransformer : IJsxTransformer
 		/// <summary>
 		/// Cache key for JSX to JavaScript compilation
 		/// </summary>
-		private const string JSX_CACHE_KEY = "JSX_v2_{0}";
+		protected const string JSX_CACHE_KEY = "JSX_v2_{0}";
 		/// <summary>
 		/// Suffix to append to compiled files
 		/// </summary>
-		private const string COMPILED_FILE_SUFFIX = ".generated.js";
+		protected const string COMPILED_FILE_SUFFIX = ".generated.js";
 		/// <summary>
 		/// Suffix to append to source map files
 		/// </summary>
-		private const string SOURE_MAP_FILE_SUFFIX = ".map";
+		protected const string SOURE_MAP_FILE_SUFFIX = ".map";
 		/// <summary>
 		/// Number of lines in the header prepended to compiled JSX files.
 		/// </summary>
-		private const int LINES_IN_HEADER = 5;
+		protected const int LINES_IN_HEADER = 5;
 
 		/// <summary>
 		/// Environment this JSX Transformer has been created in
 		/// </summary>
-		private readonly IReactEnvironment _environment;
+		protected readonly IReactEnvironment _environment;
 		/// <summary>
 		/// Cache used for storing compiled JSX
 		/// </summary>
-		private readonly ICache _cache;
+		protected readonly ICache _cache;
 		/// <summary>
 		/// File system wrapper
 		/// </summary>
-		private readonly IFileSystem _fileSystem;
+		protected readonly IFileSystem _fileSystem;
 		/// <summary>
 		/// Hash algorithm for file-based cache
 		/// </summary>
-		private readonly IFileCacheHash _fileCacheHash;
+		protected readonly IFileCacheHash _fileCacheHash;
 		/// <summary>
 		/// Site-wide configuration
 		/// </summary>
-		private readonly IReactSiteConfiguration _config;
+		protected readonly IReactSiteConfiguration _config;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JsxTransformer"/> class.
@@ -80,7 +80,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 = null)
+		public virtual string TransformJsxFile(string filename, bool? useHarmony = null)
 		{
 			return TransformJsxFileWithSourceMap(filename, false, useHarmony).Code;
 		}
@@ -96,7 +96,7 @@ public string TransformJsxFile(string filename, bool? useHarmony = null)
 		/// </param>
 		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
 		/// <returns>JavaScript and source map</returns>
-		public JavaScriptWithSourceMap TransformJsxFileWithSourceMap(string filename, bool forceGenerateSourceMap = false, bool? useHarmony = null)
+		public virtual JavaScriptWithSourceMap TransformJsxFileWithSourceMap(string filename, bool forceGenerateSourceMap = false, bool? useHarmony = null)
 		{
 			var cacheKey = string.Format(JSX_CACHE_KEY, filename);
 
@@ -152,7 +152,7 @@ public JavaScriptWithSourceMap TransformJsxFileWithSourceMap(string filename, bo
 		/// <c>true</c> to re-transform the file if a cached version with no source map is available
 		/// </param>
 		/// <returns></returns>
-		private JavaScriptWithSourceMap LoadJsxFromFileCache(string filename, string hash, bool forceGenerateSourceMap)
+		protected virtual JavaScriptWithSourceMap LoadJsxFromFileCache(string filename, string hash, bool forceGenerateSourceMap)
 		{
 			var cacheFilename = GetJsxOutputPath(filename);
 			if (!_fileSystem.FileExists(cacheFilename))
@@ -212,7 +212,7 @@ private JavaScriptWithSourceMap LoadJsxFromFileCache(string filename, string has
 		/// <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 JavaScriptWithSourceMap TransformJsxWithHeader(string filename, string contents, string hash = null, bool? useHarmony = null)
+		protected virtual JavaScriptWithSourceMap TransformJsxWithHeader(string filename, string contents, string hash = null, bool? useHarmony = null)
 		{
 			if (string.IsNullOrEmpty(hash))
 			{
@@ -242,7 +242,7 @@ private JavaScriptWithSourceMap TransformJsxWithHeader(string filename, string c
 		/// <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 = null)
+		public virtual string TransformJsx(string input, bool? useHarmony = null)
 		{
 			EnsureJsxTransformerSupported();
 			try
@@ -267,7 +267,7 @@ public string TransformJsx(string input, bool? useHarmony = null)
 		/// <param name="input">JSX</param>
 		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
 		/// <returns>JavaScript and source map</returns>
-		public JavaScriptWithSourceMap TransformJsxWithSourceMap(string input, bool? useHarmony)
+		public virtual JavaScriptWithSourceMap TransformJsxWithSourceMap(string input, bool? useHarmony)
 		{
 			EnsureJsxTransformerSupported();
 			try
@@ -290,7 +290,7 @@ public JavaScriptWithSourceMap TransformJsxWithSourceMap(string input, bool? use
 		/// </summary>
 		/// <param name="hash">Hash of the input</param>
 		/// <returns>Header for the cache</returns>
-		private string GetFileHeader(string hash)
+		protected virtual string GetFileHeader(string hash)
 		{
 			return string.Format(
 @"{0}
@@ -307,7 +307,7 @@ private string GetFileHeader(string hash)
 		/// </summary>
 		/// <param name="path">Path of the JSX file</param>
 		/// <returns>Output path of the compiled file</returns>
-		public string GetJsxOutputPath(string path)
+		public virtual string GetJsxOutputPath(string path)
 		{
 			return Path.Combine(
 				Path.GetDirectoryName(path),
@@ -321,7 +321,7 @@ public string GetJsxOutputPath(string path)
 		/// </summary>
 		/// <param name="path">Path of the JSX file</param>
 		/// <returns>Output path of the source map</returns>
-		public string GetSourceMapOutputPath(string path)
+		public virtual string GetSourceMapOutputPath(string path)
 		{
 			return GetJsxOutputPath(path) + SOURE_MAP_FILE_SUFFIX;
 		}
@@ -333,7 +333,7 @@ public string GetSourceMapOutputPath(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 = null)
+		public virtual string TransformAndSaveJsxFile(string filename, bool? useHarmony = null)
 		{
 			var outputPath = GetJsxOutputPath(filename);
 			var sourceMapPath = GetSourceMapOutputPath(filename);

src/React/ReactComponent.cs

@@ -30,12 +30,12 @@ public class ReactComponent : IReactComponent
 		/// <summary>
 		/// Environment this component has been created in
 		/// </summary>
-		private readonly IReactEnvironment _environment;
+		protected readonly IReactEnvironment _environment;
 
 		/// <summary>
 		/// Global site configuration
 		/// </summary>
-		private readonly IReactSiteConfiguration _configuration;
+		protected readonly IReactSiteConfiguration _configuration;
 
 		/// <summary>
 		/// Gets or sets the name of the component
@@ -79,7 +79,7 @@ public ReactComponent(IReactEnvironment environment, IReactSiteConfiguration con
 		/// return the rendered HTML.
 		/// </summary>
 		/// <returns>HTML</returns>
-		public string RenderHtml()
+		public virtual string RenderHtml()
 		{
 			EnsureComponentExists();
 			try
@@ -111,7 +111,7 @@ public string RenderHtml()
 		/// server-rendered HTML.
 		/// </summary>
 		/// <returns>JavaScript</returns>
-		public string RenderJavaScript()
+		public virtual string RenderJavaScript()
 		{
 			return string.Format(
 				"React.render({0}, document.getElementById({1}))",
@@ -123,7 +123,7 @@ public string RenderJavaScript()
 		/// <summary>
 		/// Ensures that this component exists in global scope
 		/// </summary>
-		private void EnsureComponentExists()
+		protected virtual void EnsureComponentExists()
 		{
 			// This is safe as componentName was validated via EnsureComponentNameValid()
 			var componentExists = _environment.Execute<bool>(string.Format(
@@ -144,7 +144,7 @@ private void EnsureComponentExists()
 		/// Gets the JavaScript code to initialise the component
 		/// </summary>
 		/// <returns>JavaScript for component initialisation</returns>
-		private string GetComponentInitialiser()
+		protected virtual string GetComponentInitialiser()
 		{
 			var encodedProps = JsonConvert.SerializeObject(Props, _configuration.JsonSerializerSettings); // SerializeObject accepts null settings
 			return string.Format(