RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2025-02-06 07:49:24 +03:00
Code Issues Projects Releases Wiki Activity

Refactoring abstract type resolution

Browse Source
This commit is contained in:
vladar 2016-11-07 17:28:47 +07:00
parent afbd5dbc90
commit 6023c0ff60
5 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Executor/Executor.php
View File

@ -722,11 +722,11 @@ class Executor
*/
private static function completeAbstractValue(ExecutionContext $exeContext, AbstractType $returnType, $fieldASTs, ResolveInfo $info, $path, &$result)
{
$resolveType = $returnType->getResolveTypeFn();
$runtimeType = $returnType->resolveType($result, $exeContext->contextValue, $info);
$runtimeType = $resolveType ?
call_user_func($resolveType, $result, $exeContext->contextValue, $info) :
Type::getTypeOf($result, $exeContext->contextValue, $info, $returnType);
if (null === $runtimeType) {
$runtimeType = self::inferTypeOf($result, $exeContext->contextValue, $info, $returnType);
}
// If resolveType returns a string, we assume it's a ObjectType name.
if (is_string($runtimeType)) {
@ -849,4 +849,25 @@ class Executor
return self::executeFields($exeContext, $returnType, $result, $path, $subFieldASTs);
}
/**
* Infer type of the value using isTypeOf of corresponding AbstractType
*
* @param $value
* @param $context
* @param ResolveInfo $info
* @param AbstractType $abstractType
* @return ObjectType|null
*/
private static function inferTypeOf($value, $context, ResolveInfo $info, AbstractType $abstractType)
{
$possibleTypes = $info->schema->getPossibleTypes($abstractType);
foreach ($possibleTypes as $type) {
if ($type->isTypeOf($value, $context, $info)) {
return $type;
}
}
return null;
}
}

9
src/Type/Definition/AbstractType.php
View File

@ -9,7 +9,12 @@ GraphQLUnionType;
interface AbstractType
{
/**
* @return callable|null
* Resolves concrete ObjectType for given object value
*
* @param $objectValue
* @param $context
* @param ResolveInfo $info
* @return mixed
*/
public function getResolveTypeFn();
public function resolveType($objectValue, $context, ResolveInfo $info);
}

19
src/Type/Definition/InterfaceType.php
View File

@ -19,11 +19,6 @@ class InterfaceType extends Type implements AbstractType, OutputType, CompositeT
*/
public $description;
/**
* @var callback
*/
private $resolveTypeFn;
/**
* @var array
*/
@ -51,7 +46,6 @@ class InterfaceType extends Type implements AbstractType, OutputType, CompositeT
$this->name = $config['name'];
$this->description = isset($config['description']) ? $config['description'] : null;
$this->resolveTypeFn = isset($config['resolveType']) ? $config['resolveType'] : null;
$this->config = $config;
}
@ -84,10 +78,19 @@ class InterfaceType extends Type implements AbstractType, OutputType, CompositeT
}
/**
* Resolves concrete ObjectType for given object value
*
* @param $objectValue
* @param $context
* @param ResolveInfo $info
* @return callable|null
*/
public function getResolveTypeFn()
public function resolveType($objectValue, $context, ResolveInfo $info)
{
return $this->resolveTypeFn;
if (isset($this->config['resolveType'])) {
$fn = $this->config['resolveType'];
return $fn($objectValue, $context, $info);
}
return null;
}
}

20
src/Type/Definition/Type.php
View File

@ -211,26 +211,6 @@ abstract class Type
return $type;
}
/**
* @param $value
* @param mixed $context
* @param AbstractType $abstractType
* @return Type
* @throws \Exception
*/
public static function getTypeOf($value, $context, ResolveInfo $info, AbstractType $abstractType)
{
$possibleTypes = $info->schema->getPossibleTypes($abstractType);
foreach ($possibleTypes as $type) {
/** @var ObjectType $type */
if ($type->isTypeOf($value, $context, $info)) {
return $type;
}
}
return null;
}
/**
* @var string
*/

27
src/Type/Definition/UnionType.php
View File

@ -20,11 +20,6 @@ class UnionType extends Type implements AbstractType, OutputType, CompositeType
*/
private $possibleTypeNames;
/**
* @var callback
*/
private $resolveTypeFn;
/**
* @var array
*/
@ -54,7 +49,6 @@ class UnionType extends Type implements AbstractType, OutputType, CompositeType
*/
$this->name = $config['name'];
$this->description = isset($config['description']) ? $config['description'] : null;
$this->resolveTypeFn = isset($config['resolveType']) ? $config['resolveType'] : null;
$this->config = $config;
}
@ -85,10 +79,10 @@ class UnionType extends Type implements AbstractType, OutputType, CompositeType
$this->name
);
// TODO: Return some sort of generator to avoid multiple loops
$this->types = Utils::map($types, function($type) {
return $type instanceof DefinitionContainer ? $type->getDefinition() : $type;
});
$this->types = [];
foreach ($types as $type) {
$this->types[] = Type::resolve($type);
}
}
return $this->types;
}
@ -113,10 +107,19 @@ class UnionType extends Type implements AbstractType, OutputType, CompositeType
}
/**
* Resolves concrete ObjectType for given object value
*
* @param $objectValue
* @param $context
* @param ResolveInfo $info
* @return callable|null
*/
public function getResolveTypeFn()
public function resolveType($objectValue, $context, ResolveInfo $info)
{
return $this->resolveTypeFn;
if (isset($this->config['resolveType'])) {
$fn = $this->config['resolveType'];
return $fn($objectValue, $context, $info);
}
return null;
}
}