Merge pull request #1 from mcg-web/webonyx-graphql-sync-promise

With webonyx/graphql sync promise

Author: mcg-web

README.md

@@ -4,10 +4,15 @@
 
 ### Run without DataLoader
 ```sh
-$ bin/run
+bin/run
 ```
 
-### Run with DataLoader
+### Run with DataLoader using React
 ```sh
-$ bin/run --with-dataloader
+bin/run --with-dataloader
+```
+
+### Run with DataLoader using deferred (native)
+```sh
+bin/run --with-dataloader --native
 ```

app/common.php

@@ -1,5 +1,6 @@
 <?php
 
+use GraphQL\Executor\Promise\PromiseAdapter;
 use GraphQL\GraphQL;
 use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
@@ -86,8 +87,10 @@ function createSchema(callable $friendsResolver, callable $characterResolver)
     return new Schema(['query' => $queryType]);
 }
 
-function executeQueries(Schema $schema, &$calls, &$callsIds,  callable $beforeExecute = null, callable $afterExecute = null)
+function executeQueries(Schema $schema, &$calls, &$callsIds, PromiseAdapter $promiseAdapter = null,  callable $beforeExecute = null, callable $afterExecute = null)
 {
+    GraphQL::setPromiseAdapter($promiseAdapter);
+
     foreach (getQueries() as $query) {
         $calls = 0;
         $callsIds = [];
@@ -106,14 +109,18 @@ function getQueries()
     $queries[] = <<<QUERY
 {
   character1: character(id: "1000") {
+    id
     name
     friends {
+      id
       name
     }
   }
   character2: character(id: "1002") {
+    id
     name
     friends {
+      id
       name
     }
   }
@@ -123,9 +130,11 @@ function getQueries()
     $queries[] = <<<QUERY
 {
   character1: character(id: "1000") {
+    id
     name
   }
   character2: character(id: "1002") {
+    id
     name
   }
 }

app/with-dataloader-native-promise.php

@@ -0,0 +1,46 @@
+<?php
+
+use GraphQL\Tests\StarWarsData;
+use Overblog\DataLoader\DataLoader;
+use Overblog\DataLoader\Promise\Adapter\Webonyx\GraphQL\SyncPromiseAdapter;
+use Overblog\PromiseAdapter\Adapter\WebonyxGraphQLSyncPromiseAdapter;
+
+require __DIR__.'/../vendor/autoload.php';
+
+$calls = 0;
+$callsIds = [];
+
+$graphQLSyncPromiseAdapter = new SyncPromiseAdapter();
+$promiseAdapter = new WebonyxGraphQLSyncPromiseAdapter($graphQLSyncPromiseAdapter);
+$batchLoadFn = function ($ids) use (&$calls, &$callsIds, $promiseAdapter) {
+    $callsIds[] = $ids;
+    ++$calls;
+    $allCharacters = StarWarsData::humans() + StarWarsData::droids();
+    $characters = array_intersect_key($allCharacters, array_flip($ids));
+
+    return $promiseAdapter->createAll(array_values($characters));
+};
+$dataLoader = new DataLoader($batchLoadFn, $promiseAdapter);
+
+$schema = createSchema(
+    function ($character) use ($dataLoader) {
+        $promise = $dataLoader->loadMany($character['friends']);
+        return $promise;
+    },
+    function ($root, $args) use ($dataLoader) {
+        $promise = $dataLoader->load($args['id']);
+        return $promise;
+    }
+);
+
+echo "With DataLoader (Using native promise):\n\n";
+
+executeQueries(
+    $schema,
+    $calls,
+    $callsIds,
+    $graphQLSyncPromiseAdapter,
+    function () use ($dataLoader) {
+        $dataLoader->clearAll();
+    }
+);

app/with-dataloader.php

@@ -1,26 +1,25 @@
 <?php
 
 use GraphQL\GraphQL;
-use GraphQL\Executor\Promise\Adapter\ReactPromiseAdapter;
 use GraphQL\Tests\StarWarsData;
-use McGWeb\PromiseFactory\Factory\ReactPromiseFactory;
 use Overblog\DataLoader\DataLoader;
+use Overblog\PromiseAdapter\Adapter\ReactPromiseAdapter;
 use React\Promise\Promise;
 
 require __DIR__.'/../vendor/autoload.php';
 
 $calls = 0;
 $callsIds = [];
-$promiseFactory = new ReactPromiseFactory();
-$batchLoadFn = function ($ids) use (&$calls, &$callsIds, $promiseFactory) {
+$promiseAdapter = new ReactPromiseAdapter();
+$batchLoadFn = function ($ids) use (&$calls, &$callsIds, $promiseAdapter) {
     $callsIds[] = $ids;
     ++$calls;
     $allCharacters = StarWarsData::humans() + StarWarsData::droids();
     $characters = array_intersect_key($allCharacters, array_flip($ids));
 
-    return $promiseFactory->createAll(array_values($characters));
+    return $promiseAdapter->createAll(array_values($characters));
 };
-$dataLoader = new DataLoader($batchLoadFn, $promiseFactory);
+$dataLoader = new DataLoader($batchLoadFn, $promiseAdapter);
 
 $schema = createSchema(
     function ($character) use ($dataLoader) {
@@ -39,13 +38,12 @@ function ($root, $args) use ($dataLoader) {
     }
 );
 
-echo "With DataLoader:\n\n";
-
-GraphQL::setPromiseAdapter(new ReactPromiseAdapter());
+echo "With DataLoader (using reactPHP promise):\n\n";
 executeQueries(
     $schema,
     $calls,
     $callsIds,
+    new \GraphQL\Executor\Promise\Adapter\ReactPromiseAdapter(),
     function () use ($dataLoader) {
         $dataLoader->clearAll();
     },

bin/run

@@ -4,7 +4,12 @@
 $useDataLoader = !empty($_SERVER['argv']) ? in_array('--with-dataloader', $_SERVER['argv']) : false;
 
 if ($useDataLoader) {
-    require __DIR__.'/../app/with-dataloader.php';
+    $useNative = !empty($_SERVER['argv']) ? in_array('--native', $_SERVER['argv']) : false;
+    if ($useNative) {
+        require __DIR__.'/../app/with-dataloader-native-promise.php';
+    } else {
+        require __DIR__.'/../app/with-dataloader.php';
+    }
 } else {
     require __DIR__.'/../app/without-dataloader.php';
 }

composer.json

@@ -1,10 +1,11 @@
 {
     "name": "mcg-web/sandbox-dataloader-graphql-php",
     "type": "project",
+    "minimum-stability": "dev",
     "require": {
         "overblog/dataloader-php": "dev-master",
         "react/promise": "^2.4",
-        "webonyx/graphql-php": "dev-master"
+        "webonyx/graphql-php": "^0.9.0"
     },
     "autoload": {
         "files": [