Skip to content

[pull] master from dotansimha:master #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 8, 2026
Merged

[pull] master from dotansimha:master #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions dev-test/general/gql-tag-operations-masking/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions dev-test/general/gql-tag-operations-urql/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions dev-test/general/gql-tag-operations/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions dev-test/general/gql-tag-operations/graphql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/persisted-documents-string-mode/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/persisted-documents/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/react/apollo-client-defer/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/react/apollo-client/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/react/http-executor/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/react/tanstack-react-query/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/react/urql/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/typescript-esm/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/typescript-graphql-request/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vite/vite-react-cts/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vite/vite-react-mts/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vite/vite-react-ts/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vue/apollo-composable/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vue/urql/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/vue/villus/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
5 changes: 0 additions & 5 deletions examples/yoga-tests/src/gql/fragment-masking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>>
: never
: never;

// return partial if `fragmentType` is partial e.g. because of conditional directives
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>,
): Partial<TType>;
// return non-nullable if `fragmentType` is non-nullable
export function useFragment<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
Expand Down
7 changes: 4 additions & 3 deletions packages/plugins/other/visitor-plugin-common/src/selection-set-to-object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,11 +1023,12 @@ export class SelectionSetToObject<
fields.push(
`{ ' $fragmentRefs'?: { ${fragmentsSpreadUsages
.map(name => {
// FIXME: https://github.com/dotansimha/graphql-code-generator/pull/10904/changes#r3729881814
// A conditional (`@skip`/`@include`) masked spread may be absent,
// so its data is wrapped in `Partial`.
if (options.partialTypes) {
return `'${name}': Partial<${name}>`;
}
// if (options.partialTypes) {
// return `'${name}': Partial<${name}>`;
// }
if (options.unsetTypes) {
return `'${name}': Incremental<${name}>`;
}
Expand Down
11 changes: 6 additions & 5 deletions packages/presets/client/src/fragment-masking-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ export function makeFragmentData<
const defaultUnmaskFunctionName = 'useFragment';

const createUnmaskFunctionTypeDefinitions = (unmaskFunctionName = defaultUnmaskFunctionName) => [
`// return partial if \`fragmentType\` is partial e.g. because of conditional directives
export function ${unmaskFunctionName}<TType>(
_documentNode: DocumentTypeDecoration<TType, any>,
fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>
): Partial<TType>;`,
// FIXME: https://github.com/dotansimha/graphql-code-generator/pull/10904/changes#r3729881814
// `// return partial if \`fragmentType\` is partial e.g. because of conditional directives
// export function ${unmaskFunctionName}<TType>(
// _documentNode: DocumentTypeDecoration<TType, any>,
// fragmentType: FragmentType<DocumentTypeDecoration<Partial<TType>, any>>
// ): Partial<TType>;`,

`// return non-nullable if \`fragmentType\` is non-nullable
export function ${unmaskFunctionName}<TType>(
Expand Down
Loading
Loading