Implement HTML output writer!

Author: clbond

package.json

@@ -66,7 +66,7 @@
     "reflect-metadata": "0.1.9",
     "rimraf": "2.5.4",
     "rxjs": "5.1.0",
-    "scoped-logger": "^0.0.16",
+    "scoped-logger": "^0.0.18",
     "source-map-support": "0.4.11",
     "typescript": "2.2.0"
   },
@@ -82,7 +82,7 @@
     "babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
     "jasmine-core": "2.5.2",
     "jasmine-promises": "0.4.1",
-    "jest": "18.1.0",
+    "jest": "19.0.2",
     "ts-jest": "^19.0.0",
     "tslint": "4.4.2",
     "zone.js": "0.7.6"
@@ -92,7 +92,7 @@
     "modulePaths": [
       "<rootDir>/source"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/source/test-fixtures/dependencies.js",
+    "setupTestFrameworkScriptFile": "<rootDir>/source/test/fixtures/dependencies.js",
     "modulePathIgnorePatterns": [
       "bundles(\\|/)"
     ],

source/application/builder/tests/from-module.ts

@@ -9,7 +9,7 @@ import {
   renderModuleFixture,
   moduleFromComponent,
   trimDocument,
-} from '../../../test-fixtures';
+} from '../../../test/fixtures';
 
 describe('ApplicationFromModule', () => {
   it('should require a template document in order to render', done => {

source/application/builder/tests/from-source.ts

@@ -1,10 +1,10 @@
 import {ApplicationFromSource} from '../from-source';
 
-import {templateDocument, getApplicationProject} from '../../../test-fixtures';
+import {templateDocument, getApplicationProject} from '../../../test/fixtures';
 
 describe('ApplicationFromSource', () => {
   it('can compile a project from source and load a NgFactory module', done => {
-    const project = getApplicationProject('test-fixtures/application-basic-inline', 'BasicInlineModule');
+    const project = getApplicationProject('test/fixtures/application-basic-inline', 'BasicInlineModule');
 
     const application = new ApplicationFromSource(project);
 

source/application/compiler/pipeline.ts

@@ -12,7 +12,7 @@ import {CompilerException} from '../../exception';
 import {Project} from '../../application';
 import {Publisher} from '../../publisher';
 import {makeAbsolute} from '../../filesystem';
-import {discoverApplicationModule} from '../ast';
+import {discoverApplicationModule} from '../static';
 
 export type CompiledSource = {filename: string, source: string};
 
@@ -53,15 +53,17 @@ export class CompilerPipeline {
   rootModule(program: Program, compilerHost: CompilerHost, options: CompilerOptions): [string, string] {
     const containingFile = join(this.project.basePath, 'index.ts');
 
-    const applicationModule =
-      this.project.applicationModule
-        ? this.project.applicationModule
-        : discoverApplicationModule(program);
+    const invalid = () =>
+      applicationModule == null ||
+      applicationModule.source == null ||
+      applicationModule.symbol == null;
 
-    if (applicationModule == null ||
-        applicationModule.source == null ||
-        applicationModule.symbol == null) {
-      throw new CompilerException(`Cannot find application root @NgModule, please provide in Project structure`);
+    var applicationModule = this.project.applicationModule;
+    if (invalid()) {
+      applicationModule = discoverApplicationModule(program);
+    }
+    if (invalid()) {
+      throw new CompilerException(`Cannot locate root @NgModule with static analysis (please name them explicitly)`);
     }
 
     const rootModule = sourceToNgFactory(applicationModule.source);
@@ -91,16 +93,12 @@ export class CompilerPipeline {
 
 const executable = (filename: string) => extname(filename) === '.js';
 
-const sourceToNgFactory = (source: string): string => {
-  if (/\.ngfactory(\.(ts|js))?$/.test(source) === false) {
-    return `${source.replace(/\.(js|ts)$/, String())}.ngfactory`;
-  }
-  return source;
-};
+const sourceToNgFactory = (source: string): string =>
+  /\.ngfactory(\.(ts|js))?$/.test(source) === false
+    ? `${source.replace(/\.(js|ts)$/, String())}.ngfactory`
+    : source;
 
-const symbolToNgFactory = (symbol: string): string => {
-  if (/NgFactory$/.test(symbol) === false) {
-    return `${symbol}NgFactory`;
-  }
-  return symbol;
-};
+const symbolToNgFactory = (symbol: string): string =>
+  /NgFactory$/.test(symbol) === false
+    ? `${symbol}NgFactory`
+    : symbol;

source/application/compiler/tests/compiler.ts

@@ -1,26 +1,26 @@
-import {getApplicationProject} from '../../../test-fixtures';
+import {getApplicationProject} from '../../../test/fixtures';
 
 import {Compiler} from '../compiler';
 
 describe('in-memory Angular compiler', () => {
   it('can build application-basic-inline in memory return executable NgModuleFactory', async () => {
-    const compiler = new Compiler(getApplicationProject('test-fixtures/application-basic-inline', 'BasicInlineModule'));
+    const compiler = new Compiler(getApplicationProject('test/fixtures/application-basic-inline', 'BasicInlineModule'));
     const module = await compiler.compile();
     expect(module).not.toBeNull();
     expect(typeof module).toBe('object');
     expect(module.constructor.name).toBe('NgModuleFactory');
   });
 
   it('can build application-basic-external in memory return executable NgModuleFactory', async () => {
-    const compiler = new Compiler(getApplicationProject('test-fixtures/application-basic-external', 'BasicExternalModule'));
+    const compiler = new Compiler(getApplicationProject('test/fixtures/application-basic-external', 'BasicExternalModule'));
     const module = await compiler.compile();
     expect(module).not.toBeNull();
     expect(typeof module).toBe('object');
     expect(module.constructor.name).toBe('NgModuleFactory');
   });
 
   it('can build application-routed in memory return executable NgModuleFactory', async () => {
-    const compiler = new Compiler(getApplicationProject('test-fixtures/application-routed', 'BasicRoutedModule'));
+    const compiler = new Compiler(getApplicationProject('test/fixtures/application-routed', 'BasicRoutedModule'));
     const module = await compiler.compile();
     expect(module).not.toBeNull();
     expect(typeof module).toBe('object');

source/application/index.ts

@@ -1,6 +1,6 @@
-export * from './ast';
 export * from './builder';
 export * from './compiler';
+export * from './static';
 export * from './fork';
 export * from './project';
 export * from './render';

source/application/ast/index.ts source/application/static/index.tssource/application/ast/index.ts renamed to source/application/static/index.ts

@@ -100,10 +100,13 @@ const importClause = (sourceFile: SourceFile, identifier: string): ApplicationMo
       continue;
     }
     for (const clause of statement.parent.importClause.namedBindings.elements || []) {
+      if (clause.name == null) {
+        continue;
+      }
       if (defactory(clause.name.text) === identifier) {
         return {
           source: relativeImportPath(sourceFile.fileName, statement.text),
-          symbol: clause.propertyName.text
+          symbol: identifier,
         };
       }
     }

source/application/ast/modules.ts source/application/static/modules.tssource/application/ast/modules.ts renamed to source/application/static/modules.ts

@@ -0,0 +1,7 @@
+import {
+  ConsoleStream,
+  Logger,
+  createLogger
+} from 'scoped-logger';
+
+export const logger: Logger = createLogger(String(), [new ConsoleStream()]);