flow plugin: generate exact object type annotations (babel#3702)

panagosg7 · Jan 17, 2017 · 0967256 · 0967256
1 parent 3e2c418
commit 0967256
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/packages/babel-generator/src/generators/flow.js b/packages/babel-generator/src/generators/flow.js
@@ -250,7 +250,12 @@ export function TypeParameterInstantiation(node: Object) {
 export { TypeParameterInstantiation as TypeParameterDeclaration };
 
 export function ObjectTypeAnnotation(node: Object) {
-  this.token("{");
+  if (node.exact) {
+    this.token("{|");
+  } else {
+    this.token("{");
+  }
+
   let props = node.properties.concat(node.callProperties, node.indexers);
 
   if (props.length) {
@@ -270,7 +275,11 @@ export function ObjectTypeAnnotation(node: Object) {
     this.space();
   }
 
-  this.token("}");
+  if (node.exact) {
+    this.token("|}");
+  } else {
+    this.token("}");
+  }
 }
 
 export function ObjectTypeCallProperty(node: Object) {

diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js b/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js
@@ -102,3 +102,16 @@ export type { foo } from "bar";
 export interface foo { p: number };
 export interface foo<T> { p: T };
 var a: ?Array<?string>;
+var a: {| numVal: number |};
+var a: {| numVal: number; |};
+var a: {| numVal: number; [indexer: string]: number |};
+var a: ?{| numVal: number |};
+var a: {| numVal: number; strVal: string |}
+var a: {| subObj: {strVal: string} |}
+var a: {| subObj: ?{strVal: string} |}
+var a: {| param1: number; param2: string |}
+var a: {| param1: number; param2?: string |}
+var a: {| [a: number]: string; [b: number]: string; |};
+var a: {| add(x: number, ...y: Array<string>): void |};
+var a: {| subtract: (x: number, ...y: Array<string>) => void |};
+var a: {| id<T>(x: T): T; |};
diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js b/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js
@@ -106,3 +106,16 @@ export type { foo } from "bar";
 export interface foo { p: number };
 export interface foo<T> { p: T };
 var a: ?Array<?string>;
+var a: {| numVal: number |};
+var a: {| numVal: number |};
+var a: {| numVal: number; [indexer: string]: number; |};
+var a: ?{| numVal: number |};
+var a: {| numVal: number; strVal: string; |};
+var a: {| subObj: { strVal: string } |};
+var a: {| subObj: ?{ strVal: string } |};
+var a: {| param1: number; param2: string; |};
+var a: {| param1: number; param2?: string; |};
+var a: {| [a: number]: string; [b: number]: string; |};
+var a: {| add: (x: number, ...y: Array<string>) => void |};
+var a: {| subtract: (x: number, ...y: Array<string>) => void |};
+var a: {| id: <T>(x: T) => T |};