Skip to content

Commit d57429d

Browse files
jerelmillerjerelmiller
authored
Leave TData alone in Unmasked if it does not contain fragment refs (#12267)
1 parent cda321c commit d57429d

17 files changed

+66
-60
lines changed

‎.api-reports/api-report-cache.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -766,14 +766,13 @@ export function makeVar<T>(value: T): ReactiveVar<T>;
766766

767767
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
768768
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
769-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
770769
//
771770
// @public
772771
type MaybeMasked<TData> = DataMasking extends {
773772
mode: "unmask";
774773
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
775774
__masked?: true;
776-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
775+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
777776
mode: "preserveTypes";
778777
} ? TData : TData;
779778

@@ -1113,11 +1112,12 @@ export type TypePolicy = {
11131112
// @public (undocumented)
11141113
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
11151114

1115+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
11161116
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
11171117
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
11181118
//
11191119
// @public
1120-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
1120+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
11211121

11221122
// @public (undocumented)
11231123
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-core.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1409,14 +1409,13 @@ interface MaskOperationOptions<TData> {
14091409
type MaybeAsync<T> = T | PromiseLike<T>;
14101410

14111411
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1412-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
14131412
//
14141413
// @public
14151414
export type MaybeMasked<TData> = DataMasking extends {
14161415
mode: "unmask";
14171416
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
14181417
__masked?: true;
1419-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1418+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
14201419
mode: "preserveTypes";
14211420
} ? TData : TData;
14221421

@@ -2410,11 +2409,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
24102409
// @public (undocumented)
24112410
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
24122411

2412+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
24132413
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
24142414
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
24152415
//
24162416
// @public
2417-
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2417+
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
24182418

24192419
// @public (undocumented)
24202420
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-masking.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -437,14 +437,13 @@ export function maskFragment<TData = unknown>(data: TData, document: TypedDocume
437437
export function maskOperation<TData = unknown>(data: TData, document: DocumentNode | TypedDocumentNode<TData>, cache: ApolloCache<unknown>): TData;
438438

439439
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
440-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
441440
//
442441
// @public
443442
export type MaybeMasked<TData> = DataMasking extends {
444443
mode: "unmask";
445444
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
446445
__masked?: true;
447-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
446+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
448447
mode: "preserveTypes";
449448
} ? TData : TData;
450449

@@ -612,11 +611,12 @@ type Transaction<T> = (c: ApolloCache<T>) => void;
612611
// @public (undocumented)
613612
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
614613

614+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
615615
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
616616
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
617617
//
618618
// @public
619-
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
619+
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
620620

621621
// @public (undocumented)
622622
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1155,14 +1155,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
11551155

11561156
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
11571157
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1158-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
11591158
//
11601159
// @public
11611160
type MaybeMasked<TData> = DataMasking extends {
11621161
mode: "unmask";
11631162
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
11641163
__masked?: true;
1165-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1164+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
11661165
mode: "preserveTypes";
11671166
} ? TData : TData;
11681167

@@ -2206,11 +2205,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
22062205
// @public (undocumented)
22072206
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
22082207

2208+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
22092209
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
22102210
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
22112211
//
22122212
// @public
2213-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2213+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
22142214

22152215
// @public (undocumented)
22162216
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react_components.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1018,14 +1018,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
10181018

10191019
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
10201020
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1021-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
10221021
//
10231022
// @public
10241023
type MaybeMasked<TData> = DataMasking extends {
10251024
mode: "unmask";
10261025
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
10271026
__masked?: true;
1028-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1027+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
10291028
mode: "preserveTypes";
10301029
} ? TData : TData;
10311030

@@ -1939,11 +1938,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
19391938
// @public (undocumented)
19401939
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
19411940

1941+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
19421942
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
19431943
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
19441944
//
19451945
// @public
1946-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
1946+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
19471947

19481948
// @public (undocumented)
19491949
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react_context.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1015,14 +1015,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
10151015

10161016
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
10171017
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1018-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
10191018
//
10201019
// @public
10211020
type MaybeMasked<TData> = DataMasking extends {
10221021
mode: "unmask";
10231022
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
10241023
__masked?: true;
1025-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1024+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
10261025
mode: "preserveTypes";
10271026
} ? TData : TData;
10281027

@@ -1859,11 +1858,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
18591858
// @public (undocumented)
18601859
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
18611860

1861+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
18621862
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
18631863
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
18641864
//
18651865
// @public
1866-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
1866+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
18671867

18681868
// @public (undocumented)
18691869
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react_hoc.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1022,14 +1022,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
10221022

10231023
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
10241024
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1025-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
10261025
//
10271026
// @public
10281027
type MaybeMasked<TData> = DataMasking extends {
10291028
mode: "unmask";
10301029
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
10311030
__masked?: true;
1032-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1031+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
10331032
mode: "preserveTypes";
10341033
} ? TData : TData;
10351034

@@ -1863,11 +1862,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
18631862
// @public (undocumented)
18641863
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
18651864

1865+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
18661866
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
18671867
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
18681868
//
18691869
// @public
1870-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
1870+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
18711871

18721872
// @public (undocumented)
18731873
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react_hooks.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1104,14 +1104,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
11041104

11051105
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
11061106
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1107-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
11081107
//
11091108
// @public
11101109
type MaybeMasked<TData> = DataMasking extends {
11111110
mode: "unmask";
11121111
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
11131112
__masked?: true;
1114-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1113+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
11151114
mode: "preserveTypes";
11161115
} ? TData : TData;
11171116

@@ -2029,11 +2028,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
20292028
// @public (undocumented)
20302029
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
20312030

2031+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
20322032
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
20332033
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
20342034
//
20352035
// @public
2036-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2036+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
20372037

20382038
// @public (undocumented)
20392039
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

‎.api-reports/api-report-react_internal.api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1114,14 +1114,13 @@ type MaybeAsync<T> = T | PromiseLike<T>;
11141114

11151115
// Warning: (ae-forgotten-export) The symbol "DataMasking" needs to be exported by the entry point index.d.ts
11161116
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
1117-
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
11181117
//
11191118
// @public
11201119
type MaybeMasked<TData> = DataMasking extends {
11211120
mode: "unmask";
11221121
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
11231122
__masked?: true;
1124-
} ? Prettify<RemoveMaskedMarker<TData>> : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never : DataMasking extends {
1123+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
11251124
mode: "preserveTypes";
11261125
} ? TData : TData;
11271126

@@ -2081,11 +2080,12 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
20812080
// @public (undocumented)
20822081
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
20832082

2083+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
20842084
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
20852085
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
20862086
//
20872087
// @public
2088-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2088+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
20892089

20902090
// @public (undocumented)
20912091
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {

0 commit comments

Comments
 (0)