add - RubyTypeHintCallLinker

joern-cli/frontends/rubysrc2cpg/src/main/scala/io/joern/rubysrc2cpg/RubySrc2Cpg.scala

@@ -6,12 +6,14 @@ import io.joern.rubysrc2cpg.passes.{
   AstPackagePass,
   ConfigFileCreationPass,
   ImportResolverPass,
+  RubyTypeHintCallLinker,
   RubyTypeRecoveryPass
 }
 import io.joern.rubysrc2cpg.utils.PackageTable
 import io.joern.x2cpg.X2Cpg.withNewEmptyCpg
 import io.joern.x2cpg.X2CpgFrontend
 import io.joern.x2cpg.datastructures.Global
+import io.joern.x2cpg.passes.base.AstLinkerPass
 import io.joern.x2cpg.passes.callgraph.NaiveCallLinker
 import io.joern.x2cpg.passes.frontend.{MetaDataPass, TypeNodePass}
 import io.joern.x2cpg.utils.ExternalCommand
@@ -73,8 +75,14 @@ object RubySrc2Cpg {
 
   def postProcessingPasses(cpg: Cpg, config: Option[Config] = None): List[CpgPassBase] =
     List(
+      // TODO commented below two passes, as waiting on Dependency download PR to get merged
       // new RubyTypeRecoveryPass(cpg),
-      new NaiveCallLinker(cpg)
+      // new RubyTypeHintCallLinker(cpg),
+      new NaiveCallLinker(cpg),
+
+      // Some of passes above create new methods, so, we
+      // need to run the ASTLinkerPass one more time
+      new AstLinkerPass(cpg)
     )
 
 }

joern-cli/frontends/rubysrc2cpg/src/main/scala/io/joern/rubysrc2cpg/passes/RubyTypeHintCallLinker.scala

@@ -0,0 +1,15 @@
+package io.joern.rubysrc2cpg.passes
+
+import io.joern.x2cpg.passes.frontend.XTypeHintCallLinker
+import io.shiftleft.codepropertygraph.Cpg
+import io.shiftleft.codepropertygraph.generated.nodes.Call
+import io.shiftleft.semanticcpg.language.Traversal
+import io.shiftleft.semanticcpg.language._
+
+import java.util.regex.Pattern
+
+class RubyTypeHintCallLinker(cpg: Cpg) extends XTypeHintCallLinker(cpg) {
+
+  override def calls: Traversal[Call] = super.calls.nameNot("^(require).*")
+
+}

joern-cli/frontends/rubysrc2cpg/src/main/scala/io/joern/rubysrc2cpg/passes/RubyTypeRecoveryPass.scala

@@ -55,12 +55,4 @@ private class RecoverForRubyFile(cpg: Cpg, cu: File, builder: DiffGraphBuilder,
     associateTypes(i, constructorPaths)
   }
 
-  override def storeCallTypeInfo(c: Call, types: Seq[String]): Unit =
-    if (types.nonEmpty) {
-      super.storeCallTypeInfo(c, types)
-      // Update the methodFullName if we have only 1 type
-      if (c.methodFullName.equals(DynamicCallUnknownFullName) && types.size == 1)
-        builder.setNodeProperty(c, PropertyNames.METHOD_FULL_NAME, types.head)
-    }
-
 }

joern-cli/frontends/x2cpg/src/main/scala/io/joern/x2cpg/passes/frontend/XTypeHintCallLinker.scala

@@ -23,7 +23,7 @@ import scala.collection.mutable
 abstract class XTypeHintCallLinker(cpg: Cpg) extends CpgPass(cpg) {
 
   implicit protected val resolver: NoResolve.type = NoResolve
-  private val fileNamePattern                     = Pattern.compile("^(.*(.py|.js)).*$")
+  private val fileNamePattern                     = Pattern.compile("^(.*(.py|.js|.rb)).*$")
   protected val pathSep: Char                     = '.'
 
   protected def calls: Traversal[Call] = cpg.call