renamed "isNodejs" to "is_nodejs"

erik-krogh · erik-krogh · commit 8782c2b8e053 · 2020-09-04T11:51:41.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/JSExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/JSExtractor.java
@@ -138,7 +138,7 @@ public Pair<Label, LoCInfo> extract(
 
     if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("is_externs", toplevelLabel);
     if (platform == Platform.NODE && sourceType == SourceType.COMMONJS_MODULE)
-      textualExtractor.getTrapwriter().addTuple("isNodejs", toplevelLabel);
+      textualExtractor.getTrapwriter().addTuple("is_nodejs", toplevelLabel);
 
     textualExtractor.getMetrics().stopPhase(ExtractionPhase.JSExtractor_extract);
 
diff --git a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
@@ -143,6 +143,6 @@ successor(#20037,#20038)
 successor(#20035,#20039)
 successor(#20033,#20044)
 successor(#20042,#20032)
-isNodejs(#20001)
+is_nodejs(#20001)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/constlet.js.trap b/javascript/extractor/tests/node/output/trap/constlet.js.trap
@@ -174,6 +174,6 @@ successor(#20046,#20043)
 successor(#20045,#20046)
 successor(#20043,#20047)
 successor(#20052,#20042)
-isNodejs(#20001)
+is_nodejs(#20001)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/hello.trap b/javascript/extractor/tests/node/output/trap/hello.trap
@@ -143,7 +143,7 @@ successor(#20036,#20037)
 successor(#20034,#20038)
 successor(#20032,#20043)
 successor(#20041,#20031)
-isNodejs(#20001)
+is_nodejs(#20001)
 #20044=*
 lines(#20044,#20001,"#!/usr/bin/env node","
 ")
diff --git a/javascript/extractor/tests/node/output/trap/tst.js.trap b/javascript/extractor/tests/node/output/trap/tst.js.trap
@@ -355,6 +355,6 @@ successor(#20079,#20076)
 successor(#20078,#20081)
 successor(#20076,#20085)
 successor(#20104,#20075)
-isNodejs(#20001)
+is_nodejs(#20001)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/shebang/output/trap/tst.js.trap b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
@@ -117,7 +117,7 @@ successor(#20032,#20028)
 successor(#20030,#20032)
 successor(#20028,#20037)
 successor(#20035,#20027)
-isNodejs(#20001)
+is_nodejs(#20001)
 #20038=*
 lines(#20038,#20001,"#!/usr/bin/node","
 ")
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -77,3 +77,8 @@ deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
  * Use the `Module` class in `Module.qll` instead.
  */ 
 deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) }
+/**
+ * Alias for the predicate `is_nodejs` defined in the .dbscheme.
+ * Use `NodeModule` from `NodeJS.qll` instead.
+ */ 
+deprecated predicate isNodejs(TopLevel toplevel) { is_nodejs(toplevel) }
diff --git a/javascript/ql/src/semmle/javascript/NodeJS.qll b/javascript/ql/src/semmle/javascript/NodeJS.qll
@@ -17,7 +17,7 @@ private import NodeModuleResolutionImpl
 class NodeModule extends Module {
   NodeModule() {
     is_module(this) and
-    isNodejs(this)
+    is_nodejs(this)
   }
 
   /** Gets the `module` variable of this module. */
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -127,7 +127,7 @@ case @toplevel.kind of
 |  3 = @javascript_url;
 
 is_module (int tl: @toplevel ref);
-isNodejs (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
 isES2015Module (int tl: @toplevel ref);
 isClosureModule (int tl: @toplevel ref);
 
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -9260,7 +9260,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isNodejs</name>
+<name>is_nodejs</name>
 <cardinality>12</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -4,3 +4,5 @@ is_externs.rel: reorder isExterns.rel(int toplevel) toplevel
 isExterns.rel: delete
 is_module.rel: reorder isModule.rel(int toplevel) toplevel
 isModule.rel: delete
+is_nodejs.rel: reorder isNodejs.rel(int toplevel) toplevel
+isNodejs.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ private import NodeModuleResolutionImpl`
`17`	`17`	`class NodeModule extends Module {`
`18`	`18`	`NodeModule() {`
`19`	`19`	`is_module(this) and`
`20`		`- isNodejs(this)`
	`20`	`+ is_nodejs(this)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	/** Gets the `module` variable of this module. */