From 8b79075497796d3c1a25898a5e0dd6fac926e816 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Tue, 12 May 2020 08:20:00 +0100
Subject: [PATCH] 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
---
 .../test/transformers/node_emitter_spec.ts    | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/packages/compiler-cli/test/transformers/node_emitter_spec.ts b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
index 0b53d4b380..57750da9c2 100644
--- a/packages/compiler-cli/test/transformers/node_emitter_spec.ts
+++ b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
@@ -17,7 +17,6 @@ const sourceMap = require('source-map');
 
 const someGenFilePath = '/somePackage/someGenFile';
 const someGenFileName = someGenFilePath + '.ts';
-const someSourceFilePath = '/somePackage/someSourceFile';
 const anotherModuleUrl = '/somePackage/someOtherPath';
 
 const sameModuleIdentifier = new o.ExternalReference(null, 'someLocalId', null);
@@ -45,7 +44,7 @@ describe('TypeScriptNodeEmitter', () => {
         [someGenFileName], {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2017}, host);
     const moduleSourceFile = program.getSourceFile(someGenFileName);
     const transformers: ts.CustomTransformers = {
-      before: [context => {
+      before: [() => {
         return sourceFile => {
           const [newSourceFile] = emitter.updateSourceFile(sourceFile, stmts, preamble);
           return newSourceFile;
@@ -53,12 +52,11 @@ describe('TypeScriptNodeEmitter', () => {
       }]
     };
     let result: string = '';
-    const emitResult = program.emit(
-        moduleSourceFile, (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
-          if (fileName.startsWith(someGenFilePath)) {
-            result = data;
-          }
-        }, undefined, undefined, transformers);
+    program.emit(moduleSourceFile, (fileName, data) => {
+      if (fileName.startsWith(someGenFilePath)) {
+        result = data;
+      }
+    }, undefined, undefined, transformers);
     return normalizeResult(result, format);
   }
 
@@ -92,24 +90,42 @@ describe('TypeScriptNodeEmitter', () => {
     });
 
     it('should create a reexport', () => {
-      expect(emitStmt(someVar.set(o.importExpr(externalModuleIdentifier))
-                          .toDeclStmt(null, [o.StmtModifier.Exported])))
-          .toEqual(
-              `var someOtherPath_1 = require("/somePackage/someOtherPath"); exports.someVar = someOtherPath_1.someExternalId;`);
+      const result = emitStmt(someVar.set(o.importExpr(externalModuleIdentifier)).toDeclStmt(null, [
+        o.StmtModifier.Exported
+      ]));
+      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', () => {
       const someVar2 = o.variable('someVar2');
       const externalModuleIdentifier2 =
           new o.ExternalReference(anotherModuleUrl, 'someExternalId2', null);
-      expect(emitStmt([
+      const result = emitStmt([
         someVar.set(o.importExpr(externalModuleIdentifier))
             .toDeclStmt(null, [o.StmtModifier.Exported]),
         someVar2.set(o.importExpr(externalModuleIdentifier2))
             .toDeclStmt(null, [o.StmtModifier.Exported])
-      ]))
-          .toEqual(
-              `var someOtherPath_1 = require("/somePackage/someOtherPath"); exports.someVar = someOtherPath_1.someExternalId; exports.someVar2 = someOtherPath_1.someExternalId2;`);
+      ]);
+      expect(result).toContain(`var someOtherPath_1 = require("/somePackage/someOtherPath");`);
+      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('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
   // Squish adjacent spaces
   if (format === Format.Flat) {