Skip to content

Remember initial types instead of lazy-loading #1697

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

Open
rudiedirkx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remember initial types instead of lazy-loading #1697

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e501d3a
remember initial types instead of lazy-loading
rudiedirkx Apr 30, 2025
e6ed1f4
types callables fix
rudiedirkx May 2, 2025
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
4 changes: 4 additions & 0 deletions src/Type/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
$this->extensionASTNodes = $config->extensionASTNodes;

$this->config = $config;

foreach ($this->config->types as $type) {

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (7.4) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.0) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.1) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.2) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.3) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.

Check failure on line 103 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.4) 

Argument of an invalid type (callable)|iterable<(callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)> supplied for foreach, only iterables are supported.
Copy link
Copy Markdown
Collaborator

@spawnia spawnia May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Users may specify types in a multitude of ways, its type is iterable<Type&NamedType>|(callable(): iterable<Type&NamedType>)|iterable<(callable(): Type&NamedType)>|(callable(): iterable<(callable(): Type&NamedType)>). The code you wrote does not work with some of those options.

$this->resolvedTypes[$type->name()] = $type;

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (7.4) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.0) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.1) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.2) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.3) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.

Check failure on line 104 in src/Type/Schema.php

View workflow job for this annotation

GitHub Actions / Static Analysis with PHPStan (8.4) 

Property GraphQL\Type\Schema::$resolvedTypes (array<string, GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type>) does not accept array<string, (callable&GraphQL\Type\Definition\NamedType)|(GraphQL\Type\Definition\NamedType&GraphQL\Type\Definition\Type)>.
Copy link

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The constructor does not validate for duplicate type names, but getTypeMap() does (line 145-148). This means duplicate types in the 'types' config will silently overwrite each other in the constructor, potentially causing unexpected behavior. The validation check from getTypeMap() should be added to the constructor loop as well.

Suggested change
$this->resolvedTypes[$type->name()] = $type;
$typeName = $type->name();
if (isset($this->resolvedTypes[$typeName]) && $this->resolvedTypes[$typeName] !== $type) {
throw new InvariantViolation(
'Schema must contain unique named types but contains multiple types named ' . $typeName
);
}
$this->resolvedTypes[$typeName] = $type;

Copilot uses AI. Check for mistakes.
}
Comment on lines +104 to +112
Copy link

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eagerly resolving all types in the constructor defeats the purpose of lazy loading and can negatively impact performance for large schemas. If the types array contains many types or lazy callables, all of them will be resolved immediately during schema construction, even if they're never used. This is particularly problematic when combined with typeLoader, as it changes the expected behavior where types are only loaded on-demand. Consider documenting this behavior change and its performance implications.

Suggested change
if (is_callable($types)) {
$types = $types();
}
foreach ($types as $typeOrLazyType) {
/** @var Type|callable(): Type $typeOrLazyType */
$type = self::resolveType($typeOrLazyType);
assert($type instanceof NamedType);
$this->resolvedTypes[$type->name()] = $type;
}
// If $types is a callable, defer its execution to preserve lazy loading.
if (! is_callable($types)) {
foreach ($types as $typeOrLazyType) {
/** @var Type|callable(): Type $typeOrLazyType */
$type = self::resolveType($typeOrLazyType);
assert($type instanceof NamedType);
$this->resolvedTypes[$type->name()] = $type;
}
}

Copilot uses AI. Check for mistakes.
}

/**
Expand Down
Loading