fix(compiler): look for flat module resources using declaration module path (#15367)

`ngc` would look for flat module resources relative to the flat module index.
`ngc` now looks for flat module resources relative to the `.d.ts` file that declarates
the component.

Fixes #15221

PR Close #15367

packages/compiler-cli/integrationtest/flat_module/public-api.ts

@@ -0,0 +1,10 @@
+/**
+ * @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 * from './src/flat.component';
+export * from './src/flat.module';

packages/compiler-cli/integrationtest/flat_module/src/flat.component.html

@@ -0,0 +1 @@
+<div>flat module component</div>

packages/compiler-cli/integrationtest/flat_module/src/flat.component.ts

@@ -0,0 +1,16 @@
+/**
+ * @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 {Component} from '@angular/core';
+
+@Component({
+  selector: 'flat-comp',
+  templateUrl: 'flat.component.html',
+})
+export class FlatComponent {
+}

packages/compiler-cli/integrationtest/flat_module/src/flat.module.ts

@@ -0,0 +1,22 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+
+import {FlatComponent} from './flat.component';
+
+@NgModule({
+  declarations: [
+    FlatComponent,
+  ],
+  exports: [
+    FlatComponent,
+  ]
+})
+export class FlatModule {
+}

packages/compiler-cli/integrationtest/flat_module/tsconfig-build.json

@@ -0,0 +1,26 @@
+{
+  "angularCompilerOptions": {
+    // For TypeScript 1.8, we have to lay out generated files
+    // in the same source directory with your code.
+    "genDir": "ng",
+    "flatModuleId": "flat_module",
+    "flatModuleOutFile": "index.js",
+    "skipTemplateCodegen": true
+  },
+
+  "compilerOptions": {
+    "target": "es5",
+    "experimentalDecorators": true,
+    "noImplicitAny": true,
+    "moduleResolution": "node",
+    "rootDir": "",
+    "declaration": true,
+    "lib": ["es6", "dom"],
+    "baseUrl": ".",
+    "outDir": "../node_modules/flat_module",
+     // Prevent scanning up the directory tree for types
+    "typeRoots": ["node_modules/@types"]
+ },
+
+ "files": ["public-api.ts"]
+}

packages/compiler-cli/integrationtest/src/comp_using_flat_module.ts

@@ -0,0 +1,16 @@
+/**
+ * @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 {Component} from '@angular/core';
+
+@Component({
+  selector: 'use-flat-module',
+  template: '<flat-comp></flat-comp>',
+})
+export class ComponentUsingFlatModule {
+}

packages/compiler-cli/integrationtest/src/module.ts

@@ -10,6 +10,7 @@ import {ApplicationRef, NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {ServerModule} from '@angular/platform-server';
 import {MdButtonModule} from '@angular2-material/button';
+import {FlatModule} from 'flat_module';
 // Note: don't refer to third_party_src as we want to test that
 // we can compile components from node_modules!
 import {ThirdpartyModule} from 'third_party/module';
@@ -18,6 +19,7 @@ import {MultipleComponentsMyComp, NextComp} from './a/multiple_components';
 import {AnimateCmp} from './animate';
 import {BasicComp} from './basic';
 import {ComponentUsingThirdParty} from './comp_using_3rdp';
+import {ComponentUsingFlatModule} from './comp_using_flat_module';
 import {CUSTOM} from './custom_token';
 import {CompWithAnalyzeEntryComponentsProvider, CompWithEntryComponents} from './entry_components';
 import {BindingErrorComp} from './errors';
@@ -48,6 +50,7 @@ import {CompForChildQuery, CompWithChildQuery, CompWithDirectiveChild, Directive
     ProjectingComp,
     SomeDirectiveInRootModule,
     SomePipeInRootModule,
+    ComponentUsingFlatModule,
     ComponentUsingThirdParty,
     BindingErrorComp,
   ],
@@ -58,6 +61,7 @@ import {CompForChildQuery, CompWithChildQuery, CompWithDirectiveChild, Directive
     ModuleUsingCustomElements,
     SomeLibModule.withProviders(),
     ThirdpartyModule,
+    FlatModule,
   ],
   providers: [
     SomeService,
@@ -73,6 +77,7 @@ import {CompForChildQuery, CompWithChildQuery, CompWithDirectiveChild, Directive
     CompWithReferences,
     ProjectingComp,
     ComponentUsingThirdParty,
+    ComponentUsingFlatModule,
     BindingErrorComp,
   ]
 })

packages/compiler-cli/integrationtest/test/ng_module_spec.ts

@@ -8,6 +8,7 @@
 import './init';
 
 import {ComponentUsingThirdParty} from '../src/comp_using_3rdp';
+import {ComponentUsingFlatModule} from '../src/comp_using_flat_module';
 import {MainModule} from '../src/module';
 import {CompUsingLibModuleDirectiveAndPipe, CompUsingRootModuleDirectiveAndPipe, SOME_TOKEN, ServiceUsingLibModule, SomeLibModule, SomeService} from '../src/module_fixtures';
 
@@ -43,6 +44,15 @@ describe('NgModule', () => {
        ]);
      });
 
+  describe('flat modules', () => {
+    it('should support flat module entryComponents components', () => {
+      // https://github.com/angular/angular/issues/15221
+      const fixture = createComponent(ComponentUsingFlatModule);
+      const bundleComp = fixture.nativeElement.children;
+      expect(bundleComp[0].children[0].children[0].data).toEqual('flat module component');
+    });
+  });
+
   describe('third-party modules', () => {
     // https://github.com/angular/angular/issues/11889
     it('should support third party entryComponents components', () => {