Add react tag helper. Clean up code and make it more consistent.

Microsoft.AspNet.NodeServices.Angular/AngularPrerenderTagHelper.cs

@@ -7,17 +7,10 @@ using Microsoft.AspNet.Http.Extensions;
 namespace Microsoft.AspNet.NodeServices.Angular
 {
     [HtmlTargetElement(Attributes = PrerenderModuleAttributeName)]
-    public class AngularRunAtServerTagHelper : TagHelper
+    public class AngularPrerenderTagHelper : TagHelper
     {
-        static StringAsTempFile nodeScript;
         static INodeServices fallbackNodeServices; // Used only if no INodeServices was registered with DI
         
-        static AngularRunAtServerTagHelper() {
-            // Consider populating this lazily
-            var script = EmbeddedResourceReader.Read(typeof (AngularRunAtServerTagHelper), "/Content/Node/angular-rendering.js");
-            nodeScript = new StringAsTempFile(script); // Will be cleaned up on process exit
-        }
-        
         const string PrerenderModuleAttributeName = "asp-ng2-prerender-module";
         const string PrerenderExportAttributeName = "asp-ng2-prerender-export";
         
@@ -30,7 +23,7 @@ namespace Microsoft.AspNet.NodeServices.Angular
         private IHttpContextAccessor contextAccessor;
         private INodeServices nodeServices;
 
-        public AngularRunAtServerTagHelper(IServiceProvider nodeServices, IHttpContextAccessor contextAccessor)
+        public AngularPrerenderTagHelper(IServiceProvider nodeServices, IHttpContextAccessor contextAccessor)
         {
             this.contextAccessor = contextAccessor;
             this.nodeServices = (INodeServices)nodeServices.GetService(typeof (INodeServices)) ?? fallbackNodeServices;
@@ -44,12 +37,13 @@ namespace Microsoft.AspNet.NodeServices.Angular
 
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            var result = await this.nodeServices.InvokeExport(nodeScript.FileName, "renderComponent", new {
-                componentModule = this.ModuleName,
-                componentExport = this.ExportName,
-                tagName = output.TagName,
-                baseUrl = UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request)
-            });
+            var result = await AngularRenderer.RenderToString(
+                nodeServices: this.nodeServices,
+                componentModuleName: this.ModuleName,
+                componentExportName: this.ExportName,
+                componentTagName: output.TagName,
+                requestUrl: UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request)
+            );
             output.SuppressOutput();
             output.PostElement.AppendEncoded(result);
         }

Microsoft.AspNet.NodeServices.Angular/AngularRenderer.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNet.NodeServices.Angular
+{
+    public static class AngularRenderer
+    {
+        private static StringAsTempFile nodeScript;
+        
+        static AngularRenderer() {
+            // Consider populating this lazily
+            var script = EmbeddedResourceReader.Read(typeof (AngularRenderer), "/Content/Node/angular-rendering.js");
+            nodeScript = new StringAsTempFile(script); // Will be cleaned up on process exit
+        }
+        
+        public static async Task<string> RenderToString(INodeServices nodeServices, string componentModuleName, string componentExportName, string componentTagName, string requestUrl) {
+            return await nodeServices.InvokeExport(nodeScript.FileName, "renderToString", new {
+                moduleName = componentModuleName,
+                exportName = componentExportName,
+                tagName = componentTagName,
+                requestUrl = requestUrl
+            });
+        }
+    }
+}

Microsoft.AspNet.NodeServices.Angular/Content/Node/angular-rendering.js

@@ -3,20 +3,39 @@ var ngUniversal = require('angular2-universal-patched');
 var ng = require('angular2/angular2');
 var ngRouter = require('angular2/router');
 
-module.exports = {
-    renderComponent: function(callback, options) {
-        // Find the component class. Use options.componentExport if specified, otherwise convert tag-name to PascalCase.
-        var loadedModule = require(path.resolve(process.cwd(), options.componentModule));
-        var componentExport = options.componentExport || options.tagName.replace(/(-|^)([a-z])/g, function (m1, m2, char) { return char.toUpperCase(); });
-        var component = loadedModule[componentExport];
-        if (!component) {
-            throw new Error('The module "' + options.componentModule + '" has no export named "' + componentExport + '"');
-        }
+function getExportOrThrow(moduleInstance, moduleFilename, exportName) {
+    if (!(exportName in moduleInstance)) {
+        throw new Error('The module "' + moduleFilename + '" has no export named "' + exportName + '"');
+    }
+    return moduleInstance[exportName];
+}
 
+function findAngularComponent(options) {
+    var resolvedPath = path.resolve(process.cwd(), options.moduleName);
+    var loadedModule = require(resolvedPath);
+    if (options.exportName) {
+        // If exportName is specified explicitly, use it
+        return getExportOrThrow(loadedModule, resolvedPath, options.exportName);
+    } else if (typeof loadedModule === 'function') {
+        // Otherwise, if the module itself is a function, assume that is the component 
+        return loadedModule;
+    } else if (typeof loadedModule.default === 'function') {
+        // Otherwise, if the module has a default export which is a function, assume that is the component
+        return loadedModule.default;
+    } else {
+        // Otherwise, guess the export name by converting tag-name to PascalCase
+        var tagNameAsPossibleExport = options.tagName.replace(/(-|^)([a-z])/g, function (m1, m2, char) { return char.toUpperCase(); });
+        return getExportOrThrow(loadedModule, resolvedPath, tagNameAsPossibleExport);
+    }
+}
+
+module.exports = {
+    renderToString: function(callback, options) {
+        var component = findAngularComponent(options);
         var serverBindings = [
             ngRouter.ROUTER_BINDINGS,
             ngUniversal.HTTP_PROVIDERS,
-            ng.provide(ngUniversal.BASE_URL, { useValue: options.baseUrl }),
+            ng.provide(ngUniversal.BASE_URL, { useValue: options.requestUrl }),
             ngUniversal.SERVER_LOCATION_PROVIDERS
         ];
 

Microsoft.AspNet.NodeServices.Angular/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha3",
+  "version": "1.0.0-alpha4",
   "description": "Microsoft.AspNet.NodeServices.Angular Class Library",
   "authors": [
     "Microsoft"