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

[7.0] Drop flowUsesCommas option from babel-generator (#5123)

Browse Source
This commit is contained in:
Chau Nguyen
2017-01-19 19:24:13 -08:00
committed by Henry Zhu
parent 3a5ce620c8
commit d710e6dd5b
12 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/babel-generator/README.md
View File

@@ -37,7 +37,6 @@ minified | boolean | `false` | Should the output be minif
concise | boolean | `false` | Set to `true` to reduce whitespace (but not as much as `opts.compact`)
quotes | `'single'` or `'double'` | autodetect based on `ast.tokens` | The type of quote to use in the output
filename | string | | Used in warning messages
flowCommaSeparator | boolean | `false` | Set to `true` to use commas instead of semicolons as Flow property separators
jsonCompatibleStrings | boolean | `false` | Set to true to run `jsesc` with "json": true to print "\u00A9" vs. "©";
Options for source maps:

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

@@ -277,11 +277,7 @@ export function ObjectTypeAnnotation(node: Object) {
statement: true,
iterator: () => {
if (props.length !== 1) {
if (this.format.flowCommaSeparator) {
this.token(",");
} else {
this.semicolon();
}
this.token(",");
this.space();
}
}

3
packages/babel-generator/src/index.js
View File

@@ -64,8 +64,7 @@ function normalizeOptions(code, opts, tokens): Format {
adjustMultilineComment: true,
style: style,
base: 0
},
flowCommaSeparator: opts.flowCommaSeparator,
}
};
if (format.minified) {

2
packages/babel-generator/test/fixtures/flow/call-properties/expected.js vendored
View File

@@ -1,5 +1,5 @@
var a: { (): number };
var a: { (): number };
var a: { y: string; (): number; (x: string): string; };
var a: { y: string, (): number, (x: string): string, };
var a: { <T>(x: T): number };
interface A { (): number };

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

@@ -6,7 +6,7 @@ declare function foo<T>(): void;
declare function foo(x: number, y: string): void;
declare class A {}
declare class A<T> extends B<T> { x: number }
declare class A { static foo: () => number; static x: string; }
declare class A { static foo: () => number, static x: string, }
declare class A { static [indexer: number]: string }
declare class A { static (): number }
declare class A mixins B<T>, C {}

2
packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/expected.js vendored
View File

@@ -2,7 +2,7 @@ interface A {};
interface A extends B {};
interface A<T> extends B<T>, C<T> {};
interface A { foo: () => number };
interface Dictionary { length: number; [index: string]: string; };
interface Dictionary { length: number, [index: string]: string, };
class Foo implements Bar {}
class Foo extends Bar implements Bat, Man<number> {}
class Foo extends class Bar implements Bat {} {}

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

@@ -38,14 +38,14 @@ var numVal: number;
var numVal: number = otherNumVal;
var a: { numVal: number };
var a: { numVal: number };
var a: { numVal: number; [indexer: string]: number; };
var a: { numVal: number, [indexer: string]: number, };
var a: ?{ numVal: number };
var a: { numVal: number; strVal: string; };
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: { 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 };
@@ -112,14 +112,14 @@ export interface qux<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, [indexer: string]: number, |};
var a: ?{| numVal: number |};
var a: {| numVal: number; strVal: string; |};
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: {| 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 |};

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

@@ -1,4 +1,4 @@
(xxx: number);
({ xxx: 0, yyy: "hey" }: { xxx: number; yyy: string; });
({ xxx: 0, yyy: "hey" }: { xxx: number, yyy: string, });
(xxx => xxx + 1: (xxx: number) => number);
(xxx: number), (yyy: string);

3
packages/babel-generator/test/fixtures/flowUsesCommas/options.json vendored
View File

@@ -1,3 +0,0 @@
{
"flowCommaSeparator": true
}

4
packages/babel-generator/test/index.js
View File

@@ -259,7 +259,7 @@ describe("programmatic generation", function() {
const output = generate(objectStatement).code;
assert.equal(output, [
"{",
" bar: string;",
" bar: string,",
"}",
].join("\n"));
});
@@ -280,7 +280,7 @@ describe("programmatic generation", function() {
assert.equal(output, [
"{",
" [key: any]: Test;",
" [key: any]: Test,",
"}",
].join("\n"));
});

2
packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/declare-statements/actual.js vendored
View File

@@ -6,7 +6,7 @@ declare function foo<T>(): void;
declare function foo(x: number, y: string): void;
declare class A {}
declare class A<T> extends B<T> { x: number }
declare class A { static foo(): number; static x : string }
declare class A { static foo(): number, static x : string }
declare class A { static [ indexer: number]: string }
declare class A { static () : number }
declare class A mixins B<T>, C {}

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

@@ -6,7 +6,7 @@
/*:: declare function foo(x: number, y: string): void;*/
/*:: declare class A {}*/
/*:: declare class A<T> extends B<T> { x: number }*/
/*:: declare class A { static foo(): number; static x : string }*/
/*:: declare class A { static foo(): number, static x : string }*/
/*:: declare class A { static [ indexer: number]: string }*/
/*:: declare class A { static () : number }*/
/*:: declare class A mixins B<T>, C {}*/