Skillshare
diff --git a/‎src/FederatedSchema.php
Copy file name to clipboardExpand all lines: src/FederatedSchema.php
+3Lines changed: 3 additions & 0 deletions b/‎src/FederatedSchema.php
Copy file name to clipboardExpand all lines: src/FederatedSchema.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Types/EntityObjectType.php
Copy file name to clipboardExpand all lines: src/Types/EntityObjectType.php
+15-3Lines changed: 15 additions & 3 deletions b/‎src/Types/EntityObjectType.php
Copy file name to clipboardExpand all lines: src/Types/EntityObjectType.php
+15-3Lines changed: 15 additions & 3 deletions
diff --git a/‎test/EntitiesTest.php
Copy file name to clipboardExpand all lines: test/EntitiesTest.php
+21Lines changed: 21 additions & 0 deletions b/‎test/EntitiesTest.php
Copy file name to clipboardExpand all lines: test/EntitiesTest.php
+21Lines changed: 21 additions & 0 deletions
diff --git a/‎test/__snapshots__/EntitiesTest__testCreatingEntityTypeWithCallable__1.yml
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎test/__snapshots__/EntitiesTest__testCreatingEntityTypeWithCallable__1.yml
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
@@ -105,6 +105,9 @@ private function getEntityDirectivesConfig(): array
     private function getQueryTypeConfig(array $config): array
     {
         $queryTypeConfig = $config['query']->config;
+        if (is_callable($queryTypeConfig['fields'])) {
+            $queryTypeConfig['fields'] = $queryTypeConfig['fields']();
+        }
 
         $queryTypeConfig['fields'] = array_merge(
             $queryTypeConfig['fields'],
 
@@ -123,9 +123,15 @@ private function validateReferenceKeys($ref)
 
     private static function validateFields(array $config)
     {
-        Utils::invariant(isset($config['fields']) && is_array($config['fields']), 'Fields must be specified.');
+        if (is_callable($config['fields'])) {
+            $fields = $config['fields']();
+        } else {
+            $fields = $config['fields'];
+        }
+
+        Utils::invariant(isset($fields) && is_array($fields), 'Fields must be specified.');
 
-        foreach ($config['fields'] as $field) {
+        foreach ($fields as $field) {
             if (isset($field['isExternal'])) {
                 Utils::invariant(is_bool($field['isExternal']), "Config property 'isExternal' should be a boolean.");
             }
@@ -142,14 +148,20 @@ private static function validateFields(array $config)
 
     public static function validateKeyFields(array $config)
     {
+        if (is_callable($config['fields'])) {
+            $fields = $config['fields']();
+        } else {
+            $fields = $config['fields'];
+        }
+
         Utils::invariant(
             isset($config['keyFields']) && is_array($config['keyFields']),
             'Entity key fields must be provided and has to be an array.'
         );
 
         foreach ($config['keyFields'] as $keyField) {
             Utils::invariant(
-                array_key_exists($keyField, $config['fields']),
+                array_key_exists($keyField, $fields),
                 'Entity key refers to a field that does not exist in the fields array.'
             );
         }
 
@@ -36,6 +36,27 @@ public function testCreatingEntityType()
         $this->assertMatchesSnapshot($userType->config);
     }
 
+    public function testCreatingEntityTypeWithCallable()
+    {
+        $userTypeKeyFields = ['id', 'email'];
+
+        $userType = new EntityObjectType([
+            'name' => 'User',
+            'keyFields' => $userTypeKeyFields,
+            'fields' => function () {
+                return [
+                    'id' => ['type' => Type::int()],
+                    'email' => ['type' => Type::string()],
+                    'firstName' => ['type' => Type::string()],
+                    'lastName' => ['type' => Type::string()]
+                ];
+            }
+        ]);
+
+        $this->assertEqualsCanonicalizing($userType->getKeyFields(), $userTypeKeyFields);
+        $this->assertMatchesSnapshot($userType->config);
+    }
+
     public function testResolvingEntityReference()
     {
         $expectedRef = [
 
@@ -0,0 +1,5 @@
+name: User
+keyFields:
+    - id
+    - email
+fields: null