fix(ngcc): add reexports only once (#33658)

When ngcc is configured to generate reexports for a package using the
`generateDeepReexports` configuration option, it could incorrectly
render the reexports as often as the number of compiled classes in the
declaration file. This would cause compilation errors due to duplicated
declarations.

PR Close #33658
This commit is contained in:
JoostK 2019-11-07 19:34:40 +01:00 committed by Andrew Scott
parent 1aa3053b12
commit 81828ae7f4
2 changed files with 23 additions and 9 deletions

View File

@ -96,14 +96,14 @@ export class DtsRenderer {
const newStatement = ` static ${declaration.name}: ${typeStr};\n`; const newStatement = ` static ${declaration.name}: ${typeStr};\n`;
outputText.appendRight(endOfClass - 1, newStatement); outputText.appendRight(endOfClass - 1, newStatement);
}); });
});
if (renderInfo.reexports.length > 0) { if (renderInfo.reexports.length > 0) {
for (const e of renderInfo.reexports) { for (const e of renderInfo.reexports) {
const newStatement = `\nexport {${e.symbolName} as ${e.asAlias}} from '${e.fromModule}';`; const newStatement = `\nexport {${e.symbolName} as ${e.asAlias}} from '${e.fromModule}';`;
outputText.appendRight(endOfClass, newStatement); outputText.append(newStatement);
} }
} }
});
this.dtsFormatter.addModuleWithProvidersParams( this.dtsFormatter.addModuleWithProvidersParams(
outputText, renderInfo.moduleWithProviders, importManager); outputText, renderInfo.moduleWithProviders, importManager);

View File

@ -918,23 +918,35 @@ runInEachFileSystem(() => {
var __decorate = null; var __decorate = null;
var core_1 = require("@angular/core"); var core_1 = require("@angular/core");
var directive_1 = require("./directive"); var directive_1 = require("./directive");
var LocalDir = /** @class */ (function () {
function LocalDir() {
}
LocalDir = __decorate([
core_1.Directive({
selector: '[local]',
})
], LocalDir);
return LocalDir;
}());
var FooModule = /** @class */ (function () { var FooModule = /** @class */ (function () {
function FooModule() { function FooModule() {
} }
FooModule = __decorate([ FooModule = __decorate([
core_1.NgModule({ core_1.NgModule({
declarations: [directive_1.Foo], declarations: [directive_1.Foo, LocalDir],
exports: [directive_1.Foo], exports: [directive_1.Foo, LocalDir],
}) })
], FooModule); ], FooModule);
return FooModule; return FooModule;
}()); }());
exports.LocalDir = LocalDir;
exports.FooModule = FooModule; exports.FooModule = FooModule;
`, `,
}, },
{ {
name: _('/node_modules/test-package/module.d.ts'), name: _('/node_modules/test-package/module.d.ts'),
contents: ` contents: `
export declare class LocalDir {}
export declare class FooModule {} export declare class FooModule {}
`, `,
}, },
@ -1005,6 +1017,8 @@ runInEachFileSystem(() => {
expect(jsContents).toContain('exports.ɵngExportɵFooModuleɵFoo = ɵngcc1.Foo;'); expect(jsContents).toContain('exports.ɵngExportɵFooModuleɵFoo = ɵngcc1.Foo;');
expect(dtsContents) expect(dtsContents)
.toContain(`export {Foo as ɵngExportɵFooModuleɵFoo} from './directive';`); .toContain(`export {Foo as ɵngExportɵFooModuleɵFoo} from './directive';`);
expect(dtsContents.match(/ɵngExportɵFooModuleɵFoo/g) !.length).toBe(1);
expect(dtsContents).not.toContain(`ɵngExportɵFooModuleɵLocalDir`);
}); });
}); });