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

Add variance node type and generate property variance annotations #4697

Merged
merged 4 commits into from Oct 21, 2016
Merged

Add variance node type and generate property variance annotations #4697

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc5cec
Add variance node type and generate property variance annotations
samwgoldman Oct 8, 2016
c3d90e0
Variance is no longer a separate node type
samwgoldman Oct 11, 2016
3f2828e
Add test + fix for edge case with variance and class proeprties
danez Oct 21, 2016
f2c3601
Merge branch 'master' into property-variance
danez Oct 21, 2016
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
1 change: 1 addition & 0 deletions packages/babel-generator/src/generators/classes.js
View file
Open in desktop
Expand Up @@ -60,6 +60,7 @@ export function ClassProperty(node: Object) {
this.print(node.key, node);
this.token("]");
} else {
this._variance(node);
this.print(node.key, node);
}
this.print(node.typeAnnotation, node);
Expand Down
16 changes: 11 additions & 5 deletions packages/babel-generator/src/generators/flow.js
View file
Open in desktop
Expand Up @@ -147,6 +147,14 @@ export function _interfaceish(node: Object) {
this.print(node.body, node);
}

export function _variance(node) {
if (node.variance === "plus") {
this.token("+");
} else if (node.variance === "minus") {
this.token("-");
}
}

export function InterfaceDeclaration(node: Object) {
this.word("interface");
this.space();
Expand Down Expand Up @@ -221,11 +229,7 @@ export function TypeAnnotation(node: Object) {
}

export function TypeParameter(node: Object) {
if (node.variance === "plus") {
this.token("+");
} else if (node.variance === "minus") {
this.token("-");
}
this._variance(node);

this.word(node.name);

Expand Down Expand Up @@ -295,6 +299,7 @@ export function ObjectTypeIndexer(node: Object) {
this.word("static");
this.space();
}
this._variance(node);
this.token("[");
this.print(node.id, node);
this.token(":");
Expand All @@ -311,6 +316,7 @@ export function ObjectTypeProperty(node: Object) {
this.word("static");
this.space();
}
this._variance(node);
this.print(node.key, node);
if (node.optional) this.token("?");
this.token(":");
Expand Down
16 changes: 15 additions & 1 deletion packages/babel-generator/test/fixtures/flow/def-site-variance/actual.js
View file
Open in desktop
@@ -1,3 +1,17 @@
class C<+T, -U> {}
class C1<+T, -U> {}
function f<+T, -U>() {}
type T<+T, -U> = {};
type T = { +p: T };
type T = { -p: T };
type T = { +[k:K]: V };
type T = { -[k:K]: V };
interface I { +p: T };
interface I { -p: T };
interface I { +[k:K]: V };
interface I { -[k:K]: V };
declare class I { +p: T };
declare class I { -p: T };
declare class I { +[k:K]: V };
declare class I { -[k:K]: V };
class C2 { +p: T = e };
class C3 { -p: T = e };
20 changes: 19 additions & 1 deletion packages/babel-generator/test/fixtures/flow/def-site-variance/expected.js
View file
Open in desktop
@@ -1,3 +1,21 @@
class C<+T, -U> {}
class C1<+T, -U> {}
function f<+T, -U>() {}
type T<+T, -U> = {};
type T = { +p: T };
type T = { -p: T };
type T = { +[k: K]: V };
type T = { -[k: K]: V };
interface I { +p: T };
interface I { -p: T };
interface I { +[k: K]: V };
interface I { -[k: K]: V };
declare class I { +p: T };
declare class I { -p: T };
declare class I { +[k: K]: V };
declare class I { -[k: K]: V };
class C2 {
+p: T = e;
};
class C3 {
-p: T = e;
};
18 changes: 16 additions & 2 deletions ...l-plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/actual.js
View file
Open in desktop
@@ -1,3 +1,17 @@
class C<+T, -U> {}
class C1<+T, -U> {}
function f<+T, -U>() {}
type T<+T, -U> = {};
type T<+T, -U> = {}
type T = { +p: T }
type T = { -p: T }
type T = { +[k:K]: V }
type T = { -[k:K]: V }
interface I { +p: T }
interface I { -p: T }
interface I { +[k:K]: V }
interface I { -[k:K]: V }
declare class I { +p: T }
declare class I { -p: T }
declare class I { +[k:K]: V }
declare class I { -[k:K]: V }
class C2 { +p: T }
class C3 { -p: T }
5 changes: 4 additions & 1 deletion ...plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/expected.js
View file
Open in desktop
@@ -1,2 +1,5 @@
class C {}
class C1 {}
function f() {}

class C2 {}
class C3 {}