JS: Fix closure namespace prefix and update tests

Author: asger-semmle

javascript/ql/src/semmle/javascript/Closure.qll

@@ -212,6 +212,8 @@ module Closure {
       or
       name = namespace
     )
+    or
+    name = "goog" // The closure libraries themselves use the "goog" namespace
   }
 
   /**
@@ -220,6 +222,8 @@ module Closure {
   bindingset[name]
   private predicate hasClosureNamespacePrefix(string name) {
     isClosureNamespace(name.substring(0, name.indexOf(".")))
+    or
+    isClosureNamespace(name)
   }
 
   /**

javascript/ql/test/library-tests/Closure/CallGraph.ql

@@ -1,4 +1,6 @@
 import javascript
+import semmle.javascript.dataflow.internal.FlowSteps
 
-from DataFlow::InvokeNode node, int imprecision
-select node, node.getACallee(imprecision), imprecision
+from DataFlow::InvokeNode node, Function callee
+where calls(node, callee)
+select node, callee, 0

javascript/ql/test/library-tests/Closure/moduleImport.expected

@@ -1,6 +1,5 @@
 | foo.bar | tests/nestedAccess.js:3:14:3:36 | goog.re ... o.bar') |
 | foo.bar.x | tests/nestedAccess.js:5:1:5:8 | fooBar.x |
-| foo.bar.x | tests/nestedAccess.js:10:9:10:11 | z.x |
 | foo.bar.x.y | tests/nestedAccess.js:5:1:5:10 | fooBar.x.y |
 | foo.bar.x.y.z | tests/nestedAccess.js:5:1:5:12 | fooBar.x.y.z |
 | goog | tests/es6Module.js:1:1:1:4 | goog |