JS: Update TRAP files

javascript/extractor/tests/shebang/output/trap/tst.js.trap

@@ -72,57 +72,59 @@ variables(#20025,"__dirname",#20020)
 #20026=@"var;{arguments};{#20020}"
 variables(#20026,"arguments",#20020)
 is_module(#20001)
-#20027=*
-stmts(#20027,2,#20001,0,"alert(""Hi!"");")
-hasLocation(#20027,#20003)
-stmt_containers(#20027,#20001)
+#20027=@"var;{this};{#20020}"
+variables(#20027,"this",#20020)
 #20028=*
-exprs(#20028,13,#20027,0,"alert(""Hi!"")")
-#20029=@"loc,{#10000},2,1,2,12"
-locations_default(#20029,#10000,2,1,2,12)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20001)
-#20030=*
-exprs(#20030,79,#20028,-1,"alert")
-hasLocation(#20030,#20005)
-enclosing_stmt(#20030,#20027)
-expr_containers(#20030,#20001)
-literals("alert","alert",#20030)
-#20031=@"var;{alert};{#20000}"
-variables(#20031,"alert",#20000)
-bind(#20030,#20031)
-#20032=*
-exprs(#20032,4,#20028,0,"""Hi!""")
-hasLocation(#20032,#20009)
-enclosing_stmt(#20032,#20027)
-expr_containers(#20032,#20001)
-literals("Hi!","""Hi!""",#20032)
+stmts(#20028,2,#20001,0,"alert(""Hi!"");")
+hasLocation(#20028,#20003)
+stmt_containers(#20028,#20001)
+#20029=*
+exprs(#20029,13,#20028,0,"alert(""Hi!"")")
+#20030=@"loc,{#10000},2,1,2,12"
+locations_default(#20030,#10000,2,1,2,12)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20028)
+expr_containers(#20029,#20001)
+#20031=*
+exprs(#20031,79,#20029,-1,"alert")
+hasLocation(#20031,#20005)
+enclosing_stmt(#20031,#20028)
+expr_containers(#20031,#20001)
+literals("alert","alert",#20031)
+#20032=@"var;{alert};{#20000}"
+variables(#20032,"alert",#20000)
+bind(#20031,#20032)
 #20033=*
-regexpterm(#20033,14,#20032,0,"Hi!")
-#20034=@"loc,{#10000},2,8,2,10"
-locations_default(#20034,#10000,2,8,2,10)
-hasLocation(#20033,#20034)
-regexp_const_value(#20033,"Hi!")
-#20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},2,1,2,0"
-locations_default(#20036,#10000,2,1,2,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20015)
-successor(#20027,#20030)
-successor(#20032,#20028)
-successor(#20030,#20032)
-successor(#20028,#20037)
-successor(#20035,#20027)
-is_nodejs(#20001)
+exprs(#20033,4,#20029,0,"""Hi!""")
+hasLocation(#20033,#20009)
+enclosing_stmt(#20033,#20028)
+expr_containers(#20033,#20001)
+literals("Hi!","""Hi!""",#20033)
+#20034=*
+regexpterm(#20034,14,#20033,0,"Hi!")
+#20035=@"loc,{#10000},2,8,2,10"
+locations_default(#20035,#10000,2,8,2,10)
+hasLocation(#20034,#20035)
+regexp_const_value(#20034,"Hi!")
+#20036=*
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},2,1,2,0"
+locations_default(#20037,#10000,2,1,2,0)
+hasLocation(#20036,#20037)
 #20038=*
-lines(#20038,#20001,"#!/usr/bin/node","
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20015)
+successor(#20028,#20031)
+successor(#20033,#20029)
+successor(#20031,#20033)
+successor(#20029,#20038)
+successor(#20036,#20028)
+is_nodejs(#20001)
+#20039=*
+lines(#20039,#20001,"#!/usr/bin/node","
 ")
-#20039=@"loc,{#10000},1,1,1,15"
-locations_default(#20039,#10000,1,1,1,15)
-hasLocation(#20038,#20039)
+#20040=@"loc,{#10000},1,1,1,15"
+locations_default(#20040,#10000,1,1,1,15)
+hasLocation(#20039,#20040)
 numlines(#10000,2,1,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap

@@ -84,46 +84,48 @@ locations_default(#20027,#10000,1,1,5,0)
 hasLocation(#20001,#20027)
 #20028=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20028,"Foo",#20000)
-#20029=*
-stmts(#20029,34,#20001,0,"#!/usr/ ... mber;\n}")
-#20030=@"loc,{#10000},1,1,4,1"
-locations_default(#20030,#10000,1,1,4,1)
-hasLocation(#20029,#20030)
-stmt_containers(#20029,#20001)
-#20031=*
-typeexprs(#20031,1,#20029,0,"Foo")
-hasLocation(#20031,#20013)
-enclosing_stmt(#20031,#20029)
-expr_containers(#20031,#20001)
-literals("Foo","Foo",#20031)
-typedecl(#20031,#20028)
+#20029=@"var;{this};{#20000}"
+variables(#20029,"this",#20000)
+#20030=*
+stmts(#20030,34,#20001,0,"#!/usr/ ... mber;\n}")
+#20031=@"loc,{#10000},1,1,4,1"
+locations_default(#20031,#10000,1,1,4,1)
+hasLocation(#20030,#20031)
+stmt_containers(#20030,#20001)
 #20032=*
-properties(#20032,#20029,2,8,"x: number;")
-#20033=@"loc,{#10000},3,3,3,12"
-locations_default(#20033,#10000,3,3,3,12)
-hasLocation(#20032,#20033)
-#20034=*
-exprs(#20034,0,#20032,0,"x")
-hasLocation(#20034,#20017)
-enclosing_stmt(#20034,#20029)
-expr_containers(#20034,#20001)
-literals("x","x",#20034)
-is_abstract_member(#20032)
+typeexprs(#20032,1,#20030,0,"Foo")
+hasLocation(#20032,#20013)
+enclosing_stmt(#20032,#20030)
+expr_containers(#20032,#20001)
+literals("Foo","Foo",#20032)
+typedecl(#20032,#20028)
+#20033=*
+properties(#20033,#20030,2,8,"x: number;")
+#20034=@"loc,{#10000},3,3,3,12"
+locations_default(#20034,#10000,3,3,3,12)
+hasLocation(#20033,#20034)
 #20035=*
-typeexprs(#20035,2,#20032,2,"number")
-hasLocation(#20035,#20021)
-enclosing_stmt(#20035,#20029)
+exprs(#20035,0,#20033,0,"x")
+hasLocation(#20035,#20017)
+enclosing_stmt(#20035,#20030)
 expr_containers(#20035,#20001)
-literals("number","number",#20035)
+literals("x","x",#20035)
+is_abstract_member(#20033)
 #20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20026)
-successor(#20029,#20038)
-successor(#20036,#20029)
+typeexprs(#20036,2,#20033,2,"number")
+hasLocation(#20036,#20021)
+enclosing_stmt(#20036,#20030)
+expr_containers(#20036,#20001)
+literals("number","number",#20036)
+#20037=*
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20026)
+successor(#20030,#20039)
+successor(#20037,#20030)
 numlines(#10000,4,3,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/shebang/output/trap/typescript.ts.trap

@@ -78,46 +78,48 @@ locations_default(#20025,#10000,1,1,4,0)
 hasLocation(#20001,#20025)
 #20026=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20026,"Foo",#20000)
-#20027=*
-stmts(#20027,34,#20001,0,"interfa ... mber;\n}")
-#20028=@"loc,{#10000},1,1,3,1"
-locations_default(#20028,#10000,1,1,3,1)
-hasLocation(#20027,#20028)
-stmt_containers(#20027,#20001)
-#20029=*
-typeexprs(#20029,1,#20027,0,"Foo")
-hasLocation(#20029,#20011)
-enclosing_stmt(#20029,#20027)
-expr_containers(#20029,#20001)
-literals("Foo","Foo",#20029)
-typedecl(#20029,#20026)
+#20027=@"var;{this};{#20000}"
+variables(#20027,"this",#20000)
+#20028=*
+stmts(#20028,34,#20001,0,"interfa ... mber;\n}")
+#20029=@"loc,{#10000},1,1,3,1"
+locations_default(#20029,#10000,1,1,3,1)
+hasLocation(#20028,#20029)
+stmt_containers(#20028,#20001)
 #20030=*
-properties(#20030,#20027,2,8,"x: number;")
-#20031=@"loc,{#10000},2,3,2,12"
-locations_default(#20031,#10000,2,3,2,12)
-hasLocation(#20030,#20031)
-#20032=*
-exprs(#20032,0,#20030,0,"x")
-hasLocation(#20032,#20015)
-enclosing_stmt(#20032,#20027)
-expr_containers(#20032,#20001)
-literals("x","x",#20032)
-is_abstract_member(#20030)
+typeexprs(#20030,1,#20028,0,"Foo")
+hasLocation(#20030,#20011)
+enclosing_stmt(#20030,#20028)
+expr_containers(#20030,#20001)
+literals("Foo","Foo",#20030)
+typedecl(#20030,#20026)
+#20031=*
+properties(#20031,#20028,2,8,"x: number;")
+#20032=@"loc,{#10000},2,3,2,12"
+locations_default(#20032,#10000,2,3,2,12)
+hasLocation(#20031,#20032)
 #20033=*
-typeexprs(#20033,2,#20030,2,"number")
-hasLocation(#20033,#20019)
-enclosing_stmt(#20033,#20027)
+exprs(#20033,0,#20031,0,"x")
+hasLocation(#20033,#20015)
+enclosing_stmt(#20033,#20028)
 expr_containers(#20033,#20001)
-literals("number","number",#20033)
+literals("x","x",#20033)
+is_abstract_member(#20031)
 #20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20024)
-successor(#20027,#20036)
-successor(#20034,#20027)
+typeexprs(#20034,2,#20031,2,"number")
+hasLocation(#20034,#20019)
+enclosing_stmt(#20034,#20028)
+expr_containers(#20034,#20001)
+literals("number","number",#20034)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20024)
+successor(#20028,#20037)
+successor(#20035,#20028)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")