Add more tests per code review

typescript-bot · Nov 16, 2023 · b464619 · b464619
1 parent 8ab01eb
commit b464619
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 5 deletions.
diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt b/tests/baselines/reference/templateLiteralTypesPatterns.errors.txt
@@ -55,7 +55,7 @@ templateLiteralTypesPatterns.ts(129,9): error TS2345: Argument of type '"1.1e-10
 templateLiteralTypesPatterns.ts(140,1): error TS2322: Type '`a${string}`' is not assignable to type '`a${number}`'.
 templateLiteralTypesPatterns.ts(141,1): error TS2322: Type '"bno"' is not assignable to type '`a${any}`'.
 templateLiteralTypesPatterns.ts(160,7): error TS2322: Type '"anything"' is not assignable to type '`${number} ${number}`'.
-templateLiteralTypesPatterns.ts(211,5): error TS2345: Argument of type '"abcTest"' is not assignable to parameter of type '`${`a${string}` & `${string}a`}Test`'.
+templateLiteralTypesPatterns.ts(215,5): error TS2345: Argument of type '"abcTest"' is not assignable to parameter of type '`${`a${string}` & `${string}a`}Test`'.
 
 
 ==== templateLiteralTypesPatterns.ts (58 errors) ====
@@ -380,6 +380,10 @@ templateLiteralTypesPatterns.ts(211,5): error TS2345: Argument of type '"abcTest
     conversionTest("testDowncast");
     function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {}
     conversionTest2("testDowncast");
+    function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {}
+    conversionTest3("testDowncast");
+    function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {}
+    conversionTest4("testDowncast");
 
     function foo(str: `${`a${string}` & `${string}a`}Test`) {}
     foo("abaTest"); // ok

diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.js b/tests/baselines/reference/templateLiteralTypesPatterns.js
@@ -208,6 +208,10 @@ function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDownc
 conversionTest("testDowncast");
 function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {}
 conversionTest2("testDowncast");
+function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {}
+conversionTest3("testDowncast");
+function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {}
+conversionTest4("testDowncast");
 
 function foo(str: `${`a${string}` & `${string}a`}Test`) {}
 foo("abaTest"); // ok
@@ -367,6 +371,10 @@ function conversionTest(groupName) { }
 conversionTest("testDowncast");
 function conversionTest2(groupName) { }
 conversionTest2("testDowncast");
+function conversionTest3(groupName) { }
+conversionTest3("testDowncast");
+function conversionTest4(groupName) { }
+conversionTest4("testDowncast");
 function foo(str) { }
 foo("abaTest"); // ok
 foo("abcTest"); // error
diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.symbols b/tests/baselines/reference/templateLiteralTypesPatterns.symbols
@@ -502,13 +502,27 @@ function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDown
 conversionTest2("testDowncast");
 >conversionTest2 : Symbol(conversionTest2, Decl(templateLiteralTypesPatterns.ts, 204, 31))
 
+function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {}
+>conversionTest3 : Symbol(conversionTest3, Decl(templateLiteralTypesPatterns.ts, 206, 32))
+>groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 207, 25))
+
+conversionTest3("testDowncast");
+>conversionTest3 : Symbol(conversionTest3, Decl(templateLiteralTypesPatterns.ts, 206, 32))
+
+function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {}
+>conversionTest4 : Symbol(conversionTest4, Decl(templateLiteralTypesPatterns.ts, 208, 32))
+>groupName : Symbol(groupName, Decl(templateLiteralTypesPatterns.ts, 209, 25))
+
+conversionTest4("testDowncast");
+>conversionTest4 : Symbol(conversionTest4, Decl(templateLiteralTypesPatterns.ts, 208, 32))
+
 function foo(str: `${`a${string}` & `${string}a`}Test`) {}
->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32))
->str : Symbol(str, Decl(templateLiteralTypesPatterns.ts, 208, 13))
+>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32))
+>str : Symbol(str, Decl(templateLiteralTypesPatterns.ts, 212, 13))
 
 foo("abaTest"); // ok
->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32))
+>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32))
 
 foo("abcTest"); // error
->foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 206, 32))
+>foo : Symbol(foo, Decl(templateLiteralTypesPatterns.ts, 210, 32))
 
diff --git a/tests/baselines/reference/templateLiteralTypesPatterns.types b/tests/baselines/reference/templateLiteralTypesPatterns.types
@@ -654,6 +654,24 @@ conversionTest2("testDowncast");
 >conversionTest2 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | ({} & `${string}Downcast`)) => void
 >"testDowncast" : "testDowncast"
 
+function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {}
+>conversionTest3 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) => void
+>groupName : "downcast" | `${string & {}}Downcast`
+
+conversionTest3("testDowncast");
+>conversionTest3("testDowncast") : void
+>conversionTest3 : (groupName: "downcast" | `${string & {}}Downcast`) => void
+>"testDowncast" : "testDowncast"
+
+function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {}
+>conversionTest4 : (groupName: "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) => void
+>groupName : "downcast" | `${{} & string}Downcast`
+
+conversionTest4("testDowncast");
+>conversionTest4("testDowncast") : void
+>conversionTest4 : (groupName: "downcast" | `${{} & string}Downcast`) => void
+>"testDowncast" : "testDowncast"
+
 function foo(str: `${`a${string}` & `${string}a`}Test`) {}
 >foo : (str: `${`a${string}` & `${string}a`}Test`) => void
 >str : `${`a${string}` & `${string}a`}Test`

diff --git a/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts b/tests/cases/conformance/types/literal/templateLiteralTypesPatterns.ts
@@ -206,6 +206,10 @@ function conversionTest(groupName: | "downcast" | "dataDowncast" | "editingDownc
 conversionTest("testDowncast");
 function conversionTest2(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | {} & `${string}Downcast`) {}
 conversionTest2("testDowncast");
+function conversionTest3(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${string & {}}Downcast`) {}
+conversionTest3("testDowncast");
+function conversionTest4(groupName: | "downcast" | "dataDowncast" | "editingDowncast" | `${{} & string}Downcast`) {}
+conversionTest4("testDowncast");
 
 function foo(str: `${`a${string}` & `${string}a`}Test`) {}
 foo("abaTest"); // ok