From db47fd1a8a6100a8536f10e5f6ac16f40e5ab891 Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Wed, 6 Nov 2019 15:25:20 +0100
Subject: [PATCH] fix: enable nullish coalescing and optional chaining
 unconditionally

---
 package.json             |  2 +-
 tests/unit/build-test.ts |  9 +++++++++
 ts/addon.ts              | 20 ++++----------------
 yarn.lock                | 15 ++++++++-------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 8b83e48a6..bf7e8e953 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "testdouble": "3.12.4",
     "tmp": "0.1.0",
     "ts-node": "8.4.1",
-    "typescript": "3.6.4"
+    "typescript": "3.7.2"
   },
   "resolutions": {
     "@types/ember": "3.1.1",
diff --git a/tests/unit/build-test.ts b/tests/unit/build-test.ts
index 8e0aa1861..4288edb83 100644
--- a/tests/unit/build-test.ts
+++ b/tests/unit/build-test.ts
@@ -39,4 +39,13 @@ module('Unit | Build', function() {
     let instance = new TestClass('hello');
     assert.equal(instance.field, 'hello');
   });
+
+  // TODO: enable once a release of Prettier comes out that supports this syntax
+  // test('optional chaining and nullish coalescing are transpiled correctly', function(assert) {
+  //   let value = { a: 'hello' } as { a?: string; b?: string };
+  //   assert.equal(value?.a, 'hello');
+  //   assert.equal(value?.b, undefined);
+  //   assert.equal(value?.a ?? 'ok', 'hello');
+  //   assert.equal(value?.b ?? 'ok', 'ok');
+  // });
 });
diff --git a/ts/addon.ts b/ts/addon.ts
index aa7a8a91d..8d5aeb1b9 100644
--- a/ts/addon.ts
+++ b/ts/addon.ts
@@ -79,11 +79,10 @@ export default addon({
 
     // As of 3.7, TS supports the optional chaining and nullish coalescing proposals.
     // https://devblogs.microsoft.com/typescript/announcing-typescript-3-7-beta/
-    let tsVersion = this._getProjectTypeScriptVersion();
-    if (semver.gte(tsVersion, '3.7.0-alpha.0')) {
-      this._addBabelPluginIfNotPresent('@babel/plugin-proposal-optional-chaining');
-      this._addBabelPluginIfNotPresent('@babel/plugin-proposal-nullish-coalescing-operator');
-    }
+    // Since we can't necessarily know what version of TS an addon was developed with,
+    // we unconditionally add the Babel plugins for both proposals.
+    this._addBabelPluginIfNotPresent('@babel/plugin-proposal-optional-chaining');
+    this._addBabelPluginIfNotPresent('@babel/plugin-proposal-nullish-coalescing-operator');
 
     // Needs to come after the class properties plugin (see tests/unit/build-test.ts -
     // "property initialization occurs in the right order")
@@ -190,17 +189,6 @@ export default addon({
     }
   },
 
-  _getProjectTypeScriptVersion() {
-    try {
-      let pkg = this.project.require('typescript/package.json') as { version: string };
-      return pkg.version;
-    } catch {
-      throw new Error(
-        `[ember-cli-typescript] Unable to determine project TypeScript version; is it installed?`
-      );
-    }
-  },
-
   _addTypecheckMiddleware(app: Application) {
     let workerPromise = this._getTypecheckWorker();
     let middleware = new TypecheckMiddleware(this.project, workerPromise);
diff --git a/yarn.lock b/yarn.lock
index a615ffef7..6a73ba1b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7572,7 +7572,6 @@ esdoc-ecmascript-proposal-plugin@^1.0.0:
 
 esdoc@pzuraq/esdoc#015a342:
   version "1.0.4"
-  uid "015a3426b2e53b2b0270a9c00133780db3f1d144"
   resolved "https://codeload.github.com/pzuraq/esdoc/tar.gz/015a3426b2e53b2b0270a9c00133780db3f1d144"
   dependencies:
     babel-generator "6.26.0"
@@ -9516,10 +9515,12 @@ imurmurhash@^0.1.4:
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 "in-repo-a@link:tests/dummy/lib/in-repo-a":
-  version "1.0.0"
+  version "0.0.0"
+  uid ""
 
 "in-repo-b@link:tests/dummy/lib/in-repo-b":
-  version "1.0.0"
+  version "0.0.0"
+  uid ""
 
 include-path-searcher@^0.1.0:
   version "0.1.0"
@@ -15718,10 +15719,10 @@ typescript-memoize@^1.0.0-alpha.3:
   dependencies:
     core-js "2.4.1"
 
-typescript@3.6.4:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
-  integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
+typescript@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
+  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"