fix(types): Fix types because array fields in ObjectTypeAnnotation …

…are always present
babel · Apr 14, 2022 · 82ad2f2 · 82ad2f2
1 parent e71843a
commit 82ad2f2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 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/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -1242,9 +1242,9 @@ export interface NumberTypeAnnotation extends BaseNode {
 export interface ObjectTypeAnnotation extends BaseNode {
   type: "ObjectTypeAnnotation";
   properties: Array<ObjectTypeProperty | ObjectTypeSpreadProperty>;
-  indexers?: Array<ObjectTypeIndexer> | null;
-  callProperties?: Array<ObjectTypeCallProperty> | null;
-  internalSlots?: Array<ObjectTypeInternalSlot> | null;
+  indexers: Array<ObjectTypeIndexer>;
+  callProperties: Array<ObjectTypeCallProperty>;
+  internalSlots: Array<ObjectTypeInternalSlot>;
   exact: boolean;
   inexact?: boolean | null;
 }

diff --git a/packages/babel-types/src/builders/generated/index.ts b/packages/babel-types/src/builders/generated/index.ts
@@ -727,9 +727,9 @@ export function numberTypeAnnotation(): t.NumberTypeAnnotation {
 }
 export function objectTypeAnnotation(
   properties: Array<t.ObjectTypeProperty | t.ObjectTypeSpreadProperty>,
-  indexers?: Array<t.ObjectTypeIndexer> | null,
-  callProperties?: Array<t.ObjectTypeCallProperty> | null,
-  internalSlots?: Array<t.ObjectTypeInternalSlot> | null,
+  indexers?: Array<t.ObjectTypeIndexer>,
+  callProperties?: Array<t.ObjectTypeCallProperty>,
+  internalSlots?: Array<t.ObjectTypeInternalSlot>,
   exact?: boolean,
 ): t.ObjectTypeAnnotation {
   return builder.apply("ObjectTypeAnnotation", arguments);

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