Skip to content

Proxy Container & Invoker #15

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proxy Container & Invoker #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fa9811
feat: proxy container & resolver for middlewares
leon0399 Oct 3, 2024
379b2ac
Update composer.json
leon0399 Oct 9, 2024
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"require": {
"php": "^8.1",
"andi-lab/graphql-php": "^1.0.1",
"spiral/framework": "^3.8.4"
"spiral/framework": "^3.12"
},
"license": "MIT",
"authors": [
Expand Down
161 changes: 156 additions & 5 deletions src/Bootloader/GraphQLBootloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
use Andi\GraphQL\ArgumentResolver\ArgumentResolverInterface;
use Andi\GraphQL\InputObjectFieldResolver\InputObjectFieldResolver;
use Andi\GraphQL\InputObjectFieldResolver\InputObjectFieldResolverInterface;
use Andi\GraphQL\ObjectFieldResolver\Middleware\AbstractObjectFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\AbstractOuterObjectFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\AdditionalFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\InterfaceFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\MutationFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\ObjectFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\Middleware\QueryFieldByReflectionMethodMiddleware;
use Andi\GraphQL\ObjectFieldResolver\ObjectFieldResolver;
use Andi\GraphQL\ObjectFieldResolver\ObjectFieldResolverInterface;
use Andi\GraphQL\Spiral\Command\ConfigCommand;
Expand All @@ -34,12 +41,14 @@
use GraphQL\Type\Schema;
use GraphQL\Type\SchemaConfig;
use Psr\Container\ContainerInterface;
use Spiral\Attributes\ReaderInterface;
use Spiral\Boot\AbstractKernel;
use Spiral\Boot\Bootloader\Bootloader;
use Spiral\Boot\EnvironmentInterface;
use Spiral\Bootloader\Http\HttpBootloader;
use Spiral\Config\ConfiguratorInterface;
use Spiral\Console\Bootloader\ConsoleBootloader;
use Spiral\Core\Internal\Proxy;
use Spiral\Core\InvokerInterface;
use Spiral\Core\ScopeInterface;
use Spiral\Tokenizer\TokenizerListenerRegistryInterface;
Expand All @@ -66,6 +75,15 @@ final class GraphQLBootloader extends Bootloader
ArgumentResolver::class => [self::class, 'buildArgumentResolver'],
];

protected const BINDINGS = [
QueryFieldByReflectionMethodMiddleware::class => [self::class, 'buildQueryFieldByReflectionMethodMiddleware'],
MutationFieldByReflectionMethodMiddleware::class => [self::class, 'buildMutationFieldByReflectionMethodMiddleware'],
AdditionalFieldByReflectionMethodMiddleware::class => [self::class, 'buildAdditionalFieldByReflectionMethodMiddleware'],

ObjectFieldByReflectionMethodMiddleware::class => [self::class, 'buildObjectFieldByReflectionMethodMiddleware'],
InterfaceFieldByReflectionMethodMiddleware::class => [self::class, 'buildInterfaceFieldByReflectionMethodMiddleware'],
];

public function __construct(
private readonly ConfiguratorInterface $configurator,
) {
Expand Down Expand Up @@ -157,7 +175,7 @@ private function registerAdditionalTypes(
TypeResolverInterface $typeResolver,
): void {
foreach ($types as $name => $aliases) {
$aliases = (array) $aliases;
$aliases = (array)$aliases;
if (\is_int($name)) {
$name = \array_shift($aliases);
}
Expand All @@ -177,16 +195,25 @@ private function buildServerConfig(
Schema $schema,
GraphQLConfig $config,
ContainerInterface $container,
ScopeInterface $scope,
InvokerInterface $invoker,
): ServerConfig {
$serverConfig = (new ServerConfig())->setSchema($schema);

$scope = Proxy::create(
Copy link
Owner

Choose a reason for hiding this comment

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

Psalm ругается:
InternalClass: Spiral\Core\Internal\Proxy is internal to Spiral but called from Andi\GraphQL\Spiral\Bootloader\GraphQLBootloader

предлагаю рассмотреть вариант, который я предлагал изначально - создать соответствующие слои с атрибутом Proxy

Copy link
Author

Choose a reason for hiding this comment

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

Так же будет ругаться:
image

Copy link
Owner

Choose a reason for hiding this comment

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

ну в этом случае не получится принять MR, т.к. атрибут и поведение к нему экспериментальные, ты можешь в своём проекте вместо библиотечных свои мидлвары подсунуть с выставленными атрибутами

могу чем-то ещё помочь?

new \ReflectionClass(ScopeInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);
$invoker = Proxy::create(
new \ReflectionClass(InvokerInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);

if ($rootValueName = $config->getRootValue()) {
$rootValue = $container->get($rootValueName);
$rootValueFn = \is_callable($rootValue)
? $rootValue
: static fn () => $rootValue;
: static fn() => $rootValue;

$serverConfig->setRootValue(new ValueResolver($scope, $invoker, $rootValueFn));
}
Expand All @@ -195,7 +222,7 @@ private function buildServerConfig(
$context = $container->get($contextName);
$contextFn = \is_callable($context)
? $context
: static fn () => $context;
: static fn() => $context;

$serverConfig->setContext(new ValueResolver($scope, $invoker, $contextFn));
}
Expand Down Expand Up @@ -284,4 +311,128 @@ private function buildArgumentResolver(

return $argumentResolver;
}

private function buildQueryFieldByReflectionMethodMiddleware(
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): QueryFieldByReflectionMethodMiddleware {
return $this->buildAbstractOuterObjectFieldByReflectionMethodMiddleware(
QueryFieldByReflectionMethodMiddleware::class,
$reader,
$typeRegistry,
$argumentResolver,
);
}

private function buildMutationFieldByReflectionMethodMiddleware(
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): MutationFieldByReflectionMethodMiddleware {
return $this->buildAbstractOuterObjectFieldByReflectionMethodMiddleware(
MutationFieldByReflectionMethodMiddleware::class,
$reader,
$typeRegistry,
$argumentResolver,
);
}

private function buildAdditionalFieldByReflectionMethodMiddleware(
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): AdditionalFieldByReflectionMethodMiddleware {
return $this->buildAbstractOuterObjectFieldByReflectionMethodMiddleware(
AdditionalFieldByReflectionMethodMiddleware::class,
$reader,
$typeRegistry,
$argumentResolver,
);
}

/**
* @param class-string<AbstractOuterObjectFieldByReflectionMethodMiddleware> $class
*/
private function buildAbstractOuterObjectFieldByReflectionMethodMiddleware(
string $class,
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): AbstractOuterObjectFieldByReflectionMethodMiddleware {
$scope = Proxy::create(
new \ReflectionClass(ScopeInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);
$invoker = Proxy::create(
new \ReflectionClass(InvokerInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);

return new $class(
$reader,
$typeRegistry,
$argumentResolver,
$scope,
$invoker,
);
}

private function buildObjectFieldByReflectionMethodMiddleware(
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): ObjectFieldByReflectionMethodMiddleware {
return $this->buildAbstractObjectFieldByReflectionMethodMiddleware(
ObjectFieldByReflectionMethodMiddleware::class,
$reader,
$typeRegistry,
$argumentResolver,
);
}


private function buildInterfaceFieldByReflectionMethodMiddleware(
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): InterfaceFieldByReflectionMethodMiddleware {
return $this->buildAbstractObjectFieldByReflectionMethodMiddleware(
InterfaceFieldByReflectionMethodMiddleware::class,
$reader,
$typeRegistry,
$argumentResolver,
);
}

/**
* @param class-string<AbstractObjectFieldByReflectionMethodMiddleware> $class
*/
private function buildAbstractObjectFieldByReflectionMethodMiddleware(
string $class,
ReaderInterface $reader,
TypeRegistryInterface $typeRegistry,
ArgumentResolverInterface $argumentResolver,
): AbstractObjectFieldByReflectionMethodMiddleware {
$scope = Proxy::create(
new \ReflectionClass(ScopeInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);
$invoker = Proxy::create(
new \ReflectionClass(InvokerInterface::class),
null,
new \Spiral\Core\Attribute\Proxy(),
);

return new $class(
$reader,
$typeRegistry,
$argumentResolver,
$scope,
$invoker,
);
}
}
Loading