Smarter blacklist behaviour (explicit "server: true" or "server: false" in routes will now always be respected regardless of --blacklist)

Author: clbond

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ssr",
-  "version": "0.10.31",
+  "version": "0.10.32",
   "description": "Angular server-side rendering implementation",
   "main": "build/index.js",
   "typings": "build/index.d.ts",

source/application/builder/impl/application.ts

@@ -30,18 +30,24 @@ export class ApplicationImpl<V, M> implements Application<V> {
     this.render.pessimistic = (options && options.pessimistic) || false;
 
     return Observable.create(async (observe) => {
-      if (this.render.routes == null || this.render.routes.length === 0) {
-        this.render.routes = renderableRoutes(await this.discoverRoutes());
+      let routes = this.render.routes;
+      if (routes == null || routes.length === 0) {
+        routes = renderableRoutes(await this.discoverRoutes());
       }
 
-      if (this.render.blacklist) { // route blacklisting
-        this.render.routes = this.render.routes.filter((r: Route & {server?: boolean}) => r.server === true);
-      }
+      routes = routes.filter((r: Route & {server?: boolean}) => {
+        if (r.server == null) {
+          return this.render.blacklist === true; // exclude all routes by default
+        }
+        return r.server; // explicit true or false will always be respected regardless of blacklisting
+      });
 
-      if (this.render.routes.length === 0) {
+      if (routes.length === 0) {
         observe.complete();
       }
       else {
+        this.render.routes = routes;
+
         this.renderToStream(this.render)
           .subscribe(
             observe.next.bind(observe),