honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(compiler-cli): hande TS 3.9 format in emisson tests (#36989) 

In TypeScript 3.9 the emitted JS code has some differences.
This commit updates the tests to be resilient to these changes.

PR Close #36989
This commit is contained in:
Pete Bacon Darwin 2020-05-12 08:20:00 +01:00 committed by Kara Erickson
parent 2956f21d82
commit 8b79075497
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/compiler-cli/test/transformers/node_emitter_spec.ts
View File

@ -17,7 +17,6 @@ const sourceMap = require('source-map');
const someGenFilePath = '/somePackage/someGenFile'; const someGenFilePath = '/somePackage/someGenFile';
const someGenFileName = someGenFilePath + '.ts'; const someGenFileName = someGenFilePath + '.ts';
const someSourceFilePath = '/somePackage/someSourceFile';
const anotherModuleUrl = '/somePackage/someOtherPath'; const anotherModuleUrl = '/somePackage/someOtherPath';
const sameModuleIdentifier = new o.ExternalReference(null, 'someLocalId', null); const sameModuleIdentifier = new o.ExternalReference(null, 'someLocalId', null);
@ -45,7 +44,7 @@ describe('TypeScriptNodeEmitter', () => {
[someGenFileName], {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2017}, host); [someGenFileName], {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2017}, host);
const moduleSourceFile = program.getSourceFile(someGenFileName); const moduleSourceFile = program.getSourceFile(someGenFileName);
const transformers: ts.CustomTransformers = { const transformers: ts.CustomTransformers = {
before: [context => { before: [() => {
return sourceFile => { return sourceFile => {
const [newSourceFile] = emitter.updateSourceFile(sourceFile, stmts, preamble); const [newSourceFile] = emitter.updateSourceFile(sourceFile, stmts, preamble);
return newSourceFile; return newSourceFile;
@ -53,8 +52,7 @@ describe('TypeScriptNodeEmitter', () => {
}] }]
}; };
let result: string = ''; let result: string = '';
const emitResult = program.emit( program.emit(moduleSourceFile, (fileName, data) => {
moduleSourceFile, (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
if (fileName.startsWith(someGenFilePath)) { if (fileName.startsWith(someGenFilePath)) {
result = data; result = data;
} }
@ -92,24 +90,42 @@ describe('TypeScriptNodeEmitter', () => {
}); });
it('should create a reexport', () => { it('should create a reexport', () => {
expect(emitStmt(someVar.set(o.importExpr(externalModuleIdentifier)) const result = emitStmt(someVar.set(o.importExpr(externalModuleIdentifier)).toDeclStmt(null, [
.toDeclStmt(null, [o.StmtModifier.Exported]))) o.StmtModifier.Exported
.toEqual( ]));
`var someOtherPath_1 = require("/somePackage/someOtherPath"); exports.someVar = someOtherPath_1.someExternalId;`); expect(result).toContain(`var someOtherPath_1 = require("/somePackage/someOtherPath");`);
if (!result.includes('exports.someVar = someOtherPath_1.someExternalId;') &&
// In TS 3.9 re-exports of namespaced imports are defined as getters
!result.includes(
'Object.defineProperty(exports, "someVar", { enumerable: true, get: function () { return someOtherPath_1.someExternalId; } });')) {
fail(
'Expected `someVar` to be exported directly or via a `definedProperty` call. Instead got:\n' +
result);
}
}); });
it('should create multiple reexports from the same file', () => { it('should create multiple reexports from the same file', () => {
const someVar2 = o.variable('someVar2'); const someVar2 = o.variable('someVar2');
const externalModuleIdentifier2 = const externalModuleIdentifier2 =
new o.ExternalReference(anotherModuleUrl, 'someExternalId2', null); new o.ExternalReference(anotherModuleUrl, 'someExternalId2', null);
expect(emitStmt([ const result = emitStmt([
someVar.set(o.importExpr(externalModuleIdentifier)) someVar.set(o.importExpr(externalModuleIdentifier))
.toDeclStmt(null, [o.StmtModifier.Exported]), .toDeclStmt(null, [o.StmtModifier.Exported]),
someVar2.set(o.importExpr(externalModuleIdentifier2)) someVar2.set(o.importExpr(externalModuleIdentifier2))
.toDeclStmt(null, [o.StmtModifier.Exported]) .toDeclStmt(null, [o.StmtModifier.Exported])
])) ]);
.toEqual( expect(result).toContain(`var someOtherPath_1 = require("/somePackage/someOtherPath");`);
`var someOtherPath_1 = require("/somePackage/someOtherPath"); exports.someVar = someOtherPath_1.someExternalId; exports.someVar2 = someOtherPath_1.someExternalId2;`); if (!result.includes(
'exports.someVar = someOtherPath_1.someExternalId;' +
'exports.someVar2 = someOtherPath_1.someExternalId2;') &&
// In TS 3.9 re-exports of namespaced imports are defined as getters
!result.includes(
'Object.defineProperty(exports, "someVar", { enumerable: true, get: function () { return someOtherPath_1.someExternalId; } }); ' +
'Object.defineProperty(exports, "someVar2", { enumerable: true, get: function () { return someOtherPath_1.someExternalId2; } })')) {
fail(
'Expected `someVar` and `someVar2` to be exported directly or via a `definedProperty` call. Instead got:\n' +
result);
}
}); });
}); });
@ -576,6 +592,10 @@ function normalizeResult(result: string, format: Format): string {
.replace('exports.__esModule = true;', ' ') .replace('exports.__esModule = true;', ' ')
.replace('Object.defineProperty(exports, "__esModule", { value: true });', ' '); .replace('Object.defineProperty(exports, "__esModule", { value: true });', ' ');
// Remove hoisted initial export assignments. These were added in TS 3.9:
// https://github.com/Microsoft/TypeScript/commit/c6c2c4c8d5aa0947de16f484b8c16fb0eab1c48f
res = res.replace(/^exports\.\S+ = void 0;$/gm, '');
// Remove new lines // Remove new lines
// Squish adjacent spaces // Squish adjacent spaces
if (format === Format.Flat) { if (format === Format.Flat) {