Merge pull request #6690 from hvitved/js/files-folders-drop-columns

JavaScript: Drop redundant columns from `files` and `folders` relations

javascript/extractor/src/com/semmle/js/extractor/test/TrapTests.java

@@ -11,6 +11,7 @@ import com.semmle.util.data.Pair;
 import com.semmle.util.data.StringUtil;
 import com.semmle.util.extraction.ExtractorOutputConfig;
 import com.semmle.util.io.WholeIO;
+import com.semmle.util.process.Env;
 import com.semmle.util.srcarchive.DummySourceArchive;
 import com.semmle.util.trap.ITrapWriterFactory;
 import com.semmle.util.trap.TrapWriter;
@@ -21,6 +22,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import org.junit.AfterClass;
@@ -140,6 +142,10 @@ public class TrapTests {
       options.add(inputFile.getAbsolutePath());
     }
 
+    LinkedHashMap<String, String> vars = new LinkedHashMap<>();
+		vars.put("CODEQL_REDUCE_FILES_FOLDERS_RELATIONS", "true");
+    Env.systemEnv().pushEnvironmentContext(vars);
+
     final List<Pair<String, String>> expectedVsActual = new ArrayList<Pair<String, String>>();
     Main main =
         new Main(

javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr1.js;sourcefile"
-files(#10000,"/classexpr1.js","classexpr1","js",0)
+files(#10000,"/classexpr1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr2.js;sourcefile"
-files(#10000,"/classexpr2.js","classexpr2","js",0)
+files(#10000,"/classexpr2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr3.js;sourcefile"
-files(#10000,"/classexpr3.js","classexpr3","js",0)
+files(#10000,"/classexpr3.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr4.js;sourcefile"
-files(#10000,"/classexpr4.js","classexpr4","js",0)
+files(#10000,"/classexpr4.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/fields.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/fields.js;sourcefile"
-files(#10000,"/fields.js","fields","js",0)
+files(#10000,"/fields.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/seq.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/seq.js;sourcefile"
-files(#10000,"/seq.js","seq","js",0)
+files(#10000,"/seq.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/short-circuit.js;sourcefile"
-files(#10000,"/short-circuit.js","short-circuit","js",0)
+files(#10000,"/short-circuit.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/cfg/output/trap/ternary.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/ternary.js;sourcefile"
-files(#10000,"/ternary.js","ternary","js",0)
+files(#10000,"/ternary.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

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

@@ -1,7 +1,7 @@
 #10000=@"/tst.js;sourcefile"
-files(#10000,"/tst.js","tst","js",0)
+files(#10000,"/tst.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/googDotDeclareModuleId.js;sourcefile"
-files(#10000,"/googDotDeclareModuleId.js","googDotDeclareModuleId","js",0)
+files(#10000,"/googDotDeclareModuleId.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/closure/output/trap/googDotModule.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/googDotModule.js;sourcefile"
-files(#10000,"/googDotModule.js","googDotModule","js",0)
+files(#10000,"/googDotModule.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/googDotProvide.js;sourcefile"
-files(#10000,"/googDotProvide.js","googDotProvide","js",0)
+files(#10000,"/googDotProvide.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/comments/output/trap/comments.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/comments.js;sourcefile"
-files(#10000,"/comments.js","comments","js",0)
+files(#10000,"/comments.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/comments/output/trap/empty_comment.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/empty_comment.js;sourcefile"
-files(#10000,"/empty_comment.js","empty_comment","js",0)
+files(#10000,"/empty_comment.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/comments/output/trap/jsdoc.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/jsdoc.js;sourcefile"
-files(#10000,"/jsdoc.js","jsdoc","js",0)
+files(#10000,"/jsdoc.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/latin1.js;sourcefile"
-files(#10000,"/latin1.js","latin1","js",0)
+files(#10000,"/latin1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/e4x/output/trap/regress.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/regress.js;sourcefile"
-files(#10000,"/regress.js","regress","js",0)
+files(#10000,"/regress.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

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

@@ -1,7 +1,7 @@
 #10000=@"/tst.js;sourcefile"
-files(#10000,"/tst.js","tst","js",0)
+files(#10000,"/tst.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/encoding/output/trap/surrogates.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/surrogates.js;sourcefile"
-files(#10000,"/surrogates.js","surrogates","js",0)
+files(#10000,"/surrogates.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/encoding/output/trap/unicode.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/unicode.js;sourcefile"
-files(#10000,"/unicode.js","unicode","js",0)
+files(#10000,"/unicode.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/encoding/output/trap/zwsp.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/zwsp.js;sourcefile"
-files(#10000,"/zwsp.js","zwsp","js",0)
+files(#10000,"/zwsp.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/empty.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/empty.js;sourcefile"
-files(#10000,"/empty.js","empty","js",0)
+files(#10000,"/empty.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/errors.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/errors.js;sourcefile"
-files(#10000,"/errors.js","errors","js",0)
+files(#10000,"/errors.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/incomplete.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/incomplete.js;sourcefile"
-files(#10000,"/incomplete.js","incomplete","js",0)
+files(#10000,"/incomplete.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/invalid-assignment-pattern.js;sourcefile"
-files(#10000,"/invalid-assignment-pattern.js","invalid-assignment-pattern","js",0)
+files(#10000,"/invalid-assignment-pattern.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/json.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/json.js;sourcefile"
-files(#10000,"/json.js","json","js",0)
+files(#10000,"/json.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/kwident.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/kwident.js;sourcefile"
-files(#10000,"/kwident.js","kwident","js",0)
+files(#10000,"/kwident.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/errors/output/trap/weirdassign.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/weirdassign.js;sourcefile"
-files(#10000,"/weirdassign.js","weirdassign","js",0)
+files(#10000,"/weirdassign.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/array_pattern_with_default.js;sourcefile"
-files(#10000,"/array_pattern_with_default.js","array_pattern_with_default","js",0)
+files(#10000,"/array_pattern_with_default.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/array_pattern_with_rest.js;sourcefile"
-files(#10000,"/array_pattern_with_rest.js","array_pattern_with_rest","js",0)
+files(#10000,"/array_pattern_with_rest.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/arrowfn.js;sourcefile"
-files(#10000,"/arrowfn.js","arrowfn","js",0)
+files(#10000,"/arrowfn.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_accessors.js;sourcefile"
-files(#10000,"/class_accessors.js","class_accessors","js",0)
+files(#10000,"/class_accessors.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_ctor.js;sourcefile"
-files(#10000,"/class_ctor.js","class_ctor","js",0)
+files(#10000,"/class_ctor.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_extends.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_extends.js;sourcefile"
-files(#10000,"/class_extends.js","class_extends","js",0)
+files(#10000,"/class_extends.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_extends2.js;sourcefile"
-files(#10000,"/class_extends2.js","class_extends2","js",0)
+files(#10000,"/class_extends2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_method.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_method.js;sourcefile"
-files(#10000,"/class_method.js","class_method","js",0)
+files(#10000,"/class_method.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/class_static.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/class_static.js;sourcefile"
-files(#10000,"/class_static.js","class_static","js",0)
+files(#10000,"/class_static.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/classdecl.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classdecl.js;sourcefile"
-files(#10000,"/classdecl.js","classdecl","js",0)
+files(#10000,"/classdecl.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/classexpr.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr.js;sourcefile"
-files(#10000,"/classexpr.js","classexpr","js",0)
+files(#10000,"/classexpr.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/classexpr2.js;sourcefile"
-files(#10000,"/classexpr2.js","classexpr2","js",0)
+files(#10000,"/classexpr2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/complex_array_pattern.js;sourcefile"
-files(#10000,"/complex_array_pattern.js","complex_array_pattern","js",0)
+files(#10000,"/complex_array_pattern.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/complex_object_pattern.js;sourcefile"
-files(#10000,"/complex_object_pattern.js","complex_object_pattern","js",0)
+files(#10000,"/complex_object_pattern.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/const.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/const.js;sourcefile"
-files(#10000,"/const.js","const","js",0)
+files(#10000,"/const.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/defaultargs.js;sourcefile"
-files(#10000,"/defaultargs.js","defaultargs","js",0)
+files(#10000,"/defaultargs.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/delegating_yield.js;sourcefile"
-files(#10000,"/delegating_yield.js","delegating_yield","js",0)
+files(#10000,"/delegating_yield.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/destructuring.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/destructuring.js;sourcefile"
-files(#10000,"/destructuring.js","destructuring","js",0)
+files(#10000,"/destructuring.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export1.js;sourcefile"
-files(#10000,"/export1.js","export1","js",0)
+files(#10000,"/export1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export10.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export10.js;sourcefile"
-files(#10000,"/export10.js","export10","js",0)
+files(#10000,"/export10.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export11.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export11.js;sourcefile"
-files(#10000,"/export11.js","export11","js",0)
+files(#10000,"/export11.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export2.js;sourcefile"
-files(#10000,"/export2.js","export2","js",0)
+files(#10000,"/export2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export3.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export3.js;sourcefile"
-files(#10000,"/export3.js","export3","js",0)
+files(#10000,"/export3.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export4.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export4.js;sourcefile"
-files(#10000,"/export4.js","export4","js",0)
+files(#10000,"/export4.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export5.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export5.js;sourcefile"
-files(#10000,"/export5.js","export5","js",0)
+files(#10000,"/export5.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export6.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export6.js;sourcefile"
-files(#10000,"/export6.js","export6","js",0)
+files(#10000,"/export6.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export7.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export7.js;sourcefile"
-files(#10000,"/export7.js","export7","js",0)
+files(#10000,"/export7.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export8.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export8.js;sourcefile"
-files(#10000,"/export8.js","export8","js",0)
+files(#10000,"/export8.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/export9.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export9.js;sourcefile"
-files(#10000,"/export9.js","export9","js",0)
+files(#10000,"/export9.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/forof.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/forof.js;sourcefile"
-files(#10000,"/forof.js","forof","js",0)
+files(#10000,"/forof.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import1.js;sourcefile"
-files(#10000,"/import1.js","import1","js",0)
+files(#10000,"/import1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import2.js;sourcefile"
-files(#10000,"/import2.js","import2","js",0)
+files(#10000,"/import2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import3.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import3.js;sourcefile"
-files(#10000,"/import3.js","import3","js",0)
+files(#10000,"/import3.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import4.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import4.js;sourcefile"
-files(#10000,"/import4.js","import4","js",0)
+files(#10000,"/import4.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import5.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import5.js;sourcefile"
-files(#10000,"/import5.js","import5","js",0)
+files(#10000,"/import5.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import6.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import6.js;sourcefile"
-files(#10000,"/import6.js","import6","js",0)
+files(#10000,"/import6.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/import7.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/import7.js;sourcefile"
-files(#10000,"/import7.js","import7","js",0)
+files(#10000,"/import7.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/let.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/let.js;sourcefile"
-files(#10000,"/let.js","let","js",0)
+files(#10000,"/let.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/let2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/let2.js;sourcefile"
-files(#10000,"/let2.js","let2","js",0)
+files(#10000,"/let2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/nested_import.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/nested_import.js;sourcefile"
-files(#10000,"/nested_import.js","nested_import","js",0)
+files(#10000,"/nested_import.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/new_target.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/new_target.js;sourcefile"
-files(#10000,"/new_target.js","new_target","js",0)
+files(#10000,"/new_target.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/no-substitution.js;sourcefile"
-files(#10000,"/no-substitution.js","no-substitution","js",0)
+files(#10000,"/no-substitution.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/nullMethodName.js;sourcefile"
-files(#10000,"/nullMethodName.js","nullMethodName","js",0)
+files(#10000,"/nullMethodName.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/odasa-2593.js;sourcefile"
-files(#10000,"/odasa-2593.js","odasa-2593","js",0)
+files(#10000,"/odasa-2593.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/properties.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/properties.js;sourcefile"
-files(#10000,"/properties.js","properties","js",0)
+files(#10000,"/properties.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/property_pattern_with_default.js;sourcefile"
-files(#10000,"/property_pattern_with_default.js","property_pattern_with_default","js",0)
+files(#10000,"/property_pattern_with_default.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/restparms.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/restparms.js;sourcefile"
-files(#10000,"/restparms.js","restparms","js",0)
+files(#10000,"/restparms.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/restparms2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/restparms2.js;sourcefile"
-files(#10000,"/restparms2.js","restparms2","js",0)
+files(#10000,"/restparms2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/spreadelement.js;sourcefile"
-files(#10000,"/spreadelement.js","spreadelement","js",0)
+files(#10000,"/spreadelement.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/super_call.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/super_call.js;sourcefile"
-files(#10000,"/super_call.js","super_call","js",0)
+files(#10000,"/super_call.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/super_ctor.js;sourcefile"
-files(#10000,"/super_ctor.js","super_ctor","js",0)
+files(#10000,"/super_ctor.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/templates.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/templates.js;sourcefile"
-files(#10000,"/templates.js","templates","js",0)
+files(#10000,"/templates.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/unknown_meta_property.js;sourcefile"
-files(#10000,"/unknown_meta_property.js","unknown_meta_property","js",0)
+files(#10000,"/unknown_meta_property.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/yield.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/yield.js;sourcefile"
-files(#10000,"/yield.js","yield","js",0)
+files(#10000,"/yield.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2015/output/trap/yield2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/yield2.js;sourcefile"
-files(#10000,"/yield2.js","yield2","js",0)
+files(#10000,"/yield2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2016/output/trap/exp.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/exp.js;sourcefile"
-files(#10000,"/exp.js","exp","js",0)
+files(#10000,"/exp.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2016/output/trap/usestrict.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/usestrict.js;sourcefile"
-files(#10000,"/usestrict.js","usestrict","js",0)
+files(#10000,"/usestrict.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2017/output/trap/async-await.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/async-await.js;sourcefile"
-files(#10000,"/async-await.js","async-await","js",0)
+files(#10000,"/async-await.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export-async-1.js;sourcefile"
-files(#10000,"/export-async-1.js","export-async-1","js",0)
+files(#10000,"/export-async-1.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/export-async-2.js;sourcefile"
-files(#10000,"/export-async-2.js","export-async-2","js",0)
+files(#10000,"/export-async-2.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/invalid-async-fn.js;sourcefile"
-files(#10000,"/invalid-async-fn.js","invalid-async-fn","js",0)
+files(#10000,"/invalid-async-fn.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/shorthand-prop-async.js;sourcefile"
-files(#10000,"/shorthand-prop-async.js","shorthand-prop-async","js",0)
+files(#10000,"/shorthand-prop-async.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/asyncIter.js;sourcefile"
-files(#10000,"/asyncIter.js","asyncIter","js",0)
+files(#10000,"/asyncIter.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2018/output/trap/templates.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/templates.js;sourcefile"
-files(#10000,"/templates.js","templates","js",0)
+files(#10000,"/templates.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2019/output/trap/json-superset.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/json-superset.js;sourcefile"
-files(#10000,"/json-superset.js","json-superset","js",0)
+files(#10000,"/json-superset.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2021/output/trap/assign.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/assign.js;sourcefile"
-files(#10000,"/assign.js","assign","js",0)
+files(#10000,"/assign.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/es2021/output/trap/numeric.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/numeric.js;sourcefile"
-files(#10000,"/numeric.js","numeric","js",0)
+files(#10000,"/numeric.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/esnext/output/trap/async-generators.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/async-generators.js;sourcefile"
-files(#10000,"/async-generators.js","async-generators","js",0)
+files(#10000,"/async-generators.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/catchGuardAndNoBinding.js;sourcefile"
-files(#10000,"/catchGuardAndNoBinding.js","catchGuardAndNoBinding","js",0)
+files(#10000,"/catchGuardAndNoBinding.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/catchNoBinding.js;sourcefile"
-files(#10000,"/catchNoBinding.js","catchNoBinding","js",0)
+files(#10000,"/catchNoBinding.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)

javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap

@@ -1,7 +1,7 @@
 #10000=@"/dynamic-import.js;sourcefile"
-files(#10000,"/dynamic-import.js","dynamic-import","js",0)
+files(#10000,"/dynamic-import.js")
 #10001=@"/;folder"
-folders(#10001,"/","")
+folders(#10001,"/")
 containerparent(#10001,#10000)
 #10002=@"loc,{#10000},0,0,0,0"
 locations_default(#10002,#10000,0,0,0,0)