renamed "isClosureModule" to "is_closure_module"

erik-krogh · erik-krogh · commit 07fd747069c2 · 2020-09-04T11:51:43.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -697,7 +697,7 @@ public Label visit(Program nd, Context c) {
       // Emit the specific source type.
       switch (sourceType) {
         case CLOSURE_MODULE:
-          trapwriter.addTuple("isClosureModule", toplevelLabel);
+          trapwriter.addTuple("is_closure_module", toplevelLabel);
           break;
         case MODULE:
           trapwriter.addTuple("is_es2015_module", toplevelLabel);
diff --git a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
@@ -144,7 +144,7 @@ scopenesting(#20051,#20000)
 #20052=@"var;{exports};{#20051}"
 variables(#20052,"exports",#20051)
 is_module(#20001)
-isClosureModule(#20001)
+is_closure_module(#20001)
 #20053=@"var;{x};{#20051}"
 variables(#20053,"x",#20051)
 #20054=*
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -87,3 +87,7 @@ deprecated predicate isNodejs(TopLevel toplevel) { is_nodejs(toplevel) }
  * Use `ES2015Module` from `ES2015Modules.qll` instead.
  */ 
 deprecated predicate isES2015Module(TopLevel toplevel) { is_es2015_module(toplevel) }
+/**
+ * Alias for the predicate `is_closure_module` defined in the .dbscheme.
+ */ 
+deprecated predicate isClosureModule(TopLevel toplevel) { is_closure_module(toplevel) }
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -129,7 +129,7 @@ case @toplevel.kind of
 is_module (int tl: @toplevel ref);
 is_nodejs (int tl: @toplevel ref);
 is_es2015_module (int tl: @toplevel ref);
-isClosureModule (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
 
 // statements
 #keyset[parent, idx]
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -9249,7 +9249,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isClosureModule</name>
+<name>is_closure_module</name>
 <cardinality>21</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -8,3 +8,5 @@ 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
+is_closure_module.rel: reorder isClosureModule.rel(int toplevel) toplevel
+isClosureModule.rel: delete
