Fix a class of bugs with exact vs. inexact object types

.flowconfig

@@ -1,11 +1,4 @@
-[ignore]
-
-[include]
-
-[libs]
-
 [lints]
-
-[options]
-
-[strict]
+; This Flow config is used when having Flow check our output for validity,
+; in test cases that use `expect(…).toBeValidFlowTypeDeclarations()`.
+implicit-inexact-object=error

src/__tests__/__snapshots__/classes.spec.ts.snap

@@ -17,10 +17,7 @@ declare class Observable<T> mixins Subscribable<T> {
   jump?: () => void;
   +jump?: () => void;
   static +jump?: () => void;
-  cfnProperties: {
-    [key: string]: any,
-    ...
-  };
+  cfnProperties: { [key: string]: any, ... };
   static fooGet: string;
 }
 "

src/__tests__/__snapshots__/duplicated-names.spec.ts.snap

@@ -34,10 +34,7 @@ export type AuthMechanismType = $ElementType<
 `;
 
 exports[`should support generic type rename 1`] = `
-"declare export var ProfilingLevel: $ReadOnly<{
-  +off: \\"off\\",
-  ...
-}>;
+"declare export var ProfilingLevel: $ReadOnly<{ +off: \\"off\\", ... }>;
 export type ProfilingLevelType = $ElementType<
   typeof ProfilingLevel,
   $Keys<typeof ProfilingLevel>

src/__tests__/__snapshots__/enums.spec.ts.snap

@@ -2,9 +2,9 @@
 
 exports[`should handle basic enums: class 1`] = `
 "declare var Label: {|
-  +LABEL_OPTIONAL: 0, // 0
-  +LABEL_REQUIRED: 1, // 1
-  +LABEL_REPEATED: 2, // 2
+  +LABEL_OPTIONAL: 0,
+  +LABEL_REQUIRED: 1,
+  +LABEL_REPEATED: 2,
 |};
 declare type A = $Values<typeof Label>;
 declare type B = typeof Label.LABEL_OPTIONAL;
@@ -18,8 +18,8 @@ exports[`should handle empty enums: class 1`] = `
 
 exports[`should handle importing enum types: class 1`] = `
 "declare export var Label: {|
-  +A: \\"A\\", // \\"A\\"
-  +B: \\"B\\", // \\"B\\"
+  +A: \\"A\\",
+  +B: \\"B\\",
 |};
 "
 `;
@@ -32,8 +32,8 @@ declare export function foo(label: $Values<Label>): void;
 
 exports[`should handle importing enums: class 1`] = `
 "declare export var Label: {|
-  +A: \\"A\\", // \\"A\\"
-  +B: \\"B\\", // \\"B\\"
+  +A: \\"A\\",
+  +B: \\"B\\",
 |};
 "
 `;
@@ -46,11 +46,11 @@ declare export function foo(label: $Values<typeof Label>): void;
 
 exports[`should handle number enums: class 1`] = `
 "declare var Label: {|
-  +ONE: 1, // 1
-  +TWO: 2, // 2
-  +THREE: 3, // 3
-  +NEGATIVE: -123, // -123
-  +DECIMAL: 3.14, // 3.14
+  +ONE: 1,
+  +TWO: 2,
+  +THREE: 3,
+  +NEGATIVE: -123,
+  +DECIMAL: 3.14,
 |};
 declare type A = $Values<typeof Label>;
 declare type B = typeof Label.TWO;
@@ -59,9 +59,9 @@ declare type B = typeof Label.TWO;
 
 exports[`should handle string enums: class 1`] = `
 "declare var Label: {|
-  +LABEL_OPTIONAL: \\"LABEL_OPTIONAL\\", // \\"LABEL_OPTIONAL\\"
-  +LABEL_REQUIRED: \\"LABEL_REQUIRED\\", // \\"LABEL_REQUIRED\\"
-  +LABEL_REPEATED: \\"LABEL_REPEATED\\", // \\"LABEL_REPEATED\\"
+  +LABEL_OPTIONAL: \\"LABEL_OPTIONAL\\",
+  +LABEL_REQUIRED: \\"LABEL_REQUIRED\\",
+  +LABEL_REPEATED: \\"LABEL_REPEATED\\",
 |};
 declare type A = $Values<typeof Label>;
 declare type B = typeof Label.LABEL_REQUIRED;

src/__tests__/__snapshots__/interfaces.spec.ts.snap

@@ -14,37 +14,37 @@ exports[`should handle interface inheritance 1`] = `
 "declare interface User {
   firstName: string;
 }
-declare type SpecialUser = {
-  nice: number,
-  ...
-} & User;
+declare type SpecialUser = { nice: number, ... } & User;
 "
 `;
 
 exports[`should handle interface inheritance 2`] = `
-"declare type User = {
-  firstName: string,
-};
+"declare type User = { firstName: string, ... };
 declare type SpecialUser = {
   ...$Exact<User>,
-
   nice: number,
+  ...
 };
 "
 `;
 
 exports[`should handle interface inheritance 3`] = `
-"declare type User = {|
-  firstName: string,
-|};
+"declare type User = {| firstName: string |};
 declare type SpecialUser = {|
   ...$Exact<User>,
-
   nice: number,
 |};
 "
 `;
 
+exports[`should handle interface inheritance 4`] = `
+"declare interface User {
+  firstName: string;
+}
+declare type SpecialUser = { nice: number, ... } & User;
+"
+`;
+
 exports[`should handle interface merging 1`] = `
 "declare interface User {
   firstName: string;
@@ -59,6 +59,7 @@ exports[`should handle interface merging 2`] = `
   firstName: string,
   lastName: string,
   username: string,
+  ...
 };
 "
 `;
@@ -70,11 +71,7 @@ exports[`should handle mutli-extends pattern 1`] = `
 declare interface PenStroke {
   penWidth: number;
 }
-declare type Square = {
-  sideLength: number,
-  ...
-} & Shape &
-  PenStroke;
+declare type Square = { sideLength: number, ... } & Shape & PenStroke;
 "
 `;
 
@@ -86,9 +83,7 @@ exports[`should handle single interface 1`] = `
 `;
 
 exports[`should handle single interface 2`] = `
-"declare type User = {
-  firstName: string,
-};
+"declare type User = { firstName: string, ... };
 "
 `;
 
@@ -133,8 +128,12 @@ exports[`should handle untyped array binding pattern 1`] = `
 exports[`should handle untyped object binding pattern 1`] = `
 "declare interface ObjectBinding {
   (): void;
-  (x: {}): void;
-  (x: { a: any, b: any }): void;
+  (x: { ... }): void;
+  (x: {
+    a: any,
+    b: any,
+    ...
+  }): void;
 }
 "
 `;

src/__tests__/__snapshots__/mapped-types.spec.ts.snap

@@ -1,10 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`should handle mapped types 1`] = `
-"declare type Ref<T> = {
-  current: T | null,
-  ...
-};
+"declare type Ref<T> = { current: T | null, ... };
 declare type SourceUnion = \\"a\\" | \\"b\\" | \\"c\\";
 declare type SourceObject = {
   a: number,

src/__tests__/__snapshots__/module-identifiers.spec.ts.snap

@@ -3,10 +3,7 @@
 exports[`should handle global types jsx 1`] = `
 "import * as React from \\"react\\";
 declare function s(node: React$Node): void;
-declare type Props = {
-  children: React$Node,
-  ...
-};
+declare type Props = { children: React$Node, ... };
 declare class Component mixins React.Component<Props> {
   render(): React$Node;
 }

src/__tests__/__snapshots__/modules.spec.ts.snap

@@ -10,14 +10,8 @@ exports[`should handle module 1`] = `
         value: T,
         ...
       }
-    | {
-        type: \\"nothing\\",
-        ...
-      };
-  declare export type Ref<T> = {
-    current: T,
-    ...
-  };
+    | { type: \\"nothing\\", ... };
+  declare export type Ref<T> = { current: T, ... };
   declare export var ok: number;
 }
 "