cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add method property to ObjectTypeProperty (#7005)

Browse Source
This commit is contained in:
Brian Ng
2017-12-11 09:32:16 -06:00
committed by GitHub
parent 42f66782be
commit f5ef928586
54 changed files with 1491 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/babel-generator/src/generators/flow.js
View File

@@ -182,7 +182,8 @@ export function FunctionTypeAnnotation(node: Object, parent: Object) {
// this node type is overloaded, not sure why but it makes it EXTREMELY annoying
if (
parent.type === "ObjectTypeCallProperty" ||
parent.type === "DeclareFunction"
parent.type === "DeclareFunction" ||
(parent.type === "ObjectTypeProperty" && parent.method)
) {
this.token(":");
} else {
@@ -437,8 +438,10 @@ export function ObjectTypeProperty(node: Object) {
this._variance(node);
this.print(node.key, node);
if (node.optional) this.token("?");
this.token(":");
this.space();
if (!node.method) {
this.token(":");
this.space();
}
this.print(node.value, node);
}

2
packages/babel-generator/test/fixtures/flow/declare-exports/expected.js vendored
View File

@@ -9,7 +9,7 @@ declare export class A<T> extends B<T> {
x: number
}
declare export class A {
static foo: () => number,
static foo(): number,
static x: string,
}
declare export class A {

6
packages/babel-generator/test/fixtures/flow/declare-module/expected.js vendored
View File

@@ -8,11 +8,11 @@ declare module A {
}
declare module A {
declare class B {
foo: () => number
foo(): number
}
}
declare module A {
declare module.exports: {
foo: () => number
foo(): number
}
}
}

2
packages/babel-generator/test/fixtures/flow/declare-statements/expected.js vendored
View File

@@ -9,7 +9,7 @@ declare class A<T> extends B<T> {
x: number
}
declare class A {
static foo: () => number,
static foo(): number,
static x: string,
}
declare class A {

4
packages/babel-generator/test/fixtures/flow/object-literal-types/actual.js vendored
View File

@@ -4,4 +4,6 @@ type T = { ...U, };
type T = { ...U, ...V };
type T = { p: V, ...U };
type T = { ...U, p: V, };
type T = { ...{}|{ p: V, }};
type T = { ...{}|{ p: V, }};
type T = { foo(): number }
type T = { foo: () => number }

8
packages/babel-generator/test/fixtures/flow/object-literal-types/expected.js vendored
View File

@@ -15,4 +15,10 @@ type T = { ...U,
type T = { ...{} | {
p: V
}
};
};
type T = {
foo(): number
};
type T = {
foo: () => number
};

10
packages/babel-generator/test/fixtures/flow/type-annotations/expected.js vendored
View File

@@ -126,13 +126,13 @@ var a: {
[b: number]: string,
};
var a: {
add: (x: number, ...y: Array<string>) => void
add(x: number, ...y: Array<string>): void
};
var a: {
subtract: (x: number, ...y: Array<string>) => void
};
var a: {
id: <T>(x: T) => T
id<T>(x: T): T
};
var a: Array<number> = [1, 2, 3];
a = class Foo<T> {};
@@ -275,17 +275,17 @@ var a: {|
[b: number]: string,
|};
var a: {|
add: (x: number, ...y: Array<string>) => void
add(x: number, ...y: Array<string>): void
|};
var a: {|
subtract: (x: number, ...y: Array<string>) => void
|};
var a: {|
id: <T>(x: T) => T
id<T>(x: T): T
|};
function foo(numVal: number = 2) {}
function foo(numVal?: number = 2) {}
export type * from "foo";
export type * from "foo";

5
packages/babylon/src/plugins/flow.js
View File

@@ -751,6 +751,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
let optional = false;
if (this.isRelational("<") || this.match(tt.parenL)) {
// This is a method property
node.method = true;
if (variance) {
this.unexpected(variance.start);
}
@@ -763,6 +765,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
} else {
if (kind !== "init") this.unexpected();
node.method = false;
if (this.eat(tt.question)) {
optional = true;
}

1
packages/babylon/test/fixtures/flow/call-properties/3/expected.json vendored
View File

@@ -284,6 +284,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 25,

6
packages/babylon/test/fixtures/flow/class-properties/getter-setter/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "get",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 20,
@@ -179,6 +180,7 @@
},
"static": false,
"kind": "set",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 39,
@@ -299,6 +301,7 @@
},
"static": false,
"kind": "get",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 65,
@@ -370,6 +373,7 @@
},
"static": false,
"kind": "set",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 86,
@@ -490,6 +494,7 @@
},
"static": false,
"kind": "get",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 114,
@@ -561,6 +566,7 @@
},
"static": false,
"kind": "set",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 133,

1
packages/babylon/test/fixtures/flow/class-properties/named-static/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "GenericTypeAnnotation",
"start": 28,

1
packages/babylon/test/fixtures/flow/declare-export/export-class/expected.json vendored
View File

@@ -174,6 +174,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 50,

1
packages/babylon/test/fixtures/flow/declare-module/10/expected.json vendored
View File

@@ -105,6 +105,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 26,

1
packages/babylon/test/fixtures/flow/declare-module/5/expected.json vendored
View File

@@ -157,6 +157,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 37,

1
packages/babylon/test/fixtures/flow/declare-module/6/expected.json vendored
View File

@@ -151,6 +151,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 45,

2
packages/babylon/test/fixtures/flow/declare-statements/10/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": true,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 18,
@@ -179,6 +180,7 @@
},
"static": true,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 51,

2
packages/babylon/test/fixtures/flow/declare-statements/15/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 27,
@@ -250,6 +251,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "GenericTypeAnnotation",
"start": 66,

3
packages/babylon/test/fixtures/flow/declare-statements/17/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 22,
@@ -162,6 +163,7 @@
},
"static": true,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 41,
@@ -213,6 +215,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 53,

1
packages/babylon/test/fixtures/flow/declare-statements/7/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 29,

1
packages/babylon/test/fixtures/flow/declare-statements/9/expected.json vendored
View File

@@ -227,6 +227,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 37,

2
packages/babylon/test/fixtures/flow/interfaces-module-and-script/10/expected.json vendored
View File

@@ -161,6 +161,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "BooleanTypeAnnotation",
"start": 22,
@@ -212,6 +213,7 @@
},
"static": true,
"kind": "init",
"method": false,
"value": {
"type": "BooleanTypeAnnotation",
"start": 62,

1
packages/babylon/test/fixtures/flow/interfaces-module-and-script/4/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "FunctionTypeAnnotation",
"start": 19,

1
packages/babylon/test/fixtures/flow/interfaces-module-and-script/5/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 56,

1
packages/babylon/test/fixtures/flow/object-types/complex-param-types/expected.json vendored
View File

@@ -109,6 +109,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 11,

8
packages/babylon/test/fixtures/flow/type-alias/4/expected.json vendored
View File

@@ -124,6 +124,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 23,
@@ -200,6 +201,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 38,
@@ -525,6 +527,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "UnionTypeAnnotation",
"start": 147,
@@ -589,6 +592,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 156,
@@ -665,6 +669,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 174,
@@ -783,6 +788,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "IntersectionTypeAnnotation",
"start": 212,
@@ -847,6 +853,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 221,
@@ -923,6 +930,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringLiteralTypeAnnotation",
"start": 239,

12
packages/babylon/test/fixtures/flow/type-annotations/108/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 14,
@@ -187,6 +188,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 25,
@@ -450,6 +452,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 71,
@@ -501,6 +504,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 82,
@@ -864,6 +868,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "ObjectTypeAnnotation",
"start": 148,
@@ -913,6 +918,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 154,
@@ -964,6 +970,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 165,
@@ -1022,6 +1029,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "BooleanTypeAnnotation",
"start": 179,
@@ -1388,6 +1396,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "ObjectTypeAnnotation",
"start": 242,
@@ -1437,6 +1446,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 247,
@@ -1488,6 +1498,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 258,
@@ -1546,6 +1557,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "BooleanTypeAnnotation",
"start": 271,

1
packages/babylon/test/fixtures/flow/type-annotations/110/expected.json vendored
View File

@@ -109,6 +109,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "GenericTypeAnnotation",
"start": 13,

1
packages/babylon/test/fixtures/flow/type-annotations/111/expected.json vendored
View File

@@ -109,6 +109,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "GenericTypeAnnotation",
"start": 13,

1
packages/babylon/test/fixtures/flow/type-annotations/136/expected.json vendored
View File

@@ -109,6 +109,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "ObjectTypeAnnotation",
"start": 15,

1
packages/babylon/test/fixtures/flow/type-annotations/32/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,

1
packages/babylon/test/fixtures/flow/type-annotations/33/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,

1
packages/babylon/test/fixtures/flow/type-annotations/34/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,

1
packages/babylon/test/fixtures/flow/type-annotations/35/expected.json vendored
View File

@@ -150,6 +150,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 17,

2
packages/babylon/test/fixtures/flow/type-annotations/36/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,
@@ -187,6 +188,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 32,

2
packages/babylon/test/fixtures/flow/type-annotations/37/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "ObjectTypeAnnotation",
"start": 16,
@@ -185,6 +186,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 25,

2
packages/babylon/test/fixtures/flow/type-annotations/38/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NullableTypeAnnotation",
"start": 16,
@@ -199,6 +200,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 26,

2
packages/babylon/test/fixtures/flow/type-annotations/39/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,
@@ -187,6 +188,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 32,

2
packages/babylon/test/fixtures/flow/type-annotations/40/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 16,
@@ -187,6 +188,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 33,

1
packages/babylon/test/fixtures/flow/type-annotations/42/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 8,

1
packages/babylon/test/fixtures/flow/type-annotations/43/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 9,

1
packages/babylon/test/fixtures/flow/type-annotations/60/expected.json vendored
View File

@@ -191,6 +191,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 13,

1
packages/babylon/test/fixtures/flow/type-annotations/61/expected.json vendored
View File

@@ -191,6 +191,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 13,

1
packages/babylon/test/fixtures/flow/type-annotations/63/expected.json vendored
View File

@@ -196,6 +196,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 23,

3
packages/babylon/test/fixtures/flow/type-annotations/98/expected.json vendored
View File

@@ -136,6 +136,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 17,
@@ -187,6 +188,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 33,
@@ -238,6 +240,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 49,

12
packages/babylon/test/fixtures/flow/type-annotations/object-type-method/actual.js vendored Normal file
View File

@@ -0,0 +1,12 @@
type T = { a: () => void };
type T = { a: <T>() => void };
type T = { a(): void };
type T = { a<T>(): void };
type T = { (): number };
type T = { <T>(x: T): number; }
declare class T { foo(): number; }
declare class T { static foo(): number; }
declare class T { (): number }
declare class T { static (): number }

1350
packages/babylon/test/fixtures/flow/type-annotations/object-type-method/expected.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
packages/babylon/test/fixtures/flow/type-exports/interface/expected.json vendored
View File

@@ -128,6 +128,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 26,
@@ -300,6 +301,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "GenericTypeAnnotation",
"start": 65,

8
packages/babylon/test/fixtures/flow/type-parameter-declaration/declare-class-method-reserved-word/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 20,
@@ -212,6 +213,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 41,
@@ -313,6 +315,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 62,
@@ -414,6 +417,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 82,
@@ -515,6 +519,7 @@
},
"static": true,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 99,
@@ -616,6 +621,7 @@
},
"static": true,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 127,
@@ -717,6 +723,7 @@
},
"static": true,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 155,
@@ -818,6 +825,7 @@
},
"static": true,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 182,

4
packages/babylon/test/fixtures/flow/type-parameter-declaration/declare-interface-method-reserved-word/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 24,
@@ -212,6 +213,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 45,
@@ -313,6 +315,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 66,
@@ -414,6 +417,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 86,

4
packages/babylon/test/fixtures/flow/type-parameter-declaration/interface-reserved-word/expected.json vendored
View File

@@ -111,6 +111,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 16,
@@ -212,6 +213,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 37,
@@ -313,6 +315,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 58,
@@ -414,6 +417,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 78,

4
packages/babylon/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/expected.json vendored
View File

@@ -109,6 +109,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 13,
@@ -210,6 +211,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 34,
@@ -311,6 +313,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 55,
@@ -412,6 +415,7 @@
},
"static": false,
"kind": "init",
"method": true,
"value": {
"type": "FunctionTypeAnnotation",
"start": 75,

2
packages/babylon/test/fixtures/flow/typecasts/2/expected.json vendored
View File

@@ -246,6 +246,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "NumberTypeAnnotation",
"start": 29,
@@ -297,6 +298,7 @@
},
"static": false,
"kind": "init",
"method": false,
"value": {
"type": "StringTypeAnnotation",
"start": 42,