Merge pull request #151 from php-api-clients/optimize-internal-call-routing

Optimize internal call routing

Author: WyriHaximus

composer.json

@@ -17,6 +17,7 @@
         "devizzent/cebe-php-openapi": "^1",
         "eventsauce/object-hydrator": "^1.2",
         "jawira/case-converter": "^3.5",
+        "kwn/number-to-words": "^2.6",
         "league/openapi-psr7-validator": "^0.21",
         "nikic/php-parser": "^4.15",
         "nunomaduro/termwind": "^1.15",

composer.lock

@@ -183,7 +183,6 @@ public function generate(string $namespace, string $namespaceTest, string $confi
                     'Schema' => null,
                     'WebHook' => null,
                     'Router' => null,
-                    'ChunkSize' => null,
                 ]));
             }
 
@@ -425,8 +424,8 @@ private function oneClient(string $namespace, string $namespaceTest, string $con
             $this->configuration,
             $this->configuration->destination->source . DIRECTORY_SEPARATOR,
             $namespace,
+            $paths,
             $operations,
-            $routers,
         );
 
         $webHooksHydrators = [];
@@ -658,8 +657,8 @@ private function subSplitClient(string $namespace, string $namespaceTest, string
             $this->configuration,
             $this->configuration->subSplit->subSplitsDestination . DIRECTORY_SEPARATOR . $this->splitPathPrefix($this->configuration->subSplit->rootPackage, '') . $this->configuration->destination->source,
             $namespace,
+            $paths,
             $operations,
-            $routers,
         );
 
         $this->statusOutput->itemForStep('generating_webhooks', count($webHooks));

src/Generator.php

@@ -15,6 +15,7 @@
 use ApiClients\Tools\OpenApiClientGenerator\Utils;
 use EventSauce\ObjectHydrator\ObjectMapper;
 use Jawira\CaseConverter\Convert;
+use NumberToWords\NumberToWords;
 use PhpParser\Builder\Method;
 use PhpParser\Builder\Param;
 use PhpParser\BuilderFactory;
@@ -353,30 +354,14 @@ public static function generate(Configuration $configuration, string $pathPrefix
             }
         }
 
-//        new Node\Stmt\Switch_(
-//            new Node\Expr\Variable('method'),
-//            iterator_to_array((function (array $sortedOperations) use ($factory): iterable {
-//                foreach ($sortedOperations as $method => $operation) {
-//                    yield new Node\Stmt\Case_(
-//                        new Node\Scalar\String_($method),
-//                        [
-//                            ...self::traverseOperations($operation['operations'], $operation['paths'], 0),
-//                            new Node\Stmt\Break_(),
-//                        ],
-//                    );
-//                }
-//            })($sortedOperations))
-//        )
-
-
         if ($configuration->entryPoints->call) {
             $chunkCountClasses = [];
             $operationsIfs = [];
             foreach ($sortedOperations as $method => $ops) {
                 $opsTmts = [];
                 foreach ($ops as $chunkCount => $moar) {
                     $chunkCountClasses[] = $cc = new ChunkCount(
-                        'ChunkSize\\' . (new Convert($method))->toPascal() . '\\' . (new Convert('cc' . $chunkCount))->toPascal(),
+                        'Router\\' . (new Convert($method))->toPascal() . '\\' . (new Convert(NumberToWords::transformNumber('en', $chunkCount)))->toPascal(),
                         self::traverseOperations($namespace, $moar['operations'], $moar['paths'], 0, $routers),
                     );
 
@@ -734,7 +719,7 @@ public static function generate(Configuration $configuration, string $pathPrefix
         }
 
         foreach ($chunkCountClasses as $chunkCountClass) {
-            yield from self::createChunkCount(
+            yield from self::createRouterChunkSize(
                 $pathPrefix,
                 $namespace,
                 $chunkCountClass,
@@ -1284,7 +1269,7 @@ private static function createRouter(string $pathPrefix, string $namespace, Rout
      *
      * @return iterable<File>
      */
-    private static function createChunkCount(string $pathPrefix, string $namespace, ChunkCount $chunkCount, Method $constructor, array $properties): iterable
+    private static function createRouterChunkSize(string $pathPrefix, string $namespace, ChunkCount $chunkCount, Method $constructor, array $properties): iterable
     {
         $factory = new BuilderFactory();
         $stmt    = $factory->namespace(trim(Utils::dirname($namespace . $chunkCount->className), '\\'));