fix: optional-chaining should work correctly with ts non-null operator

babel · Jan 7, 2020 · f56f54b · f56f54b
1 parent a7dac49
commit f56f54b
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 0 deletions.
diff --git a/packages/babel-plugin-proposal-optional-chaining/src/index.js b/packages/babel-plugin-proposal-optional-chaining/src/index.js
@@ -34,6 +34,11 @@ export default declare((api, options) => {
             optionalPath.node.type = "CallExpression";
             optionalPath = optionalPath.get("callee");
           }
+
+          // unwrap a TSNonNullExpression if need
+          if (optionalPath.isTSNonNullExpression()) {
+            optionalPath.replaceWith(optionalPath.node.expression);
+          }
         }
 
         let replacementPath = path;

diff --git a/.../test/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/input.ts b/.../test/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/input.ts
@@ -0,0 +1 @@
+a?.b!.c
diff --git a/...t/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/options.json b/...t/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["proposal-optional-chaining"],
+  "presets": ["../../../../../babel-preset-typescript"]
+}
diff --git a/...test/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/output.js b/...test/fixtures/regression/10959-proposal-optional-chaining-and-preset-typescript/output.js
@@ -0,0 +1,3 @@
+var _a;
+
+(_a = a) === null || _a === void 0 ? void 0 : _a.b.c;
diff --git a/.../test/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/input.ts b/.../test/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/input.ts
@@ -0,0 +1 @@
+a?.b!.c
diff --git a/...t/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/options.json b/...t/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "proposal-optional-chaining",
+    "../../../../../babel-plugin-syntax-typescript"
+  ]
+}
diff --git a/...test/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/output.js b/...test/fixtures/regression/10959-proposal-optional-chaining-and-typescript-syntax/output.js
@@ -0,0 +1,3 @@
+var _a;
+
+(_a = a) === null || _a === void 0 ? void 0 : _a.b.c;
diff --git a/...test/fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/input.ts b/...test/fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/input.ts
@@ -0,0 +1 @@
+a?.b!.c
diff --git a/.../fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/options.json b/.../fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../../../babel-plugin-syntax-optional-chaining",
+    "../../../../../babel-plugin-transform-typescript"
+  ]
+}
diff --git a/...est/fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/output.js b/...est/fixtures/regression/10959-syntax-optional-chaining-and-transform-typescript/output.js
@@ -0,0 +1 @@
+a?.b.c;