Add option to change filename of output (--filename)

Author: clbond

package.json

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

source/application/builder/index.ts

@@ -4,4 +4,5 @@ export * from './fork';
 export * from './from-module-factory';
 export * from './from-module';
 export * from './from-source';
+export * from './options';
 export * from './prerenderer';

source/bin/options/parse.ts

@@ -104,6 +104,9 @@ let inlineVectorGraphics: boolean = false;
 // Enable 'blacklist by default' route rendering behaviour (each route you wish to render must be marked with `server: true')
 let blacklist: boolean = false;
 
+// The name of files to generate for each route (index.html, eg foo/index.html)
+let filename: string = Files.index;
+
 const renderOptions = (options): OutputOptions => {
   let outputString = options['output'];
 
@@ -113,7 +116,7 @@ const renderOptions = (options): OutputOptions => {
 
   const output = pathFromString(outputString);
 
-  return {output, inlineStylesheets, inlineVectorGraphics};
+  return {filename, output, inlineStylesheets, inlineVectorGraphics};
 };
 
 const createOutput = (options): OutputProducer =>
@@ -134,6 +137,7 @@ const parseCommandLine = () => {
     .option('-p, --project <path>', 'Path to tsconfig.json file or project root (if tsconfig.json lives in the root)', cwd())
     .option('-w, --webpack <config>', 'Optional path to webpack configuration file')
     .option('-t, --template <path>', 'HTML template document', 'dist/index.html')
+    .option('-f, --filename <path>', 'Change the name of the HTML files that are produced', filename)
     .option('-m, --module <path>', 'Path to root application module TypeScript file')
     .option('-s, --symbol <identifier>', 'Class name of application root module')
     .option('-o, --output <path>', 'Output path to write rendered HTML documents to', 'dist')
@@ -160,6 +164,8 @@ const parseCommandLine = () => {
   options.on('pessimistic',
     value => pessimistic = value == null ? true : value);
 
+  options.on('filename', value => filename = value);
+
   return options.parse(process.argv);
 };
 

source/bin/render.ts

@@ -10,6 +10,7 @@ const Module = require('module');
 
 import {
   Files,
+  PrerenderOptions,
   applicationBuilderFromSource,
   applicationPrerenderer,
   log,
@@ -41,7 +42,9 @@ const applicationRenderer = applicationPrerenderer(application);
 
 const execute = async () => {
   try {
-    await applicationRenderer.prerenderTo(options.output, {pessimistic: options.pessimistic});
+    const prerender: PrerenderOptions = {pessimistic: options.pessimistic};
+
+    await applicationRenderer.prerenderTo(options.output, prerender);
   }
   finally {
     // If we are debugging, then we are likely to produce a stack trace that includes compiled

source/output/html.ts

@@ -35,7 +35,7 @@ export class HtmlOutput implements OutputProducer {
   }
 
   async write<V>(snapshot: Snapshot<V>): Promise<void> {
-    const file = fileFromString(join(this.routedPathFromSnapshot(snapshot).toString(), Files.index));
+    const file = fileFromString(join(this.routedPathFromSnapshot(snapshot).toString(), this.options.filename || Files.index));
 
     transformInplace(file.parent(), snapshot, this.options);
 

source/output/options.ts

@@ -1,6 +1,9 @@
 import {PathReference} from '../filesystem/contracts';
 
 export interface OutputOptions {
+  // Output filename to generate for each route (index.html by default)
+  filename: string;
+
   output: PathReference;
 
   // Inline CSS stylesheets into the output

source/platform/http/backend.ts

@@ -0,0 +1,11 @@
+import {ConnectionBackend, Connection, Request, XHRBackend} from '@angular/http';
+
+import {HttpConnection} from './connection';
+
+export class HttpBackendImpl implements ConnectionBackend {
+  constructor(private backend: XHRBackend) {}
+
+  createConnection(request: Request): Connection {
+    return new HttpConnection(request, this.backend);
+  }
+}

source/platform/http/connection.ts

@@ -0,0 +1,26 @@
+import {Connection, ReadyState, Request, XHRBackend} from '@angular/http';
+import {Observable} from 'rxjs/Observable';
+
+import {adjustUri} from './uri';
+
+import {scheduleTask} from './../zone/task';
+
+export class HttpConnection implements Connection {
+  response: Observable<Response>;
+
+  private connection: Connection;
+
+  constructor(public request: Request, backend: XHRBackend) {
+    Object.assign(request, {url: adjustUri(request.url)});
+
+    this.response = scheduleTask(() => {
+      this.connection = backend.createConnection(this.request);
+
+      return this.connection.response as Observable<any>;
+    });
+  }
+
+  get readyState(): ReadyState {
+    return this.connection ? this.connection.readyState : ReadyState.Unsent;
+  }
+}

source/platform/http/http.ts

@@ -0,0 +1,17 @@
+import {Injectable} from '@angular/core';
+
+import {ConnectionBackend, Http, RequestOptionsArgs, RequestOptions, Request, Response} from '@angular/http';
+
+import {Observable} from 'rxjs/Observable';
+
+@Injectable()
+export class HttpImpl extends Http {
+  constructor(private backend: ConnectionBackend, defaultOptions: RequestOptions) {
+    super(backend, defaultOptions);
+  }
+
+  request(url: string | Request, options?: RequestOptionsArgs): Observable<Response> {
+  console.error('CREATE REQUEST CON');
+    return this.backend.createConnection(url).response;
+  }
+}

source/platform/http/uri.ts

@@ -0,0 +1,29 @@
+import {PlatformLocation} from '@angular/common';
+
+import {LocationImpl} from '../location/location';
+
+import {PlatformException} from '../../exception';
+
+import {injectableFromZone} from '../zone';
+
+import url = require('url');
+
+export const adjustUri = (uri: string): string => {
+  const parsed = url.parse(uri);
+
+  if (parsed.host == null) { // relative path?
+    const location = injectableFromZone(Zone.current, PlatformLocation) as LocationImpl;
+    if (location) {
+      return url.resolve(location.href, parsed.href);
+    }
+    else {
+      try {
+        return url.resolve(Zone.current.name, parsed.href);
+      }
+      catch (exception) {
+        throw new PlatformException(`Cannot determine origin URI of zone: ${Zone.current.name}`, exception);
+      }
+    }
+  }
+  return uri;
+};

source/platform/http/xsrf.ts

@@ -0,0 +1,8 @@
+import {Injectable} from '@angular/core';
+
+import {Request, XSRFStrategy} from '@angular/http';
+
+@Injectable()
+export class NoopXsrfStrategy implements XSRFStrategy {
+  configureRequest(req: Request) {}
+}

source/platform/zone/task.ts

@@ -0,0 +1,37 @@
+import {Observable, Subscription} from 'rxjs';
+
+import 'zone.js';
+
+import {RuntimeException} from '../../exception';
+
+export const scheduleTask = <T>(execute: () => Observable<T>, description?: string): Observable<T> => {
+  let subscription: Subscription;
+
+  return new Observable<T>(observer => {
+    let result: T | Error;
+
+    const scheduleTask = (task: Task) => {
+      subscription = execute().subscribe(
+        value => {
+          result = value;
+          task.invoke();
+        },
+        error => {
+          result = new RuntimeException(`Task failure: ${description}`, error);
+        },
+        () => task.invoke());
+    };
+
+    const complete = () => {
+      if (result instanceof Error) {
+        observer.error(result as Error);
+      }
+      else {
+        observer.next(result);
+        observer.complete();
+      }
+    };
+
+    Zone.current.scheduleMacroTask('wrapped task', complete, null, scheduleTask, subscription.unsubscribe.bind(subscription));
+  });
+};

source/static/files.ts

@@ -2,7 +2,7 @@ export namespace Files {
   // Angular CLI configuration file names
   export const cli = ['angular-cli.json', '.angular-cli.json'];
 
-  // Filename used when writing route structures to disk (eg foo/index.html)
+  // Default filename used when writing route structures to disk (eg foo/index.html)
   export const index = 'index.html';
 
   // The possible names of node_modules folders (TODO(bond): Really inviolate or configurable?)