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

fix(ngcc): support defineProperty() re-exports in CommonJS and UMD (#36989)

Browse Source 
In TypeScript 3.9 some re-export syntaxes have changed to be getter
functions (created by calls to `Object.defineProperty()`) rather than
simple property accessors.

This commit adds support into the CommonJS and UMD reflection hosts
for this style of re-export syntax.

PR Close #36989
This commit is contained in:
Pete Bacon Darwin
2020-05-12 08:20:01 +01:00
committed by Kara Erickson
parent d268d2ad85
commit 91092f668e
5 changed files with 241 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
View File

@ -517,8 +517,8 @@ var c = file_a.a;
`var b_module = require('./b_module');\n` +
`var xtra_module = require('./xtra_module');\n` +
`var wildcard_reexports_emitted_helpers = require('./wildcard_reexports_emitted_helpers');\n` +
`var wildcard_reexports_imported_helpers = require('./wildcard_reexports_imported_helpers');\n`,
`var wildcard_reexports_imported_helpers = require('./wildcard_reexports_imported_helpers');\n` +
`var define_property_reexports = require('./define_property_reexports');\n`
},
{
name: _('/a_module.js'),
@ -570,6 +570,11 @@ var c = file_a.a;
`tslib_1.__exportStar(b_module, exports);\n` +
`tslib_1.__exportStar(require("./xtra_module"), exports);\n`,
},
{
name: _('/define_property_reexports.js'),
contents: `var moduleA = require("./a_module");\n` +
`Object.defineProperty(exports, "newA", { enumerable: true, get: function () { return moduleA.a; } });`,
}
];
FUNCTION_BODY_FILE = {
@ -2180,6 +2185,22 @@ exports.MissingClass2 = MissingClass2;
['__unknownHelper', null],
]);
});
it('should define property exports from a module', () => {
loadFakeCore(getFileSystem());
loadTestFiles(EXPORTS_FILES);
const bundle = makeTestBundleProgram(_('/index.js'));
const host =
createHost(bundle, new CommonJsReflectionHost(new MockLogger(), false, bundle));
const file = getSourceFileOrError(bundle.program, _('/define_property_reexports.js'));
const exportDeclarations = host.getExportsOfModule(file);
expect(exportDeclarations).not.toBe(null);
expect(Array.from(exportDeclarations!.entries())
.map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
.toEqual([
['newA', `a = 'a'`, null],
]);
});
});
describe('getClassSymbol()', () => {