cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ngcc): correctly handle inline exports in UMD (#34512)

Browse Source 
This fix was part of a broader `ngtsc`/`ngcc` fix in 02bab8cf9 (see
there for details). In 02bab8cf9, the fix was only applied to
`CommonJsReflectionHost`, but it is equally applicable to
`UmdReflectionHost`. Later in #34254, the fix was partially ported to
`UmdReflectionHost` by fixing the `extractUmdReexports()` method.

This commit fully fixes `ngcc`'s handling of inline exports for code in
UMD format.

PR Close #34512
This commit is contained in:
George Kalpakas
2019-12-20 14:19:08 +02:00
committed by Alex Rickabaugh
parent ba4aeed2eb
commit 7bbfccfcd8
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/compiler-cli/ngcc/src/host/umd_host.ts
View File

@ -114,9 +114,7 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
for (const statement of this.getModuleStatements(sourceFile)) {
if (isUmdExportStatement(statement)) {
const declaration = this.extractUmdExportDeclaration(statement);
if (declaration !== null) {
moduleMap.set(declaration.name, declaration.declaration);
}
moduleMap.set(declaration.name, declaration.declaration);
} else if (isReexportStatement(statement)) {
const reexports = this.extractUmdReexports(statement, sourceFile);
for (const reexport of reexports) {
@ -127,16 +125,22 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
return moduleMap;
}
private extractUmdExportDeclaration(statement: UmdExportStatement): UmdExportDeclaration|null {
private extractUmdExportDeclaration(statement: UmdExportStatement): UmdExportDeclaration {
const exportExpression = statement.expression.right;
const name = statement.expression.left.name.text;
const declaration = this.getDeclarationOfExpression(exportExpression);
if (declaration === null) {
return null;
const name = statement.expression.left.name.text;
if (declaration !== null) {
return {name, declaration};
} else {
return {
name,
declaration: {
node: null,
expression: exportExpression,
viaModule: null,
},
};
}
return {name, declaration};
}
private extractUmdReexports(statement: ReexportStatement, containingFile: ts.SourceFile):