parser: support type assertions for non-typeref

ScalablyTyped · Sep 29, 2022 · 4c38c4a · 4c38c4a
1 parent ad2b976
commit 4c38c4a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/core/src/main/scala/org/scalablytyped/converter/internal/ts/trees.scala b/core/src/main/scala/org/scalablytyped/converter/internal/ts/trees.scala
@@ -563,7 +563,7 @@ final case class TsTypeConstructor(isAbstract: Boolean, signature: TsTypeFunctio
 
 final case class TsTypeIs(ident: TsIdent, tpe: TsType) extends TsType
 
-final case class TsTypeAsserts(ident: TsIdentSimple, isOpt: Option[TsTypeRef]) extends TsType
+final case class TsTypeAsserts(ident: TsIdentSimple, isOpt: Option[TsType]) extends TsType
 
 final case class TsTupleElement(label: Option[TsIdent], tpe: TsType)
 

diff --git a/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala b/importer/src/test/scala/org/scalablytyped/converter/internal/ts/parser/ParserTests.scala
@@ -3083,4 +3083,21 @@ export {};
       ),
     )
   }
+
+  test("asserts type is not typeref") {
+    val a = TsTypeRef(NoComments, TsQIdent(IArray(TsIdentSimple("a"))), IArray())
+    val repeatedA = TsTypeRepeated(
+      TsTypeRef(
+        NoComments,
+        TsQIdent(IArray(TsIdentSimple("Array"))),
+        IArray(a),
+      ),
+    )
+    shouldParseAs("asserts value is [a, ...a[]]", TsParser.tsType)(
+      TsTypeAsserts(
+        TsIdentSimple("value"),
+        Some(TsTypeTuple(IArray(TsTupleElement(None, a), TsTupleElement(None, repeatedA)))),
+      ),
+    )
+  }
 }
diff --git a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TreeTransformation.scala b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TreeTransformation.scala
@@ -350,7 +350,7 @@ trait TreeTransformation[T] { self =>
     val xx = enterTsTypeAsserts(withTree(t, x))(x)
     val tt = withTree(t, xx)
     xx match {
-      case TsTypeAsserts(_1, _2) => TsTypeAsserts(_1, _2.map(visitTsTypeRef(tt)))
+      case TsTypeAsserts(_1, _2) => TsTypeAsserts(_1, _2.map(visitTsType(tt)))
     }
   }
 

diff --git a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/parser/TsParser.scala b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/parser/TsParser.scala
@@ -459,7 +459,7 @@ class TsParser(path: Option[(os.Path, Int)]) extends StdTokenParsers with Parser
       | "(" ~> tsType <~ ")"
       | tsLiteral ^^ TsTypeLiteral
       | "this" ~> success(TsTypeThis())
-      | "asserts" ~> tsIdent ~ ("is" ~> tsTypeRef).? ^^ TsTypeAsserts
+      | "asserts" ~> tsIdent ~ ("is" ~> tsType).? ^^ TsTypeAsserts
       | tsTypeKeyOf
       | "infer" ~> typeParam ^^ TsTypeInfer
       | "readonly" ~> tsType