@angular/compiler-cli - npm Package Compare versions

Comparing version 4.0.0-beta.0 to 4.0.0-beta.1

package.json

 {
   "name": "@angular/compiler-cli",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.1",
   "description": "Angular - the compiler CLI for Node.js",
@@ -12,3 +12,3 @@ "main": "index.js",
   "dependencies": {
-    "@angular/tsc-wrapped": "0.4.2",
+    "@angular/tsc-wrapped": "0.5.0",
     "reflect-metadata": "^0.1.2",
@@ -19,4 +19,4 @@ "minimist": "^1.2.0"
     "typescript": "^2.0.2",
-    "@angular/compiler": "4.0.0-beta.0",
-    "@angular/core": "4.0.0-beta.0"
+    "@angular/compiler": "4.0.0-beta.1",
+    "@angular/core": "4.0.0-beta.1"
   },
@@ -23,0 +23,0 @@ "repository": {

src/codegen.d.ts

@@ -27,2 +27,1 @@ /**
 }
-export declare function excludeFilePattern(options: AngularCompilerOptions): RegExp;

src/codegen.js

@@ -18,5 +18,3 @@ /**
 var path_mapped_compiler_host_1 = require('./path_mapped_compiler_host');
-var GENERATED_FILES = /\.ngfactory\.ts$|\.ngstyle\.ts$/;
 var GENERATED_META_FILES = /\.json$/;
-var GENERATED_OR_DTS_FILES = /\.d\.ts$|\.ngfactory\.ts$|\.ngstyle\.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";
@@ -86,5 +84,3 @@ var CodeGenerator = (function () {
             i18nFormat: cliOptions.i18nFormat,
-            locale: cliOptions.locale,
-            excludeFilePattern: options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES :
-                GENERATED_FILES
+            locale: cliOptions.locale
         }).compiler;
@@ -96,6 +92,2 @@ return new CodeGenerator(options, program, tsCompilerHost, aotCompiler, ngCompilerHost);
 exports.CodeGenerator = CodeGenerator;
-function excludeFilePattern(options) {
-    return options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES : GENERATED_FILES;
-}
-exports.excludeFilePattern = excludeFilePattern;
 //# sourceMappingURL=codegen.js.map

src/codegen.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":3,"metadata":{"CodeGenerator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"@angular/compiler","name":"AotCompiler"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"}]}],"calculateEmitPath":[{"__symbolic":"method"}],"codegen":[{"__symbolic":"method"}]}},"excludeFilePattern":{"__symbolic":"function","parameters":["options"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":"===","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"options"},"member":"generateCodeForLibraries"},"right":false},"thenExpression":{"__symbolic":"error","message":"Reference to a local symbol","line":25,"character":6,"context":{"name":"GENERATED_OR_DTS_FILES"}},"elseExpression":{"__symbolic":"error","message":"Reference to a local symbol","line":23,"character":6,"context":{"name":"GENERATED_FILES"}}}}}},{"__symbolic":"module","version":1,"metadata":{"CodeGenerator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"@angular/compiler","name":"AotCompiler"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"}]}],"calculateEmitPath":[{"__symbolic":"method"}],"codegen":[{"__symbolic":"method"}]}},"excludeFilePattern":{"__symbolic":"function","parameters":["options"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":"===","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"options"},"member":"generateCodeForLibraries"},"right":false},"thenExpression":{"__symbolic":"error","message":"Reference to a local symbol","line":25,"character":6,"context":{"name":"GENERATED_OR_DTS_FILES"}},"elseExpression":{"__symbolic":"error","message":"Reference to a local symbol","line":23,"character":6,"context":{"name":"GENERATED_FILES"}}}}}}]
+[{"__symbolic":"module","version":3,"metadata":{"CodeGenerator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"@angular/compiler","name":"AotCompiler"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"}]}],"calculateEmitPath":[{"__symbolic":"method"}],"codegen":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"CodeGenerator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"@angular/compiler","name":"AotCompiler"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"}]}],"calculateEmitPath":[{"__symbolic":"method"}],"codegen":[{"__symbolic":"method"}]}}}}]

src/compiler_host.d.ts

@@ -24,5 +24,6 @@ /**
     private resolverCache;
+    protected resolveModuleNameHost: CompilerHostContext;
     constructor(program: ts.Program, options: AngularCompilerOptions, context: CompilerHostContext);
     getCanonicalFileName(fileName: string): string;
-    moduleNameToFileName(m: string, containingFile: string): string;
+    moduleNameToFileName(m: string, containingFile: string): string | null;
     /**
@@ -52,5 +53,7 @@ * We want a moduleId that will appear in import statements in the generated code.
     readMetadata(filePath: string, dtsFilePath: string): ModuleMetadata[];
+    private upgradeVersion1Metadata(v1Metadata, dtsFilePath);
     loadResource(filePath: string): Promise<string>;
-    loadSummary(filePath: string): string;
+    loadSummary(filePath: string): string | null;
     getOutputFileName(sourceFilePath: string): string;
+    isSourceFile(filePath: string): boolean;
 }
@@ -57,0 +60,0 @@ export declare class CompilerHostContextAdapter {

src/compiler_host.js

@@ -22,4 +22,7 @@ /**
 var IS_GENERATED = /\.(ngfactory|ngstyle)$/;
+var GENERATED_FILES = /\.ngfactory\.ts$|\.ngstyle\.ts$/;
+var GENERATED_OR_DTS_FILES = /\.d\.ts$|\.ngfactory\.ts$|\.ngstyle\.ts$/;
 var CompilerHost = (function () {
     function CompilerHost(program, options, context) {
+        var _this = this;
         this.program = program;
@@ -35,2 +38,20 @@ this.options = options;
         this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..');
+        this.resolveModuleNameHost = Object.create(this.context);
+        // When calling ts.resolveModuleName,
+        // additional allow checks for .d.ts files to be done based on
+        // checks for .ngsummary.json files,
+        // so that our codegen depends on fewer inputs and requires to be called
+        // less often.
+        // This is needed as we use ts.resolveModuleName in reflector_host
+        // and it should be able to resolve summary file names.
+        this.resolveModuleNameHost.fileExists = function (fileName) {
+            if (_this.context.fileExists(fileName)) {
+                return true;
+            }
+            if (DTS.test(fileName)) {
+                var base = fileName.substring(0, fileName.length - 5);
+                return _this.context.fileExists(base + '.ngsummary.json');
+            }
+            return false;
+        };
     }
@@ -48,3 +69,3 @@ // We use absolute paths on disk as canonical.
         m = m.replace(EXT, '');
-        var resolved = ts.resolveModuleName(m, containingFile.replace(/\\/g, '/'), this.options, this.context)
+        var resolved = ts.resolveModuleName(m, containingFile.replace(/\\/g, '/'), this.options, this.resolveModuleNameHost)
             .resolvedModule;
@@ -152,2 +173,8 @@ return resolved ? this.getCanonicalFileName(resolved.resolvedFileName) : null;
             }
+            else {
+                // If there is a .d.ts file but no metadata file we need to produce a
+                // v3 metadata from the .d.ts file as v3 includes the exports we need
+                // to resolve symbols.
+                return [this.upgradeVersion1Metadata({ '__symbolic': 'module', 'version': 1, 'metadata': {} }, filePath)];
+            }
         }
@@ -170,27 +197,6 @@ else {
                 [];
-            var v1Metadata = metadatas_1.find(function (m) { return m['version'] === 1; });
-            var v3Metadata = metadatas_1.find(function (m) { return m['version'] === 3; });
+            var v1Metadata = metadatas_1.find(function (m) { return m.version === 1; });
+            var v3Metadata = metadatas_1.find(function (m) { return m.version === 3; });
             if (!v3Metadata && v1Metadata) {
-                // patch up v1 to v3 by merging the metadata with metadata collected from the d.ts file
-                // as the only difference between the versions is whether all exports are contained in
-                // the metadata and the `extends` clause.
-                v3Metadata = { '__symbolic': 'module', 'version': 3, 'metadata': {} };
-                if (v1Metadata.exports) {
-                    v3Metadata.exports = v1Metadata.exports;
-                }
-                for (var prop in v1Metadata.metadata) {
-                    v3Metadata.metadata[prop] = v1Metadata.metadata[prop];
-                }
-                var exports_1 = this.metadataCollector.getMetadata(this.getSourceFile(dtsFilePath));
-                if (exports_1) {
-                    for (var prop in exports_1.metadata) {
-                        if (!v3Metadata.metadata[prop]) {
-                            v3Metadata.metadata[prop] = exports_1.metadata[prop];
-                        }
-                    }
-                    if (exports_1.exports) {
-                        v3Metadata.exports = exports_1.exports;
-                    }
-                }
-                metadatas_1.push(v3Metadata);
+                metadatas_1.push(this.upgradeVersion1Metadata(v1Metadata, dtsFilePath));
             }
@@ -205,7 +211,39 @@ this.resolverCache.set(filePath, metadatas_1);
     };
+    CompilerHost.prototype.upgradeVersion1Metadata = function (v1Metadata, dtsFilePath) {
+        // patch up v1 to v3 by merging the metadata with metadata collected from the d.ts file
+        // as the only difference between the versions is whether all exports are contained in
+        // the metadata and the `extends` clause.
+        var v3Metadata = { '__symbolic': 'module', 'version': 3, 'metadata': {} };
+        if (v1Metadata.exports) {
+            v3Metadata.exports = v1Metadata.exports;
+        }
+        for (var prop in v1Metadata.metadata) {
+            v3Metadata.metadata[prop] = v1Metadata.metadata[prop];
+        }
+        var exports = this.metadataCollector.getMetadata(this.getSourceFile(dtsFilePath));
+        if (exports) {
+            for (var prop in exports.metadata) {
+                if (!v3Metadata.metadata[prop]) {
+                    v3Metadata.metadata[prop] = exports.metadata[prop];
+                }
+            }
+            if (exports.exports) {
+                v3Metadata.exports = exports.exports;
+            }
+        }
+        return v3Metadata;
+    };
     CompilerHost.prototype.loadResource = function (filePath) { return this.context.readResource(filePath); };
-    CompilerHost.prototype.loadSummary = function (filePath) { return this.context.readFile(filePath); };
+    CompilerHost.prototype.loadSummary = function (filePath) {
+        if (this.context.fileExists(filePath)) {
+            return this.context.readFile(filePath);
+        }
+    };
     CompilerHost.prototype.getOutputFileName = function (sourceFilePath) {
         return sourceFilePath.replace(EXT, '') + '.d.ts';
     };
+    CompilerHost.prototype.isSourceFile = function (filePath) {
+        var excludeRegex = this.options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES : GENERATED_FILES;
+        return !excludeRegex.test(filePath);
+    };
     return CompilerHost;
@@ -212,0 +250,0 @@ }());

src/compiler_host.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":3,"metadata":{"CompilerHost":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"error","message":"Could not resolve type","line":33,"character":25,"context":{"typeName":"CompilerHostContext"}}]}],"getCanonicalFileName":[{"__symbolic":"method"}],"moduleNameToFileName":[{"__symbolic":"method"}],"fileNameToModuleName":[{"__symbolic":"method"}],"dotRelative":[{"__symbolic":"method"}],"rewriteGenDirPath":[{"__symbolic":"method"}],"getSourceFile":[{"__symbolic":"method"}],"getMetadataFor":[{"__symbolic":"method"}],"readMetadata":[{"__symbolic":"method"}],"loadResource":[{"__symbolic":"method"}],"loadSummary":[{"__symbolic":"method"}],"getOutputFileName":[{"__symbolic":"method"}]}},"CompilerHostContextAdapter":{"__symbolic":"class","members":{"assumeFileExists":[{"__symbolic":"method"}]}},"ModuleResolutionHostAdapter":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"ModuleResolutionHost"}]}],"fileExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}},"NodeCompilerHostContext":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"fileExists":[{"__symbolic":"method"}],"directoryExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"CompilerHost":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"error","message":"Could not resolve type","line":33,"character":25,"context":{"typeName":"CompilerHostContext"}}]}],"getCanonicalFileName":[{"__symbolic":"method"}],"moduleNameToFileName":[{"__symbolic":"method"}],"fileNameToModuleName":[{"__symbolic":"method"}],"dotRelative":[{"__symbolic":"method"}],"rewriteGenDirPath":[{"__symbolic":"method"}],"getSourceFile":[{"__symbolic":"method"}],"getMetadataFor":[{"__symbolic":"method"}],"readMetadata":[{"__symbolic":"method"}],"loadResource":[{"__symbolic":"method"}],"loadSummary":[{"__symbolic":"method"}],"getOutputFileName":[{"__symbolic":"method"}]}},"CompilerHostContextAdapter":{"__symbolic":"class","members":{"assumeFileExists":[{"__symbolic":"method"}]}},"ModuleResolutionHostAdapter":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"ModuleResolutionHost"}]}],"fileExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}},"NodeCompilerHostContext":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"fileExists":[{"__symbolic":"method"}],"directoryExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":3,"metadata":{"CompilerHost":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"error","message":"Could not resolve type","line":36,"character":25,"context":{"typeName":"CompilerHostContext"}}]}],"getCanonicalFileName":[{"__symbolic":"method"}],"moduleNameToFileName":[{"__symbolic":"method"}],"fileNameToModuleName":[{"__symbolic":"method"}],"dotRelative":[{"__symbolic":"method"}],"rewriteGenDirPath":[{"__symbolic":"method"}],"getSourceFile":[{"__symbolic":"method"}],"getMetadataFor":[{"__symbolic":"method"}],"readMetadata":[{"__symbolic":"method"}],"upgradeVersion1Metadata":[{"__symbolic":"method"}],"loadResource":[{"__symbolic":"method"}],"loadSummary":[{"__symbolic":"method"}],"getOutputFileName":[{"__symbolic":"method"}],"isSourceFile":[{"__symbolic":"method"}]}},"CompilerHostContextAdapter":{"__symbolic":"class","members":{"assumeFileExists":[{"__symbolic":"method"}]}},"ModuleResolutionHostAdapter":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"ModuleResolutionHost"}]}],"fileExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}},"NodeCompilerHostContext":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"fileExists":[{"__symbolic":"method"}],"directoryExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"CompilerHost":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"Program"},{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"error","message":"Could not resolve type","line":36,"character":25,"context":{"typeName":"CompilerHostContext"}}]}],"getCanonicalFileName":[{"__symbolic":"method"}],"moduleNameToFileName":[{"__symbolic":"method"}],"fileNameToModuleName":[{"__symbolic":"method"}],"dotRelative":[{"__symbolic":"method"}],"rewriteGenDirPath":[{"__symbolic":"method"}],"getSourceFile":[{"__symbolic":"method"}],"getMetadataFor":[{"__symbolic":"method"}],"readMetadata":[{"__symbolic":"method"}],"upgradeVersion1Metadata":[{"__symbolic":"method"}],"loadResource":[{"__symbolic":"method"}],"loadSummary":[{"__symbolic":"method"}],"getOutputFileName":[{"__symbolic":"method"}],"isSourceFile":[{"__symbolic":"method"}]}},"CompilerHostContextAdapter":{"__symbolic":"class","members":{"assumeFileExists":[{"__symbolic":"method"}]}},"ModuleResolutionHostAdapter":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"typescript","name":"ModuleResolutionHost"}]}],"fileExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}},"NodeCompilerHostContext":{"__symbolic":"class","extends":{"__symbolic":"reference","name":"CompilerHostContextAdapter"},"members":{"fileExists":[{"__symbolic":"method"}],"directoryExists":[{"__symbolic":"method"}],"readFile":[{"__symbolic":"method"}],"readResource":[{"__symbolic":"method"}]}}}}]

src/extract_i18n.js

 #!/usr/bin/env node
 "use strict";
 require('reflect-metadata');
-var compiler = require('@angular/compiler');
 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 bundlePromise = extractor.extract();
-    return (bundlePromise).then(function (messageBundle) {
-        var ext;
-        var serializer;
-        var format = (cliOptions.i18nFormat || 'xlf').toLowerCase();
-        switch (format) {
-            case 'xmb':
-                ext = 'xmb';
-                serializer = new compiler.Xmb();
-                break;
-            case 'xliff':
-            case 'xlf':
-            default:
-                ext = 'xlf';
-                serializer = new compiler.Xliff();
-                break;
-        }
-        var dstPath = path.join(ngOptions.genDir, "messages." + ext);
-        host.writeFile(dstPath, messageBundle.write(serializer), false);
-    });
+    return extractor_1.Extractor.create(ngOptions, program, host).extract(cliOptions.i18nFormat);
 }
@@ -31,0 +9,0 @@ // Entry point

src/extractor.d.ts

@@ -15,10 +15,15 @@ /**
 import * as ts from 'typescript';
-import { CompilerHost } from './compiler_host';
+import { CompilerHost, CompilerHostContext } from './compiler_host';
 export declare class Extractor {
+    private options;
     private ngExtractor;
+    host: ts.CompilerHost;
     private ngCompilerHost;
     private program;
-    constructor(ngExtractor: compiler.Extractor, ngCompilerHost: CompilerHost, program: ts.Program);
-    extract(): Promise<compiler.MessageBundle>;
-    static create(options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program, moduleResolverHost: ts.ModuleResolutionHost, ngCompilerHost?: CompilerHost): Extractor;
+    constructor(options: tsc.AngularCompilerOptions, ngExtractor: compiler.Extractor, host: ts.CompilerHost, ngCompilerHost: CompilerHost, program: ts.Program);
+    extract(formatName: string): Promise<void>;
+    extractBundle(): Promise<compiler.MessageBundle>;
+    serialize(bundle: compiler.MessageBundle, ext: string): string;
+    getExtension(formatName: string): string;
+    static create(options: tsc.AngularCompilerOptions, program: ts.Program, tsCompilerHost: ts.CompilerHost, compilerHostContext?: CompilerHostContext, ngCompilerHost?: CompilerHost): Extractor;
 }

src/extractor.js

@@ -15,21 +15,59 @@ /**
 var compiler = require('@angular/compiler');
-var codegen_1 = require('./codegen');
+var path = require('path');
 var compiler_host_1 = require('./compiler_host');
+var path_mapped_compiler_host_1 = require('./path_mapped_compiler_host');
 var Extractor = (function () {
-    function Extractor(ngExtractor, ngCompilerHost, program) {
+    function Extractor(options, ngExtractor, host, ngCompilerHost, program) {
+        this.options = options;
         this.ngExtractor = ngExtractor;
+        this.host = host;
         this.ngCompilerHost = ngCompilerHost;
         this.program = program;
     }
-    Extractor.prototype.extract = function () {
+    Extractor.prototype.extract = function (formatName) {
         var _this = this;
-        return this.ngExtractor.extract(this.program.getSourceFiles().map(function (sf) { return _this.ngCompilerHost.getCanonicalFileName(sf.fileName); }));
+        // Checks the format and returns the extension
+        var ext = this.getExtension(formatName);
+        var promiseBundle = this.extractBundle();
+        return promiseBundle.then(function (bundle) {
+            var content = _this.serialize(bundle, ext);
+            var dstPath = path.join(_this.options.genDir, "messages." + ext);
+            _this.host.writeFile(dstPath, content, false);
+        });
     };
-    Extractor.create = function (options, translationsFormat, program, moduleResolverHost, ngCompilerHost) {
-        if (!ngCompilerHost)
-            ngCompilerHost =
-                new compiler_host_1.CompilerHost(program, options, new compiler_host_1.ModuleResolutionHostAdapter(moduleResolverHost));
-        var ngExtractor = compiler.Extractor.create(ngCompilerHost, { excludeFilePattern: codegen_1.excludeFilePattern(options) }).extractor;
-        return new Extractor(ngExtractor, ngCompilerHost, program);
+    Extractor.prototype.extractBundle = function () {
+        var _this = this;
+        var files = this.program.getSourceFiles().map(function (sf) { return _this.ngCompilerHost.getCanonicalFileName(sf.fileName); });
+        return this.ngExtractor.extract(files);
     };
+    Extractor.prototype.serialize = function (bundle, ext) {
+        var serializer;
+        switch (ext) {
+            case 'xmb':
+                serializer = new compiler.Xmb();
+                break;
+            case 'xlf':
+            default:
+                serializer = new compiler.Xliff();
+        }
+        return bundle.write(serializer);
+    };
+    Extractor.prototype.getExtension = function (formatName) {
+        var format = (formatName || 'xlf').toLowerCase();
+        if (format === 'xmb')
+            return 'xmb';
+        if (format === 'xlf' || format === 'xlif')
+            return 'xlf';
+        throw new Error('Unsupported format "${formatName}"');
+    };
+    Extractor.create = function (options, program, tsCompilerHost, compilerHostContext, ngCompilerHost) {
+        if (!ngCompilerHost) {
+            var usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
+            var context = compilerHostContext || new compiler_host_1.ModuleResolutionHostAdapter(tsCompilerHost);
+            ngCompilerHost = usePathMapping ? new path_mapped_compiler_host_1.PathMappedCompilerHost(program, options, context) :
+                new compiler_host_1.CompilerHost(program, options, context);
+        }
+        var ngExtractor = compiler.Extractor.create(ngCompilerHost).extractor;
+        return new Extractor(options, ngExtractor, tsCompilerHost, ngCompilerHost, program);
+    };
     return Extractor;
@@ -36,0 +74,0 @@ }());

src/extractor.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":3,"metadata":{"Extractor":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/compiler","name":"Extractor"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"},{"__symbolic":"reference","module":"typescript","name":"Program"}]}],"extract":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"Extractor":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/compiler","name":"Extractor"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"},{"__symbolic":"reference","module":"typescript","name":"Program"}]}],"extract":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":3,"metadata":{"Extractor":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"@angular/compiler","name":"Extractor"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"},{"__symbolic":"reference","module":"typescript","name":"Program"}]}],"extract":[{"__symbolic":"method"}],"extractBundle":[{"__symbolic":"method"}],"serialize":[{"__symbolic":"method"}],"getExtension":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"Extractor":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/tsc-wrapped","name":"AngularCompilerOptions"},{"__symbolic":"reference","module":"@angular/compiler","name":"Extractor"},{"__symbolic":"reference","module":"typescript","name":"CompilerHost"},{"__symbolic":"reference","module":"./compiler_host","name":"CompilerHost"},{"__symbolic":"reference","module":"typescript","name":"Program"}]}],"extract":[{"__symbolic":"method"}],"extractBundle":[{"__symbolic":"method"}],"serialize":[{"__symbolic":"method"}],"getExtension":[{"__symbolic":"method"}]}}}}]

src/main.js

@@ -5,2 +5,3 @@ #!/usr/bin/env node
 var tsc = require('@angular/tsc-wrapped');
+var compiler_1 = require('@angular/compiler');
 var codegen_1 = require('./codegen');
@@ -15,3 +16,3 @@ function codegen(ngOptions, cliOptions, program, host) {
     return tsc.main(project, cliOptions, codegen).then(function () { return 0; }).catch(function (e) {
-        if (e instanceof tsc.UserError) {
+        if (e instanceof tsc.UserError || e instanceof compiler_1.SyntaxError) {
             consoleError(e.message);
@@ -18,0 +19,0 @@ return Promise.resolve(1);

src/ngtools_api.d.ts

@@ -23,2 +23,11 @@ import { AngularCompilerOptions } from '@angular/tsc-wrapped';
 }
+export interface NgTools_InternalApi_NG2_ExtractI18n_Options {
+    basePath: string;
+    compilerOptions: ts.CompilerOptions;
+    program: ts.Program;
+    host: ts.CompilerHost;
+    angularCompilerOptions: AngularCompilerOptions;
+    i18nFormat: string;
+    readResource: (fileName: string) => Promise<string>;
+}
 /**
@@ -39,2 +48,7 @@ * @internal
     static listLazyRoutes(options: NgTools_InternalApi_NG2_ListLazyRoutes_Options): NgTools_InternalApi_NG_2_LazyRouteMap;
+    /**
+     * @internal
+     * @private
+     */
+    static extractI18n(options: NgTools_InternalApi_NG2_ExtractI18n_Options): Promise<void>;
 }

src/ngtools_api.js

@@ -23,2 +23,3 @@ /**
 var compiler_host_1 = require('./compiler_host');
+var extractor_1 = require('./extractor');
 var ngtools_impl_1 = require('./ngtools_impl');
@@ -74,3 +75,6 @@ var path_mapped_compiler_host_1 = require('./path_mapped_compiler_host');
             new compiler_host_1.CompilerHost(program, angularCompilerOptions, moduleResolutionHost);
-        var staticReflector = new compiler_1.StaticReflector(ngCompilerHost);
+        var symbolCache = new compiler_1.StaticSymbolCache();
+        var summaryResolver = new compiler_1.AotSummaryResolver(ngCompilerHost, symbolCache);
+        var symbolResolver = new compiler_1.StaticSymbolResolver(ngCompilerHost, symbolCache, summaryResolver);
+        var staticReflector = new compiler_1.StaticReflector(symbolResolver);
         var routeMap = ngtools_impl_1.listLazyRoutesOfModule(options.entryModule, ngCompilerHost, staticReflector);
@@ -82,2 +86,12 @@ return Object.keys(routeMap).reduce(function (acc, route) {
     };
+    /**
+     * @internal
+     * @private
+     */
+    NgTools_InternalApi_NG_2.extractI18n = function (options) {
+        var hostContext = new CustomLoaderModuleResolutionHostAdapter(options.readResource, options.host);
+        // Create the i18n extractor.
+        var extractor = extractor_1.Extractor.create(options.angularCompilerOptions, options.program, options.host, hostContext);
+        return extractor.extract(options.i18nFormat);
+    };
     return NgTools_InternalApi_NG_2;
@@ -84,0 +98,0 @@ }());

src/version.js

@@ -18,3 +18,3 @@ /**
  */
-exports.VERSION = new core_1.Version('4.0.0-beta.0');
+exports.VERSION = new core_1.Version('4.0.0-beta.1');
 //# sourceMappingURL=version.js.map

src/version.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":3,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["4.0.0-beta.0"]}}},{"__symbolic":"module","version":1,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["4.0.0-beta.0"]}}}]
+[{"__symbolic":"module","version":3,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["4.0.0-beta.1"]}}},{"__symbolic":"module","version":1,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["4.0.0-beta.1"]}}}]

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

142681

increased by6.68%

Lines of code

1262

increased by6.95%

Dependency changes

• + Added@angular/compiler@4.0.0-beta.1(transitive)

• + Added@angular/core@4.0.0-beta.1(transitive)

• + Added@angular/tsc-wrapped@0.5.0(transitive)

• + Addedrxjs@5.5.12(transitive)

• + Addedsymbol-observable@1.0.1(transitive)

• - Removed@angular/compiler@4.0.0-beta.0(transitive)

• - Removed@angular/core@4.0.0-beta.0(transitive)

• - Removed@angular/tsc-wrapped@0.4.2(transitive)

• - Removedrxjs@5.0.0-rc.4(transitive)

• - Removedsymbol-observable@1.2.0(transitive)

• Updated@angular/tsc-wrapped@0.5.0