review comments

Author: max-leuthaeuser

joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/astcreation/AstForTypesCreator.scala

@@ -368,8 +368,9 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     fullName: String,
     returnType: String
   ): Ast = {
-    val staticModifier = NewModifier().modifierType(ModifierTypes.STATIC)
-    val blockNode      = NewBlock().typeFullName(Defines.Any)
+    val modifiers =
+      List(NewModifier().modifierType(ModifierTypes.STATIC), NewModifier().modifierType(ModifierTypes.CONSTRUCTOR))
+    val blockNode   = NewBlock().typeFullName(Defines.Any)
     val methodNode_ = methodNode(node, io.joern.x2cpg.Defines.StaticInitMethodName, fullName, "", parserResult.filename)
 
     methodAstParentStack.push(methodNode_)
@@ -390,7 +391,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     scope.popScope()
 
     val methodReturn = methodReturnNode(node, returnType)
-    methodAst(methodNode_, Nil, body, methodReturn, List(staticModifier))
+    methodAst(methodNode_, Nil, body, methodReturn, modifiers)
   }
 
   private def staticEnumInitMethodAst(
@@ -400,8 +401,9 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     fullName: String,
     returnType: String
   ): Ast = {
-    val staticModifier = NewModifier().modifierType(ModifierTypes.STATIC)
-    val blockNode      = NewBlock().typeFullName(Defines.Any)
+    val modifiers =
+      List(NewModifier().modifierType(ModifierTypes.STATIC), NewModifier().modifierType(ModifierTypes.CONSTRUCTOR))
+    val blockNode   = NewBlock().typeFullName(Defines.Any)
     val methodNode_ = methodNode(node, io.joern.x2cpg.Defines.StaticInitMethodName, fullName, "", parserResult.filename)
 
     methodAstParentStack.push(methodNode_)
@@ -424,7 +426,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     scope.popScope()
 
     val methodReturn = methodReturnNode(node, returnType)
-    methodAst(methodNode_, Nil, body, methodReturn, List(staticModifier))
+    methodAst(methodNode_, Nil, body, methodReturn, modifiers)
   }
 
   protected def astForClass(clazz: BabelNodeInfo, shouldCreateAssignmentCall: Boolean = false): Ast = {
@@ -528,12 +530,12 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
         clazz.columnNumber
       )
 
-      val classAnnotationAst     = createClassAnnotationAst(clazz, classIdNode)
-      val propertyAnnotationAsts = createPropertyAnnotationAsts(clazz, classIdNode)
-      val methodAnnotationAsts   = createMethodAnnotationAsts(clazz, classIdNode)
-      if (classAnnotationAst.root.isDefined || propertyAnnotationAsts.nonEmpty || methodAnnotationAsts.nonEmpty) {
+      val classDecorationAst     = createClassDecorationAst(clazz, classIdNode)
+      val propertyDecorationAsts = createPropertyDecorationAsts(clazz, classIdNode)
+      val methodDecorationAsts   = createMethodDecorationAsts(clazz, classIdNode)
+      if (classDecorationAst.root.isDefined || propertyDecorationAsts.nonEmpty || methodDecorationAsts.nonEmpty) {
         val blockNode_   = blockNode(clazz)
-        val childrenAsts = List(assignmentAst, classAnnotationAst) ++ propertyAnnotationAsts ++ methodAnnotationAsts
+        val childrenAsts = List(assignmentAst, classDecorationAst) ++ propertyDecorationAsts ++ methodDecorationAsts
         setArgumentIndices(childrenAsts)
         Ast(blockNode_).withChildren(childrenAsts)
       } else assignmentAst
@@ -542,7 +544,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     }
   }
 
-  private def createClassAnnotationAst(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Ast = {
+  private def createClassDecorationAst(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Ast = {
     val decoratorAsts = decoratorExpressionElements(classNodeInfo).map(e => astForNodeWithFunctionReference(e.json))
     if (decoratorAsts.nonEmpty) {
       val lhsAst = Ast(
@@ -744,7 +746,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     )
   }
 
-  private def createPropertyAnnotationAsts(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Seq[Ast] = {
+  private def createPropertyDecorationAsts(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Seq[Ast] = {
     val tsProperties = classMembers(classNodeInfo).flatMap { member =>
       val memberNodeInfo = createBabelNodeInfo(member)
       if (
@@ -800,7 +802,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
     }
   }
 
-  private def createMethodAnnotationAsts(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Seq[Ast] = {
+  private def createMethodDecorationAsts(classNodeInfo: BabelNodeInfo, classIdNode: NewIdentifier): Seq[Ast] = {
     val tsMethods = classMembers(classNodeInfo).flatMap { member =>
       val memberNodeInfo = createBabelNodeInfo(member)
       if (memberNodeInfo.node == ClassMethod) {
@@ -814,7 +816,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
       val decoratorAsts =
         decoratorExpressionElements(tsMethodNodeInfo).map(e => astForNodeWithFunctionReference(e.json))
       val (name, fullName) = calcMethodNameAndFullName(tsMethodNodeInfo)
-      val methodTpe        = typeFor(tsMethodNodeInfo)
+      val methodTpe        = typeFor(tsMethodNodeInfo).stripPrefix("__ecma.")
       val paramNodeInfos = if (hasKey(tsMethodNodeInfo.json, "parameters")) {
         tsMethodNodeInfo.json("parameters").arr.toSeq
       } else {

joern-cli/frontends/jssrc2cpg/src/test/scala/io/joern/jssrc2cpg/passes/ast/TsDecoratorAstCreationPassTests.scala

@@ -348,8 +348,8 @@ class TsDecoratorAstCreationPassTests extends AstJsSrc2CpgSuite(".ts") {
       reqBAnnotationPut.name shouldBe "Put"
 
       val List(decorateReqACall, decorateReqBCall) = cpg.call.name("__decorate").l
-      decorateReqACall.code shouldBe """__decorate([Get("argA"), __param(0, Req("reqAParam")), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:type", __ecma.String)], Foo.prototype, 'reqA', null)"""
-      decorateReqBCall.code shouldBe """__decorate([Get("argB"),Put("argC"), __param(0, Req("reqBParam1")),__param(1, Req("reqBParam2")), __metadata("design:type", Function), __metadata("design:paramtypes", [Object,Object]), __metadata("design:type", __ecma.Number)], Foo.prototype, 'reqB', null)"""
+      decorateReqACall.code shouldBe """__decorate([Get("argA"), __param(0, Req("reqAParam")), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:type", String)], Foo.prototype, 'reqA', null)"""
+      decorateReqBCall.code shouldBe """__decorate([Get("argB"),Put("argC"), __param(0, Req("reqBParam1")),__param(1, Req("reqBParam2")), __metadata("design:type", Function), __metadata("design:paramtypes", [Object,Object]), __metadata("design:type", Number)], Foo.prototype, 'reqB', null)"""
 
       val List(recReqA) = decorateReqACall.receiver.isIdentifier.l
       recReqA.name shouldBe "__decorate"
@@ -409,9 +409,9 @@ class TsDecoratorAstCreationPassTests extends AstJsSrc2CpgSuite(".ts") {
         "__ecma.Array.factory()",
         "_tmp_0.push(Object)",
         "_tmp_0.push",
-        """_tmp_1.push(__metadata("design:type", __ecma.String))""",
+        """_tmp_1.push(__metadata("design:type", String))""",
         "_tmp_1.push",
-        """__metadata("design:type", __ecma.String)"""
+        """__metadata("design:type", String)"""
       )
 
       decorateReqBCall.arguments(1).ast.isCall.code.l shouldBe List(
@@ -443,9 +443,9 @@ class TsDecoratorAstCreationPassTests extends AstJsSrc2CpgSuite(".ts") {
         "_tmp_2.push",
         "_tmp_2.push(Object)",
         "_tmp_2.push",
-        """_tmp_3.push(__metadata("design:type", __ecma.Number))""",
+        """_tmp_3.push(__metadata("design:type", Number))""",
         "_tmp_3.push",
-        """__metadata("design:type", __ecma.Number)"""
+        """__metadata("design:type", Number)"""
       )
     }
   }