JS: support additional Flow syntax: ... in object types

esbena · esbena · commit 9ffe03bcce97 · 2019-11-26T15:24:27.000+01:00
diff --git a/change-notes/1.23/extractor-javascript.md b/change-notes/1.23/extractor-javascript.md
@@ -16,6 +16,7 @@ extraction:
         - include: "**/bower_components"
 ```
 
+* Additional [Flow](https://flow.org/) syntax is now supported.
 * Recognition of CommonJS modules has improved. As a result, some files that were previously extracted as
   global scripts are now extracted as modules.
 * Top-level `await` is now supported.
diff --git a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
@@ -541,7 +541,11 @@ private void flowParseObjectType(boolean allowStatic, boolean allowExact, boolea
         if (isStatic && this.type == TokenType.colon) {
           this.parseIdent(false);
         } else if (allowSpread && this.eat(TokenType.ellipsis)) {
-          flowParseType();
+          boolean hasType =
+              this.type != endDelim && this.type != TokenType.comma && this.type != TokenType.semi;
+          if (hasType) {
+            flowParseType();
+          }
           flowObjectTypeSemicolon();
           continue;
         } else {
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -37,7 +37,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2019-11-17";
+  public static final String EXTRACTOR_VERSION = "2019-11-26";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 
diff --git a/javascript/extractor/tests/flow/input/objectTypeSpread.js b/javascript/extractor/tests/flow/input/objectTypeSpread.js
@@ -1,2 +1,4 @@
 type A = { x: int };
-type B = { ...A, y: string };
+type B = { ...A, y: string };
+type C<T> = {c: null | T, ...} | ((r: null | T) => mixed);
+type D = { d: D, ..., };
diff --git a/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap b/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap
