renamed "isExterns" to "is_externs"

erik-krogh · erik-krogh · commit 39ff727ec76b · 2020-09-04T11:51:39.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
@@ -136,7 +136,7 @@ public Pair<Label, LoCInfo> extract(
       lexicalExtractor.extractLines(source, toplevelLabel);
     }
 
-    if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("isExterns", toplevelLabel);
+    if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("is_externs", toplevelLabel);
     if (platform == Platform.NODE && sourceType == SourceType.COMMONJS_MODULE)
       textualExtractor.getTrapwriter().addTuple("isNodejs", toplevelLabel);
 
diff --git a/javascript/extractor/tests/externs/output/trap/Point.js.trap b/javascript/extractor/tests/externs/output/trap/Point.js.trap
@@ -951,6 +951,6 @@ successor(#20188,#20190)
 successor(#20283,#20188)
 successor(#20185,#20184)
 successor(#20272,#20185)
-isExterns(#20001)
+is_externs(#20001)
 numlines(#10000,17,10,1)
 filetype(#10000,"javascript")
diff --git a/javascript/ql/src/semmle/javascript/AST.qll b/javascript/ql/src/semmle/javascript/AST.qll
@@ -221,7 +221,7 @@ class TopLevel extends @toplevel, StmtContainer {
   /** Holds if this toplevel is an externs definitions file. */
   predicate isExterns() {
     // either it was explicitly extracted as an externs file...
-    isExterns(this)
+    is_externs(this)
     or
     // ...or it has a comment with an `@externs` tag in it
     exists(JSDocTag externs |
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -67,3 +67,8 @@ class XorBitwiseExpr = XOrExpr;
 
 // Aliases for deprecated predicates from the dbscheme
  
+/**
+ * Alias for the predicate `is_externs` defined in the .dbscheme.
+ * Use `TopLevel#isExterns()` instead.
+ */ 
+deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -118,7 +118,7 @@ filetype(
 toplevels (unique int id: @toplevel,
            int kind: int ref);
 
-isExterns (int toplevel: @toplevel ref);
+is_externs (int toplevel: @toplevel ref);
 
 case @toplevel.kind of
    0 = @script
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -7897,7 +7897,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isExterns</name>
+<name>is_externs</name>
 <cardinality>44</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -1,2 +1,4 @@
 description: Rename multiple relation names. 
 compatibility: backwards
+is_externs.rel: reorder isExterns.rel(int toplevel) toplevel
+isExterns.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public Pair<Label, LoCInfo> extract(`
`136`	`136`	`lexicalExtractor.extractLines(source, toplevelLabel);`
`137`	`137`	`}`
`138`	`138`
`139`		`- if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("isExterns", toplevelLabel);`
	`139`	`+ if (config.isExterns()) textualExtractor.getTrapwriter().addTuple("is_externs", toplevelLabel);`
`140`	`140`	`if (platform == Platform.NODE && sourceType == SourceType.COMMONJS_MODULE)`
`141`	`141`	`textualExtractor.getTrapwriter().addTuple("isNodejs", toplevelLabel);`
`142`	`142`