Fix t.arrowFunctionExpression and t.functionExpression builders by ad…

…ding all fields
babel · Nov 8, 2020 · 56aa9b9 · 56aa9b9
1 parent 3227914
commit 56aa9b9
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 2 deletions.
diff --git a/packages/babel-types/src/definitions/core.js b/packages/babel-types/src/definitions/core.js
@@ -401,7 +401,15 @@ export const functionDeclarationCommon = {
 };
 
 defineType("FunctionDeclaration", {
-  builder: ["id", "params", "body", "generator", "async"],
+  builder: [
+    "id",
+    "params",
+    "body",
+    "generator",
+    "async",
+    "returnType",
+    "typeParameters",
+  ],
   visitor: ["id", "params", "body", "returnType", "typeParameters"],
   fields: {
     ...functionDeclarationCommon,
@@ -1209,7 +1217,15 @@ defineType("ArrayPattern", {
 });
 
 defineType("ArrowFunctionExpression", {
-  builder: ["params", "body", "async"],
+  builder: [
+    "params",
+    "body",
+    "async",
+    "expression",
+    "generator",
+    "returnType",
+    "typeParameters",
+  ],
   visitor: ["params", "body", "returnType", "typeParameters"],
   aliases: [
     "Scopable",

diff --git a/packages/babel-types/test/builders/core/__snapshots__/arrowFunctionExpression.js.snap b/packages/babel-types/test/builders/core/__snapshots__/arrowFunctionExpression.js.snap
@@ -0,0 +1,47 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`builders es2015 arrowFunctionExpression accept all parameters 1`] = `
+Object {
+  "async": true,
+  "body": Object {
+    "body": Array [
+      Object {
+        "argument": Object {
+          "type": "ThisExpression",
+        },
+        "type": "ReturnStatement",
+      },
+    ],
+    "directives": Array [],
+    "type": "BlockStatement",
+  },
+  "expression": true,
+  "generator": true,
+  "params": Array [
+    Object {
+      "name": "foo",
+      "type": "Identifier",
+    },
+  ],
+  "returnType": Object {
+    "type": "TSTypeAnnotation",
+    "typeAnnotation": Object {
+      "type": "TSStringKeyword",
+    },
+  },
+  "type": "ArrowFunctionExpression",
+  "typeParameters": Object {
+    "params": Array [
+      Object {
+        "constraint": Object {
+          "type": "TSObjectKeyword",
+        },
+        "default": null,
+        "name": "foo",
+        "type": "TSTypeParameter",
+      },
+    ],
+    "type": "TSTypeParameterDeclaration",
+  },
+}
+`;
diff --git a/packages/babel-types/test/builders/core/__snapshots__/functionExpression.js.snap b/packages/babel-types/test/builders/core/__snapshots__/functionExpression.js.snap
@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`builders core functionExpression accept all parameters 1`] = `
+Object {
+  "async": true,
+  "body": Object {
+    "body": Array [
+      Object {
+        "argument": Object {
+          "type": "ThisExpression",
+        },
+        "type": "ReturnStatement",
+      },
+    ],
+    "directives": Array [],
+    "type": "BlockStatement",
+  },
+  "generator": true,
+  "id": Object {
+    "name": "foo",
+    "type": "Identifier",
+  },
+  "params": Array [
+    Object {
+      "name": "bar",
+      "type": "Identifier",
+    },
+  ],
+  "returnType": Object {
+    "type": "TSTypeAnnotation",
+    "typeAnnotation": Object {
+      "type": "TSStringKeyword",
+    },
+  },
+  "type": "FunctionExpression",
+  "typeParameters": Object {
+    "params": Array [
+      Object {
+        "constraint": Object {
+          "type": "TSObjectKeyword",
+        },
+        "default": null,
+        "name": "bar",
+        "type": "TSTypeParameter",
+      },
+    ],
+    "type": "TSTypeParameterDeclaration",
+  },
+}
+`;
diff --git a/packages/babel-types/test/builders/core/arrowFunctionExpression.js b/packages/babel-types/test/builders/core/arrowFunctionExpression.js
@@ -0,0 +1,22 @@
+import * as t from "@babel/types";
+
+describe("builders", function () {
+  describe("es2015", function () {
+    describe("arrowFunctionExpression", function () {
+      it("accept all parameters", function () {
+        const arrowFunctionExpression = t.arrowFunctionExpression(
+          [t.identifier("foo")],
+          t.blockStatement([t.returnStatement(t.thisExpression())]),
+          true,
+          true,
+          true,
+          t.tsTypeAnnotation(t.tsStringKeyword()),
+          t.tsTypeParameterDeclaration([
+            t.tsTypeParameter(t.tsObjectKeyword(), null, "foo"),
+          ]),
+        );
+        expect(arrowFunctionExpression).toMatchSnapshot();
+      });
+    });
+  });
+});
diff --git a/packages/babel-types/test/builders/core/functionExpression.js b/packages/babel-types/test/builders/core/functionExpression.js
@@ -0,0 +1,22 @@
+import * as t from "../../..";
+
+describe("builders", function () {
+  describe("core", function () {
+    describe("functionExpression", function () {
+      it("accept all parameters", function () {
+        const functionExpression = t.functionExpression(
+          t.identifier("foo"),
+          [t.identifier("bar")],
+          t.blockStatement([t.returnStatement(t.thisExpression())]),
+          true,
+          true,
+          t.tsTypeAnnotation(t.tsStringKeyword()),
+          t.tsTypeParameterDeclaration([
+            t.tsTypeParameter(t.tsObjectKeyword(), null, "bar"),
+          ]),
+        );
+        expect(functionExpression).toMatchSnapshot();
+      });
+    });
+  });
+});