renamed "isES2015Module" to "is_es2015_module"

javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java

@@ -700,7 +700,7 @@ public class ASTExtractor {
           trapwriter.addTuple("isClosureModule", toplevelLabel);
           break;
         case MODULE:
-          trapwriter.addTuple("isES2015Module", toplevelLabel);
+          trapwriter.addTuple("is_es2015_module", toplevelLabel);
           break;
         default:
           break;

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

@@ -107,7 +107,7 @@ scopes(#20037,3)
 scopenodes(#20001,#20037)
 scopenesting(#20037,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20038=@"var;{x};{#20037}"
 variables(#20038,"x",#20037)
 #20039=*

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

@@ -57,7 +57,7 @@ scopes(#20018,3)
 scopenodes(#20001,#20018)
 scopenesting(#20018,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20019=@"var;{x};{#20018}"
 variables(#20019,"x",#20018)
 #20020=*

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

@@ -85,7 +85,7 @@ scopes(#20029,3)
 scopenodes(#20001,#20029)
 scopenesting(#20029,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20030=@"var;{f};{#20029}"
 variables(#20030,"f",#20029)
 #20031=*

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

@@ -55,7 +55,7 @@ scopes(#20017,3)
 scopenodes(#20001,#20017)
 scopenesting(#20017,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20018=*
 stmts(#20018,29,#20001,0,"export  ... lass {}")
 hasLocation(#20018,#20003)

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

@@ -67,7 +67,7 @@ scopes(#20022,3)
 scopenodes(#20001,#20022)
 scopenesting(#20022,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20023=@"var;{f};{#20022}"
 variables(#20023,"f",#20022)
 #20024=*

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

@@ -72,7 +72,7 @@ scopes(#20024,3)
 scopenodes(#20001,#20024)
 scopenesting(#20024,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20025=@"var;{f};{#20024}"
 variables(#20025,"f",#20024)
 #20026=*

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

@@ -67,7 +67,7 @@ scopes(#20022,3)
 scopenodes(#20001,#20022)
 scopenesting(#20022,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20023=*
 stmts(#20023,29,#20001,0,"export  ... n () {}")
 #20024=@"loc,{#10000},1,1,1,29"

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

@@ -125,7 +125,7 @@ scopes(#20045,3)
 scopenodes(#20001,#20045)
 scopenesting(#20045,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20046=@"var;{x};{#20045}"
 variables(#20046,"x",#20045)
 #20047=@"var;{y};{#20045}"

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

@@ -52,7 +52,7 @@ scopes(#20016,3)
 scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20017=*
 stmts(#20017,28,#20001,0,"export * from 'foo';")
 hasLocation(#20017,#20003)

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

@@ -82,7 +82,7 @@ scopes(#20028,3)
 scopenodes(#20001,#20028)
 scopenesting(#20028,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20029=*
 stmts(#20029,30,#20001,0,"export  ...  'foo';")
 hasLocation(#20029,#20003)

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

@@ -75,7 +75,7 @@ scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20026=*
 stmts(#20026,2,#20001,0,"foo = 42;")
 hasLocation(#20026,#20003)

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

@@ -75,7 +75,7 @@ scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20026=@"var;{C};{#20025}"
 variables(#20026,"C",#20025)
 #20027=@"local_type_name;{C};{#20025}"

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

@@ -52,7 +52,7 @@ scopes(#20016,3)
 scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20017=@"var;{x};{#20016}"
 variables(#20017,"x",#20016)
 #20018=@"local_type_name;{x};{#20016}"

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

@@ -62,7 +62,7 @@ scopes(#20020,3)
 scopenodes(#20001,#20020)
 scopenesting(#20020,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20021=@"var;{y};{#20020}"
 variables(#20021,"y",#20020)
 #20022=@"local_type_name;{y};{#20020}"

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

@@ -72,7 +72,7 @@ scopes(#20024,3)
 scopenodes(#20001,#20024)
 scopenesting(#20024,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20025=@"var;{z};{#20024}"
 variables(#20025,"z",#20024)
 #20026=@"local_type_name;{z};{#20024}"

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

@@ -82,7 +82,7 @@ scopes(#20028,3)
 scopenodes(#20001,#20028)
 scopenesting(#20028,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20029=@"var;{x};{#20028}"
 variables(#20029,"x",#20028)
 #20030=@"var;{z};{#20028}"

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

@@ -62,7 +62,7 @@ scopes(#20020,3)
 scopenodes(#20001,#20020)
 scopenesting(#20020,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20021=@"var;{foo};{#20020}"
 variables(#20021,"foo",#20020)
 #20022=@"local_type_name;{foo};{#20020}"

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

@@ -42,7 +42,7 @@ scopes(#20012,3)
 scopenodes(#20001,#20012)
 scopenesting(#20012,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20013=*
 stmts(#20013,27,#20001,0,"import 'foo';")
 hasLocation(#20013,#20003)

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

@@ -126,7 +126,7 @@ scopes(#20045,3)
 scopenodes(#20001,#20045)
 scopenesting(#20045,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20046=@"var;{x};{#20045}"
 variables(#20046,"x",#20045)
 #20047=@"var;{z};{#20045}"

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

@@ -179,7 +179,7 @@ scopes(#20064,3)
 scopenodes(#20001,#20064)
 scopenesting(#20064,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20065=@"var;{x};{#20064}"
 variables(#20065,"x",#20064)
 #20066=@"var;{y};{#20064}"

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

@@ -196,7 +196,7 @@ scopes(#20069,3)
 scopenodes(#20001,#20069)
 scopenesting(#20069,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20070=@"var;{foo};{#20069}"
 variables(#20070,"foo",#20069)
 #20071=*

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

@@ -80,7 +80,7 @@ scopes(#20027,3)
 scopenodes(#20001,#20027)
 scopenesting(#20027,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20028=@"var;{f};{#20027}"
 variables(#20028,"f",#20027)
 #20029=*

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

@@ -75,7 +75,7 @@ scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20026=*
 stmts(#20026,29,#20001,0,"export  ... n () {}")
 #20027=@"loc,{#10000},1,1,1,35"

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

@@ -192,7 +192,7 @@ scopes(#20071,3)
 scopenodes(#20001,#20071)
 scopenesting(#20071,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20072=*
 stmts(#20072,2,#20001,0,"import(""m"");")
 hasLocation(#20072,#20003)

javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap

@@ -146,7 +146,7 @@ scopes(#20053,3)
 scopenodes(#20001,#20053)
 scopenesting(#20053,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20054=@"var;{language};{#20053}"
 variables(#20054,"language",#20053)
 #20055=@"local_type_name;{language};{#20053}"

javascript/extractor/tests/extensions/output/trap/tst.es6.trap

@@ -65,7 +65,7 @@ scopes(#20021,3)
 scopenodes(#20001,#20021)
 scopenesting(#20021,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20022=*
 stmts(#20022,2,#20001,0,"console ...  ES6"");")
 hasLocation(#20022,#20003)

javascript/extractor/tests/extensions/output/trap/tst2.es.trap

@@ -65,7 +65,7 @@ scopes(#20021,3)
 scopenodes(#20001,#20021)
 scopenesting(#20021,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20022=*
 stmts(#20022,2,#20001,0,"console ... o ES"");")
 hasLocation(#20022,#20003)

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

@@ -77,7 +77,7 @@ scopes(#20026,3)
 scopenodes(#20001,#20026)
 scopenesting(#20026,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20027=*
 entry_cfg_node(#20027,#20001)
 #20028=@"loc,{#10000},1,1,1,0"

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

@@ -90,7 +90,7 @@ scopes(#20031,3)
 scopenodes(#20001,#20031)
 scopenesting(#20031,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20032=*
 entry_cfg_node(#20032,#20001)
 #20033=@"loc,{#10000},1,1,1,0"

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

@@ -133,7 +133,7 @@ scopes(#20046,3)
 scopenodes(#20001,#20046)
 scopenesting(#20046,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20047=*
 entry_cfg_node(#20047,#20001)
 #20048=@"loc,{#10000},1,1,1,0"

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

@@ -223,7 +223,7 @@ scopes(#20083,3)
 scopenodes(#20001,#20083)
 scopenesting(#20083,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20084=*
 stmts(#20084,30,#20001,0,"export  ... om ""m"";")
 hasLocation(#20084,#20003)

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

@@ -75,7 +75,7 @@ scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20026=*
 entry_cfg_node(#20026,#20001)
 #20027=@"loc,{#10000},1,1,1,0"

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

@@ -186,7 +186,7 @@ scopes(#20069,3)
 scopenodes(#20001,#20069)
 scopenesting(#20069,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20070=@"var;{type};{#20069}"
 variables(#20070,"type",#20069)
 #20071=@"local_type_name;{type};{#20069}"

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

@@ -210,7 +210,7 @@ scopes(#20072,3)
 scopenodes(#20001,#20072)
 scopenesting(#20072,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20073=*
 entry_cfg_node(#20073,#20001)
 #20074=@"loc,{#10000},1,1,1,0"

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

@@ -165,7 +165,7 @@ scopes(#20058,3)
 scopenodes(#20001,#20058)
 scopenesting(#20058,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20059=@"var;{Foo};{#20058}"
 variables(#20059,"Foo",#20058)
 #20060=@"local_type_name;{Foo};{#20058}"

javascript/extractor/tests/html/output/trap/module.html.trap

@@ -104,7 +104,7 @@ scopes(#20035,3)
 scopenodes(#20001,#20035)
 scopenesting(#20035,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20036=@"var;{foo};{#20035}"
 variables(#20036,"foo",#20035)
 #20037=@"local_type_name;{foo};{#20035}"

javascript/extractor/tests/html/output/trap/tst2.html.trap

@@ -175,7 +175,7 @@ scopes(#20053,3)
 scopenodes(#20037,#20053)
 scopenesting(#20053,#20000)
 is_module(#20037)
-isES2015Module(#20037)
+is_es2015_module(#20037)
 #20054=@"var;{inAModule};{#20053}"
 variables(#20054,"inAModule",#20053)
 #20055=*
@@ -260,7 +260,7 @@ scopes(#20079,3)
 scopenodes(#20061,#20079)
 scopenesting(#20079,#20000)
 is_module(#20061)
-isES2015Module(#20061)
+is_es2015_module(#20061)
 #20080=@"var;{f};{#20079}"
 variables(#20080,"f",#20079)
 #20081=@"local_type_name;{f};{#20079}"

javascript/extractor/tests/node/output/trap/tst.mjs.trap

@@ -50,7 +50,7 @@ scopes(#20016,3)
 scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20017=@"var;{x};{#20016}"
 variables(#20017,"x",#20016)
 #20018=*

javascript/extractor/tests/ts/output/trap/decorators.ts.trap

@@ -310,7 +310,7 @@ scopes(#20112,3)
 scopenodes(#20001,#20112)
 scopenesting(#20112,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20113=@"var;{Class};{#20112}"
 variables(#20113,"Class",#20112)
 #20114=@"var;{fun};{#20112}"

javascript/extractor/tests/ts/output/trap/export.ts.trap

@@ -154,7 +154,7 @@ scopes(#20055,3)
 scopenodes(#20001,#20055)
 scopenesting(#20055,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20056=@"var;{foo};{#20055}"
 variables(#20056,"foo",#20055)
 #20057=@"var;{C};{#20055}"

javascript/extractor/tests/ts/output/trap/export2.ts.trap

@@ -50,7 +50,7 @@ scopes(#20015,3)
 scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20016=*
 stmts(#20016,29,#20001,0,"export default 42;")
 hasLocation(#20016,#20003)

javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap

@@ -96,7 +96,7 @@ scopes(#20033,3)
 scopenodes(#20001,#20033)
 scopenesting(#20033,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20034=*
 stmts(#20034,30,#20001,0,"export  ...  foo();")
 hasLocation(#20034,#20003)

javascript/extractor/tests/ts/output/trap/exportassign.ts.trap

@@ -50,7 +50,7 @@ scopes(#20015,3)
 scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20016=*
 stmts(#20016,33,#20001,0,"export = 42;")
 hasLocation(#20016,#20003)

javascript/extractor/tests/ts/output/trap/exportclass.ts.trap

@@ -50,7 +50,7 @@ scopes(#20015,3)
 scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20016=*
 stmts(#20016,30,#20001,0,"export class {}")
 hasLocation(#20016,#20003)

javascript/extractor/tests/ts/output/trap/importExport.ts.trap

@@ -117,7 +117,7 @@ scopes(#20041,3)
 scopenodes(#20001,#20041)
 scopenesting(#20041,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20042=@"var;{Something};{#20041}"
 variables(#20042,"Something",#20041)
 #20043=@"var;{importExport};{#20041}"

javascript/extractor/tests/ts/output/trap/importassign.ts.trap

@@ -70,7 +70,7 @@ scopes(#20023,3)
 scopenodes(#20001,#20023)
 scopenesting(#20023,#20000)
 is_module(#20001)
-isES2015Module(#20001)
+is_es2015_module(#20001)
 #20024=@"var;{x};{#20023}"
 variables(#20024,"x",#20023)
 #20025=@"local_type_name;{x};{#20023}"

javascript/ql/src/semmle/javascript/Aliases.qll

@@ -82,3 +82,8 @@ deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) }
  * Use `NodeModule` from `NodeJS.qll` instead.
  */ 
 deprecated predicate isNodejs(TopLevel toplevel) { is_nodejs(toplevel) }
+/**
+ * Alias for the predicate `is_es2015_module` defined in the .dbscheme.
+ * Use `ES2015Module` from `ES2015Modules.qll` instead.
+ */ 
+deprecated predicate isES2015Module(TopLevel toplevel) { is_es2015_module(toplevel) }

javascript/ql/src/semmle/javascript/ES2015Modules.qll

@@ -14,7 +14,7 @@ import javascript
  * ```
  */
 class ES2015Module extends Module {
-  ES2015Module() { isES2015Module(this) }
+  ES2015Module() { is_es2015_module(this) }
 
   override ModuleScope getScope() { result.getScopeElement() = this }
 

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -128,7 +128,7 @@ case @toplevel.kind of
 
 is_module (int tl: @toplevel ref);
 is_nodejs (int tl: @toplevel ref);
-isES2015Module (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
 isClosureModule (int tl: @toplevel ref);
 
 // statements

javascript/ql/src/semmlecode.javascript.dbscheme.stats

@@ -9238,7 +9238,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isES2015Module</name>
+<name>is_es2015_module</name>
 <cardinality>21</cardinality>
 <columnsizes>
 <e>

javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties

@@ -6,3 +6,5 @@ is_module.rel: reorder isModule.rel(int toplevel) toplevel
 isModule.rel: delete
 is_nodejs.rel: reorder isNodejs.rel(int toplevel) toplevel
 isNodejs.rel: delete
+is_es2015_module.rel: reorder isES2015Module.rel(int toplevel) toplevel
+isES2015Module.rel: delete