Add --pessimistic option which allows you to continue the render process even if some routes fail to render

Author: clbond

package.json

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

source/application/builder/impl/application.ts

@@ -27,7 +27,7 @@ export class ApplicationImpl<V, M> implements Application<V> {
   ) {}
 
   prerender(options: PrerenderOptions = {pessimistic: false}): Observable<Snapshot<V>> {
-    this.render.pessimistic = options.pessimistic || false;
+    this.render.pessimistic = (options && options.pessimistic) || false;
 
     return Observable.create(async (observe) => {
       if (this.render.routes == null || this.render.routes.length === 0) {

source/application/builder/prerenderer.ts

@@ -1,19 +1,19 @@
-import {OutputProducer} from '../../output';
-
 import {Application} from '../builder';
+import {OutputProducer} from '../../output';
+import {PrerenderOptions} from './options';
 
 import {assertSnapshot} from '../../snapshot/assert';
 
 export interface ApplicationPrerenderer {
-  prerenderTo(output: OutputProducer): Promise<void>;
+  prerenderTo(output: OutputProducer, options?: PrerenderOptions): Promise<void>;
 }
 
 export const applicationPrerenderer = <V>(application: Application<V>): ApplicationPrerenderer => {
   return {
-    prerenderTo: async (output: OutputProducer): Promise<void> => {
+    prerenderTo: async (output: OutputProducer, options?: PrerenderOptions): Promise<void> => {
       output.initialize();
 
-      const snapshots = application.prerender();
+      const snapshots = application.prerender(options);
 
       return new Promise<void>((resolve, reject) => {
         snapshots.subscribe(

source/bin/options/options.ts

@@ -4,6 +4,7 @@ export interface CommandLineOptions {
   blacklist?: boolean;
   debug: boolean;
   output: OutputProducer;
+  pessimistic: boolean; // ignore routes that cannot render
   preboot: PrebootConfiguration | boolean;
   project: Project;
   templateDocument: string;

source/bin/options/parse.ts

@@ -80,6 +80,7 @@ export const parseCommandLineOptions = (): CommandLineOptions => {
   return {
     debug,
     output,
+    pessimistic,
     preboot,
     project,
     templateDocument: template.content(),
@@ -91,6 +92,9 @@ export const parseCommandLineOptions = (): CommandLineOptions => {
 // Enable preboot integration
 let enablePreboot: boolean = false;
 
+// Ignore routes that fail to render (just emit warnings instead of failing the process)
+let pessimistic = false;
+
 // Inline CSS resources in the compiled HTML output
 let inlineStylesheets: boolean = true;
 
@@ -135,6 +139,7 @@ const parseCommandLine = () => {
     .option('-o, --output <path>', 'Output path to write rendered HTML documents to', 'dist')
     .option('-a, --application <applicationID>', 'Optional application ID if your CLI configuration contains multiple apps')
     .option('-P, --preboot [boolean | json-file | json-text]', 'Enable or disable preboot with optional configuration file or JSON text (otherwise automatically find the root element and use defaults)')
+    .option('-R, --pessimistic [boolean]', 'Ignore routes that fail to render (just emit warnings, do not fail the whole run)')
     .option('-i, --inline [boolean]', 'Inline of resources referenced in links')
     .option('-S, --inline-svg [boolean]', 'Inline SVG <use xlink:href> instances (to resolve issues with absolute URI SVG identifiers eg http://localhost/#foo')
     .option('-I, --ipc', 'Send rendered documents to parent process through IPC instead of writing them to disk', false)
@@ -152,6 +157,9 @@ const parseCommandLine = () => {
   options.on('blacklist',
     value => blacklist = value == null ? true : value);
 
+  options.on('pessimistic',
+    value => pessimistic = value == null ? true : value);
+
   return options.parse(process.argv);
 };
 

source/bin/render.ts

@@ -41,7 +41,7 @@ const applicationRenderer = applicationPrerenderer(application);
 
 const execute = async () => {
   try {
-    await applicationRenderer.prerenderTo(options.output);
+    await applicationRenderer.prerenderTo(options.output, {pessimistic: options.pessimistic});
   }
   finally {
     // If we are debugging, then we are likely to produce a stack trace that includes compiled

source/output/svg.ts

@@ -21,7 +21,8 @@ export const inlineVectorGraphics = (document: Document): void => {
 
     const matchingDefinition = definitions.get(identifier.split(/[#\/]/g).pop());
     if (matchingDefinition == null) {
-      throw new Error(`Cannot find matching SVG definition for ${identifier}`);
+      console.warn(`Cannot find matching SVG definition for ${identifier}`);
+      continue;
     }
 
     link.parentElement.replaceChild(matchingDefinition.cloneNode(true), link);