hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 20:26:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed "isNodejs" to "is_nodejs"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:51:41 +02:00
parent 4fb6d6060c
commit 8782c2b8e0
11 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/extractor/src/com/semmle/js/extractor/JSExtractor.java
View File

@@ -138,7 +138,7 @@ public class JSExtractor {
if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("is_externs", toplevelLabel); if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("is_externs", toplevelLabel);
if (platform == Platform.NODE && sourceType == SourceType.COMMONJS_MODULE) 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); textualExtractor.getMetrics().stopPhase(ExtractionPhase.JSExtractor_extract);

2
javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
View File

@@ -143,6 +143,6 @@ successor(#20037,#20038)
successor(#20035,#20039) successor(#20035,#20039)
successor(#20033,#20044) successor(#20033,#20044)
successor(#20042,#20032) successor(#20042,#20032)
isNodejs(#20001) is_nodejs(#20001)
numlines(#10000,1,1,0) numlines(#10000,1,1,0)
filetype(#10000,"javascript") filetype(#10000,"javascript")

2
javascript/extractor/tests/node/output/trap/constlet.js.trap
View File

@@ -174,6 +174,6 @@ successor(#20046,#20043)
successor(#20045,#20046) successor(#20045,#20046)
successor(#20043,#20047) successor(#20043,#20047)
successor(#20052,#20042) successor(#20052,#20042)
isNodejs(#20001) is_nodejs(#20001)
numlines(#10000,2,2,0) numlines(#10000,2,2,0)
filetype(#10000,"javascript") filetype(#10000,"javascript")

2
javascript/extractor/tests/node/output/trap/hello.trap
View File

@@ -143,7 +143,7 @@ successor(#20036,#20037)
successor(#20034,#20038) successor(#20034,#20038)
successor(#20032,#20043) successor(#20032,#20043)
successor(#20041,#20031) successor(#20041,#20031)
isNodejs(#20001) is_nodejs(#20001)
#20044=* #20044=*
lines(#20044,#20001,"#!/usr/bin/env node"," lines(#20044,#20001,"#!/usr/bin/env node","
") ")

2
javascript/extractor/tests/node/output/trap/tst.js.trap
View File

@@ -355,6 +355,6 @@ successor(#20079,#20076)
successor(#20078,#20081) successor(#20078,#20081)
successor(#20076,#20085) successor(#20076,#20085)
successor(#20104,#20075) successor(#20104,#20075)
isNodejs(#20001) is_nodejs(#20001)
numlines(#10000,4,4,0) numlines(#10000,4,4,0)
filetype(#10000,"javascript") filetype(#10000,"javascript")

2
javascript/extractor/tests/shebang/output/trap/tst.js.trap
View File

@@ -117,7 +117,7 @@ successor(#20032,#20028)
successor(#20030,#20032) successor(#20030,#20032)
successor(#20028,#20037) successor(#20028,#20037)
successor(#20035,#20027) successor(#20035,#20027)
isNodejs(#20001) is_nodejs(#20001)
#20038=* #20038=*
lines(#20038,#20001,"#!/usr/bin/node"," lines(#20038,#20001,"#!/usr/bin/node","
") ")

5
javascript/ql/src/semmle/javascript/Aliases.qll
View File

@@ -77,3 +77,8 @@ deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
* Use the `Module` class in `Module.qll` instead. * Use the `Module` class in `Module.qll` instead.
*/ */
deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) } 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) }

2
javascript/ql/src/semmle/javascript/NodeJS.qll
View File

@@ -17,7 +17,7 @@ private import NodeModuleResolutionImpl
class NodeModule extends Module { class NodeModule extends Module {
NodeModule() { NodeModule() {
is_module(this) and is_module(this) and
isNodejs(this) is_nodejs(this)
} }
/** Gets the `module` variable of this module. */ /** Gets the `module` variable of this module. */

2
javascript/ql/src/semmlecode.javascript.dbscheme
View File

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

2
javascript/ql/src/semmlecode.javascript.dbscheme.stats
View File

@@ -9260,7 +9260,7 @@
<dependencies/> <dependencies/>
</relation> </relation>
<relation> <relation>
<name>isNodejs</name> <name>is_nodejs</name>
<cardinality>12</cardinality> <cardinality>12</cardinality>
<columnsizes> <columnsizes>
<e> <e>

2
javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
View File

@@ -4,3 +4,5 @@ is_externs.rel: reorder isExterns.rel(int toplevel) toplevel
isExterns.rel: delete isExterns.rel: delete
is_module.rel: reorder isModule.rel(int toplevel) toplevel is_module.rel: reorder isModule.rel(int toplevel) toplevel
isModule.rel: delete isModule.rel: delete
is_nodejs.rel: reorder isNodejs.rel(int toplevel) toplevel
isNodejs.rel: delete