Accept new baselines

microsoft · Oct 6, 2023 · 5082d17 · 5082d17
1 parent 388daf5
commit 5082d17
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 154 deletions.
diff --git a/...rcularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt b/...rcularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt
diff --git a/tests/baselines/reference/conditionalTypes1.errors.txt b/tests/baselines/reference/conditionalTypes1.errors.txt
@@ -57,8 +57,10 @@ conditionalTypes1.ts(136,22): error TS2540: Cannot assign to 'id' because it is
 conditionalTypes1.ts(137,10): error TS2339: Property 'updatePart' does not exist on type 'DeepReadonlyObject<Part>'.
 conditionalTypes1.ts(159,5): error TS2322: Type 'ZeroOf<T>' is not assignable to type 'T'.
   'ZeroOf<T>' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
-    Type '0 | (T extends string ? "" : false)' is not assignable to type 'T'.
-      'T' could be instantiated with an arbitrary type which could be unrelated to '0 | (T extends string ? "" : false)'.
+    Type 'string | number' is not assignable to type 'T'.
+      'string | number' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
+        Type 'string' is not assignable to type 'T'.
+          'string' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
 conditionalTypes1.ts(160,5): error TS2322: Type 'T' is not assignable to type 'ZeroOf<T>'.
   Type 'string | number' is not assignable to type 'ZeroOf<T>'.
     Type 'string' is not assignable to type 'ZeroOf<T>'.
@@ -306,8 +308,10 @@ conditionalTypes1.ts(288,43): error TS2322: Type 'T95<U>' is not assignable to t
         ~
 !!! error TS2322: Type 'ZeroOf<T>' is not assignable to type 'T'.
 !!! error TS2322:   'ZeroOf<T>' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
-!!! error TS2322:     Type '0 | (T extends string ? "" : false)' is not assignable to type 'T'.
-!!! error TS2322:       'T' could be instantiated with an arbitrary type which could be unrelated to '0 | (T extends string ? "" : false)'.
+!!! error TS2322:     Type 'string | number' is not assignable to type 'T'.
+!!! error TS2322:       'string | number' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
+!!! error TS2322:         Type 'string' is not assignable to type 'T'.
+!!! error TS2322:           'string' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint 'string | number'.
         y = x;  // Error
         ~
 !!! error TS2322: Type 'T' is not assignable to type 'ZeroOf<T>'.

diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -25,9 +25,8 @@ conditionalTypes2.ts(25,5): error TS2322: Type 'Invariant<A>' is not assignable
           Type 'A' is not assignable to type 'B'.
             'B' could be instantiated with an arbitrary type which could be unrelated to 'A'.
 conditionalTypes2.ts(73,12): error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-  Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
-    Type 'Extract<T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-      Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
+  Type 'Extract<T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
+    Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
 conditionalTypes2.ts(74,12): error TS2345: Argument of type 'Extract<T, Foo & Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
   Property 'bat' is missing in type 'Foo & Bar' but required in type '{ foo: string; bat: string; }'.
 conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2<T, Foo, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
@@ -145,10 +144,8 @@ conditionalTypes2.ts(75,12): error TS2345: Argument of type 'Extract2<T, Foo, Ba
         fooBat(x);  // Error
                ~
 !!! error TS2345: Argument of type 'Extract<Extract<T, Foo>, Bar>' is not assignable to parameter of type '{ foo: string; bat: string; }'.
-!!! error TS2345:   Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
-!!! error TS2345:     Type 'Extract<T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
-!!! error TS2345:       Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
-!!! related TS2728 conditionalTypes2.ts:62:43: 'bat' is declared here.
+!!! error TS2345:   Type 'Extract<T, Bar>' is not assignable to type '{ foo: string; bat: string; }'.
+!!! error TS2345:     Property 'bat' is missing in type 'Bar & Foo' but required in type '{ foo: string; bat: string; }'.
 !!! related TS2728 conditionalTypes2.ts:62:43: 'bat' is declared here.
         fooBat(y);  // Error
                ~

diff --git a/.../reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt b/.../reference/genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.errors.txt
@@ -1,15 +1,10 @@
 genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts(13,5): error TS2322: Type 'ReturnType<T[M]>' is not assignable to type 'A'.
-  Type 'unknown' is not assignable to type 'A'.
-    Type 'ReturnType<T[keyof T]>' is not assignable to type 'A'.
-      Type 'unknown' is not assignable to type 'A'.
-        Type 'ReturnType<T[string | number | symbol]>' is not assignable to type 'A'.
-          Type 'unknown' is not assignable to type 'A'.
-            Type 'ReturnType<T[string]> | ReturnType<T[number]> | ReturnType<T[symbol]>' is not assignable to type 'A'.
-              Type 'ReturnType<T[string]>' is not assignable to type 'A'.
-                Type 'unknown' is not assignable to type 'A'.
-                  Type 'ReturnType<FunctionsObj<T>[string]>' is not assignable to type 'A'.
-                    Type 'unknown' is not assignable to type 'A'.
-                      Property 'x' is missing in type '{}' but required in type 'A'.
+  Type 'ReturnType<T[keyof T]>' is not assignable to type 'A'.
+    Type 'ReturnType<T[string | number | symbol]>' is not assignable to type 'A'.
+      Type 'ReturnType<T[string]> | ReturnType<T[number]> | ReturnType<T[symbol]>' is not assignable to type 'A'.
+        Type 'ReturnType<T[string]>' is not assignable to type 'A'.
+          Type 'ReturnType<FunctionsObj<T>[string]>' is not assignable to type 'A'.
+            Type 'unknown' is not assignable to type 'A'.
 
 
 ==== genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts (1 errors) ====
@@ -28,18 +23,12 @@ genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts(13,5): er
         x = a2;
         ~
 !!! error TS2322: Type 'ReturnType<T[M]>' is not assignable to type 'A'.
-!!! error TS2322:   Type 'unknown' is not assignable to type 'A'.
-!!! error TS2322:     Type 'ReturnType<T[keyof T]>' is not assignable to type 'A'.
-!!! error TS2322:       Type 'unknown' is not assignable to type 'A'.
-!!! error TS2322:         Type 'ReturnType<T[string | number | symbol]>' is not assignable to type 'A'.
-!!! error TS2322:           Type 'unknown' is not assignable to type 'A'.
-!!! error TS2322:             Type 'ReturnType<T[string]> | ReturnType<T[number]> | ReturnType<T[symbol]>' is not assignable to type 'A'.
-!!! error TS2322:               Type 'ReturnType<T[string]>' is not assignable to type 'A'.
-!!! error TS2322:                 Type 'unknown' is not assignable to type 'A'.
-!!! error TS2322:                   Type 'ReturnType<FunctionsObj<T>[string]>' is not assignable to type 'A'.
-!!! error TS2322:                     Type 'unknown' is not assignable to type 'A'.
-!!! error TS2322:                       Property 'x' is missing in type '{}' but required in type 'A'.
-!!! related TS2728 genericConditionalConstrainedToUnknownNotAssignableToConcreteObject.ts:1:15: 'x' is declared here.
+!!! error TS2322:   Type 'ReturnType<T[keyof T]>' is not assignable to type 'A'.
+!!! error TS2322:     Type 'ReturnType<T[string | number | symbol]>' is not assignable to type 'A'.
+!!! error TS2322:       Type 'ReturnType<T[string]> | ReturnType<T[number]> | ReturnType<T[symbol]>' is not assignable to type 'A'.
+!!! error TS2322:         Type 'ReturnType<T[string]>' is not assignable to type 'A'.
+!!! error TS2322:           Type 'ReturnType<FunctionsObj<T>[string]>' is not assignable to type 'A'.
+!!! error TS2322:             Type 'unknown' is not assignable to type 'A'.
     }
 
     // Original CFA report of the above issue

diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
@@ -40,10 +40,8 @@ keyofAndIndexedAccessErrors.ts(87,5): error TS2322: Type 'keyof T | keyof U' is
   Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
 keyofAndIndexedAccessErrors.ts(103,9): error TS2322: Type 'Extract<keyof T, string>' is not assignable to type 'K'.
   'Extract<keyof T, string>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
-    Type 'string & keyof T' is not assignable to type 'K'.
-      'string & keyof T' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
-        Type 'string' is not assignable to type 'K'.
-          'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
+    Type 'string' is not assignable to type 'K'.
+      'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
 keyofAndIndexedAccessErrors.ts(105,9): error TS2322: Type 'T[Extract<keyof T, string>]' is not assignable to type 'T[K]'.
   Type 'Extract<keyof T, string>' is not assignable to type 'K'.
     'Extract<keyof T, string>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
@@ -247,10 +245,8 @@ keyofAndIndexedAccessErrors.ts(165,5): error TS2322: Type 'number' is not assign
             ~
 !!! error TS2322: Type 'Extract<keyof T, string>' is not assignable to type 'K'.
 !!! error TS2322:   'Extract<keyof T, string>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
-!!! error TS2322:     Type 'string & keyof T' is not assignable to type 'K'.
-!!! error TS2322:       'string & keyof T' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
-!!! error TS2322:         Type 'string' is not assignable to type 'K'.
-!!! error TS2322:           'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'K'.
+!!! error TS2322:       'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
             t[key] = tk; // ok, T[K] ==> T[keyof T]
             tk = t[key]; // error, T[keyof T] =/=> T[K]
             ~~