JS: Accept new trap files

As I see it, these all seem to have invalid code initially anyway, but
this is definitely something a JS expert should review :)

javascript/extractor/tests/flow/output/trap/anonFunctionWithoutParens.js.trap

@@ -72,20 +72,14 @@ locations_default(#20025,#10000,1,40,1,39)
 hasLocation(#20024,#20025)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20026=@"module;{#10000},1,1"
-scopes(#20026,3)
-scopenodes(#20001,#20026)
-scopenesting(#20026,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20027=*
-entry_cfg_node(#20027,#20001)
-#20028=@"loc,{#10000},1,1,1,0"
-locations_default(#20028,#10000,1,1,1,0)
-hasLocation(#20027,#20028)
-#20029=*
-exit_cfg_node(#20029,#20001)
-hasLocation(#20029,#20025)
-successor(#20027,#20029)
+#20026=*
+entry_cfg_node(#20026,#20001)
+#20027=@"loc,{#10000},1,1,1,0"
+locations_default(#20027,#10000,1,1,1,0)
+hasLocation(#20026,#20027)
+#20028=*
+exit_cfg_node(#20028,#20001)
+hasLocation(#20028,#20025)
+successor(#20026,#20028)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/flow/output/trap/anonIndexer.js.trap

@@ -85,20 +85,14 @@ toplevels(#20001,0)
 #20030=@"loc,{#10000},1,1,2,0"
 locations_default(#20030,#10000,1,1,2,0)
 hasLocation(#20001,#20030)
-#20031=@"module;{#10000},1,1"
-scopes(#20031,3)
-scopenodes(#20001,#20031)
-scopenesting(#20031,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20032=*
-entry_cfg_node(#20032,#20001)
-#20033=@"loc,{#10000},1,1,1,0"
-locations_default(#20033,#10000,1,1,1,0)
-hasLocation(#20032,#20033)
-#20034=*
-exit_cfg_node(#20034,#20001)
-hasLocation(#20034,#20029)
-successor(#20032,#20034)
+#20031=*
+entry_cfg_node(#20031,#20001)
+#20032=@"loc,{#10000},1,1,1,0"
+locations_default(#20032,#10000,1,1,1,0)
+hasLocation(#20031,#20032)
+#20033=*
+exit_cfg_node(#20033,#20001)
+hasLocation(#20033,#20029)
+successor(#20031,#20033)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/flow/output/trap/declared-module-imports.js.trap

@@ -128,20 +128,14 @@ toplevels(#20001,0)
 #20045=@"loc,{#10000},1,1,5,0"
 locations_default(#20045,#10000,1,1,5,0)
 hasLocation(#20001,#20045)
-#20046=@"module;{#10000},1,1"
-scopes(#20046,3)
-scopenodes(#20001,#20046)
-scopenesting(#20046,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
-hasLocation(#20047,#20048)
-#20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20044)
-successor(#20047,#20049)
+#20046=*
+entry_cfg_node(#20046,#20001)
+#20047=@"loc,{#10000},1,1,1,0"
+locations_default(#20047,#10000,1,1,1,0)
+hasLocation(#20046,#20047)
+#20048=*
+exit_cfg_node(#20048,#20001)
+hasLocation(#20048,#20044)
+successor(#20046,#20048)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/flow/output/trap/exportOpaqueType.js.trap

@@ -70,20 +70,14 @@ toplevels(#20001,0)
 #20024=@"loc,{#10000},1,1,2,0"
 locations_default(#20024,#10000,1,1,2,0)
 hasLocation(#20001,#20024)
-#20025=@"module;{#10000},1,1"
-scopes(#20025,3)
-scopenodes(#20001,#20025)
-scopenesting(#20025,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20023)
-successor(#20026,#20028)
+#20025=*
+entry_cfg_node(#20025,#20001)
+#20026=@"loc,{#10000},1,1,1,0"
+locations_default(#20026,#10000,1,1,1,0)
+hasLocation(#20025,#20026)
+#20027=*
+exit_cfg_node(#20027,#20001)
+hasLocation(#20027,#20023)
+successor(#20025,#20027)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/flow/output/trap/importTypeInDeclaredModule.js.trap

@@ -205,20 +205,14 @@ toplevels(#20001,0)
 #20071=@"loc,{#10000},1,1,11,2"
 locations_default(#20071,#10000,1,1,11,2)
 hasLocation(#20001,#20071)
-#20072=@"module;{#10000},1,1"
-scopes(#20072,3)
-scopenodes(#20001,#20072)
-scopenesting(#20072,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20073=*
-entry_cfg_node(#20073,#20001)
-#20074=@"loc,{#10000},1,1,1,0"
-locations_default(#20074,#10000,1,1,1,0)
-hasLocation(#20073,#20074)
-#20075=*
-exit_cfg_node(#20075,#20001)
-hasLocation(#20075,#20070)
-successor(#20073,#20075)
+#20072=*
+entry_cfg_node(#20072,#20001)
+#20073=@"loc,{#10000},1,1,1,0"
+locations_default(#20073,#10000,1,1,1,0)
+hasLocation(#20072,#20073)
+#20074=*
+exit_cfg_node(#20074,#20001)
+hasLocation(#20074,#20070)
+successor(#20072,#20074)
 numlines(#10000,11,10,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/flow/output/trap/variance.js.trap

@@ -160,95 +160,89 @@ toplevels(#20001,0)
 #20057=@"loc,{#10000},1,1,7,1"
 locations_default(#20057,#10000,1,1,7,1)
 hasLocation(#20001,#20057)
-#20058=@"module;{#10000},1,1"
-scopes(#20058,3)
-scopenodes(#20001,#20058)
-scopenesting(#20058,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20059=@"var;{Foo};{#20058}"
-variables(#20059,"Foo",#20058)
-#20060=@"local_type_name;{Foo};{#20058}"
-local_type_names(#20060,"Foo",#20058)
-#20061=*
-stmts(#20061,26,#20001,0,"class F ... : int\n}")
-#20062=@"loc,{#10000},5,1,7,1"
-locations_default(#20062,#10000,5,1,7,1)
-hasLocation(#20061,#20062)
-stmt_containers(#20061,#20001)
+#20058=@"var;{Foo};{#20000}"
+variables(#20058,"Foo",#20000)
+#20059=@"local_type_name;{Foo};{#20000}"
+local_type_names(#20059,"Foo",#20000)
+#20060=*
+stmts(#20060,26,#20001,0,"class F ... : int\n}")
+#20061=@"loc,{#10000},5,1,7,1"
+locations_default(#20061,#10000,5,1,7,1)
+hasLocation(#20060,#20061)
+stmt_containers(#20060,#20001)
+#20062=*
+exprs(#20062,78,#20060,0,"Foo")
+hasLocation(#20062,#20043)
+enclosing_stmt(#20062,#20060)
+expr_containers(#20062,#20001)
+literals("Foo","Foo",#20062)
+decl(#20062,#20058)
+typedecl(#20062,#20059)
 #20063=*
-exprs(#20063,78,#20061,0,"Foo")
-hasLocation(#20063,#20043)
-enclosing_stmt(#20063,#20061)
-expr_containers(#20063,#20001)
-literals("Foo","Foo",#20063)
-decl(#20063,#20059)
-typedecl(#20063,#20060)
+scopes(#20063,10)
+scopenodes(#20060,#20063)
+scopenesting(#20063,#20000)
 #20064=*
-scopes(#20064,10)
-scopenodes(#20061,#20064)
-scopenesting(#20064,#20058)
-#20065=*
-properties(#20065,#20061,2,8,"+x: int")
-#20066=@"loc,{#10000},6,3,6,9"
-locations_default(#20066,#10000,6,3,6,9)
-hasLocation(#20065,#20066)
+properties(#20064,#20060,2,8,"+x: int")
+#20065=@"loc,{#10000},6,3,6,9"
+locations_default(#20065,#10000,6,3,6,9)
+hasLocation(#20064,#20065)
+#20066=*
 #20067=*
+exprs(#20067,0,#20064,0,"x")
+hasLocation(#20067,#20049)
+expr_containers(#20067,#20066)
+literals("x","x",#20067)
 #20068=*
-exprs(#20068,0,#20065,0,"x")
-hasLocation(#20068,#20049)
-expr_containers(#20068,#20067)
-literals("x","x",#20068)
-#20069=*
-properties(#20069,#20061,3,0,"constructor() {}")
-#20070=@"loc,{#10000},5,11,5,10"
-locations_default(#20070,#10000,5,11,5,10)
-hasLocation(#20069,#20070)
+properties(#20068,#20060,3,0,"constructor() {}")
+#20069=@"loc,{#10000},5,11,5,10"
+locations_default(#20069,#10000,5,11,5,10)
+hasLocation(#20068,#20069)
+#20070=*
+exprs(#20070,0,#20068,0,"constructor")
+hasLocation(#20070,#20069)
+enclosing_stmt(#20070,#20060)
+expr_containers(#20070,#20001)
+literals("constructor","constructor",#20070)
+exprs(#20066,9,#20068,1,"() {}")
+hasLocation(#20066,#20069)
+enclosing_stmt(#20066,#20060)
+expr_containers(#20066,#20001)
 #20071=*
-exprs(#20071,0,#20069,0,"constructor")
-hasLocation(#20071,#20070)
-enclosing_stmt(#20071,#20061)
-expr_containers(#20071,#20001)
-literals("constructor","constructor",#20071)
-exprs(#20067,9,#20069,1,"() {}")
-hasLocation(#20067,#20070)
-enclosing_stmt(#20067,#20061)
-expr_containers(#20067,#20001)
-#20072=*
-scopes(#20072,1)
-scopenodes(#20067,#20072)
-scopenesting(#20072,#20064)
-#20073=@"var;{arguments};{#20072}"
-variables(#20073,"arguments",#20072)
-is_arguments_object(#20073)
+scopes(#20071,1)
+scopenodes(#20066,#20071)
+scopenesting(#20071,#20063)
+#20072=@"var;{arguments};{#20071}"
+variables(#20072,"arguments",#20071)
+is_arguments_object(#20072)
+#20073=*
+stmts(#20073,1,#20066,-2,"{}")
+hasLocation(#20073,#20069)
+stmt_containers(#20073,#20066)
+is_method(#20068)
 #20074=*
-stmts(#20074,1,#20067,-2,"{}")
-hasLocation(#20074,#20070)
-stmt_containers(#20074,#20067)
-is_method(#20069)
-#20075=*
-entry_cfg_node(#20075,#20001)
-#20076=@"loc,{#10000},1,1,1,0"
-locations_default(#20076,#10000,1,1,1,0)
-hasLocation(#20075,#20076)
+entry_cfg_node(#20074,#20001)
+#20075=@"loc,{#10000},1,1,1,0"
+locations_default(#20075,#10000,1,1,1,0)
+hasLocation(#20074,#20075)
+#20076=*
+exit_cfg_node(#20076,#20001)
+hasLocation(#20076,#20056)
+successor(#20067,#20064)
+successor(#20066,#20068)
 #20077=*
-exit_cfg_node(#20077,#20001)
-hasLocation(#20077,#20056)
-successor(#20068,#20065)
-successor(#20067,#20069)
+entry_cfg_node(#20077,#20066)
+hasLocation(#20077,#20069)
+successor(#20064,#20073)
 #20078=*
-entry_cfg_node(#20078,#20067)
-hasLocation(#20078,#20070)
-successor(#20065,#20074)
-#20079=*
-exit_cfg_node(#20079,#20067)
-hasLocation(#20079,#20070)
-successor(#20074,#20079)
-successor(#20078,#20068)
-successor(#20071,#20067)
-successor(#20069,#20061)
-successor(#20063,#20071)
-successor(#20061,#20077)
-successor(#20075,#20063)
+exit_cfg_node(#20078,#20066)
+hasLocation(#20078,#20069)
+successor(#20073,#20078)
+successor(#20077,#20067)
+successor(#20070,#20066)
+successor(#20068,#20060)
+successor(#20062,#20070)
+successor(#20060,#20076)
+successor(#20074,#20062)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")