Consistently propagate intersectionState in relations (#52392)

microsoft · Feb 2, 2023 · 3099385 · 3099385
1 parent 9ee3315
commit 3099385
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 51 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt b/tests/baselines/reference/nestedExcessPropertyChecking.errors.txt
@@ -67,4 +67,25 @@ tests/cases/compiler/nestedExcessPropertyChecking.ts(40,9): error TS2559: Type '
 !!! related TS6500 tests/cases/compiler/nestedExcessPropertyChecking.ts:35:24: The expected type comes from property 'overrides' which is declared here on type 'VariablesA & VariablesB'
         }
     };
+
+    // Simplified repro from #52252
+
+    type T1 = {
+        primary: { __typename?: 'Feature' } & { colors: { light: number, dark: number } },
+    };
+
+    type T2 = {
+        primary: { __typename?: 'Feature' } & { colors: { light: number } },
+    };
+
+    type Query = T1 & T2;
+
+    const response: Query = {
+        primary: {
+            colors: {
+                light: 1,
+                dark: 3,
+            },
+        },
+    };
 
diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.js b/tests/baselines/reference/nestedExcessPropertyChecking.js
@@ -41,6 +41,27 @@ const foo2: Unrelated & { variables: VariablesA & VariablesB } = {
         overrides: false  // Error
     }
 };
+
+// Simplified repro from #52252
+
+type T1 = {
+    primary: { __typename?: 'Feature' } & { colors: { light: number, dark: number } },
+};
+
+type T2 = {
+    primary: { __typename?: 'Feature' } & { colors: { light: number } },
+};
+
+type Query = T1 & T2;
+
+const response: Query = {
+    primary: {
+        colors: {
+            light: 1,
+            dark: 3,
+        },
+    },
+};
 
 
 //// [nestedExcessPropertyChecking.js]
@@ -59,3 +80,11 @@ var foo2 = {
         overrides: false // Error
     }
 };
+var response = {
+    primary: {
+        colors: {
+            light: 1,
+            dark: 3,
+        },
+    },
+};
diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.symbols b/tests/baselines/reference/nestedExcessPropertyChecking.symbols
@@ -113,3 +113,53 @@ const foo2: Unrelated & { variables: VariablesA & VariablesB } = {
     }
 };
 
+// Simplified repro from #52252
+
+type T1 = {
+>T1 : Symbol(T1, Decl(nestedExcessPropertyChecking.ts, 41, 2))
+
+    primary: { __typename?: 'Feature' } & { colors: { light: number, dark: number } },
+>primary : Symbol(primary, Decl(nestedExcessPropertyChecking.ts, 45, 11))
+>__typename : Symbol(__typename, Decl(nestedExcessPropertyChecking.ts, 46, 14))
+>colors : Symbol(colors, Decl(nestedExcessPropertyChecking.ts, 46, 43))
+>light : Symbol(light, Decl(nestedExcessPropertyChecking.ts, 46, 53))
+>dark : Symbol(dark, Decl(nestedExcessPropertyChecking.ts, 46, 68))
+
+};
+
+type T2 = {
+>T2 : Symbol(T2, Decl(nestedExcessPropertyChecking.ts, 47, 2))
+
+    primary: { __typename?: 'Feature' } & { colors: { light: number } },
+>primary : Symbol(primary, Decl(nestedExcessPropertyChecking.ts, 49, 11))
+>__typename : Symbol(__typename, Decl(nestedExcessPropertyChecking.ts, 50, 14))
+>colors : Symbol(colors, Decl(nestedExcessPropertyChecking.ts, 50, 43))
+>light : Symbol(light, Decl(nestedExcessPropertyChecking.ts, 50, 53))
+
+};
+
+type Query = T1 & T2;
+>Query : Symbol(Query, Decl(nestedExcessPropertyChecking.ts, 51, 2))
+>T1 : Symbol(T1, Decl(nestedExcessPropertyChecking.ts, 41, 2))
+>T2 : Symbol(T2, Decl(nestedExcessPropertyChecking.ts, 47, 2))
+
+const response: Query = {
+>response : Symbol(response, Decl(nestedExcessPropertyChecking.ts, 55, 5))
+>Query : Symbol(Query, Decl(nestedExcessPropertyChecking.ts, 51, 2))
+
+    primary: {
+>primary : Symbol(primary, Decl(nestedExcessPropertyChecking.ts, 55, 25))
+
+        colors: {
+>colors : Symbol(colors, Decl(nestedExcessPropertyChecking.ts, 56, 14))
+
+            light: 1,
+>light : Symbol(light, Decl(nestedExcessPropertyChecking.ts, 57, 17))
+
+            dark: 3,
+>dark : Symbol(dark, Decl(nestedExcessPropertyChecking.ts, 58, 21))
+
+        },
+    },
+};
+
diff --git a/tests/baselines/reference/nestedExcessPropertyChecking.types b/tests/baselines/reference/nestedExcessPropertyChecking.types
@@ -106,3 +106,55 @@ const foo2: Unrelated & { variables: VariablesA & VariablesB } = {
     }
 };
 
+// Simplified repro from #52252
+
+type T1 = {
+>T1 : { primary: {    __typename?: 'Feature';} & {    colors: {        light: number;        dark: number;    };}; }
+
+    primary: { __typename?: 'Feature' } & { colors: { light: number, dark: number } },
+>primary : { __typename?: "Feature" | undefined; } & { colors: {    light: number;    dark: number;}; }
+>__typename : "Feature" | undefined
+>colors : { light: number; dark: number; }
+>light : number
+>dark : number
+
+};
+
+type T2 = {
+>T2 : { primary: {    __typename?: 'Feature';} & {    colors: {        light: number;    };}; }
+
+    primary: { __typename?: 'Feature' } & { colors: { light: number } },
+>primary : { __typename?: "Feature" | undefined; } & { colors: {    light: number;}; }
+>__typename : "Feature" | undefined
+>colors : { light: number; }
+>light : number
+
+};
+
+type Query = T1 & T2;
+>Query : T1 & T2
+
+const response: Query = {
+>response : Query
+>{    primary: {        colors: {            light: 1,            dark: 3,        },    },} : { primary: { colors: { light: number; dark: number; }; }; }
+
+    primary: {
+>primary : { colors: { light: number; dark: number; }; }
+>{        colors: {            light: 1,            dark: 3,        },    } : { colors: { light: number; dark: number; }; }
+
+        colors: {
+>colors : { light: number; dark: number; }
+>{            light: 1,            dark: 3,        } : { light: number; dark: number; }
+
+            light: 1,
+>light : number
+>1 : 1
+
+            dark: 3,
+>dark : number
+>3 : 3
+
+        },
+    },
+};
+
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.errors.txt b/tests/baselines/reference/unionThisTypeInFunctions.errors.txt
@@ -5,12 +5,8 @@ tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts(10,5): error
         Type '(this: Real, n: number) => void' is not assignable to type '(this: Fake, n: number) => void'.
           The 'this' types of each signature are incompatible.
             Type 'Fake' is not assignable to type 'Real'.
-              Types of property 'method' are incompatible.
-                Type '(this: Fake, n: number) => void' is not assignable to type '(this: Real, n: number) => void'.
-                  The 'this' types of each signature are incompatible.
-                    Type 'Real' is not assignable to type 'Fake'.
-                      Types of property 'data' are incompatible.
-                        Type 'string' is not assignable to type 'number'.
+              Types of property 'data' are incompatible.
+                Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts (1 errors) ====
@@ -32,11 +28,7 @@ tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts(10,5): error
 !!! error TS2684:         Type '(this: Real, n: number) => void' is not assignable to type '(this: Fake, n: number) => void'.
 !!! error TS2684:           The 'this' types of each signature are incompatible.
 !!! error TS2684:             Type 'Fake' is not assignable to type 'Real'.
-!!! error TS2684:               Types of property 'method' are incompatible.
-!!! error TS2684:                 Type '(this: Fake, n: number) => void' is not assignable to type '(this: Real, n: number) => void'.
-!!! error TS2684:                   The 'this' types of each signature are incompatible.
-!!! error TS2684:                     Type 'Real' is not assignable to type 'Fake'.
-!!! error TS2684:                       Types of property 'data' are incompatible.
-!!! error TS2684:                         Type 'string' is not assignable to type 'number'.
+!!! error TS2684:               Types of property 'data' are incompatible.
+!!! error TS2684:                 Type 'number' is not assignable to type 'string'.
     }
 
diff --git a/tests/cases/compiler/nestedExcessPropertyChecking.ts b/tests/cases/compiler/nestedExcessPropertyChecking.ts
@@ -42,3 +42,24 @@ const foo2: Unrelated & { variables: VariablesA & VariablesB } = {
         overrides: false  // Error
     }
 };
+
+// Simplified repro from #52252
+
+type T1 = {
+    primary: { __typename?: 'Feature' } & { colors: { light: number, dark: number } },
+};
+
+type T2 = {
+    primary: { __typename?: 'Feature' } & { colors: { light: number } },
+};
+
+type Query = T1 & T2;
+
+const response: Query = {
+    primary: {
+        colors: {
+            light: 1,
+            dark: 3,
+        },
+    },
+};