@angular/compiler-cli 2.2.2 → 2.2.3

package/index.d.ts

@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export { AotCompilerHost, AotCompilerHost as StaticReflectorHost, StaticReflector, StaticSymbol } from '@angular/compiler';
 export { CodeGenerator } from './src/codegen';
-export { CompilerHost, CompilerHostContext, NodeCompilerHostContext } from './src/compiler_host';
 export { Extractor } from './src/extractor';
+export { NodeReflectorHostContext, ReflectorHost, ReflectorHostContext } from './src/reflector_host';
+export { StaticReflector, StaticReflectorHost, StaticSymbol } from './src/static_reflector';
 export * from '@angular/tsc-wrapped';

package/index.js

@@ -9,15 +9,15 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-var compiler_1 = require('@angular/compiler');
-exports.StaticReflector = compiler_1.StaticReflector;
-exports.StaticSymbol = compiler_1.StaticSymbol;
 var codegen_1 = require('./src/codegen');
 exports.CodeGenerator = codegen_1.CodeGenerator;
-var compiler_host_1 = require('./src/compiler_host');
-exports.CompilerHost = compiler_host_1.CompilerHost;
-exports.NodeCompilerHostContext = compiler_host_1.NodeCompilerHostContext;
 var extractor_1 = require('./src/extractor');
 exports.Extractor = extractor_1.Extractor;
+var reflector_host_1 = require('./src/reflector_host');
+exports.NodeReflectorHostContext = reflector_host_1.NodeReflectorHostContext;
+exports.ReflectorHost = reflector_host_1.ReflectorHost;
+var static_reflector_1 = require('./src/static_reflector');
+exports.StaticReflector = static_reflector_1.StaticReflector;
+exports.StaticSymbol = static_reflector_1.StaticSymbol;
 __export(require('@angular/tsc-wrapped'));
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/Users/chuckj/src/angular/modules/@angular/compiler-cli/","sources":["index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;AAEH,yBAAqG,mBAAmB,CAAC;AAAxD,qDAAe;AAAE,+CAAuC;AACzH,wBAA4B,eAAe,CAAC;AAApC,gDAAoC;AAC5C,8BAAyE,qBAAqB,CAAC;AAAvF,oDAAY;AAAuB,0EAAoD;AAC/F,0BAAwB,iBAAiB,CAAC;AAAlC,0CAAkC;AAE1C,iBAAc,sBAAsB,CAAC,EAAA"}
+{"version":3,"file":"index.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;AAEH,wBAA4B,eAAe,CAAC;AAApC,gDAAoC;AAC5C,0BAAwB,iBAAiB,CAAC;AAAlC,0CAAkC;AAC1C,+BAA4E,sBAAsB,CAAC;AAA3F,6EAAwB;AAAE,uDAAiE;AACnG,iCAAiE,wBAAwB,CAAC;AAAlF,6DAAe;AAAuB,uDAA4C;AAE1F,iBAAc,sBAAsB,CAAC,EAAA"}

package/index.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","version":2,"metadata":{},"exports":[{"from":"@angular/compiler","export":["AotCompilerHost",{"name":"AotCompilerHost","as":"StaticReflectorHost"},"StaticReflector","StaticSymbol"]},{"from":"./src/codegen","export":["CodeGenerator"]},{"from":"./src/compiler_host","export":["CompilerHost","CompilerHostContext","NodeCompilerHostContext"]},{"from":"./src/extractor","export":["Extractor"]},{"from":"@angular/tsc-wrapped"}]}
+{"__symbolic":"module","version":1,"metadata":{},"exports":[{"from":"./src/codegen","export":["CodeGenerator"]},{"from":"./src/extractor","export":["Extractor"]},{"from":"./src/reflector_host","export":["NodeReflectorHostContext","ReflectorHost","ReflectorHostContext"]},{"from":"./src/static_reflector","export":["StaticReflector","StaticReflectorHost","StaticSymbol"]},{"from":"@angular/tsc-wrapped"}]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/compiler-cli",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Angular - the compiler CLI for Node.js",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -9,14 +9,14 @@
     "ng-xi18n": "./src/extract_i18n.js"
   },
   "dependencies": {
-    "@angular/tsc-wrapped": "^0.4.0",
+    "@angular/tsc-wrapped": "^0.3.0",
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0"
   },
   "peerDependencies": {
     "typescript": "^2.0.2",
-    "@angular/compiler": "2.2.2",
-    "@angular/core": "2.2.2"
+    "@angular/compiler": "2.2.3",
+    "@angular/core": "2.2.3"
   },
   "repository": {
     "type": "git",

package/src/codegen.d.ts

@@ -12,16 +12,20 @@
 import * as compiler from '@angular/compiler';
 import { AngularCompilerOptions, NgcCliOptions } from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
-import { CompilerHost, CompilerHostContext } from './compiler_host';
+import { ReflectorHost, ReflectorHostContext } from './reflector_host';
+import { StaticReflector, StaticReflectorHost, StaticSymbol } from './static_reflector';
 export declare class CodeGenerator {
     private options;
     private program;
     host: ts.CompilerHost;
+    private staticReflector;
     private compiler;
-    private ngCompilerHost;
-    constructor(options: AngularCompilerOptions, program: ts.Program, host: ts.CompilerHost, compiler: compiler.AotCompiler, ngCompilerHost: CompilerHost);
+    private reflectorHost;
+    constructor(options: AngularCompilerOptions, program: ts.Program, host: ts.CompilerHost, staticReflector: StaticReflector, compiler: compiler.OfflineCompiler, reflectorHost: StaticReflectorHost);
     private calculateEmitPath(filePath);
-    codegen(): Promise<any>;
-    static create(options: AngularCompilerOptions, cliOptions: NgcCliOptions, program: ts.Program, tsCompilerHost: ts.CompilerHost, compilerHostContext?: CompilerHostContext, ngCompilerHost?: CompilerHost): CodeGenerator;
+    codegen(options: {
+        transitiveModules: boolean;
+    }): Promise<any>;
+    static create(options: AngularCompilerOptions, cliOptions: NgcCliOptions, program: ts.Program, compilerHost: ts.CompilerHost, reflectorHostContext?: ReflectorHostContext, resourceLoader?: compiler.ResourceLoader, reflectorHost?: ReflectorHost): CodeGenerator;
 }
-export declare function excludeFilePattern(options: AngularCompilerOptions): RegExp;
+export declare function extractProgramSymbols(program: ts.Program, staticReflector: StaticReflector, reflectorHost: StaticReflectorHost, options: AngularCompilerOptions): StaticSymbol[];

package/src/codegen.js

@@ -11,20 +11,25 @@
  * Intended to be used in a build step.
  */
 var compiler = require('@angular/compiler');
+var core_1 = require('@angular/core');
 var fs_1 = require('fs');
 var path = require('path');
-var compiler_host_1 = require('./compiler_host');
-var path_mapped_compiler_host_1 = require('./path_mapped_compiler_host');
+var path_mapped_reflector_host_1 = require('./path_mapped_reflector_host');
+var private_import_core_1 = require('./private_import_core');
+var reflector_host_1 = require('./reflector_host');
+var static_reflection_capabilities_1 = require('./static_reflection_capabilities');
+var static_reflector_1 = require('./static_reflector');
 var GENERATED_FILES = /\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
 var GENERATED_OR_DTS_FILES = /\.d\.ts$|\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
 var PREAMBLE = "/**\n * @fileoverview This file is generated by the Angular 2 template compiler.\n * Do not edit.\n * @suppress {suspiciousCode,uselessCode,missingProperties}\n */\n /* tslint:disable */\n\n";
 var CodeGenerator = (function () {
-    function CodeGenerator(options, program, host, compiler, ngCompilerHost) {
+    function CodeGenerator(options, program, host, staticReflector, compiler, reflectorHost) {
         this.options = options;
         this.program = program;
         this.host = host;
+        this.staticReflector = staticReflector;
         this.compiler = compiler;
-        this.ngCompilerHost = ngCompilerHost;
+        this.reflectorHost = reflectorHost;
     }
     // Write codegen in a directory structure matching the sources.
     CodeGenerator.prototype.calculateEmitPath = function (filePath) {
@@ -47,11 +52,10 @@ var CodeGenerator = (function () {
         }
         return path.join(this.options.genDir, relativePath);
     };
-    CodeGenerator.prototype.codegen = function () {
+    CodeGenerator.prototype.codegen = function (options) {
         var _this = this;
-        return this.compiler
-            .compileAll(this.program.getSourceFiles().map(function (sf) { return _this.ngCompilerHost.getCanonicalFileName(sf.fileName); }))
-            .then(function (generatedModules) {
+        var staticSymbols = extractProgramSymbols(this.program, this.staticReflector, this.reflectorHost, this.options);
+        return this.compiler.compileModules(staticSymbols, options).then(function (generatedModules) {
             generatedModules.forEach(function (generatedModule) {
                 var sourceFile = _this.program.getSourceFile(generatedModule.fileUrl);
                 var emitPath = _this.calculateEmitPath(generatedModule.moduleUrl);
@@ -59,13 +63,16 @@ var CodeGenerator = (function () {
             });
         });
     };
-    CodeGenerator.create = function (options, cliOptions, program, tsCompilerHost, compilerHostContext, ngCompilerHost) {
-        if (!ngCompilerHost) {
-            var usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
-            ngCompilerHost = usePathMapping ?
-                new path_mapped_compiler_host_1.PathMappedCompilerHost(program, tsCompilerHost, options, compilerHostContext) :
-                new compiler_host_1.CompilerHost(program, tsCompilerHost, options, compilerHostContext);
-        }
+    CodeGenerator.create = function (options, cliOptions, program, compilerHost, reflectorHostContext, resourceLoader, reflectorHost) {
+        resourceLoader = resourceLoader || {
+            get: function (s) {
+                if (!compilerHost.fileExists(s)) {
+                    // TODO: We should really have a test for error cases like this!
+                    throw new Error("Compilation failed. Resource file not found: " + s);
+                }
+                return Promise.resolve(compilerHost.readFile(s));
+            }
+        };
         var transFile = cliOptions.i18nFile;
         var locale = cliOptions.locale;
         var transContent = '';
@@ -75,21 +82,62 @@ var CodeGenerator = (function () {
             }
             transContent = fs_1.readFileSync(transFile, 'utf8');
         }
-        var aotCompiler = compiler.createAotCompiler(ngCompilerHost, {
-            debug: options.debug === true,
-            translations: transContent,
-            i18nFormat: cliOptions.i18nFormat,
-            locale: cliOptions.locale,
-            excludeFilePattern: options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES :
-                GENERATED_FILES
-        }).compiler;
-        return new CodeGenerator(options, program, tsCompilerHost, aotCompiler, ngCompilerHost);
+        var urlResolver = compiler.createOfflineCompileUrlResolver();
+        if (!reflectorHost) {
+            var usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
+            reflectorHost = usePathMapping ?
+                new path_mapped_reflector_host_1.PathMappedReflectorHost(program, compilerHost, options, reflectorHostContext) :
+                new reflector_host_1.ReflectorHost(program, compilerHost, options, reflectorHostContext);
+        }
+        var staticReflector = new static_reflector_1.StaticReflector(reflectorHost);
+        static_reflection_capabilities_1.StaticAndDynamicReflectionCapabilities.install(staticReflector);
+        var htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser(), transContent, cliOptions.i18nFormat);
+        var config = new compiler.CompilerConfig({
+            genDebugInfo: options.debug === true,
+            defaultEncapsulation: core_1.ViewEncapsulation.Emulated,
+            logBindingUpdate: false,
+            useJit: false
+        });
+        var normalizer = new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
+        var expressionParser = new compiler.Parser(new compiler.Lexer());
+        var elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
+        var console = new private_import_core_1.Console();
+        var tmplParser = new compiler.TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, console, []);
+        var resolver = new compiler.CompileMetadataResolver(new compiler.NgModuleResolver(staticReflector), new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector), elementSchemaRegistry, normalizer, staticReflector);
+        // TODO(vicb): do not pass cliOptions.i18nFormat here
+        var offlineCompiler = new compiler.OfflineCompiler(resolver, tmplParser, new compiler.StyleCompiler(urlResolver), new compiler.ViewCompiler(config, elementSchemaRegistry), new compiler.DirectiveWrapperCompiler(config, expressionParser, elementSchemaRegistry, console), new compiler.NgModuleCompiler(), new compiler.TypeScriptEmitter(reflectorHost), cliOptions.locale, cliOptions.i18nFormat, new compiler.AnimationParser(elementSchemaRegistry));
+        return new CodeGenerator(options, program, compilerHost, staticReflector, offlineCompiler, reflectorHost);
     };
     return CodeGenerator;
 }());
 exports.CodeGenerator = CodeGenerator;
-function excludeFilePattern(options) {
-    return options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES : GENERATED_FILES;
+function extractProgramSymbols(program, staticReflector, reflectorHost, options) {
+    // Compare with false since the default should be true
+    var skipFileNames = options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES : GENERATED_FILES;
+    var staticSymbols = [];
+    program.getSourceFiles()
+        .filter(function (sourceFile) { return !skipFileNames.test(sourceFile.fileName); })
+        .forEach(function (sourceFile) {
+        var absSrcPath = reflectorHost.getCanonicalFileName(sourceFile.fileName);
+        var moduleMetadata = staticReflector.getModuleMetadata(absSrcPath);
+        if (!moduleMetadata) {
+            console.log("WARNING: no metadata found for " + absSrcPath);
+            return;
+        }
+        var metadata = moduleMetadata['metadata'];
+        if (!metadata) {
+            return;
+        }
+        for (var _i = 0, _a = Object.keys(metadata); _i < _a.length; _i++) {
+            var symbol = _a[_i];
+            if (metadata[symbol] && metadata[symbol].__symbolic == 'error') {
+                // Ignore symbols that are only included to record error information.
+                continue;
+            }
+            staticSymbols.push(reflectorHost.findDeclaration(absSrcPath, symbol, absSrcPath));
+        }
+    });
+    return staticSymbols;
 }
-exports.excludeFilePattern = excludeFilePattern;
+exports.extractProgramSymbols = extractProgramSymbols;
 //# sourceMappingURL=codegen.js.map

package/src/codegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"/Users/chuckj/src/angular/modules/@angular/compiler-cli/","sources":["src/codegen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codegen.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["src/codegen.ts"],"names":[],"mappings":"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"}

package/src/extract_i18n.js

@@ -6,7 +6,16 @@ var tsc = require('@angular/tsc-wrapped');
 var path = require('path');
 var extractor_1 = require('./extractor');
 function extract(ngOptions, cliOptions, program, host) {
-    var extractor = extractor_1.Extractor.create(ngOptions, cliOptions.i18nFormat, program, host);
+    var resourceLoader = {
+        get: function (s) {
+            if (!host.fileExists(s)) {
+                // TODO: We should really have a test for error cases like this!
+                throw new Error("Compilation failed. Resource file not found: " + s);
+            }
+            return Promise.resolve(host.readFile(s));
+        }
+    };
+    var extractor = extractor_1.Extractor.create(ngOptions, cliOptions.i18nFormat, program, host, resourceLoader);
     var bundlePromise = extractor.extract();
     return (bundlePromise).then(function (messageBundle) {
         var ext;

package/src/extract_i18n.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract_i18n.js","sourceRoot":"/Users/chuckj/src/angular/modules/@angular/compiler-cli/","sources":["src/extract_i18n.ts"],"names":[],"mappings":";;AAcA,QAAO,kBAAkB,CAAC,CAAA;AAE1B,IAAY,QAAQ,WAAM,mBAAmB,CAAC,CAAA;AAC9C,IAAY,GAAG,WAAM,sBAAsB,CAAC,CAAA;AAC5C,IAAY,IAAI,WAAM,MAAM,CAAC,CAAA;AAG7B,0BAAwB,aAAa,CAAC,CAAA;AAEtC,iBACI,SAAqC,EAAE,UAAwC,EAC/E,OAAmB,EAAE,IAAqB;IAC5C,IAAM,SAAS,GAAG,qBAAS,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAEpF,IAAM,aAAa,GAAoC,SAAS,CAAC,OAAO,EAAE,CAAC;IAE3E,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAA,aAAa;QACvC,IAAI,GAAW,CAAC;QAChB,IAAI,UAA+B,CAAC;QACpC,IAAM,MAAM,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAE9D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACf,KAAK,KAAK;gBACR,GAAG,GAAG,KAAK,CAAC;gBACZ,UAAU,GAAG,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAChC,KAAK,CAAC;YACR,KAAK,OAAO,CAAC;YACb,KAAK,KAAK,CAAC;YACX;gBACE,IAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,cAAc,CAAC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;gBAC1E,GAAG,GAAG,KAAK,CAAC;gBACZ,UAAU,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;gBACnF,KAAK,CAAC;QACV,CAAC;QAED,IAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,cAAY,GAAK,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,cAAc;AACd,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;IAC5B,IAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAM,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC;IAC9C,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC1D,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC;SACjC,IAAI,CAAC,UAAC,QAAa,IAAK,OAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAtB,CAAsB,CAAC;SAC/C,KAAK,CAAC,UAAC,CAAM;QACZ,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"extract_i18n.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["src/extract_i18n.ts"],"names":[],"mappings":"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"}

package/src/extractor.d.ts

@@ -12,12 +12,17 @@ import 'reflect-metadata';
 import * as compiler from '@angular/compiler';
 import * as tsc from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
-import { CompilerHost } from './compiler_host';
+import { ReflectorHost } from './reflector_host';
+import { StaticReflector } from './static_reflector';
 export declare class Extractor {
-    private ngExtractor;
-    private ngCompilerHost;
+    private options;
     private program;
-    constructor(ngExtractor: compiler.Extractor, ngCompilerHost: CompilerHost, program: ts.Program);
+    host: ts.CompilerHost;
+    private staticReflector;
+    private messageBundle;
+    private reflectorHost;
+    private metadataResolver;
+    constructor(options: tsc.AngularCompilerOptions, program: ts.Program, host: ts.CompilerHost, staticReflector: StaticReflector, messageBundle: compiler.MessageBundle, reflectorHost: ReflectorHost, metadataResolver: compiler.CompileMetadataResolver);
     extract(): Promise<compiler.MessageBundle>;
-    static create(options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program, tsCompilerHost: ts.CompilerHost, ngCompilerHost?: CompilerHost): Extractor;
+    static create(options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program, compilerHost: ts.CompilerHost, resourceLoader: compiler.ResourceLoader, reflectorHost?: ReflectorHost): Extractor;
 }

package/src/extractor.js

@@ -12,23 +12,66 @@
 // Must be imported first, because angular2 decorators throws on load.
 require('reflect-metadata');
 var compiler = require('@angular/compiler');
+var core_1 = require('@angular/core');
 var codegen_1 = require('./codegen');
-var compiler_host_1 = require('./compiler_host');
+var reflector_host_1 = require('./reflector_host');
+var static_reflection_capabilities_1 = require('./static_reflection_capabilities');
+var static_reflector_1 = require('./static_reflector');
 var Extractor = (function () {
-    function Extractor(ngExtractor, ngCompilerHost, program) {
-        this.ngExtractor = ngExtractor;
-        this.ngCompilerHost = ngCompilerHost;
+    function Extractor(options, program, host, staticReflector, messageBundle, reflectorHost, metadataResolver) {
+        this.options = options;
         this.program = program;
+        this.host = host;
+        this.staticReflector = staticReflector;
+        this.messageBundle = messageBundle;
+        this.reflectorHost = reflectorHost;
+        this.metadataResolver = metadataResolver;
     }
     Extractor.prototype.extract = function () {
         var _this = this;
-        return this.ngExtractor.extract(this.program.getSourceFiles().map(function (sf) { return _this.ngCompilerHost.getCanonicalFileName(sf.fileName); }));
+        var programSymbols = codegen_1.extractProgramSymbols(this.program, this.staticReflector, this.reflectorHost, this.options);
+        var _a = compiler.analyzeAndValidateNgModules(programSymbols, { transitiveModules: true }, this.metadataResolver), ngModules = _a.ngModules, files = _a.files;
+        return compiler.loadNgModuleDirectives(ngModules).then(function () {
+            var errors = [];
+            files.forEach(function (file) {
+                var compMetas = [];
+                file.directives.forEach(function (directiveType) {
+                    var dirMeta = _this.metadataResolver.getDirectiveMetadata(directiveType);
+                    if (dirMeta && dirMeta.isComponent) {
+                        compMetas.push(dirMeta);
+                    }
+                });
+                compMetas.forEach(function (compMeta) {
+                    var html = compMeta.template.template;
+                    var interpolationConfig = compiler.InterpolationConfig.fromArray(compMeta.template.interpolation);
+                    errors.push.apply(errors, _this.messageBundle.updateFromTemplate(html, file.srcUrl, interpolationConfig));
+                });
+            });
+            if (errors.length) {
+                throw new Error(errors.map(function (e) { return e.toString(); }).join('\n'));
+            }
+            return _this.messageBundle;
+        });
     };
-    Extractor.create = function (options, translationsFormat, program, tsCompilerHost, ngCompilerHost) {
-        if (!ngCompilerHost)
-            ngCompilerHost = new compiler_host_1.CompilerHost(program, tsCompilerHost, options);
-        var ngExtractor = compiler.Extractor.create(ngCompilerHost, { excludeFilePattern: codegen_1.excludeFilePattern(options) }).extractor;
-        return new Extractor(ngExtractor, ngCompilerHost, program);
+    Extractor.create = function (options, translationsFormat, program, compilerHost, resourceLoader, reflectorHost) {
+        var htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser());
+        var urlResolver = compiler.createOfflineCompileUrlResolver();
+        if (!reflectorHost)
+            reflectorHost = new reflector_host_1.ReflectorHost(program, compilerHost, options);
+        var staticReflector = new static_reflector_1.StaticReflector(reflectorHost);
+        static_reflection_capabilities_1.StaticAndDynamicReflectionCapabilities.install(staticReflector);
+        var config = new compiler.CompilerConfig({
+            genDebugInfo: options.debug === true,
+            defaultEncapsulation: core_1.ViewEncapsulation.Emulated,
+            logBindingUpdate: false,
+            useJit: false
+        });
+        var normalizer = new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
+        var elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
+        var resolver = new compiler.CompileMetadataResolver(new compiler.NgModuleResolver(staticReflector), new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector), elementSchemaRegistry, normalizer, staticReflector);
+        // TODO(vicb): implicit tags & attributes
+        var messageBundle = new compiler.MessageBundle(htmlParser, [], {});
+        return new Extractor(options, program, compilerHost, staticReflector, messageBundle, reflectorHost, resolver);
     };
     return Extractor;
 }());

package/src/extractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractor.js","sourceRoot":"/Users/chuckj/src/angular/modules/@angular/compiler-cli/","sources":["src/extractor.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;AAGH;;GAEG;AACH,sEAAsE;AACtE,QAAO,kBAAkB,CAAC,CAAA;AAE1B,IAAY,QAAQ,WAAM,mBAAmB,CAAC,CAAA;AAI9C,wBAAiC,WAAW,CAAC,CAAA;AAC7C,8BAA2B,iBAAiB,CAAC,CAAA;AAE7C;IACE,mBACY,WAA+B,EAAU,cAA4B,EACrE,OAAmB;QADnB,gBAAW,GAAX,WAAW,CAAoB;QAAU,mBAAc,GAAd,cAAc,CAAc;QACrE,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IAEnC,2BAAO,GAAP;QAAA,iBAGC;QAFC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAC7D,UAAA,EAAE,IAAI,OAAA,KAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC,EAArD,CAAqD,CAAC,CAAC,CAAC;IACpE,CAAC;IAEM,gBAAM,GAAb,UACI,OAAmC,EAAE,kBAA0B,EAAE,OAAmB,EACpF,cAA+B,EAAE,cAA6B;QAChE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;YAAC,cAAc,GAAG,IAAI,4BAAY,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAClF,oIAAsB,CAC0C;QACvE,MAAM,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IACH,gBAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,iBAAS,YAkBrB,CAAA"}
+{"version":3,"file":"extractor.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["src/extractor.ts"],"names":[],"mappings":"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"}

package/src/main.js

@@ -4,7 +4,9 @@ require('reflect-metadata');
 var tsc = require('@angular/tsc-wrapped');
 var codegen_1 = require('./codegen');
 function codegen(ngOptions, cliOptions, program, host) {
-    return codegen_1.CodeGenerator.create(ngOptions, cliOptions, program, host).codegen();
+    return codegen_1.CodeGenerator.create(ngOptions, cliOptions, program, host).codegen({
+        transitiveModules: true
+    });
 }
 // CLI entry point
 if (require.main === module) {

package/src/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"/Users/chuckj/src/angular/modules/@angular/compiler-cli/","sources":["src/main.ts"],"names":[],"mappings":";;AAWA,QAAO,kBAAkB,CAAC,CAAA;AAG1B,IAAY,GAAG,WAAM,sBAAsB,CAAC,CAAA;AAE5C,wBAA4B,WAAW,CAAC,CAAA;AAExC,iBACI,SAAqC,EAAE,UAA6B,EAAE,OAAmB,EACzF,IAAqB;IACvB,MAAM,CAAC,uBAAa,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC;AAED,kBAAkB;AAClB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;IAC5B,IAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAM,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC;IAC9C,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAtB,CAAsB,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC;QACrF,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["src/main.ts"],"names":[],"mappings":";;AAWA,QAAO,kBAAkB,CAAC,CAAA;AAG1B,IAAY,GAAG,WAAM,sBAAsB,CAAC,CAAA;AAE5C,wBAA4B,WAAW,CAAC,CAAA;AAExC,iBACI,SAAqC,EAAE,UAA6B,EAAE,OAAmB,EACzF,IAAqB;IACvB,MAAM,CAAC,uBAAa,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC;QACxE,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;AACL,CAAC;AAED,kBAAkB;AAClB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;IAC5B,IAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAM,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC;IAC9C,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAtB,CAAsB,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC;QACrF,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}

package/src/{path_mapped_compiler_host.d.ts → path_mapped_reflector_host.d.ts}

@@ -1,23 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
 import { AngularCompilerOptions, ModuleMetadata } from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
-import { CompilerHost, CompilerHostContext } from './compiler_host';
+import { ReflectorHost, ReflectorHostContext } from './reflector_host';
 /**
- * This version of the AotCompilerHost expects that the program will be compiled
+ * This version of the reflector host expects that the program will be compiled
  * and executed with a "path mapped" directory structure, where generated files
  * are in a parallel tree with the sources, and imported using a `./` relative
  * import. This requires using TS `rootDirs` option and also teaching the module
  * loader what to do.
  */
-export declare class PathMappedCompilerHost extends CompilerHost {
-    constructor(program: ts.Program, compilerHost: ts.CompilerHost, options: AngularCompilerOptions, context?: CompilerHostContext);
+export declare class PathMappedReflectorHost extends ReflectorHost {
+    constructor(program: ts.Program, compilerHost: ts.CompilerHost, options: AngularCompilerOptions, context?: ReflectorHostContext);
     getCanonicalFileName(fileName: string): string;
-    moduleNameToFileName(m: string, containingFile: string): string;
+    protected resolve(m: string, containingFile: string): string;
     /**
      * We want a moduleId that will appear in import statements in the generated code.
      * These need to be in a form that system.js can load, so absolute file paths don't work.
      * Relativize the paths by checking candidate prefixes of the absolute path, to see if
      * they are resolvable by the moduleResolution strategy from the CompilerHost.
      */
-    fileNameToModuleName(importedFile: string, containingFile: string): string;
-    getMetadataFor(filePath: string): ModuleMetadata[];
+    getImportPath(containingFile: string, importedFile: string): string;
+    getMetadataFor(filePath: string): ModuleMetadata;
 }

package/src/{path_mapped_compiler_host.js → path_mapped_reflector_host.js}

@@ -13,22 +13,22 @@ var __extends = (this && this.__extends) || function (d, b) {
 };
 var path = require('path');
 var ts = require('typescript');
-var compiler_host_1 = require('./compiler_host');
+var reflector_host_1 = require('./reflector_host');
 var EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 var DTS = /\.d\.ts$/;
 /**
- * This version of the AotCompilerHost expects that the program will be compiled
+ * This version of the reflector host expects that the program will be compiled
  * and executed with a "path mapped" directory structure, where generated files
  * are in a parallel tree with the sources, and imported using a `./` relative
  * import. This requires using TS `rootDirs` option and also teaching the module
  * loader what to do.
  */
-var PathMappedCompilerHost = (function (_super) {
-    __extends(PathMappedCompilerHost, _super);
-    function PathMappedCompilerHost(program, compilerHost, options, context) {
+var PathMappedReflectorHost = (function (_super) {
+    __extends(PathMappedReflectorHost, _super);
+    function PathMappedReflectorHost(program, compilerHost, options, context) {
         _super.call(this, program, compilerHost, options, context);
     }
-    PathMappedCompilerHost.prototype.getCanonicalFileName = function (fileName) {
+    PathMappedReflectorHost.prototype.getCanonicalFileName = function (fileName) {
         if (!fileName)
             return fileName;
         // NB: the rootDirs should have been sorted longest-first
@@ -40,14 +40,7 @@ var PathMappedCompilerHost = (function (_super) {
         }
         return fileName;
     };
-    PathMappedCompilerHost.prototype.moduleNameToFileName = function (m, containingFile) {
-        if (!containingFile || !containingFile.length) {
-            if (m.indexOf('.') === 0) {
-                throw new Error('Resolution of relative paths requires a containing file.');
-            }
-            // Any containing file gives the same result for absolute imports
-            containingFile = this.getCanonicalFileName(path.join(this.basePath, 'index.ts'));
-        }
+    PathMappedReflectorHost.prototype.resolve = function (m, containingFile) {
         for (var _i = 0, _a = this.options.rootDirs || ['']; _i < _a.length; _i++) {
             var root = _a[_i];
             var rootedContainingFile = path.join(root, containingFile);
@@ -56,7 +49,7 @@ var PathMappedCompilerHost = (function (_super) {
                 if (this.options.traceResolution) {
                     console.log('resolve', m, containingFile, '=>', resolved.resolvedFileName);
                 }
-                return this.getCanonicalFileName(resolved.resolvedFileName);
+                return resolved.resolvedFileName;
             }
         }
     };
@@ -66,8 +59,10 @@ var PathMappedCompilerHost = (function (_super) {
      * Relativize the paths by checking candidate prefixes of the absolute path, to see if
      * they are resolvable by the moduleResolution strategy from the CompilerHost.
      */
-    PathMappedCompilerHost.prototype.fileNameToModuleName = function (importedFile, containingFile) {
+    PathMappedReflectorHost.prototype.getImportPath = function (containingFile, importedFile) {
         var _this = this;
+        importedFile = this.resolveAssetUrl(importedFile, containingFile);
+        containingFile = this.resolveAssetUrl(containingFile, '');
         if (this.options.traceResolution) {
             console.log('getImportPath from containingFile', containingFile, 'to importedFile', importedFile);
         }
@@ -82,7 +77,7 @@ var PathMappedCompilerHost = (function (_super) {
             }
         }
         var resolvable = function (candidate) {
-            var resolved = _this.moduleNameToFileName(candidate, importedFile);
+            var resolved = _this.getCanonicalFileName(_this.resolve(candidate, importedFile));
             return resolved && resolved.replace(EXT, '') === importedFile.replace(EXT, '');
         };
         var importModuleName = importedFile.replace(EXT, '');
@@ -107,7 +102,7 @@ var PathMappedCompilerHost = (function (_super) {
         }
         throw new Error("Unable to find any resolvable import for " + importedFile + " relative to " + containingFile);
     };
-    PathMappedCompilerHost.prototype.getMetadataFor = function (filePath) {
+    PathMappedReflectorHost.prototype.getMetadataFor = function (filePath) {
         for (var _i = 0, _a = this.options.rootDirs || []; _i < _a.length; _i++) {
             var root = _a[_i];
             var rootedPath = path.join(root, filePath);
@@ -120,18 +115,21 @@ var PathMappedCompilerHost = (function (_super) {
             if (DTS.test(rootedPath)) {
                 var metadataPath = rootedPath.replace(DTS, '.metadata.json');
                 if (this.context.fileExists(metadataPath)) {
-                    return this.readMetadata(metadataPath, rootedPath);
+                    var metadata = this.readMetadata(metadataPath);
+                    return (Array.isArray(metadata) && metadata.length == 0) ? undefined : metadata;
                 }
             }
             else {
-                var sf = this.getSourceFile(rootedPath);
-                sf.fileName = sf.fileName;
-                var metadata = this.metadataCollector.getMetadata(sf);
-                return metadata ? [metadata] : [];
+                var sf = this.program.getSourceFile(rootedPath);
+                if (!sf) {
+                    throw new Error("Source file " + rootedPath + " not present in program.");
+                }
+                sf.fileName = this.getCanonicalFileName(sf.fileName);
+                return this.metadataCollector.getMetadata(sf);
             }
         }
     };
-    return PathMappedCompilerHost;
-}(compiler_host_1.CompilerHost));
-exports.PathMappedCompilerHost = PathMappedCompilerHost;
-//# sourceMappingURL=path_mapped_compiler_host.js.map
+    return PathMappedReflectorHost;
+}(reflector_host_1.ReflectorHost));
+exports.PathMappedReflectorHost = PathMappedReflectorHost;
+//# sourceMappingURL=path_mapped_reflector_host.js.map

package/src/path_mapped_reflector_host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"path_mapped_reflector_host.js","sourceRoot":"/Users/vsavkin/projects/angular/modules/@angular/compiler-cli/","sources":["src/path_mapped_reflector_host.ts"],"names":[],"mappings":"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"}