Include client directives when inlining fragments (#78)

spawnia · Nov 9, 2022 · 20f6ca6 · 20f6ca6
1 parent 5d6278d
commit 20f6ca6
Show file tree

Hide file tree

Showing 56 changed files with 621 additions and 153 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -6,6 +6,7 @@
     ->notPath('vendor')
     ->notPath('/examples\/.*\/expected/')
     ->notPath('/examples\/.*\/generated/')
+    ->notPath('/examples\/.*\/sailor/')
     ->in(__DIR__)
     ->name('*.php')
     ->ignoreDotFiles(true)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v0.26.1
+
+### Fixed
+
+- Include client directives when inlining fragments
+
 ## v0.26.0
 
 ### Added

diff --git a/examples/custom-types/composer.json b/examples/custom-types/composer.json
@@ -18,7 +18,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/custom-types/src/CustomDateTypeConfig.php b/examples/custom-types/src/CustomDateTypeConfig.php
@@ -2,7 +2,6 @@
 
 namespace Spawnia\Sailor\CustomTypesSrc;
 
-use DateTime;
 use GraphQL\Type\Definition\ScalarType;
 use GraphQL\Type\Definition\Type;
 use Nette\PhpGenerator\ClassType;
@@ -34,7 +33,7 @@ public function typeConverter(): string
 
     public function typeReference(): string
     {
-        return '\\' . DateTime::class;
+        return '\\' . \DateTime::class;
     }
 
     public function generateClasses(): iterable
@@ -44,7 +43,7 @@ public function generateClasses(): iterable
 
     protected function decorateTypeConverterClass(Type $type, ClassType $class, Method $fromGraphQL, Method $toGraphQL): ClassType
     {
-        $dateTimeClass = DateTime::class;
+        $dateTimeClass = \DateTime::class;
         $format = self::FORMAT;
 
         $fromGraphQL->setReturnType($dateTimeClass);

diff --git a/examples/custom-types/src/Enum.php b/examples/custom-types/src/Enum.php
@@ -2,18 +2,15 @@
 
 namespace Spawnia\Sailor\CustomTypesSrc;
 
-use InvalidArgumentException;
-use ReflectionClass;
-
 abstract class Enum
 {
     public string $value;
 
     public function __construct(string $value)
     {
-        $reflection = new ReflectionClass($this);
+        $reflection = new \ReflectionClass($this);
         if (! in_array($value, $reflection->getConstants())) {
-            throw new InvalidArgumentException('Unexpect enum value: ' . $value);
+            throw new \InvalidArgumentException('Unexpect enum value: ' . $value);
         }
 
         $this->value = $value;

diff --git a/examples/input/composer.json b/examples/input/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/install/composer.json b/examples/install/composer.json
@@ -12,7 +12,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/php-keywords/composer.json b/examples/php-keywords/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/polymorphic/composer.json b/examples/polymorphic/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/simple/composer.json b/examples/simple/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "scripts": {
-    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .git --exclude .build --delete",
     "pre-install-cmd": "@move-package",
     "pre-update-cmd": "@move-package"
   }

diff --git a/examples/simple/expected/Operations/ClientDirectiveFragmentSpreadQuery.php b/examples/simple/expected/Operations/ClientDirectiveFragmentSpreadQuery.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations;
+
+/**
+ * @extends \Spawnia\Sailor\Operation<\Spawnia\Sailor\Simple\Operations\ClientDirectiveFragmentSpreadQuery\ClientDirectiveFragmentSpreadQueryResult>
+ */
+class ClientDirectiveFragmentSpreadQuery extends \Spawnia\Sailor\Operation
+{
+    /**
+     * @param bool $value
+     */
+    public static function execute($value): ClientDirectiveFragmentSpreadQuery\ClientDirectiveFragmentSpreadQueryResult
+    {
+        return self::executeOperation(
+            $value,
+        );
+    }
+
+    protected static function converters(): array
+    {
+        static $converters;
+
+        return $converters ??= [
+            ['value', new \Spawnia\Sailor\Convert\NonNullConverter(new \Spawnia\Sailor\Convert\BooleanConverter)],
+        ];
+    }
+
+    public static function document(): string
+    {
+        return /* @lang GraphQL */ 'query ClientDirectiveFragmentSpreadQuery($value: Boolean!) {
+          __typename
+          ... on Query @skip(if: $value) {
+            twoArgs
+          }
+        }';
+    }
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../sailor.php');
+    }
+}
diff --git a/...cted/Operations/ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQuery.php b/...cted/Operations/ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQuery.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations\ClientDirectiveFragmentSpreadQuery;
+
+/**
+ * @property string $__typename
+ * @property string|null $twoArgs
+ */
+class ClientDirectiveFragmentSpreadQuery extends \Spawnia\Sailor\ObjectLike
+{
+    /**
+     * @param string|null $twoArgs
+     */
+    public static function make($twoArgs = 'Special default value that allows Sailor to differentiate between explicitly passing null and not passing a value at all.'): self
+    {
+        $instance = new self;
+
+        $instance->__typename = 'Query';
+        if ($twoArgs !== self::UNDEFINED) {
+            $instance->twoArgs = $twoArgs;
+        }
+
+        return $instance;
+    }
+
+    protected function converters(): array
+    {
+        static $converters;
+
+        return $converters ??= [
+            '__typename' => new \Spawnia\Sailor\Convert\NonNullConverter(new \Spawnia\Sailor\Convert\StringConverter),
+            'twoArgs' => new \Spawnia\Sailor\Convert\NullConverter(new \Spawnia\Sailor\Convert\IDConverter),
+        ];
+    }
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../../sailor.php');
+    }
+}
diff --git a/.../ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQueryErrorFreeResult.php b/.../ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQueryErrorFreeResult.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations\ClientDirectiveFragmentSpreadQuery;
+
+class ClientDirectiveFragmentSpreadQueryErrorFreeResult extends \Spawnia\Sailor\ErrorFreeResult
+{
+    public ClientDirectiveFragmentSpreadQuery $data;
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../../sailor.php');
+    }
+}
diff --git a/...perations/ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQueryResult.php b/...perations/ClientDirectiveFragmentSpreadQuery/ClientDirectiveFragmentSpreadQueryResult.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations\ClientDirectiveFragmentSpreadQuery;
+
+class ClientDirectiveFragmentSpreadQueryResult extends \Spawnia\Sailor\Result
+{
+    public ?ClientDirectiveFragmentSpreadQuery $data = null;
+
+    protected function setData(\stdClass $data): void
+    {
+        $this->data = ClientDirectiveFragmentSpreadQuery::fromStdClass($data);
+    }
+
+    /**
+     * Useful for instantiation of successful mocked results.
+     *
+     * @return static
+     */
+    public static function fromData(ClientDirectiveFragmentSpreadQuery $data): self
+    {
+        $instance = new static;
+        $instance->data = $data;
+
+        return $instance;
+    }
+
+    public function errorFree(): ClientDirectiveFragmentSpreadQueryErrorFreeResult
+    {
+        return ClientDirectiveFragmentSpreadQueryErrorFreeResult::fromResult($this);
+    }
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../../sailor.php');
+    }
+}
diff --git a/examples/simple/expected/Operations/ClientDirectiveInlineFragmentQuery.php b/examples/simple/expected/Operations/ClientDirectiveInlineFragmentQuery.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations;
+
+/**
+ * @extends \Spawnia\Sailor\Operation<\Spawnia\Sailor\Simple\Operations\ClientDirectiveInlineFragmentQuery\ClientDirectiveInlineFragmentQueryResult>
+ */
+class ClientDirectiveInlineFragmentQuery extends \Spawnia\Sailor\Operation
+{
+    /**
+     * @param bool $value
+     */
+    public static function execute($value): ClientDirectiveInlineFragmentQuery\ClientDirectiveInlineFragmentQueryResult
+    {
+        return self::executeOperation(
+            $value,
+        );
+    }
+
+    protected static function converters(): array
+    {
+        static $converters;
+
+        return $converters ??= [
+            ['value', new \Spawnia\Sailor\Convert\NonNullConverter(new \Spawnia\Sailor\Convert\BooleanConverter)],
+        ];
+    }
+
+    public static function document(): string
+    {
+        return /* @lang GraphQL */ 'query ClientDirectiveInlineFragmentQuery($value: Boolean!) {
+          __typename
+          ... on Query @skip(if: $value) {
+            twoArgs
+          }
+        }';
+    }
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../sailor.php');
+    }
+}
diff --git a/...cted/Operations/ClientDirectiveInlineFragmentQuery/ClientDirectiveInlineFragmentQuery.php b/...cted/Operations/ClientDirectiveInlineFragmentQuery/ClientDirectiveInlineFragmentQuery.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spawnia\Sailor\Simple\Operations\ClientDirectiveInlineFragmentQuery;
+
+/**
+ * @property string $__typename
+ * @property string|null $twoArgs
+ */
+class ClientDirectiveInlineFragmentQuery extends \Spawnia\Sailor\ObjectLike
+{
+    /**
+     * @param string|null $twoArgs
+     */
+    public static function make($twoArgs = 'Special default value that allows Sailor to differentiate between explicitly passing null and not passing a value at all.'): self
+    {
+        $instance = new self;
+
+        $instance->__typename = 'Query';
+        if ($twoArgs !== self::UNDEFINED) {
+            $instance->twoArgs = $twoArgs;
+        }
+
+        return $instance;
+    }
+
+    protected function converters(): array
+    {
+        static $converters;
+
+        return $converters ??= [
+            '__typename' => new \Spawnia\Sailor\Convert\NonNullConverter(new \Spawnia\Sailor\Convert\StringConverter),
+            'twoArgs' => new \Spawnia\Sailor\Convert\NullConverter(new \Spawnia\Sailor\Convert\IDConverter),
+        ];
+    }
+
+    public static function endpoint(): string
+    {
+        return 'simple';
+    }
+
+    public static function config(): string
+    {
+        return \Safe\realpath(__DIR__ . '/../../../sailor.php');
+    }
+}