Skip to content

fix(ivy): ngcc - properly handle aliased class expressions #29119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JoostK wants to merge 9 commits into from
Closed

fix(ivy): ngcc - properly handle aliased class expressions #29119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
387cd87
ci: exclude ngcc from needing g3 presubmit
JoostK Mar 23, 2019
901708b
fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 5, 2019
7890b47
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 24, 2019
0b4e7ff
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 27, 2019
b20fe73
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 27, 2019
08621d5
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 28, 2019
2b80d69
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 28, 2019
05570ec
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 28, 2019
8f8097e
fixup! fix(ivy): ngcc - properly handle aliases class expressions
JoostK Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/angular-robot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ merge:
- "packages/bazel/src/ng_package/**"
- "packages/bazel/src/protractor/**"
- "packages/bazel/src/schematics/**"
- "packages/compiler-cli/src/ngcc/**"
- "packages/compiler-cli/ngcc/**"
- "packages/docs/**"
- "packages/elements/schematics/**"
- "packages/examples/**"
Expand Down
20 changes: 7 additions & 13 deletions packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import * as ts from 'typescript';

import {ReferencesRegistry} from '../../../src/ngtsc/annotations';
import {Reference} from '../../../src/ngtsc/imports';
import {Declaration} from '../../../src/ngtsc/reflection';
import {ClassDeclaration, Declaration} from '../../../src/ngtsc/reflection';
import {ModuleWithProvidersFunction, NgccReflectionHost} from '../host/ngcc_host';
import {isDefined} from '../utils';
import {hasNameIdentifier, isDefined} from '../utils';

export interface ModuleWithProvidersInfo {
/**
Expand All @@ -23,7 +23,7 @@ export interface ModuleWithProvidersInfo {
/**
* The NgModule class declaration (in the .d.ts file) to add as a type parameter.
*/
ngModule: Declaration;
ngModule: Declaration<ClassDeclaration>;
}

export type ModuleWithProvidersAnalyses = Map<ts.SourceFile, ModuleWithProvidersInfo[]>;
Expand All @@ -44,11 +44,7 @@ export class ModuleWithProvidersAnalyzer {
null;
if (!typeParam || isAnyKeyword(typeParam)) {
// Either we do not have a parameterized type or the type is `any`.
let ngModule = this.host.getDeclarationOfIdentifier(fn.ngModule);
if (!ngModule) {
throw new Error(
`Cannot find a declaration for NgModule ${fn.ngModule.text} referenced in ${fn.declaration.getText()}`);
}
let ngModule = fn.ngModule;
// For internal (non-library) module references, redirect the module's value declaration
// to its type declaration.
if (ngModule.viaModule === null) {
Expand All @@ -57,14 +53,12 @@ export class ModuleWithProvidersAnalyzer {
throw new Error(
`No typings declaration can be found for the referenced NgModule class in ${fn.declaration.getText()}.`);
}
if (!ts.isClassDeclaration(dtsNgModule)) {
if (!ts.isClassDeclaration(dtsNgModule) || !hasNameIdentifier(dtsNgModule)) {
throw new Error(
`The referenced NgModule in ${fn.declaration.getText()} is not a class declaration in the typings program; instead we get ${dtsNgModule.getText()}`);
`The referenced NgModule in ${fn.declaration.getText()} is not a named class declaration in the typings program; instead we get ${dtsNgModule.getText()}`);
}
// Record the usage of the internal module as it needs to become an exported symbol
const reference = new Reference(ngModule.node);
reference.addIdentifier(fn.ngModule);
this.referencesRegistry.add(ngModule.node, reference);
this.referencesRegistry.add(ngModule.node, new Reference(ngModule.node));

ngModule = {node: dtsNgModule, viaModule: null};
}
Expand Down
Loading