temp

Author: soyuka

src/GraphQl/Type/FieldsBuilder.php

@@ -497,58 +497,85 @@ private function getResourceFieldConfiguration(?string $property, ?string $field
      */
     private function getParameterArgs(Operation $operation, array $args = []): array
     {
+        $groups = [];
+
         foreach ($operation->getParameters() ?? [] as $parameter) {
             $key = $parameter->getKey();
 
-            if (!str_contains($key, ':property')) {
-                $args[$key] = ['type' => GraphQLType::string()];
-
-                if ($parameter->getRequired()) {
-                    $args[$key]['type'] = GraphQLType::nonNull($args[$key]['type']);
+            if (str_contains($key, ':property')) {
+                if (!($filterId = $parameter->getFilter()) || !$this->filterLocator->has($filterId)) {
+                    continue;
                 }
 
-                continue;
-            }
+                $filter = $this->filterLocator->get($filterId);
+                $parsedKey = explode('[:property]', $key);
+                $flattenFields = [];
 
-            if (!($filterId = $parameter->getFilter()) || !$this->filterLocator->has($filterId)) {
-                continue;
-            }
-
-            $filter = $this->filterLocator->get($filterId);
-            $parsedKey = explode('[:property]', $key);
-            $flattenFields = [];
+                if ($filter instanceof FilterInterface) {
+                    foreach ($filter->getDescription($operation->getClass()) as $name => $value) {
+                        $values = [];
+                        parse_str($name, $values);
+                        if (isset($values[$parsedKey[0]])) {
+                            $values = $values[$parsedKey[0]];
+                        }
 
-            if ($filter instanceof FilterInterface) {
-                foreach ($filter->getDescription($operation->getClass()) as $name => $value) {
-                    $values = [];
-                    parse_str($name, $values);
-                    if (isset($values[$parsedKey[0]])) {
-                        $values = $values[$parsedKey[0]];
+                        $name = key($values);
+                        $flattenFields[] = ['name' => $name, 'required' => $value['required'] ?? null, 'description' => $value['description'] ?? null, 'leafs' => $values[$name], 'type' => $value['type'] ?? 'string'];
                     }
 
-                    $name = key($values);
-                    $flattenFields[] = ['name' => $name, 'required' => $value['required'] ?? null, 'description' => $value['description'] ?? null, 'leafs' => $values[$name], 'type' => $value['type'] ?? 'string'];
+                    $args[$parsedKey[0]] = $this->parameterToObjectType($flattenFields, $parsedKey[0]);
                 }
 
-                $args[$parsedKey[0]] = $this->parameterToObjectType($flattenFields, $parsedKey[0]);
-            }
+                if ($filter instanceof OpenApiParameterFilterInterface) {
+                    foreach ($filter->getOpenApiParameters($parameter) as $value) {
+                        $values = [];
+                        parse_str($value->getName(), $values);
+                        if (isset($values[$parsedKey[0]])) {
+                            $values = $values[$parsedKey[0]];
+                        }
 
-            if ($filter instanceof OpenApiParameterFilterInterface) {
-                foreach ($filter->getOpenApiParameters($parameter) as $value) {
-                    $values = [];
-                    parse_str($value->getName(), $values);
-                    if (isset($values[$parsedKey[0]])) {
-                        $values = $values[$parsedKey[0]];
+                        $name = key($values);
+                        $flattenFields[] = ['name' => $name, 'required' => $value->getRequired(), 'description' => $value->getDescription(), 'leafs' => $values[$name], 'type' => $value->getSchema()['type'] ?? 'string'];
                     }
 
-                    $name = key($values);
-                    $flattenFields[] = ['name' => $name, 'required' => $value->getRequired(), 'description' => $value->getDescription(), 'leafs' => $values[$name], 'type' => $value->getSchema()['type'] ?? 'string'];
+                    $args[$parsedKey[0]] = $this->parameterToObjectType($flattenFields, $parsedKey[0].$operation->getShortName().$operation->getName());
                 }
 
-                $args[$parsedKey[0]] = $this->parameterToObjectType($flattenFields, $parsedKey[0].$operation->getShortName().$operation->getName());
+                continue;
+            }
+
+            if (str_contains($key, '[')) {
+                $key = str_replace('.', $this->nestingSeparator, $key);
+                parse_str($key, $values);
+                $rootKey = key($values);
+
+                $leafs = $values[$rootKey];
+                $name = key($leafs);
+
+                $groups[$rootKey][] = [
+                    'name' => $name,
+                    'leafs' => $leafs[$name],
+                    'required' => $parameter->getRequired(),
+                    'description' => $parameter->getDescription(),
+                    'type' => 'string',
+                ];
+                continue;
+            }
+
+            $args[$key] = ['type' => GraphQLType::string()];
+
+            if ($parameter->getRequired()) {
+                $args[$key]['type'] = GraphQLType::nonNull($args[$key]['type']);
             }
         }
 
+        foreach ($groups as $key => $flattenFields) {
+            $name = $key.$operation->getShortName().$operation->getName();
+            $inputObject = $this->parameterToObjectType($flattenFields, $name);
+            $this->typesContainer->set($name, $inputObject);
+            $args[$key] = $inputObject;
+        }
+
         return $args;
     }
 
@@ -743,4 +770,3 @@ private function normalizePropertyName(string $property, string $resourceClass):
         return $this->nameConverter->normalize($property, $resourceClass);
     }
 }
-

src/Laravel/workbench/app/Models/Slot.php

@@ -36,6 +36,7 @@
         new Patch(),
         new Delete(),
     ],
+    graphQlOperations: []
 )]
 class Slot extends Model
 {