querydb: cleanup/simplify dependency tree, move classes into querydb namespace

console/build.sbt

@@ -10,7 +10,6 @@ val ZeroturnaroundVersion = "1.15"
 
 dependsOn(
   Projects.semanticcpg,
-  Projects.macros,
   Projects.javasrc2cpg,
   Projects.jssrc2cpg,
   Projects.pysrc2cpg,

console/src/main/scala/io/joern/console/scan/ScanPass.scala

@@ -1,6 +1,6 @@
 package io.joern.console.scan
 
-import io.joern.console.Query
+import io.joern.querydb.Query
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.passes.ConcurrentWriterCpgPass
 

console/src/main/scala/io/joern/console/scan/package.scala

@@ -1,6 +1,6 @@
 package io.joern.console
 
-import io.joern.console.Query
+import io.joern.querydb.Query
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.NodeTypes
 import io.shiftleft.codepropertygraph.generated.nodes._

macros/src/main/scala/io/joern/console/Query.scala → console/src/main/scala/io/joern/querydb/Query.scala

@@ -1,4 +1,4 @@
-package io.joern.console
+package io.joern.querydb
 
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.nodes.StoredNode

joern-cli/build.sbt

@@ -2,9 +2,10 @@ name := "joern-cli"
 
 dependsOn(
   Projects.console,
-  Projects.console % "test->test",
+  Projects.macros,
   Projects.dataflowengineoss,
-  Projects.x2cpg
+  Projects.x2cpg,
+  Projects.console % "test->test"
 )
 
 libraryDependencies ++= Seq(

joern-cli/src/main/scala/io/joern/joerncli/JoernScan.scala

@@ -2,7 +2,8 @@ package io.joern.joerncli
 
 import better.files._
 import io.joern.console.scan.{ScanPass, outputFindings}
-import io.joern.console.{BridgeBase, DefaultArgumentProvider, JoernProduct, Query, QueryDatabase}
+import io.joern.console.{BridgeBase, JoernProduct}
+import io.joern.querydb.{DefaultArgumentProvider, Query, QueryDatabase}
 import io.joern.dataflowengineoss.queryengine.{EngineConfig, EngineContext}
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.joerncli.JoernScan.getQueriesFromQueryDb

macros/build.sbt

@@ -3,7 +3,10 @@ name := "macros"
 scalaVersion       := "2.13.8"
 crossScalaVersions := Seq("2.13.8", "3.2.2")
 
-dependsOn(Projects.semanticcpg % Test)
+dependsOn(
+  Projects.console,
+  Projects.semanticcpg % Test
+)
 
 libraryDependencies ++= Seq(
   "io.shiftleft"  %% "codepropertygraph" % Versions.cpg,

macros/src/main/java/io/joern/console/q.java → macros/src/main/java/io/joern/querydb/q.java

@@ -1,4 +1,4 @@
-package io.joern.console;
+package io.joern.querydb;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

macros/src/main/scala-2/io/joern/macros/QueryMacros.scala

@@ -2,7 +2,7 @@ package io.joern.macros
 
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.nodes.StoredNode
-import io.joern.console.TraversalWithStrRep
+import io.joern.querydb.TraversalWithStrRep
 import overflowdb.traversal.Traversal
 
 import scala.language.experimental.macros

macros/src/main/scala-3/io/joern/macros/QueryMacros.scala

@@ -1,6 +1,6 @@
 package io.joern.macros
 
-import io.joern.console.TraversalWithStrRep
+import io.joern.querydb.TraversalWithStrRep
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.codepropertygraph.generated.nodes.StoredNode
 import overflowdb.traversal.Traversal

macros/src/main/scala/io/joern/console/QueryDatabase.scala → macros/src/main/scala/io/joern/querydb/QueryDatabase.scala

@@ -1,4 +1,4 @@
-package io.joern.console
+package io.joern.querydb
 
 import org.reflections8.Reflections
 import org.reflections8.util.{ClasspathHelper, ConfigurationBuilder}

macros/src/test/scala/io/joern/macros/QueryMacroTests.scala

@@ -5,6 +5,7 @@ import org.scalatest.wordspec.AnyWordSpec
 
 import io.joern.macros.QueryMacros.withStrRep
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.semanticcpg.language._
 
 class QueryMacroTests extends AnyWordSpec with Matchers {

macros/src/test/scala/io/joern/console/QueryDatabaseTests.scala → macros/src/test/scala/io/joern/querydb/QueryDatabaseTests.scala

@@ -1,4 +1,4 @@
-package io.joern.console
+package io.joern.querydb
 
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.semanticcpg.language._
@@ -36,13 +36,13 @@ object InvalidBundle extends QueryBundle {
 class QueryDatabaseTests extends AnyWordSpec with should.Matchers {
   "QueryDatabase" should {
     "contain Metrics bundle" in {
-      new QueryDatabase(namespace = "io.joern.console").allBundles.count { bundle =>
+      new QueryDatabase(namespace = "io.joern.querydb").allBundles.count { bundle =>
         bundle.getName.endsWith("TestBundle$")
       } shouldBe 1
     }
 
     "contain `foo` query" in {
-      val qdb = new QueryDatabase(namespace = "io.joern.console")
+      val qdb = new QueryDatabase(namespace = "io.joern.querydb")
       val testBundles = qdb.allBundles.filter { bundle =>
         bundle.getName.endsWith("TestBundle$")
       }
@@ -67,7 +67,7 @@ class QueryDatabaseTests extends AnyWordSpec with should.Matchers {
     }
 
     "throw exception when trying to fetch queries from invalid bundle" in {
-      val qdb = new QueryDatabase(namespace = "io.joern.console")
+      val qdb = new QueryDatabase(namespace = "io.joern.querydb")
       val testBundles = qdb.allBundles.filter { bundle =>
         bundle.getName.endsWith("InvalidBundle$")
       }

querydb/src/main/scala/io/joern/dumpq/Main.scala

@@ -1,6 +1,6 @@
 package io.joern.dumpq
 
-import io.joern.console.{DefaultArgumentProvider, QueryDatabase}
+import io.joern.querydb.{DefaultArgumentProvider, QueryDatabase}
 import io.joern.dataflowengineoss.queryengine.{EngineConfig, EngineContext}
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import org.json4s.{Formats, NoTypeHints}

querydb/src/main/scala/io/joern/scanners/android/ArbitraryFileWrites.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/android/ExternalStorage.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/android/Intents.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/android/JavaScriptInterface.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/android/Misconfigurations.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._

querydb/src/main/scala/io/joern/scanners/android/RootDetection.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/android/UnprotectedAppParts.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.language.toExtendedCfgNode
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics

querydb/src/main/scala/io/joern/scanners/android/UnsafeReflection.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.android
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/c/CopyLoops.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 

querydb/src/main/scala/io/joern/scanners/c/CredentialDrop.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.semanticcpg.language._
 import io.joern.macros.QueryMacros._
 

querydb/src/main/scala/io/joern/scanners/c/DangerousFunctions.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.semanticcpg.language._
 import io.joern.macros.QueryMacros._
 

querydb/src/main/scala/io/joern/scanners/c/FileOpRace.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.c
 import io.joern.scanners.{Crew, QueryTags}
 import io.shiftleft.codepropertygraph.generated.nodes._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.shiftleft.semanticcpg.language._
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/c/HeapBasedOverflow.scala

@@ -5,6 +5,7 @@ import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.shiftleft.semanticcpg.language._
 import io.joern.dataflowengineoss.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._
 

querydb/src/main/scala/io/joern/scanners/c/IntegerTruncations.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.c
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 
 object IntegerTruncations extends QueryBundle {

querydb/src/main/scala/io/joern/scanners/c/Metrics.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.semanticcpg.language._
 import io.joern.macros.QueryMacros._
 

querydb/src/main/scala/io/joern/scanners/c/MissingLengthCheck.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.c
 import io.shiftleft.semanticcpg.language.{ICallResolver, NoResolve}
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.codepropertygraph.generated.nodes
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.shiftleft.semanticcpg.language._

querydb/src/main/scala/io/joern/scanners/c/NullTermination.scala

@@ -4,6 +4,7 @@ import io.joern.scanners.{Crew, QueryTags}
 import io.shiftleft.semanticcpg.language._
 import io.joern.dataflowengineoss.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.macros.QueryMacros._

querydb/src/main/scala/io/joern/scanners/c/QueryLangExtensions.scala

@@ -1,5 +1,6 @@
 package io.joern.scanners.c
 
+import io.joern.querydb._
 import io.shiftleft.codepropertygraph.generated.nodes
 import io.shiftleft.semanticcpg.language._
 import overflowdb.traversal.Traversal

querydb/src/main/scala/io/joern/scanners/c/RetvalChecks.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners.{Crew, QueryTags}
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 import QueryLangExtensions._

querydb/src/main/scala/io/joern/scanners/c/SignedLeftShift.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.c
 import io.joern.scanners._
 import io.shiftleft.codepropertygraph.generated.Operators
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 

querydb/src/main/scala/io/joern/scanners/c/SocketApi.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.c
 
 import io.joern.scanners.{Crew, QueryTags}
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._

querydb/src/main/scala/io/joern/scanners/c/UseAfterFree.scala

@@ -4,6 +4,7 @@ import io.joern.scanners.{Crew, QueryTags}
 import io.shiftleft.codepropertygraph.generated.Operators
 import io.shiftleft.codepropertygraph.generated.nodes._
 import io.joern.console._
+import io.joern.querydb._
 import io.shiftleft.semanticcpg.language._
 import io.joern.dataflowengineoss.language._
 import io.joern.dataflowengineoss.queryengine.EngineContext

querydb/src/main/scala/io/joern/scanners/ghidra/DangerousFunctions.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.ghidra
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 

querydb/src/main/scala/io/joern/scanners/ghidra/UserInputIntoDangerousFunctions.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.ghidra
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 import io.joern.dataflowengineoss.language._

querydb/src/main/scala/io/joern/scanners/java/CertificateChecks.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.java
 import io.joern.scanners.{Crew, QueryTags}
 import io.shiftleft.codepropertygraph.generated._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 import overflowdb.traversal.Traversal

querydb/src/main/scala/io/joern/scanners/java/CrossSiteScripting.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.java
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.joern.dataflowengineoss.language._
 import io.joern.dataflowengineoss.queryengine.EngineContext

querydb/src/main/scala/io/joern/scanners/java/CryptographyMisuse.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.java
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.joern.dataflowengineoss.language._
 import io.joern.dataflowengineoss.queryengine.EngineContext

querydb/src/main/scala/io/joern/scanners/java/DangerousFunctions.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.java
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 
 object DangerousFunctions extends QueryBundle {

querydb/src/main/scala/io/joern/scanners/java/SQLInjection.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.java
 import io.joern.scanners._
 import io.shiftleft.semanticcpg.language._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.joern.dataflowengineoss.language._
 import io.joern.dataflowengineoss.queryengine.EngineContext

querydb/src/main/scala/io/joern/scanners/kotlin/NetworkCommunication.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.kotlin
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.dataflowengineoss.language._

querydb/src/main/scala/io/joern/scanners/kotlin/NetworkProtocols.scala

@@ -3,6 +3,7 @@ package io.joern.scanners.kotlin
 import io.joern.scanners.{Crew, QueryTags}
 import io.shiftleft.codepropertygraph.generated._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.macros.QueryMacros._
 import io.shiftleft.semanticcpg.language._
 import overflowdb.traversal.Traversal

querydb/src/main/scala/io/joern/scanners/kotlin/PathTraversals.scala

@@ -2,6 +2,7 @@ package io.joern.scanners.kotlin
 
 import io.joern.scanners._
 import io.joern.console._
+import io.joern.querydb._
 import io.joern.dataflowengineoss.queryengine.EngineContext
 import io.joern.dataflowengineoss.semanticsloader.Semantics
 import io.joern.dataflowengineoss.language._