[flow] Explicit inexact objects with ...

packages/babel-parser/src/plugins/flow.js

@@ -463,7 +463,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         } while (this.eat(tt.comma));
       }
 
-      node.body = this.flowParseObjectType(isClass, false, false, isClass);
+      node.body = this.flowParseObjectType({
+        allowStatic: isClass,
+        allowExact: false,
+        allowSpread: false,
+        allowProto: isClass,
+        allowInexact: false,
+      });
     }
 
     flowParseInterfaceExtends(): N.FlowInterfaceExtends {
@@ -656,7 +662,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         } while (this.eat(tt.comma));
       }
 
-      node.body = this.flowParseObjectType(false, false, false, false);
+      node.body = this.flowParseObjectType({
+        allowStatic: false,
+        allowExact: false,
+        allowSpread: false,
+        allowProto: false,
+        allowInexact: false,
+      });
 
       return this.finishNode(node, "InterfaceTypeAnnotation");
     }
@@ -754,12 +766,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return this.finishNode(node, "ObjectTypeCallProperty");
     }
 
-    flowParseObjectType(
+    flowParseObjectType({
+      allowStatic,
+      allowExact,
+      allowSpread,
+      allowProto,
+      allowInexact,
+    }: {
       allowStatic: boolean,
       allowExact: boolean,
       allowSpread: boolean,
       allowProto: boolean,
-    ): N.FlowObjectTypeAnnotation {
+      allowInexact: boolean,
+    }): N.FlowObjectTypeAnnotation {
       const oldInType = this.state.inType;
       this.state.inType = true;
 
@@ -772,6 +791,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       let endDelim;
       let exact;
+      let inexact = false;
       if (allowExact && this.match(tt.braceBarL)) {
         this.expect(tt.braceBarL);
         endDelim = tt.braceBarR;
@@ -852,23 +872,37 @@ export default (superClass: Class<Parser>): Class<Parser> =>
             }
           }
 
-          nodeStart.properties.push(
-            this.flowParseObjectTypeProperty(
-              node,
-              isStatic,
-              protoStart,
-              variance,
-              kind,
-              allowSpread,
-            ),
+          const propOrInexact = this.flowParseObjectTypeProperty(
+            node,
+            isStatic,
+            protoStart,
+            variance,
+            kind,
+            allowSpread,
+            allowInexact,
           );
+
+          if (typeof propOrInexact === "boolean") {
+            inexact = inexact || propOrInexact;
+          } else {
+            nodeStart.properties.push(propOrInexact);
+          }
         }
 
         this.flowObjectTypeSemicolon();
       }
 
       this.expect(endDelim);
 
+      /* The inexact flag should only be added on ObjectTypeAnnotations that
+       * are not the body of an interface, declare interface, or declare class.
+       * Since spreads are only allowed in objec types, checking that is
+       * sufficient here.
+       */
+      if (allowSpread) {
+        nodeStart.inexact = inexact;
+      }
+
       const out = this.finishNode(nodeStart, "ObjectTypeAnnotation");
 
       this.state.inType = oldInType;
@@ -883,7 +917,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       variance: ?N.FlowVariance,
       kind: string,
       allowSpread: boolean,
-    ): N.FlowObjectTypeProperty | N.FlowObjectTypeSpreadProperty {
+      allowInexact: boolean,
+    ): (N.FlowObjectTypeProperty | N.FlowObjectTypeSpreadProperty) | boolean {
       if (this.match(tt.ellipsis)) {
         if (!allowSpread) {
           this.unexpected(
@@ -901,9 +936,41 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           );
         }
         this.expect(tt.ellipsis);
-        node.argument = this.flowParseType();
+        switch (this.state.type) {
+          case tt.comma:
+          case tt.semi:
+          case tt.braceR:
+          case tt.braceBarR: {
+            const isInexactToken = this.eat(tt.comma) || this.eat(tt.semi);
+
+            if (this.match(tt.braceR)) {
+              if (allowInexact) return true;
+              this.unexpected(
+                null,
+                "Explicit inexact syntax is only allowed inside inexact objects",
+              );
+            }
+
+            if (this.match(tt.braceBarR)) {
+              this.unexpected(
+                null,
+                "Explicit inexact syntax cannot appear inside an explicit exact object type",
+              );
+              return false;
+            }
 
-        return this.finishNode(node, "ObjectTypeSpreadProperty");
+            if (isInexactToken) {
+              this.unexpected(
+                null,
+                "Explicit inexact syntax must appear at the end of an inexact object",
+              );
+              return false;
+            }
+          }
+          default:
+            node.argument = this.flowParseType();
+            return this.finishNode(node, "ObjectTypeSpreadProperty");
+        }
       } else {
         node.key = this.flowParseObjectPropertyKey();
         node.static = isStatic;
@@ -1146,10 +1213,22 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           );
 
         case tt.braceL:
-          return this.flowParseObjectType(false, false, true, false);
+          return this.flowParseObjectType({
+            allowStatic: false,
+            allowExact: false,
+            allowSpread: true,
+            allowProto: false,
+            allowInexact: true,
+          });
 
         case tt.braceBarL:
-          return this.flowParseObjectType(false, true, true, false);
+          return this.flowParseObjectType({
+            allowStatic: false,
+            allowExact: true,
+            allowSpread: true,
+            allowProto: false,
+            allowInexact: false,
+          });
 
         case tt.bracketL:
           return this.flowParseTupleType();

packages/babel-parser/test/fixtures/flow/call-properties/1/output.json

@@ -156,7 +156,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },

packages/babel-parser/test/fixtures/flow/call-properties/2/output.json

@@ -156,7 +156,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },

packages/babel-parser/test/fixtures/flow/call-properties/3/output.json

@@ -308,7 +308,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },

packages/babel-parser/test/fixtures/flow/call-properties/4/output.json

@@ -256,7 +256,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },

packages/babel-parser/test/fixtures/flow/comment/02-type-include/output.json

@@ -239,7 +239,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],

packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/output.json

@@ -239,7 +239,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],

packages/babel-parser/test/fixtures/flow/declare-module/10/output.json

@@ -146,7 +146,8 @@
             ],
             "indexers": [],
             "internalSlots": [],
-            "exact": false
+            "exact": false,
+            "inexact": false
           }
         }
       }

packages/babel-parser/test/fixtures/flow/declare-module/6/output.json

@@ -192,7 +192,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             }

packages/babel-parser/test/fixtures/flow/declare-statements/14/output.json

@@ -243,7 +243,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],

packages/babel-parser/test/fixtures/flow/def-site-variance/1/output.json

@@ -422,7 +422,8 @@
           "properties": [],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/input.js

@@ -0,0 +1,4 @@
+//@flow
+declare class A {
+  ...;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/input.js

@@ -0,0 +1,5 @@
+//@flow
+declare class B {
+  foo: number;
+  ...;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/input.js

@@ -0,0 +1,5 @@
+//@flow
+declare class C {
+  ...;
+  foo: number;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/input.js

@@ -0,0 +1,6 @@
+//@flow
+declare class D {
+  foo: number;
+  ...;
+  bar: number;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/input.js

@@ -0,0 +1,5 @@
+//@flow
+interface F {
+  foo: number;
+  ...;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/input.js

@@ -0,0 +1,5 @@
+//@flow
+interface G {
+  ...;
+  foo: number;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/input.js

@@ -0,0 +1,6 @@
+//@flow
+interface H {
+  foo: number;
+  ...;
+  bar: number;
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/input.js

@@ -0,0 +1,2 @@
+//@flow
+type T = {| foo: number, ... |}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax cannot appear inside an explicit exact object type (2:29)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/input.js

@@ -0,0 +1,2 @@
+//@flow
+type T = {..., foo: number};

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/options.json

@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax must appear at the end of an inexact object (2:15)"
+}

packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/input.js

@@ -0,0 +1,4 @@
+//@flow
+type T = {...};
+type U = {x: number, ...};
+type V = {x: number, ...V, ...U};