renamed "isModule" to "is_module"

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

@@ -691,7 +691,7 @@ public class ASTExtractor {
         scopeManager.enterScope(3, moduleScopeKey, toplevelLabel);
         scopeManager.addVariables(
             sourceType.getPredefinedLocals(platform, locationManager.getSourceFileExtension()));
-        trapwriter.addTuple("isModule", toplevelLabel);
+        trapwriter.addTuple("is_module", toplevelLabel);
       }
 
       // Emit the specific source type.

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

@@ -106,7 +106,7 @@ hasLocation(#20001,#20036)
 scopes(#20037,3)
 scopenodes(#20001,#20037)
 scopenesting(#20037,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20038=@"var;{x};{#20037}"
 variables(#20038,"x",#20037)

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

@@ -143,7 +143,7 @@ scopenodes(#20001,#20051)
 scopenesting(#20051,#20000)
 #20052=@"var;{exports};{#20051}"
 variables(#20052,"exports",#20051)
-isModule(#20001)
+is_module(#20001)
 isClosureModule(#20001)
 #20053=@"var;{x};{#20051}"
 variables(#20053,"x",#20051)

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

@@ -56,7 +56,7 @@ hasLocation(#20001,#20003)
 scopes(#20018,3)
 scopenodes(#20001,#20018)
 scopenesting(#20018,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20019=@"var;{x};{#20018}"
 variables(#20019,"x",#20018)

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

@@ -84,7 +84,7 @@ hasLocation(#20001,#20028)
 scopes(#20029,3)
 scopenodes(#20001,#20029)
 scopenesting(#20029,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20030=@"var;{f};{#20029}"
 variables(#20030,"f",#20029)

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

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

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

@@ -66,7 +66,7 @@ hasLocation(#20001,#20003)
 scopes(#20022,3)
 scopenodes(#20001,#20022)
 scopenesting(#20022,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20023=@"var;{f};{#20022}"
 variables(#20023,"f",#20022)

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

@@ -71,7 +71,7 @@ hasLocation(#20001,#20003)
 scopes(#20024,3)
 scopenodes(#20001,#20024)
 scopenesting(#20024,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20025=@"var;{f};{#20024}"
 variables(#20025,"f",#20024)

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

@@ -66,7 +66,7 @@ hasLocation(#20001,#20003)
 scopes(#20022,3)
 scopenodes(#20001,#20022)
 scopenesting(#20022,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20023=*
 stmts(#20023,29,#20001,0,"export  ... n () {}")

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

@@ -124,7 +124,7 @@ hasLocation(#20001,#20044)
 scopes(#20045,3)
 scopenodes(#20001,#20045)
 scopenesting(#20045,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20046=@"var;{x};{#20045}"
 variables(#20046,"x",#20045)

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

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

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

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

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

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

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

@@ -74,7 +74,7 @@ hasLocation(#20001,#20024)
 scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20026=@"var;{C};{#20025}"
 variables(#20026,"C",#20025)

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

@@ -51,7 +51,7 @@ hasLocation(#20001,#20003)
 scopes(#20016,3)
 scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20017=@"var;{x};{#20016}"
 variables(#20017,"x",#20016)

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

@@ -61,7 +61,7 @@ hasLocation(#20001,#20003)
 scopes(#20020,3)
 scopenodes(#20001,#20020)
 scopenesting(#20020,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20021=@"var;{y};{#20020}"
 variables(#20021,"y",#20020)

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

@@ -71,7 +71,7 @@ hasLocation(#20001,#20003)
 scopes(#20024,3)
 scopenodes(#20001,#20024)
 scopenesting(#20024,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20025=@"var;{z};{#20024}"
 variables(#20025,"z",#20024)

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

@@ -81,7 +81,7 @@ hasLocation(#20001,#20003)
 scopes(#20028,3)
 scopenodes(#20001,#20028)
 scopenesting(#20028,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20029=@"var;{x};{#20028}"
 variables(#20029,"x",#20028)

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

@@ -61,7 +61,7 @@ hasLocation(#20001,#20003)
 scopes(#20020,3)
 scopenodes(#20001,#20020)
 scopenesting(#20020,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20021=@"var;{foo};{#20020}"
 variables(#20021,"foo",#20020)

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

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

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

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

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

@@ -178,7 +178,7 @@ hasLocation(#20001,#20063)
 scopes(#20064,3)
 scopenodes(#20001,#20064)
 scopenesting(#20064,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20065=@"var;{x};{#20064}"
 variables(#20065,"x",#20064)

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

@@ -195,7 +195,7 @@ hasLocation(#20001,#20068)
 scopes(#20069,3)
 scopenodes(#20001,#20069)
 scopenesting(#20069,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20070=@"var;{foo};{#20069}"
 variables(#20070,"foo",#20069)

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

@@ -79,7 +79,7 @@ hasLocation(#20001,#20026)
 scopes(#20027,3)
 scopenodes(#20001,#20027)
 scopenesting(#20027,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20028=@"var;{f};{#20027}"
 variables(#20028,"f",#20027)

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

@@ -74,7 +74,7 @@ hasLocation(#20001,#20024)
 scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20026=*
 stmts(#20026,29,#20001,0,"export  ... n () {}")

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

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

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

@@ -145,7 +145,7 @@ hasLocation(#20001,#20052)
 scopes(#20053,3)
 scopenodes(#20001,#20053)
 scopenesting(#20053,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20054=@"var;{language};{#20053}"
 variables(#20054,"language",#20053)

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

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

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

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

javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap

@@ -84,7 +84,7 @@ variables(#20029,"__filename",#20025)
 variables(#20030,"__dirname",#20025)
 #20031=@"var;{arguments};{#20025}"
 variables(#20031,"arguments",#20025)
-isModule(#20001)
+is_module(#20001)
 #20032=*
 stmts(#20032,2,#20001,0,"console ... onJS"");")
 hasLocation(#20032,#20003)

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

@@ -76,7 +76,7 @@ hasLocation(#20001,#20003)
 scopes(#20026,3)
 scopenodes(#20001,#20026)
 scopenesting(#20026,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20027=*
 entry_cfg_node(#20027,#20001)

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

@@ -89,7 +89,7 @@ hasLocation(#20001,#20030)
 scopes(#20031,3)
 scopenodes(#20001,#20031)
 scopenesting(#20031,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20032=*
 entry_cfg_node(#20032,#20001)

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

@@ -132,7 +132,7 @@ hasLocation(#20001,#20045)
 scopes(#20046,3)
 scopenodes(#20001,#20046)
 scopenesting(#20046,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20047=*
 entry_cfg_node(#20047,#20001)

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

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

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

@@ -74,7 +74,7 @@ hasLocation(#20001,#20024)
 scopes(#20025,3)
 scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20026=*
 entry_cfg_node(#20026,#20001)

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

@@ -185,7 +185,7 @@ hasLocation(#20001,#20068)
 scopes(#20069,3)
 scopenodes(#20001,#20069)
 scopenesting(#20069,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20070=@"var;{type};{#20069}"
 variables(#20070,"type",#20069)

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

@@ -209,7 +209,7 @@ hasLocation(#20001,#20071)
 scopes(#20072,3)
 scopenodes(#20001,#20072)
 scopenesting(#20072,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20073=*
 entry_cfg_node(#20073,#20001)

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

@@ -164,7 +164,7 @@ hasLocation(#20001,#20057)
 scopes(#20058,3)
 scopenodes(#20001,#20058)
 scopenesting(#20058,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20059=@"var;{Foo};{#20058}"
 variables(#20059,"Foo",#20058)

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

@@ -103,7 +103,7 @@ hasLocation(#20001,#20034)
 scopes(#20035,3)
 scopenodes(#20001,#20035)
 scopenesting(#20035,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20036=@"var;{foo};{#20035}"
 variables(#20036,"foo",#20035)

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

@@ -174,7 +174,7 @@ hasLocation(#20037,#20052)
 scopes(#20053,3)
 scopenodes(#20037,#20053)
 scopenesting(#20053,#20000)
-isModule(#20037)
+is_module(#20037)
 isES2015Module(#20037)
 #20054=@"var;{inAModule};{#20053}"
 variables(#20054,"inAModule",#20053)
@@ -259,7 +259,7 @@ hasLocation(#20061,#20078)
 scopes(#20079,3)
 scopenodes(#20061,#20079)
 scopenesting(#20079,#20000)
-isModule(#20061)
+is_module(#20061)
 isES2015Module(#20061)
 #20080=@"var;{f};{#20079}"
 variables(#20080,"f",#20079)

javascript/extractor/tests/node/output/trap/constlet.js.trap

@@ -104,7 +104,7 @@ variables(#20037,"__filename",#20033)
 variables(#20038,"__dirname",#20033)
 #20039=@"var;{arguments};{#20033}"
 variables(#20039,"arguments",#20033)
-isModule(#20001)
+is_module(#20001)
 #20040=@"var;{x};{#20033}"
 variables(#20040,"x",#20033)
 #20041=@"var;{y};{#20033}"

javascript/extractor/tests/node/output/trap/hello.trap

@@ -84,7 +84,7 @@ variables(#20028,"__filename",#20024)
 variables(#20029,"__dirname",#20024)
 #20030=@"var;{arguments};{#20024}"
 variables(#20030,"arguments",#20024)
-isModule(#20001)
+is_module(#20001)
 #20031=*
 stmts(#20031,2,#20001,0,"console ... rld!"");")
 hasLocation(#20031,#20003)

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

@@ -191,7 +191,7 @@ variables(#20071,"__filename",#20067)
 variables(#20072,"__dirname",#20067)
 #20073=@"var;{arguments};{#20067}"
 variables(#20073,"arguments",#20067)
-isModule(#20001)
+is_module(#20001)
 #20074=@"var;{fs};{#20067}"
 variables(#20074,"fs",#20067)
 #20075=*

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

@@ -49,7 +49,7 @@ variables(#20015,"Buffer",#20000)
 scopes(#20016,3)
 scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20017=@"var;{x};{#20016}"
 variables(#20017,"x",#20016)

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

@@ -71,7 +71,7 @@ variables(#20024,"__filename",#20020)
 variables(#20025,"__dirname",#20020)
 #20026=@"var;{arguments};{#20020}"
 variables(#20026,"arguments",#20020)
-isModule(#20001)
+is_module(#20001)
 #20027=*
 stmts(#20027,2,#20001,0,"alert(""Hi!"");")
 hasLocation(#20027,#20003)

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

@@ -309,7 +309,7 @@ hasLocation(#20001,#20111)
 scopes(#20112,3)
 scopenodes(#20001,#20112)
 scopenesting(#20112,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20113=@"var;{Class};{#20112}"
 variables(#20113,"Class",#20112)

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

@@ -153,7 +153,7 @@ hasLocation(#20001,#20054)
 scopes(#20055,3)
 scopenodes(#20001,#20055)
 scopenesting(#20055,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20056=@"var;{foo};{#20055}"
 variables(#20056,"foo",#20055)

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

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

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

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

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

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

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

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

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

@@ -116,7 +116,7 @@ hasLocation(#20001,#20040)
 scopes(#20041,3)
 scopenodes(#20001,#20041)
 scopenesting(#20041,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20042=@"var;{Something};{#20041}"
 variables(#20042,"Something",#20041)

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

@@ -69,7 +69,7 @@ hasLocation(#20001,#20022)
 scopes(#20023,3)
 scopenodes(#20001,#20023)
 scopenesting(#20023,#20000)
-isModule(#20001)
+is_module(#20001)
 isES2015Module(#20001)
 #20024=@"var;{x};{#20023}"
 variables(#20024,"x",#20023)

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

@@ -72,3 +72,8 @@ class XorBitwiseExpr = XOrExpr;
  * Use `TopLevel#isExterns()` instead.
  */ 
 deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
+/**
+ * Alias for the predicate `is_module` defined in the .dbscheme.
+ * Use the `Module` class in `Module.qll` instead.
+ */ 
+deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) }

javascript/ql/src/semmle/javascript/NodeJS.qll

@@ -16,7 +16,7 @@ private import NodeModuleResolutionImpl
  */
 class NodeModule extends Module {
   NodeModule() {
-    isModule(this) and
+    is_module(this) and
     isNodejs(this)
   }
 

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -126,7 +126,7 @@ case @toplevel.kind of
 |  2 = @event_handler
 |  3 = @javascript_url;
 
-isModule (int tl: @toplevel ref);
+is_module (int tl: @toplevel ref);
 isNodejs (int tl: @toplevel ref);
 isES2015Module (int tl: @toplevel ref);
 isClosureModule (int tl: @toplevel ref);

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

@@ -9227,7 +9227,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isModule</name>
+<name>is_module</name>
 <cardinality>21</cardinality>
 <columnsizes>
 <e>

javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties

@@ -2,3 +2,5 @@ description: Rename multiple relation names.
 compatibility: backwards
 is_externs.rel: reorder isExterns.rel(int toplevel) toplevel
 isExterns.rel: delete
+is_module.rel: reorder isModule.rel(int toplevel) toplevel
+isModule.rel: delete