retain method return types on transform-es2015-classes (closes babel#…

…4665)

packages/babel-helper-define-map/src/index.js

@@ -55,6 +55,7 @@ export function push(mutatorMap: Object, node: Object, kind: string, file, scope
     value = node.value;
   } else if (t.isObjectMethod(node) || t.isClassMethod(node)) {
     value = t.functionExpression(null, node.params, node.body, node.generator, node.async);
+    value.returnType = node.returnType;
   }
 
   let inheritedKind = toKind(node);

packages/babel-plugin-transform-es2015-classes/src/loose.js

@@ -17,6 +17,7 @@ export default class LooseClassTransformer extends VanillaTransformer {
       let methodName = t.memberExpression(classRef, node.key, node.computed || t.isLiteral(node.key));
 
       let func = t.functionExpression(null, node.params, node.body, node.generator, node.async);
+      func.returnType = node.returnType;
       let key = t.toComputedKey(node, node.key);
       if (t.isStringLiteral(key)) {
         func = nameFunction({

packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/method-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/method-return-type-annotation/expected.js

@@ -0,0 +1,12 @@
+// @flow
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  C.prototype.m = function m(x: number): string {
+    return 'a';
+  };
+
+  return C;
+}();

packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/method-return-type-annotation/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "transform-es2015-function-name", ["transform-es2015-classes", { "loose": true }], "transform-es2015-spread", "transform-es2015-block-scoping", "syntax-flow"]
+}

packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/method-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/method-return-type-annotation/expected.js

@@ -0,0 +1,14 @@
+// @flow
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  babelHelpers.createClass(C, [{
+    key: 'm',
+    value: function m(x: number): string {
+      return 'a';
+    }
+  }]);
+  return C;
+}();

packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/method-return-type-annotation/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "transform-es2015-function-name", "transform-es2015-classes", "transform-es2015-spread", "transform-es2015-block-scoping", "syntax-flow"]
+}

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/expected.js

@@ -0,0 +1,14 @@
+'use strict';
+
+// @flow
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  C.prototype.m = function m(x /*: number*/) /*: string*/ {
+    return 'a';
+  };
+
+  return C;
+}();

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/options.json

@@ -0,0 +1,4 @@
+{
+  "presets": [["es2015", { "loose": true }]],
+  "plugins": ["transform-flow-comments", "external-helpers"]
+}

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/expected.js

@@ -0,0 +1,16 @@
+'use strict';
+
+// @flow
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  babelHelpers.createClass(C, [{
+    key: 'm',
+    value: function m(x /*: number*/) /*: string*/ {
+      return 'a';
+    }
+  }]);
+  return C;
+}();

packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/options.json

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "plugins": ["transform-flow-comments", "external-helpers"]
+}

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/expected.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  C.prototype.m = function m(x) {
+    return 'a';
+  };
+
+  return C;
+}();

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/options.json

@@ -0,0 +1,4 @@
+{
+  "presets": [["es2015", { "loose": true }]],
+  "plugins": ["transform-flow-strip-types", "external-helpers"]
+}

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/actual.js

@@ -0,0 +1,6 @@
+// @flow
+class C {
+  m(x: number): string {
+    return 'a';
+  }
+}

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/expected.js

@@ -0,0 +1,15 @@
+'use strict';
+
+var C = function () {
+  function C() {
+    babelHelpers.classCallCheck(this, C);
+  }
+
+  babelHelpers.createClass(C, [{
+    key: 'm',
+    value: function m(x) {
+      return 'a';
+    }
+  }]);
+  return C;
+}();

packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/options.json

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "plugins": ["transform-flow-strip-types", "external-helpers"]
+}