Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flow plugin: generate exact object type annotations #3702

Merged
merged 1 commit into from Sep 20, 2016
Merged

flow plugin: generate exact object type annotations #3702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/babel-generator/src/generators/flow.js
View file
Open in desktop
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
13 changes: 13 additions & 0 deletions packages/babel-generator/test/fixtures/flow/type-annotations/actual.js
View file
Open in desktop
Expand Up @@ -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; |};
13 changes: 13 additions & 0 deletions packages/babel-generator/test/fixtures/flow/type-annotations/expected.js
View file
Open in desktop
Expand Up @@ -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 |};