[babel 8] ObjectTypeAnnotation fields must always be arrays (#14465)

babel · Apr 24, 2022 · 0b9fb13 · 0b9fb13
1 parent 0d2ae01
commit 0b9fb13
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
@@ -438,12 +438,9 @@ describe("programmatic generation", function () {
   });
 
   it("flow object indentation", function () {
-    const objectStatement = t.objectTypeAnnotation(
-      [t.objectTypeProperty(t.identifier("bar"), t.stringTypeAnnotation())],
-      null,
-      null,
-      null,
-    );
+    const objectStatement = t.objectTypeAnnotation([
+      t.objectTypeProperty(t.identifier("bar"), t.stringTypeAnnotation()),
+    ]);
 
     const output = generate(objectStatement).code;
     expect(output).toBe(`{
@@ -454,9 +451,9 @@ describe("programmatic generation", function () {
   it("flow object exact", function () {
     const objectStatement = t.objectTypeAnnotation(
       [t.objectTypeProperty(t.identifier("bar"), t.stringTypeAnnotation())],
-      null,
-      null,
-      null,
+      undefined,
+      undefined,
+      undefined,
       true,
     );
 
@@ -476,7 +473,6 @@ describe("programmatic generation", function () {
           t.numberTypeAnnotation(),
         ),
       ],
-      null,
     );
 
     const output = generate(objectStatement).code;

diff --git a/packages/babel-types/src/definitions/flow.ts b/packages/babel-types/src/definitions/flow.ts
@@ -272,9 +272,21 @@ defineType("ObjectTypeAnnotation", {
     properties: validate(
       arrayOfType(["ObjectTypeProperty", "ObjectTypeSpreadProperty"]),
     ),
-    indexers: validateOptional(arrayOfType("ObjectTypeIndexer")),
-    callProperties: validateOptional(arrayOfType("ObjectTypeCallProperty")),
-    internalSlots: validateOptional(arrayOfType("ObjectTypeInternalSlot")),
+    indexers: {
+      validate: arrayOfType("ObjectTypeIndexer"),
+      optional: process.env.BABEL_8_BREAKING ? false : true,
+      default: process.env.BABEL_8_BREAKING ? [] : undefined,
+    },
+    callProperties: {
+      validate: arrayOfType("ObjectTypeCallProperty"),
+      optional: process.env.BABEL_8_BREAKING ? false : true,
+      default: process.env.BABEL_8_BREAKING ? [] : undefined,
+    },
+    internalSlots: {
+      validate: arrayOfType("ObjectTypeInternalSlot"),
+      optional: process.env.BABEL_8_BREAKING ? false : true,
+      default: process.env.BABEL_8_BREAKING ? [] : undefined,
+    },
     exact: {
       validate: assertValueType("boolean"),
       default: false,