feat: multiple methods with different namespaces.

Author: ItzNotABug

src/Spec/Spec.php

@@ -105,6 +105,13 @@ abstract public function getServices();
      */
     abstract public function getMethods($service);
 
+    /**
+     * @param array $method
+     * @param string $service
+     * @return string
+     */
+    abstract public function getTargetNamespace(array $method, string $service);
+
     /**
      * @return string
      */

src/Spec/Swagger2.php

@@ -302,7 +302,19 @@ public function getMethods($service)
 
         foreach ($paths as $pathName => $path) {
             foreach ($path as $methodName => $method) {
-                if (!(isset($method['tags']) && is_array($method['tags']) && in_array($service, $method['tags']))) {
+                $isCurrentService = isset($method['tags']) && is_array($method['tags']) && in_array($service, $method['tags']);
+
+                if (!$isCurrentService) {
+                    if (!empty($method['x-appwrite']['methods'] ?? [])) {
+                        foreach ($method['x-appwrite']['methods'] as $additionalMethod) {
+                            // has multiple namespaced methods!
+                            $targetNamespace = $this->getTargetNamespace($additionalMethod, $service);
+
+                            if ($targetNamespace === $service) {
+                                $list[] = $this->handleAdditionalMethods($methodName, $pathName, $method, $additionalMethod);
+                            }
+                        }
+                    }
                     continue;
                 }
 
@@ -312,79 +324,103 @@ public function getMethods($service)
                 }
 
                 foreach ($method['x-appwrite']['methods'] as $additionalMethod) {
-                    $duplicatedMethod = $method;
-                    $duplicatedMethod['x-appwrite']['method'] = $additionalMethod['name'];
-                    $duplicatedMethod['x-appwrite']['auth'] = $additionalMethod['auth'] ?? [];
-
-                    // Update Response
-                    $responses = $additionalMethod['responses'];
-                    $convertedResponse = [];
-
-                    foreach ($responses as $desc) {
-                        $code = $desc['code'];
-                        if (isset($desc['model'])) {
-                            if (\is_array($desc['model'])) {
-                                $convertedResponse[$code] = [
-                                    'schema' => [
-                                        'x-oneOf' => \array_map(fn($model) => [
-                                            '$ref' => $model,
-                                        ], $desc['model']),
-                                    ],
-                                ];
-                                continue;
-                            }
+                    $targetNamespace = $this->getTargetNamespace($additionalMethod, $service);
 
-                            $convertedResponse[$code] = [
-                                'schema' => [
-                                    '$ref' => $desc['model'],
-                                ],
-                            ];
-                        }
+                    if ($targetNamespace === $service) {
+                        $list[] = $this->handleAdditionalMethods($methodName, $pathName, $method, $additionalMethod);
                     }
+                }
+            }
+        }
 
-                    $duplicatedMethod['responses'] = $convertedResponse;
-
-                    // Remove non-whitelisted parameters on body parameters, also set required.
-                    $handleParams = function (&$params) use ($additionalMethod) {
-                        if (isset($additionalMethod['parameters'])) {
-                            foreach ($params as $key => $param) {
-                                if (empty($param['in']) || $param['in'] !== 'body' || empty($param['schema']['properties'])) {
-                                    continue;
-                                }
-
-                                $whitelistedParams = $additionalMethod['parameters'] ?? [];
-
-                                foreach ($param['schema']['properties'] as $paramName => $value) {
-                                    if (!in_array($paramName, $whitelistedParams)) {
-                                        unset($param['schema']['properties'][$paramName]);
-                                    }
-                                }
+        return $list;
+    }
 
-                                $param['schema']['required'] = $additionalMethod['required'] ?? [];
-                                $params[$key] = $param;
-                            }
-                        }
+    /**
+     * @param $methodName
+     * @param $pathName
+     * @param $method
+     * @param $additionalMethod
+     * @return array
+     */
+    private function handleAdditionalMethods($methodName, $pathName, $method, $additionalMethod): array
+    {
+        $duplicatedMethod = $method;
+        $duplicatedMethod['x-appwrite']['method'] = $additionalMethod['name'];
+        $duplicatedMethod['x-appwrite']['auth'] = $additionalMethod['auth'] ?? [];
+
+        // Update Response
+        $responses = $additionalMethod['responses'];
+        $convertedResponse = [];
+
+        foreach ($responses as $desc) {
+            $code = $desc['code'];
+            if (isset($desc['model'])) {
+                if (\is_array($desc['model'])) {
+                    $convertedResponse[$code] = [
+                        'schema' => [
+                            'x-oneOf' => \array_map(fn($model) => [
+                                '$ref' => $model,
+                            ], $desc['model']),
+                        ],
+                    ];
+                    continue;
+                }
 
-                        return;
-                    };
+                $convertedResponse[$code] = [
+                    'schema' => [
+                        '$ref' => $desc['model'],
+                    ],
+                ];
+            }
+        }
 
-                    $handleParams($duplicatedMethod['parameters']);
+        $duplicatedMethod['responses'] = $convertedResponse;
 
-                    // Overwrite description and name if method has one
-                    if (!empty($additionalMethod['name'])) {
-                        $duplicatedMethod['summary'] = $additionalMethod['name'];
+        // Remove non-whitelisted parameters on body parameters, also set required.
+        $handleParams = function (&$params) use ($additionalMethod) {
+            if (isset($additionalMethod['parameters'])) {
+                foreach ($params as $key => $param) {
+                    if (empty($param['in']) || $param['in'] !== 'body' || empty($param['schema']['properties'])) {
+                        continue;
                     }
 
-                    if (!empty($additionalMethod['description'])) {
-                        $duplicatedMethod['description'] = $additionalMethod['description'];
+                    $whitelistedParams = $additionalMethod['parameters'];
+
+                    foreach ($param['schema']['properties'] as $paramName => $value) {
+                        if (!in_array($paramName, $whitelistedParams)) {
+                            unset($param['schema']['properties'][$paramName]);
+                        }
                     }
 
-                    $list[] = $this->parseMethod($methodName, $pathName, $duplicatedMethod);
+                    $param['schema']['required'] = $additionalMethod['required'] ?? [];
+                    $params[$key] = $param;
                 }
             }
+        };
+
+        $handleParams($duplicatedMethod['parameters']);
+
+        // Overwrite description and name if method has one
+        if (!empty($additionalMethod['name'])) {
+            $duplicatedMethod['summary'] = $additionalMethod['name'];
         }
 
-        return $list;
+        if (!empty($additionalMethod['description'])) {
+            $duplicatedMethod['description'] = $additionalMethod['description'];
+        }
+
+        return $this->parseMethod($methodName, $pathName, $duplicatedMethod);
+    }
+
+    /**
+     * @param array $method
+     * @param string $service
+     * @return string
+     */
+    public function getTargetNamespace(array $method, string $service): string
+    {
+        return $method['namespace'] ?? $service;
     }
 
     /**