JS: Update trap output

2026-04-30 11:15:13 +02:00 · 2019-10-09 11:58:15 +01:00
parent e4e10a3222
commit 7355fdf900
8 changed files with 175 additions and 187 deletions
--- a/javascript/extractor/tests/cfg/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
@@ -457,8 +457,7 @@ hasLocation(#20156,#20157)
 #20158=*
 exprs(#20158,0,#20156,0,"x")
 hasLocation(#20158,#20059)
-enclosingStmt(#20158,#20139)
-exprContainers(#20158,#20001)
+exprContainers(#20158,#20146)
 literals("x","x",#20158)
 #20159=*
 properties(#20159,#20139,4,8,"static y;")
@@ -650,8 +649,7 @@ hasLocation(#20207,#20208)
 #20209=*
 exprs(#20209,0,#20207,0,"z")
 hasLocation(#20209,#20128)
-enclosingStmt(#20209,#20180)
-exprContainers(#20209,#20001)
+exprContainers(#20209,#20188)
 literals("z","z",#20209)
 #20210=*
 entry_cfg_node(#20210,#20001)
--- a/javascript/extractor/tests/esnext/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -258,18 +258,17 @@ properties(#20090,#20086,2,8,"x = new.target;")
 locations_default(#20091,#10000,2,3,2,17)
 hasLocation(#20090,#20091)
 #20092=*
-exprs(#20092,0,#20090,0,"x")
-hasLocation(#20092,#20031)
-enclosingStmt(#20092,#20086)
-exprContainers(#20092,#20001)
-literals("x","x",#20092)
 #20093=*
+exprs(#20093,0,#20090,0,"x")
+hasLocation(#20093,#20031)
+exprContainers(#20093,#20092)
+literals("x","x",#20093)
 #20094=*
 exprs(#20094,82,#20090,1,"new.target")
 #20095=@"loc,{#10000},2,7,2,16"
 locations_default(#20095,#10000,2,7,2,16)
 hasLocation(#20094,#20095)
-exprContainers(#20094,#20093)
+exprContainers(#20094,#20092)
 #20096=*
 properties(#20096,#20086,3,0,"constructor() {}")
 #20097=@"loc,{#10000},1,9,1,8"
@@ -281,21 +280,21 @@ hasLocation(#20098,#20097)
 enclosingStmt(#20098,#20086)
 exprContainers(#20098,#20001)
 literals("constructor","constructor",#20098)
-exprs(#20093,9,#20096,1,"() {}")
-hasLocation(#20093,#20097)
-enclosingStmt(#20093,#20086)
-exprContainers(#20093,#20001)
+exprs(#20092,9,#20096,1,"() {}")
+hasLocation(#20092,#20097)
+enclosingStmt(#20092,#20086)
+exprContainers(#20092,#20001)
 #20099=*
 scopes(#20099,1)
-scopenodes(#20093,#20099)
+scopenodes(#20092,#20099)
 scopenesting(#20099,#20089)
 #20100=@"var;{arguments};{#20099}"
 variables(#20100,"arguments",#20099)
 isArgumentsObject(#20100)
 #20101=*
-stmts(#20101,1,#20093,-2,"{}")
+stmts(#20101,1,#20092,-2,"{}")
 hasLocation(#20101,#20097)
-stmtContainers(#20101,#20093)
+stmtContainers(#20101,#20092)
 isMethod(#20096)
 #20102=*
 stmts(#20102,26,#20001,1,"class B ... er.x;\n}")
@@ -328,26 +327,25 @@ properties(#20107,#20102,2,8,"y = super.x;")
 locations_default(#20108,#10000,6,3,6,14)
 hasLocation(#20107,#20108)
 #20109=*
-exprs(#20109,0,#20107,0,"y")
-hasLocation(#20109,#20054)
-enclosingStmt(#20109,#20102)
-exprContainers(#20109,#20001)
-literals("y","y",#20109)
 #20110=*
+exprs(#20110,0,#20107,0,"y")
+hasLocation(#20110,#20054)
+exprContainers(#20110,#20109)
+literals("y","y",#20110)
 #20111=*
 exprs(#20111,14,#20107,1,"super.x")
 #20112=@"loc,{#10000},6,7,6,13"
 locations_default(#20112,#10000,6,7,6,13)
 hasLocation(#20111,#20112)
-exprContainers(#20111,#20110)
+exprContainers(#20111,#20109)
 #20113=*
 exprs(#20113,81,#20111,0,"super")
 hasLocation(#20113,#20058)
-exprContainers(#20113,#20110)
+exprContainers(#20113,#20109)
 #20114=*
 exprs(#20114,0,#20111,1,"x")
 hasLocation(#20114,#20062)
-exprContainers(#20114,#20110)
+exprContainers(#20114,#20109)
 literals("x","x",#20114)
 #20115=*
 properties(#20115,#20102,3,0,"constru ... rgs); }")
@@ -360,54 +358,54 @@ hasLocation(#20117,#20116)
 enclosingStmt(#20117,#20102)
 exprContainers(#20117,#20001)
 literals("constructor","constructor",#20117)
-exprs(#20110,9,#20115,1,"(...arg ... rgs); }")
-hasLocation(#20110,#20116)
-enclosingStmt(#20110,#20102)
-exprContainers(#20110,#20001)
+exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
+hasLocation(#20109,#20116)
+enclosingStmt(#20109,#20102)
+exprContainers(#20109,#20001)
 #20118=*
 scopes(#20118,1)
-scopenodes(#20110,#20118)
+scopenodes(#20109,#20118)
 scopenesting(#20118,#20105)
 #20119=@"var;{args};{#20118}"
 variables(#20119,"args",#20118)
 #20120=*
-exprs(#20120,78,#20110,0,"args")
+exprs(#20120,78,#20109,0,"args")
 hasLocation(#20120,#20116)
-exprContainers(#20120,#20110)
+exprContainers(#20120,#20109)
 literals("args","args",#20120)
 decl(#20120,#20119)
 #20121=@"var;{arguments};{#20118}"
 variables(#20121,"arguments",#20118)
 isArgumentsObject(#20121)
-hasRestParameter(#20110)
+hasRestParameter(#20109)
 #20122=*
-stmts(#20122,1,#20110,-2,"{ super(...args); }")
+stmts(#20122,1,#20109,-2,"{ super(...args); }")
 hasLocation(#20122,#20116)
-stmtContainers(#20122,#20110)
+stmtContainers(#20122,#20109)
 #20123=*
 stmts(#20123,2,#20122,0,"super(...args);")
 hasLocation(#20123,#20116)
-stmtContainers(#20123,#20110)
+stmtContainers(#20123,#20109)
 #20124=*
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
 enclosingStmt(#20124,#20123)
-exprContainers(#20124,#20110)
+exprContainers(#20124,#20109)
 #20125=*
 exprs(#20125,81,#20124,-1,"super")
 hasLocation(#20125,#20116)
 enclosingStmt(#20125,#20123)
-exprContainers(#20125,#20110)
+exprContainers(#20125,#20109)
 #20126=*
 exprs(#20126,66,#20124,0,"...args")
 hasLocation(#20126,#20116)
 enclosingStmt(#20126,#20123)
-exprContainers(#20126,#20110)
+exprContainers(#20126,#20109)
 #20127=*
 exprs(#20127,79,#20126,0,"args")
 hasLocation(#20127,#20116)
 enclosingStmt(#20127,#20123)
-exprContainers(#20127,#20110)
+exprContainers(#20127,#20109)
 literals("args","args",#20127)
 bind(#20127,#20119)
 isMethod(#20115)
@@ -435,12 +433,11 @@ properties(#20132,#20128,2,8,"async;")
 locations_default(#20133,#10000,10,3,10,8)
 hasLocation(#20132,#20133)
 #20134=*
-exprs(#20134,0,#20132,0,"async")
-hasLocation(#20134,#20073)
-enclosingStmt(#20134,#20128)
-exprContainers(#20134,#20001)
-literals("async","async",#20134)
 #20135=*
+exprs(#20135,0,#20132,0,"async")
+hasLocation(#20135,#20073)
+exprContainers(#20135,#20134)
+literals("async","async",#20135)
 #20136=*
 properties(#20136,#20128,3,0,"constructor() {}")
 #20137=@"loc,{#10000},9,9,9,8"
@@ -452,21 +449,21 @@ hasLocation(#20138,#20137)
 enclosingStmt(#20138,#20128)
 exprContainers(#20138,#20001)
 literals("constructor","constructor",#20138)
-exprs(#20135,9,#20136,1,"() {}")
-hasLocation(#20135,#20137)
-enclosingStmt(#20135,#20128)
-exprContainers(#20135,#20001)
+exprs(#20134,9,#20136,1,"() {}")
+hasLocation(#20134,#20137)
+enclosingStmt(#20134,#20128)
+exprContainers(#20134,#20001)
 #20139=*
 scopes(#20139,1)
-scopenodes(#20135,#20139)
+scopenodes(#20134,#20139)
 scopenesting(#20139,#20131)
 #20140=@"var;{arguments};{#20139}"
 variables(#20140,"arguments",#20139)
 isArgumentsObject(#20140)
 #20141=*
-stmts(#20141,1,#20135,-2,"{}")
+stmts(#20141,1,#20134,-2,"{}")
 hasLocation(#20141,#20137)
-stmtContainers(#20141,#20135)
+stmtContainers(#20141,#20134)
 isMethod(#20136)
 #20142=*
 entry_cfg_node(#20142,#20001)
@@ -476,31 +473,31 @@ hasLocation(#20142,#20143)
 #20144=*
 exit_cfg_node(#20144,#20001)
 hasLocation(#20144,#20078)
-successor(#20134,#20132)
-successor(#20135,#20136)
+successor(#20135,#20132)
+successor(#20134,#20136)
 #20145=*
-entry_cfg_node(#20145,#20135)
+entry_cfg_node(#20145,#20134)
 hasLocation(#20145,#20137)
 successor(#20132,#20141)
 #20146=*
-exit_cfg_node(#20146,#20135)
+exit_cfg_node(#20146,#20134)
 hasLocation(#20146,#20137)
 successor(#20141,#20146)
-successor(#20145,#20134)
-successor(#20138,#20135)
+successor(#20145,#20135)
+successor(#20138,#20134)
 successor(#20136,#20128)
 successor(#20130,#20138)
 successor(#20128,#20144)
 successor(#20114,#20111)
 successor(#20113,#20114)
 successor(#20111,#20107)
-successor(#20109,#20113)
-successor(#20110,#20115)
+successor(#20110,#20113)
+successor(#20109,#20115)
 #20147=*
-entry_cfg_node(#20147,#20110)
+entry_cfg_node(#20147,#20109)
 hasLocation(#20147,#20116)
 #20148=*
-exit_cfg_node(#20148,#20110)
+exit_cfg_node(#20148,#20109)
 hasLocation(#20148,#20116)
 successor(#20122,#20123)
 successor(#20123,#20125)
@@ -508,27 +505,27 @@ successor(#20127,#20126)
 successor(#20126,#20124)
 successor(#20125,#20127)
 successor(#20107,#20148)
-successor(#20124,#20109)
+successor(#20124,#20110)
 successor(#20120,#20122)
 successor(#20147,#20120)
-successor(#20117,#20110)
+successor(#20117,#20109)
 successor(#20115,#20102)
 successor(#20106,#20117)
 successor(#20104,#20106)
 successor(#20102,#20130)
 successor(#20094,#20090)
-successor(#20092,#20094)
-successor(#20093,#20096)
+successor(#20093,#20094)
+successor(#20092,#20096)
 #20149=*
-entry_cfg_node(#20149,#20093)
+entry_cfg_node(#20149,#20092)
 hasLocation(#20149,#20097)
 successor(#20090,#20101)
 #20150=*
-exit_cfg_node(#20150,#20093)
+exit_cfg_node(#20150,#20092)
 hasLocation(#20150,#20097)
 successor(#20101,#20150)
-successor(#20149,#20092)
-successor(#20098,#20093)
+successor(#20149,#20093)
+successor(#20098,#20092)
 successor(#20096,#20086)
 successor(#20088,#20098)
 successor(#20086,#20104)
--- a/javascript/extractor/tests/flow/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/tst.js.trap
@@ -542,12 +542,11 @@ properties(#20197,#20193,2,8,"x: T;")
 locations_default(#20198,#10000,7,3,7,7)
 hasLocation(#20197,#20198)
 #20199=*
-exprs(#20199,0,#20197,0,"x")
-hasLocation(#20199,#20082)
-enclosingStmt(#20199,#20193)
-exprContainers(#20199,#20001)
-literals("x","x",#20199)
 #20200=*
+exprs(#20200,0,#20197,0,"x")
+hasLocation(#20200,#20082)
+exprContainers(#20200,#20199)
+literals("x","x",#20200)
 #20201=*
 properties(#20201,#20193,3,0,"m() : Point {}")
 #20202=@"loc,{#10000},8,3,8,16"
@@ -591,21 +590,21 @@ hasLocation(#20212,#20211)
 enclosingStmt(#20212,#20193)
 exprContainers(#20212,#20001)
 literals("constructor","constructor",#20212)
-exprs(#20200,9,#20210,1,"() {}")
-hasLocation(#20200,#20211)
-enclosingStmt(#20200,#20193)
-exprContainers(#20200,#20001)
+exprs(#20199,9,#20210,1,"() {}")
+hasLocation(#20199,#20211)
+enclosingStmt(#20199,#20193)
+exprContainers(#20199,#20001)
 #20213=*
 scopes(#20213,1)
-scopenodes(#20200,#20213)
+scopenodes(#20199,#20213)
 scopenesting(#20213,#20196)
 #20214=@"var;{arguments};{#20213}"
 variables(#20214,"arguments",#20213)
 isArgumentsObject(#20214)
 #20215=*
-stmts(#20215,1,#20200,-2,"{}")
+stmts(#20215,1,#20199,-2,"{}")
 hasLocation(#20215,#20211)
-stmtContainers(#20215,#20200)
+stmtContainers(#20215,#20199)
 isMethod(#20210)
 #20216=*
 stmts(#20216,17,#20001,1,"functio ... :\n  }\n}")
@@ -692,18 +691,18 @@ successor(#20227,#20229)
 successor(#20229,#20231)
 successor(#20231,#20237)
 successor(#20235,#20221)
-successor(#20199,#20197)
-successor(#20200,#20210)
+successor(#20200,#20197)
+successor(#20199,#20210)
 #20239=*
-entry_cfg_node(#20239,#20200)
+entry_cfg_node(#20239,#20199)
 hasLocation(#20239,#20211)
 successor(#20197,#20215)
 #20240=*
-exit_cfg_node(#20240,#20200)
+exit_cfg_node(#20240,#20199)
 hasLocation(#20240,#20211)
 successor(#20215,#20240)
-successor(#20239,#20199)
-successor(#20212,#20200)
+successor(#20239,#20200)
+successor(#20212,#20199)
 successor(#20210,#20193)
 successor(#20204,#20201)
 #20241=*
--- a/javascript/extractor/tests/flow/output/trap/variance.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/variance.js.trap
@@ -194,12 +194,11 @@ properties(#20065,#20061,2,8,"+x: int")
 locations_default(#20066,#10000,6,3,6,9)
 hasLocation(#20065,#20066)
 #20067=*
-exprs(#20067,0,#20065,0,"x")
-hasLocation(#20067,#20049)
-enclosingStmt(#20067,#20061)
-exprContainers(#20067,#20001)
-literals("x","x",#20067)
 #20068=*
+exprs(#20068,0,#20065,0,"x")
+hasLocation(#20068,#20049)
+exprContainers(#20068,#20067)
+literals("x","x",#20068)
 #20069=*
 properties(#20069,#20061,3,0,"constructor() {}")
 #20070=@"loc,{#10000},5,11,5,10"
@@ -211,21 +210,21 @@ hasLocation(#20071,#20070)
 enclosingStmt(#20071,#20061)
 exprContainers(#20071,#20001)
 literals("constructor","constructor",#20071)
-exprs(#20068,9,#20069,1,"() {}")
-hasLocation(#20068,#20070)
-enclosingStmt(#20068,#20061)
-exprContainers(#20068,#20001)
+exprs(#20067,9,#20069,1,"() {}")
+hasLocation(#20067,#20070)
+enclosingStmt(#20067,#20061)
+exprContainers(#20067,#20001)
 #20072=*
 scopes(#20072,1)
-scopenodes(#20068,#20072)
+scopenodes(#20067,#20072)
 scopenesting(#20072,#20064)
 #20073=@"var;{arguments};{#20072}"
 variables(#20073,"arguments",#20072)
 isArgumentsObject(#20073)
 #20074=*
-stmts(#20074,1,#20068,-2,"{}")
+stmts(#20074,1,#20067,-2,"{}")
 hasLocation(#20074,#20070)
-stmtContainers(#20074,#20068)
+stmtContainers(#20074,#20067)
 isMethod(#20069)
 #20075=*
 entry_cfg_node(#20075,#20001)
@@ -235,18 +234,18 @@ hasLocation(#20075,#20076)
 #20077=*
 exit_cfg_node(#20077,#20001)
 hasLocation(#20077,#20056)
-successor(#20067,#20065)
-successor(#20068,#20069)
+successor(#20068,#20065)
+successor(#20067,#20069)
 #20078=*
-entry_cfg_node(#20078,#20068)
+entry_cfg_node(#20078,#20067)
 hasLocation(#20078,#20070)
 successor(#20065,#20074)
 #20079=*
-exit_cfg_node(#20079,#20068)
+exit_cfg_node(#20079,#20067)
 hasLocation(#20079,#20070)
 successor(#20074,#20079)
-successor(#20078,#20067)
-successor(#20071,#20068)
+successor(#20078,#20068)
+successor(#20071,#20067)
 successor(#20069,#20061)
 successor(#20063,#20071)
 successor(#20061,#20077)
--- a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
@@ -190,16 +190,15 @@ properties(#20065,#20062,2,8,"y = 42;")
 locations_default(#20066,#10000,2,3,2,9)
 hasLocation(#20065,#20066)
 #20067=*
-exprs(#20067,0,#20065,0,"y")
-hasLocation(#20067,#20019)
-enclosingStmt(#20067,#20062)
-exprContainers(#20067,#20001)
-literals("y","y",#20067)
 #20068=*
+exprs(#20068,0,#20065,0,"y")
+hasLocation(#20068,#20019)
+exprContainers(#20068,#20067)
+literals("y","y",#20068)
 #20069=*
 exprs(#20069,3,#20065,1,"42")
 hasLocation(#20069,#20023)
-exprContainers(#20069,#20068)
+exprContainers(#20069,#20067)
 literals("42","42",#20069)
 #20070=*
 properties(#20070,#20062,3,0,"constru ... tring);")
@@ -212,29 +211,29 @@ hasLocation(#20072,#20071)
 enclosingStmt(#20072,#20062)
 exprContainers(#20072,#20001)
 literals("constructor","constructor",#20072)
-exprs(#20068,9,#20070,1,"constru ... tring);")
-hasLocation(#20068,#20071)
-enclosingStmt(#20068,#20062)
-exprContainers(#20068,#20001)
+exprs(#20067,9,#20070,1,"constru ... tring);")
+hasLocation(#20067,#20071)
+enclosingStmt(#20067,#20062)
+exprContainers(#20067,#20001)
 #20073=*
 scopes(#20073,1)
-scopenodes(#20068,#20073)
+scopenodes(#20067,#20073)
 scopenesting(#20073,#20064)
 #20074=@"var;{x};{#20073}"
 variables(#20074,"x",#20073)
 #20075=*
-exprs(#20075,78,#20068,0,"x")
+exprs(#20075,78,#20067,0,"x")
 hasLocation(#20075,#20031)
-exprContainers(#20075,#20068)
+exprContainers(#20075,#20067)
 literals("x","x",#20075)
 decl(#20075,#20074)
 #20076=@"var;{arguments};{#20073}"
 variables(#20076,"arguments",#20073)
 isArgumentsObject(#20076)
 #20077=*
-typeexprs(#20077,2,#20068,-6,"string")
+typeexprs(#20077,2,#20067,-6,"string")
 hasLocation(#20077,#20035)
-exprContainers(#20077,#20068)
+exprContainers(#20077,#20067)
 literals("string","string",#20077)
 isMethod(#20070)
 #20078=*
@@ -289,7 +288,7 @@ hasLocation(#20089,#20090)
 exit_cfg_node(#20091,#20001)
 hasLocation(#20091,#20058)
 successor(#20069,#20065)
-successor(#20067,#20069)
+successor(#20068,#20069)
 successor(#20081,#20078)
 #20092=*
 entry_cfg_node(#20092,#20081)
@@ -303,7 +302,7 @@ exit_cfg_node(#20094,#20081)
 locations_default(#20095,#10000,4,24,4,23)
 hasLocation(#20094,#20095)
 successor(#20087,#20094)
-successor(#20084,#20067)
+successor(#20084,#20068)
 successor(#20092,#20084)
 successor(#20080,#20081)
 successor(#20078,#20062)
--- a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
@@ -450,12 +450,11 @@ literals("fieldDecorator","fieldDecorator",#20148)
 variables(#20149,"fieldDecorator",#20000)
 bind(#20148,#20149)
 #20150=*
-exprs(#20150,0,#20144,0,"field")
-hasLocation(#20150,#20071)
-enclosingStmt(#20150,#20118)
-exprContainers(#20150,#20001)
-literals("field","field",#20150)
 #20151=*
+exprs(#20151,0,#20144,0,"field")
+hasLocation(#20151,#20071)
+exprContainers(#20151,#20150)
+literals("field","field",#20151)
 #20152=*
 typeexprs(#20152,2,#20144,2,"number")
 hasLocation(#20152,#20075)
@@ -473,21 +472,21 @@ hasLocation(#20155,#20154)
 enclosingStmt(#20155,#20118)
 exprContainers(#20155,#20001)
 literals("constructor","constructor",#20155)
-exprs(#20151,9,#20153,1,"() {}")
-hasLocation(#20151,#20154)
-enclosingStmt(#20151,#20118)
-exprContainers(#20151,#20001)
+exprs(#20150,9,#20153,1,"() {}")
+hasLocation(#20150,#20154)
+enclosingStmt(#20150,#20118)
+exprContainers(#20150,#20001)
 #20156=*
 scopes(#20156,1)
-scopenodes(#20151,#20156)
+scopenodes(#20150,#20156)
 scopenesting(#20156,#20124)
 #20157=@"var;{arguments};{#20156}"
 variables(#20157,"arguments",#20156)
 isArgumentsObject(#20157)
 #20158=*
-stmts(#20158,1,#20151,-2,"{}")
+stmts(#20158,1,#20150,-2,"{}")
 hasLocation(#20158,#20154)
-stmtContainers(#20158,#20151)
+stmtContainers(#20158,#20150)
 isMethod(#20153)
 #20159=*
 stmts(#20159,17,#20001,1,"@functi ... un() {}")
@@ -615,18 +614,18 @@ locations_default(#20189,#10000,11,18,11,17)
 hasLocation(#20188,#20189)
 successor(#20164,#20188)
 successor(#20186,#20164)
-successor(#20150,#20144)
-successor(#20151,#20153)
+successor(#20151,#20144)
+successor(#20150,#20153)
 #20190=*
-entry_cfg_node(#20190,#20151)
+entry_cfg_node(#20190,#20150)
 hasLocation(#20190,#20154)
 successor(#20144,#20158)
 #20191=*
-exit_cfg_node(#20191,#20151)
+exit_cfg_node(#20191,#20150)
 hasLocation(#20191,#20154)
 successor(#20158,#20191)
-successor(#20190,#20150)
-successor(#20155,#20151)
+successor(#20190,#20151)
+successor(#20155,#20150)
 successor(#20153,#20118)
 successor(#20132,#20125)
 #20192=*
--- a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -895,12 +895,11 @@ properties(#20301,#20260,6,8,"abstract x: number;")
 locations_default(#20302,#10000,14,3,14,21)
 hasLocation(#20301,#20302)
 #20303=*
-exprs(#20303,0,#20301,0,"x")
-hasLocation(#20303,#20159)
-enclosingStmt(#20303,#20260)
-exprContainers(#20303,#20001)
-literals("x","x",#20303)
 #20304=*
+exprs(#20304,0,#20301,0,"x")
+hasLocation(#20304,#20159)
+exprContainers(#20304,#20303)
+literals("x","x",#20304)
 isAbstractMember(#20301)
 #20305=*
 typeexprs(#20305,2,#20301,2,"number")
@@ -919,21 +918,21 @@ hasLocation(#20308,#20307)
 enclosingStmt(#20308,#20260)
 exprContainers(#20308,#20001)
 literals("constructor","constructor",#20308)
-exprs(#20304,9,#20306,1,"() {}")
-hasLocation(#20304,#20307)
-enclosingStmt(#20304,#20260)
-exprContainers(#20304,#20001)
+exprs(#20303,9,#20306,1,"() {}")
+hasLocation(#20303,#20307)
+enclosingStmt(#20303,#20260)
+exprContainers(#20303,#20001)
 #20309=*
 scopes(#20309,1)
-scopenodes(#20304,#20309)
+scopenodes(#20303,#20309)
 scopenesting(#20309,#20263)
 #20310=@"var;{arguments};{#20309}"
 variables(#20310,"arguments",#20309)
 isArgumentsObject(#20310)
 #20311=*
-stmts(#20311,1,#20304,-2,"{}")
+stmts(#20311,1,#20303,-2,"{}")
 hasLocation(#20311,#20307)
-stmtContainers(#20311,#20304)
+stmtContainers(#20311,#20303)
 isMethod(#20306)
 #20312=*
 stmts(#20312,26,#20001,2,"declare ... mber;\n}")
@@ -1114,12 +1113,11 @@ properties(#20354,#20312,6,8,"abstract x: number;")
 locations_default(#20355,#10000,28,3,28,21)
 hasLocation(#20354,#20355)
 #20356=*
-exprs(#20356,0,#20354,0,"x")
-hasLocation(#20356,#20242)
-enclosingStmt(#20356,#20312)
-exprContainers(#20356,#20001)
-literals("x","x",#20356)
 #20357=*
+exprs(#20357,0,#20354,0,"x")
+hasLocation(#20357,#20242)
+exprContainers(#20357,#20356)
+literals("x","x",#20357)
 isAbstractMember(#20354)
 #20358=*
 typeexprs(#20358,2,#20354,2,"number")
@@ -1138,21 +1136,21 @@ hasLocation(#20361,#20360)
 enclosingStmt(#20361,#20312)
 exprContainers(#20361,#20001)
 literals("constructor","constructor",#20361)
-exprs(#20357,9,#20359,1,"() {}")
-hasLocation(#20357,#20360)
-enclosingStmt(#20357,#20312)
-exprContainers(#20357,#20001)
+exprs(#20356,9,#20359,1,"() {}")
+hasLocation(#20356,#20360)
+enclosingStmt(#20356,#20312)
+exprContainers(#20356,#20001)
 #20362=*
 scopes(#20362,1)
-scopenodes(#20357,#20362)
+scopenodes(#20356,#20362)
 scopenesting(#20362,#20316)
 #20363=@"var;{arguments};{#20362}"
 variables(#20363,"arguments",#20362)
 isArgumentsObject(#20363)
 #20364=*
-stmts(#20364,1,#20357,-2,"{}")
+stmts(#20364,1,#20356,-2,"{}")
 hasLocation(#20364,#20360)
-stmtContainers(#20364,#20357)
+stmtContainers(#20364,#20356)
 isMethod(#20359)
 #20365=*
 entry_cfg_node(#20365,#20001)
@@ -1163,16 +1161,16 @@ hasLocation(#20365,#20366)
 exit_cfg_node(#20367,#20001)
 hasLocation(#20367,#20251)
 successor(#20312,#20367)
-successor(#20304,#20306)
+successor(#20303,#20306)
 #20368=*
-entry_cfg_node(#20368,#20304)
+entry_cfg_node(#20368,#20303)
 hasLocation(#20368,#20307)
 #20369=*
-exit_cfg_node(#20369,#20304)
+exit_cfg_node(#20369,#20303)
 hasLocation(#20369,#20307)
 successor(#20311,#20369)
 successor(#20368,#20311)
-successor(#20308,#20304)
+successor(#20308,#20303)
 successor(#20306,#20260)
 successor(#20293,#20290)
 #20370=*
--- a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
@@ -4229,12 +4229,11 @@ properties(#21361,#21350,2,8,"field: T")
 locations_default(#21362,#10000,55,3,55,10)
 hasLocation(#21361,#21362)
 #21363=*
-exprs(#21363,0,#21361,0,"field")
-hasLocation(#21363,#20821)
-enclosingStmt(#21363,#21350)
-exprContainers(#21363,#20001)
-literals("field","field",#21363)
 #21364=*
+exprs(#21364,0,#21361,0,"field")
+hasLocation(#21364,#20821)
+exprContainers(#21364,#21363)
+literals("field","field",#21364)
 #21365=*
 typeexprs(#21365,0,#21361,2,"T")
 hasLocation(#21365,#20825)
@@ -4298,21 +4297,21 @@ hasLocation(#21378,#21377)
 enclosingStmt(#21378,#21350)
 exprContainers(#21378,#20001)
 literals("constructor","constructor",#21378)
-exprs(#21364,9,#21376,1,"() {}")
-hasLocation(#21364,#21377)
-enclosingStmt(#21364,#21350)
-exprContainers(#21364,#20001)
+exprs(#21363,9,#21376,1,"() {}")
+hasLocation(#21363,#21377)
+enclosingStmt(#21363,#21350)
+exprContainers(#21363,#20001)
 #21379=*
 scopes(#21379,1)
-scopenodes(#21364,#21379)
+scopenodes(#21363,#21379)
 scopenesting(#21379,#21353)
 #21380=@"var;{arguments};{#21379}"
 variables(#21380,"arguments",#21379)
 isArgumentsObject(#21380)
 #21381=*
-stmts(#21381,1,#21364,-2,"{}")
+stmts(#21381,1,#21363,-2,"{}")
 hasLocation(#21381,#21377)
-stmtContainers(#21381,#21364)
+stmtContainers(#21381,#21363)
 isMethod(#21376)
 #21382=*
 stmts(#21382,26,#20001,45,"class Fish {}")
@@ -4653,18 +4652,18 @@ successor(#21387,#21388)
 successor(#21385,#21382)
 successor(#21383,#21387)
 successor(#21382,#21393)
-successor(#21363,#21361)
-successor(#21364,#21376)
+successor(#21364,#21361)
+successor(#21363,#21376)
 #21461=*
-entry_cfg_node(#21461,#21364)
+entry_cfg_node(#21461,#21363)
 hasLocation(#21461,#21377)
 successor(#21361,#21381)
 #21462=*
-exit_cfg_node(#21462,#21364)
+exit_cfg_node(#21462,#21363)
 hasLocation(#21462,#21377)
 successor(#21381,#21462)
-successor(#21461,#21363)
-successor(#21378,#21364)
+successor(#21461,#21364)
+successor(#21378,#21363)
 successor(#21376,#21350)
 successor(#21366,#21378)
 successor(#21352,#21366)