Skip to content

Commit b47c7dd

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #467 from apollographql/main
Create a new pull request by comparing changes across two branches
2 parents 26847ff + eeba2ef commit b47c7dd

File tree

115 files changed

+23097
-19141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+23097
-19141
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -764,16 +764,17 @@ export function makeReference(id: string): Reference;
764764
// @public (undocumented)
765765
export function makeVar<T>(value: T): ReactiveVar<T>;
766766

767-
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
768767
// Warning: (ae-forgotten-export) The symbol "DataMasking" 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
768+
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
770769
//
771770
// @public
772-
type MaybeMasked<TData> = TData extends any ? true extends IsAny<TData> ? TData : TData extends {
771+
type MaybeMasked<TData> = DataMasking extends {
772+
mode: "unmask";
773+
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
773774
__masked?: true;
774-
} ? Prettify<RemoveMaskedMarker<TData>> : DataMasking extends {
775-
enabled: true;
776-
} ? TData : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never;
775+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
776+
mode: "preserveTypes";
777+
} ? TData : TData;
777778

778779
// @public (undocumented)
779780
export interface MergeInfo {
@@ -1111,14 +1112,15 @@ export type TypePolicy = {
11111112
// @public (undocumented)
11121113
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
11131114

1115+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
11141116
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
11151117
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
11161118
//
11171119
// @public
1118-
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;
11191121

11201122
// @public (undocumented)
1121-
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
1123+
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? TData extends Primitive ? TData : string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
11221124
" $fragmentRefs"?: infer FragmentRefs;
11231125
} ? UnwrapFragmentRefs<CombineIntersection<Omit<TData, " $fragmentRefs"> | RemoveFragmentName<NonNullable<NonNullable<FragmentRefs>[keyof NonNullable<FragmentRefs>]>>>> : TData extends object ? {
11241126
[K in keyof TData]: UnwrapFragmentRefs<TData[K]>;

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,7 @@ export class ApolloError extends Error {
200200
// (undocumented)
201201
networkError: Error | ServerParseError | ServerError | null;
202202
// (undocumented)
203-
protocolErrors: ReadonlyArray<{
204-
message: string;
205-
extensions?: GraphQLErrorExtensions[];
206-
}>;
203+
protocolErrors: ReadonlyArray<GraphQLFormattedError>;
207204
}
208205

209206
// @public (undocumented)
@@ -219,10 +216,7 @@ interface ApolloErrorOptions {
219216
// (undocumented)
220217
networkError?: Error | ServerParseError | ServerError | null;
221218
// (undocumented)
222-
protocolErrors?: ReadonlyArray<{
223-
message: string;
224-
extensions?: GraphQLErrorExtensions[];
225-
}>;
219+
protocolErrors?: ReadonlyArray<GraphQLFormattedError>;
226220
}
227221

228222
// @public (undocumented)
@@ -259,9 +253,9 @@ export class ApolloLink {
259253
// @public (undocumented)
260254
export interface ApolloPayloadResult<TData = Record<string, any>, TExtensions = Record<string, any>> {
261255
// (undocumented)
262-
errors?: ReadonlyArray<Error | string>;
256+
errors?: ReadonlyArray<GraphQLFormattedError>;
263257
// (undocumented)
264-
payload: SingleExecutionResult | ExecutionPatchResult | null;
258+
payload: SingleExecutionResult<TData, DefaultContext, TExtensions> | ExecutionPatchResult<TData, TExtensions> | null;
265259
}
266260

267261
// @public (undocumented)
@@ -1409,14 +1403,15 @@ interface MaskOperationOptions<TData> {
14091403
type MaybeAsync<T> = T | PromiseLike<T>;
14101404

14111405
// 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
14131406
//
14141407
// @public
1415-
export type MaybeMasked<TData> = TData extends any ? true extends IsAny<TData> ? TData : TData extends {
1408+
export type MaybeMasked<TData> = DataMasking extends {
1409+
mode: "unmask";
1410+
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
14161411
__masked?: true;
1417-
} ? Prettify<RemoveMaskedMarker<TData>> : DataMasking extends {
1418-
enabled: true;
1419-
} ? TData : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never;
1412+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
1413+
mode: "preserveTypes";
1414+
} ? TData : TData;
14201415

14211416
// @public (undocumented)
14221417
export interface MergeInfo {
@@ -2408,14 +2403,15 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
24082403
// @public (undocumented)
24092404
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
24102405

2406+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
24112407
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
24122408
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
24132409
//
24142410
// @public
2415-
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2411+
export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
24162412

24172413
// @public (undocumented)
2418-
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
2414+
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? TData extends Primitive ? TData : string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
24192415
" $fragmentRefs"?: infer FragmentRefs;
24202416
} ? UnwrapFragmentRefs<CombineIntersection<Omit<TData, " $fragmentRefs"> | RemoveFragmentName<NonNullable<NonNullable<FragmentRefs>[keyof NonNullable<FragmentRefs>]>>>> : TData extends object ? {
24212417
[K in keyof TData]: UnwrapFragmentRefs<TData[K]>;

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ export class ApolloError extends Error {
3131
// (undocumented)
3232
networkError: Error | ServerParseError | ServerError | null;
3333
// (undocumented)
34-
protocolErrors: ReadonlyArray<{
35-
message: string;
36-
extensions?: GraphQLErrorExtensions[];
37-
}>;
34+
protocolErrors: ReadonlyArray<GraphQLFormattedError>;
3835
}
3936

4037
// @public (undocumented)
@@ -50,10 +47,7 @@ export interface ApolloErrorOptions {
5047
// (undocumented)
5148
networkError?: Error | ServerParseError | ServerError | null;
5249
// (undocumented)
53-
protocolErrors?: ReadonlyArray<{
54-
message: string;
55-
extensions?: GraphQLErrorExtensions[];
56-
}>;
50+
protocolErrors?: ReadonlyArray<GraphQLFormattedError>;
5751
}
5852

5953
// @public (undocumented)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ export class ApolloLink {
4343
// @public (undocumented)
4444
export interface ApolloPayloadResult<TData = Record<string, any>, TExtensions = Record<string, any>> {
4545
// (undocumented)
46-
errors?: ReadonlyArray<Error | string>;
46+
errors?: ReadonlyArray<GraphQLFormattedError>;
47+
// Warning: (ae-forgotten-export) The symbol "DefaultContext" needs to be exported by the entry point index.d.ts
48+
//
4749
// (undocumented)
48-
payload: SingleExecutionResult | ExecutionPatchResult | null;
50+
payload: SingleExecutionResult<TData, DefaultContext, TExtensions> | ExecutionPatchResult<TData, TExtensions> | null;
4951
}
5052

5153
// @public (undocumented)
@@ -106,8 +108,6 @@ export const from: typeof ApolloLink.from;
106108

107109
// @public (undocumented)
108110
export interface GraphQLRequest<TVariables = Record<string, any>> {
109-
// Warning: (ae-forgotten-export) The symbol "DefaultContext" needs to be exported by the entry point index.d.ts
110-
//
111111
// (undocumented)
112112
context?: DefaultContext;
113113
// (undocumented)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,12 @@ export class ErrorLink extends ApolloLink {
8080
export interface ErrorResponse {
8181
// (undocumented)
8282
forward: NextLink;
83-
// (undocumented)
8483
graphQLErrors?: ReadonlyArray<GraphQLFormattedError>;
8584
// Warning: (ae-forgotten-export) The symbol "NetworkError" needs to be exported by the entry point index.d.ts
86-
//
87-
// (undocumented)
8885
networkError?: NetworkError;
8986
// (undocumented)
9087
operation: Operation;
88+
protocolErrors?: ReadonlyArray<GraphQLFormattedError>;
9189
// (undocumented)
9290
response?: FormattedExecutionResult;
9391
}

‎.api-reports/api-report-link_persisted-queries.api.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ interface BaseOptions {
6363
// Warning: (ae-forgotten-export) The symbol "ApolloLink" needs to be exported by the entry point index.d.ts
6464
//
6565
// @public (undocumented)
66-
export const createPersistedQueryLink: (options: PersistedQueryLink.Options) => ApolloLink & {
66+
export const createPersistedQueryLink: (options: PersistedQueryLink.Options) => ApolloLink & ({
6767
resetHashCache: () => void;
6868
} & ({
6969
getMemoryInternals(): {
@@ -73,7 +73,7 @@ export const createPersistedQueryLink: (options: PersistedQueryLink.Options) =>
7373
};
7474
} | {
7575
getMemoryInternals?: undefined;
76-
});
76+
}));
7777

7878
// @public (undocumented)
7979
interface DefaultContext extends Record<string, any> {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,14 +437,15 @@ 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
443-
export type MaybeMasked<TData> = TData extends any ? true extends IsAny<TData> ? TData : TData extends {
442+
export type MaybeMasked<TData> = DataMasking extends {
443+
mode: "unmask";
444+
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
444445
__masked?: true;
445-
} ? Prettify<RemoveMaskedMarker<TData>> : DataMasking extends {
446-
enabled: true;
447-
} ? TData : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never;
446+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
447+
mode: "preserveTypes";
448+
} ? TData : TData;
448449

449450
// Warning: (ae-forgotten-export) The symbol "CombineIntersection" needs to be exported by the entry point index.d.ts
450451
//
@@ -610,14 +611,15 @@ type Transaction<T> = (c: ApolloCache<T>) => void;
610611
// @public (undocumented)
611612
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
612613

614+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
613615
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
614616
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
615617
//
616618
// @public
617-
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;
618620

619621
// @public (undocumented)
620-
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
622+
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? TData extends Primitive ? TData : string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
621623
" $fragmentRefs"?: infer FragmentRefs;
622624
} ? UnwrapFragmentRefs<CombineIntersection<Omit<TData, " $fragmentRefs"> | RemoveFragmentName<NonNullable<NonNullable<FragmentRefs>[keyof NonNullable<FragmentRefs>]>>>> : TData extends object ? {
623625
[K in keyof TData]: UnwrapFragmentRefs<TData[K]>;

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,7 @@ class ApolloError extends Error {
257257
// (undocumented)
258258
networkError: Error | ServerParseError | ServerError | null;
259259
// (undocumented)
260-
protocolErrors: ReadonlyArray<{
261-
message: string;
262-
extensions?: GraphQLErrorExtensions[];
263-
}>;
260+
protocolErrors: ReadonlyArray<GraphQLFormattedError>;
264261
}
265262

266263
// @public (undocumented)
@@ -276,10 +273,7 @@ interface ApolloErrorOptions {
276273
// (undocumented)
277274
networkError?: Error | ServerParseError | ServerError | null;
278275
// (undocumented)
279-
protocolErrors?: ReadonlyArray<{
280-
message: string;
281-
extensions?: GraphQLErrorExtensions[];
282-
}>;
276+
protocolErrors?: ReadonlyArray<GraphQLFormattedError>;
283277
}
284278

285279
// @public (undocumented)
@@ -1153,16 +1147,17 @@ interface MaskOperationOptions<TData> {
11531147
// @public (undocumented)
11541148
type MaybeAsync<T> = T | PromiseLike<T>;
11551149

1156-
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
11571150
// Warning: (ae-forgotten-export) The symbol "DataMasking" 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
1151+
// Warning: (ae-forgotten-export) The symbol "RemoveMaskedMarker" needs to be exported by the entry point index.d.ts
11591152
//
11601153
// @public
1161-
type MaybeMasked<TData> = TData extends any ? true extends IsAny<TData> ? TData : TData extends {
1154+
type MaybeMasked<TData> = DataMasking extends {
1155+
mode: "unmask";
1156+
} ? TData extends any ? true extends IsAny<TData> ? TData : TData extends {
11621157
__masked?: true;
1163-
} ? Prettify<RemoveMaskedMarker<TData>> : DataMasking extends {
1164-
enabled: true;
1165-
} ? TData : true extends ContainsFragmentsRefs<TData> ? Unmasked<TData> : TData : never;
1158+
} ? Prettify<RemoveMaskedMarker<TData>> : Unmasked<TData> : never : DataMasking extends {
1159+
mode: "preserveTypes";
1160+
} ? TData : TData;
11661161

11671162
// Warning: (ae-forgotten-export) The symbol "CombineIntersection" needs to be exported by the entry point index.d.ts
11681163
//
@@ -2204,14 +2199,15 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
22042199
// @public (undocumented)
22052200
type unionToIntersection<T> = (T extends unknown ? (x: T) => unknown : never) extends ((x: infer U) => unknown) ? U : never;
22062201

2202+
// Warning: (ae-forgotten-export) The symbol "ContainsFragmentsRefs" needs to be exported by the entry point index.d.ts
22072203
// Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
22082204
// Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
22092205
//
22102206
// @public
2211-
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData;
2207+
type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
22122208

22132209
// @public (undocumented)
2214-
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
2210+
type UnwrapFragmentRefs<TData> = true extends IsAny<TData> ? TData : TData extends any ? TData extends Primitive ? TData : string extends keyof TData ? TData : keyof TData extends never ? TData : TData extends {
22152211
" $fragmentRefs"?: infer FragmentRefs;
22162212
} ? UnwrapFragmentRefs<CombineIntersection<Omit<TData, " $fragmentRefs"> | RemoveFragmentName<NonNullable<NonNullable<FragmentRefs>[keyof NonNullable<FragmentRefs>]>>>> : TData extends object ? {
22172213
[K in keyof TData]: UnwrapFragmentRefs<TData[K]>;
@@ -2411,7 +2407,7 @@ export interface UseReadQueryResult<TData = unknown> {
24112407
export function useSubscription<TData = any, TVariables extends OperationVariables = OperationVariables>(subscription: DocumentNode | TypedDocumentNode<TData, TVariables>, options?: SubscriptionHookOptions<NoInfer_2<TData>, NoInfer_2<TVariables>>): {
24122408
restart: () => void;
24132409
loading: boolean;
2414-
data?: MaybeMasked<TData> | undefined;
2410+
data?: TData | undefined;
24152411
error?: ApolloError;
24162412
variables?: TVariables | undefined;
24172413
};

0 commit comments

Comments
 (0)