Adds the missing defines (#2832)

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
joernio · Jun 8, 2023 · 8a9dcb7 · 8a9dcb7
1 parent 25f3f29
commit 8a9dcb7
Show file tree

Hide file tree

Showing 5 changed files with 988 additions and 12 deletions.
diff --git a/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/astcreation/TypeHelper.scala b/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/astcreation/TypeHelper.scala
@@ -14,17 +14,20 @@ trait TypeHelper { this: AstCreator =>
 
   private val ArrayReplacements = Map(
     "any[]"     -> s"${Defines.Any}[]",
+    "unknown[]" -> s"${Defines.Unknown}[]",
     "number[]"  -> s"${Defines.Number}[]",
     "string[]"  -> s"${Defines.String}[]",
     "boolean[]" -> s"${Defines.Boolean}[]"
   )
 
   private val TypeReplacements = Map(
     " any"     -> s" ${Defines.Any}",
+    " unknown" -> s" ${Defines.Unknown}",
     " number"  -> s" ${Defines.Number}",
     " null"    -> s" ${Defines.Null}",
     " string"  -> s" ${Defines.String}",
     " boolean" -> s" ${Defines.Boolean}",
+    " bigint"  -> s" ${Defines.BigInt}",
     "{}"       -> Defines.Object,
     "typeof "  -> ""
   )
@@ -60,6 +63,10 @@ trait TypeHelper { this: AstCreator =>
     case TSObjectKeyword     => Defines.Object
     case TSStringKeyword     => Defines.String
     case TSSymbolKeyword     => Defines.Symbol
+    case TSUnknownKeyword    => Defines.Unknown
+    case TSVoidKeyword       => Defines.Void
+    case TSUndefinedKeyword  => Defines.Undefined
+    case TSNeverKeyword      => Defines.Never
     case TSIntrinsicKeyword  => code(tsType.json)
     case TSTypeReference     => code(tsType.json)
     case TSArrayType         => code(tsType.json)

diff --git a/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/parser/BabelAst.scala b/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/parser/BabelAst.scala
@@ -234,6 +234,7 @@ object BabelAst {
   object TSTypeAliasDeclaration          extends BabelNode
   object TSTypeAnnotation                extends FlowType
   object TSTypeAssertion                 extends BabelNode
+  object TSTypeExpression                extends TSType
   object TSTypeLiteral                   extends TSType
   object TSTypeOperator                  extends TSType
   object TSTypeParameter                 extends TSType

diff --git a/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/passes/Defines.scala b/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/passes/Defines.scala
@@ -12,8 +12,14 @@ object Defines {
   val Symbol: String            = "__ecma.Symbol"
   val Console: String           = "__whatwg.console"
   val Object: String            = "object"
+  val BigInt: String            = "bigint"
+  val Unknown: String           = "unknown"
+  val Void: String              = "void"
+  val Never: String             = "never"
+  val Undefined: String         = "undefined"
   val NodeModulesFolder: String = "node_modules"
   val GlobalNamespace: String   = NamespaceTraversal.globalNamespaceName
 
-  val JsTypes: List[String] = List(Any, Number, String, Boolean, Null, Math, Symbol, Console, Object)
+  val JsTypes: List[String] =
+    List(Any, Number, String, Boolean, Null, Math, Symbol, Console, Object, BigInt, Unknown, Never, Void, Undefined)
 }