angular · petebacondarwin · Jul 20, 2018 · Jul 25, 2018 · Jul 16, 2018 · Jul 24, 2018
diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "angular-integration",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@types/node": "^9.4.0",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "file:../../node_modules/typescript",
+    "zone.js": "file:../../node_modules/zone.js"
+  },
+  "devDependencies": {
+    "@types/jasmine": "2.5.41",
+    "concurrently": "3.4.0",
+    "lite-server": "2.2.2",
+    "protractor": "file:../../node_modules/protractor"
+  },
+  "scripts": {
+    "test": "./test.sh"
+  }
+}
diff --git a/integration/ngcc/src/main.ts b/integration/ngcc/src/main.ts
@@ -0,0 +1,20 @@
+import {Component, NgModule, ɵrenderComponent as renderComponent} from '@angular/core';
+import {CommonModule} from '@angular/common';
+@Component({
+  selector: 'hello-world',
+  template: `
+    <button (click)="visible = true">See Message</button>
+    <h2 *ngIf="visible">Hello World</h2>
+  `,
+})
+class HelloWorld {
+  visible = false;
+}
+
+@NgModule({
+  declarations: [HelloWorld],
+  imports: [CommonModule],
+})
+class Module {}
+
+renderComponent(HelloWorld);
diff --git a/integration/ngcc/test.sh b/integration/ngcc/test.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e -x
+
+PATH=$PATH:$(npm bin)
+
+ivy-ngcc fesm2015,esm2015
+ngc -p tsconfig-app.json
+
+# Look for correct output
+grep "directives: \[\S*\.NgIf\]" dist/src/main.js > /dev/null
diff --git a/integration/ngcc/tsconfig-app.json b/integration/ngcc/tsconfig-app.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "lib": ["es2015", "dom"],
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "outDir": "dist",
+    "types": ["node"],
+    "rootDir": "."
+  },
+  "files": [
+    "src/main.ts"
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": "ngtsc"
+  }
+}
diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts
@@ -8,10 +8,11 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import {MetadataCollector} from '../metadata/collector';
-import {ClassMetadata, ConstructorMetadata, FunctionMetadata, METADATA_VERSION, MemberMetadata, MetadataEntry, MetadataError, MetadataImportedSymbolReferenceExpression, MetadataMap, MetadataObject, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleExportMetadata, ModuleMetadata, isClassMetadata, isConstructorMetadata, isFunctionMetadata, isInterfaceMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportedSymbolReferenceExpression, isMetadataModuleReferenceExpression, isMetadataSymbolicExpression, isMethodMetadata} from '../metadata/schema';
 import {MetadataCache} from '../transformers/metadata_cache';
 
+import {MetadataCollector} from './collector';
+import {ClassMetadata, ConstructorMetadata, FunctionMetadata, METADATA_VERSION, MemberMetadata, MetadataEntry, MetadataError, MetadataImportedSymbolReferenceExpression, MetadataMap, MetadataObject, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleExportMetadata, ModuleMetadata, isClassMetadata, isConstructorMetadata, isFunctionMetadata, isInterfaceMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportedSymbolReferenceExpression, isMetadataModuleReferenceExpression, isMetadataSymbolicExpression, isMethodMetadata} from './schema';
+
 
 
 // The character set used to produce private names.

diff --git a/packages/compiler-cli/src/ngcc/src/analyzer.ts b/packages/compiler-cli/src/ngcc/src/analyzer.ts
@@ -66,7 +66,7 @@ export class Analyzer {
   analyzeFile(file: ParsedFile): AnalyzedFile {
     const constantPool = new ConstantPool();
     const analyzedClasses =
-        file.decoratedClasses.map(clazz => this.analyzeClass(file.sourceFile, constantPool, clazz))
+        file.decoratedClasses.map(clazz => this.analyzeClass(constantPool, clazz))
             .filter(isDefined);
 
     return {
@@ -75,8 +75,7 @@ export class Analyzer {
     };
   }
 
-  protected analyzeClass(file: ts.SourceFile, pool: ConstantPool, clazz: ParsedClass): AnalyzedClass
-      |undefined {
+  protected analyzeClass(pool: ConstantPool, clazz: ParsedClass): AnalyzedClass|undefined {
     const matchingHandlers = this.handlers
                                  .map(handler => ({
                                         handler,

diff --git a/packages/compiler-cli/src/ngcc/src/constants.ts b/packages/compiler-cli/src/ngcc/src/constants.ts
@@ -0,0 +1,9 @@
+/**
+ * @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
+ */
+
+export const IMPORT_PREFIX = 'ɵngcc';
diff --git a/packages/compiler-cli/src/ngcc/src/host/dts_mapper.ts b/packages/compiler-cli/src/ngcc/src/host/dts_mapper.ts
@@ -0,0 +1,32 @@
+/**
+ * @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 {relative, resolve} from 'path';
+
+/**
+ * Map source files to their associated typings definitions files.
+ */
+export class DtsMapper {
+  constructor(private sourceRoot: string, private dtsRoot: string) {}
+
+  /**
+   * Given the absolute path to a source file, return the absolute path to the corresponding `.d.ts`
+   * file. Assume that source files and `.d.ts` files have the same directory layout and the names
+   * of the `.d.ts` files can be derived by replacing the `.js` extension of the source file with
+   * `.d.ts`.
+   *
+   * @param sourceFileName The absolute path to the source file whose corresponding `.d.ts` file
+   *     should be returned.
+   *
+   * @returns The absolute path to the `.d.ts` file that corresponds to the specified source file.
+   */
+  getDtsFileNameFor(sourceFileName: string): string {
+    const relativeSourcePath = relative(this.sourceRoot, sourceFileName);
+    return resolve(this.dtsRoot, relativeSourcePath).replace(/\.js$/, '.d.ts');
+  }
+}