reimplement cdragon

Author: SKarajic

composer.json

@@ -35,7 +35,6 @@
         "symfony/console": "^6.4||^7.0||^8.0",
         "symfony/filesystem": "^6.4||^7.0||^8.0",
         "symfony/finder": "^6.4||^7.0||^8.0",
-        "symfony/http-client": "^6.4||^7.0||^8.0",
         "symfony/yaml": "^6.4||^7.0||^8.0"
     },
     "autoload": {

generator/Definitions/CDragonClientDefinition.php

@@ -9,7 +9,7 @@
 use Phizz\Support\StaticClient;
 
 /**
- * Generates CDragonClient — a thin wrapper that exposes $lol and $tft sub-clients.
+ * Generates AssetClient — a thin wrapper that exposes $lol and $tft sub-clients.
  *
  * @extends Definition<ClassType>
  */
@@ -19,34 +19,36 @@ class CDragonClientDefinition extends Definition implements Writable
 
     public function namespace(): string
     {
-        return $this->resolveNamespace('CDragon');
+        return $this->resolveNamespace('Assets');
     }
 
     public function directory(): string
     {
-        return $this->resolvePath('CDragon');
+        return $this->resolvePath('Assets');
     }
 
     public function imports(): array
     {
         return [
             StaticApi::class,
             StaticClient::class,
+            $this->resolveNamespace('Assets\\Lol').'\\LolClient',
+            $this->resolveNamespace('Assets\\Tft').'\\TftClient',
         ];
     }
 
     public function definition(): ClassType
     {
-        $class = (new ClassType('CDragonClient'))
+        $class = (new ClassType('AssetClient'))
             ->setExtends(StaticApi::class);
 
         $class->addProperty('lol')
-            ->setType($this->resolveNamespace('CDragon').'\\LolClient')
+            ->setType($this->resolveNamespace('Assets\\Lol').'\\LolClient')
             ->setPublic()
             ->setReadOnly();
 
         $class->addProperty('tft')
-            ->setType($this->resolveNamespace('CDragon').'\\TftClient')
+            ->setType($this->resolveNamespace('Assets\\Tft').'\\TftClient')
             ->setPublic()
             ->setReadOnly();
 

generator/Definitions/StaticDataDefinition.php

@@ -30,27 +30,31 @@ class StaticDataDefinition extends Definition implements Writable
      * @param  string|null  $fieldName  When set, overrides class name derivation (used for nested definitions).
      * @param  string  $classPrefix  Prepended to the short class name to avoid collisions in deep nesting.
      * @param  bool  $singularize  When true, singularizes the field name for the class name (used for list fields).
+     * @param  string  $game  'lol' or 'tft' — determines the Assets sub-namespace.
      */
     public function __construct(
         private readonly CDragonEndpoint $endpoint,
         private readonly ?string $parentSlug = null,
         private readonly ?string $fieldName = null,
         private readonly string $classPrefix = '',
         private readonly bool $singularize = false,
+        private readonly string $game = 'lol',
     ) {}
 
     public function namespace(): string
     {
         $slug = $this->parentSlug ?? $this->endpoint->slug;
+        $stem = StaticGameClientDefinition::resolveSlugStem($slug, $this->game);
 
-        return $this->resolveNamespace('CDragon\\'.Str::studly($slug).'\\Objects');
+        return $this->resolveNamespace('Assets\\'.ucfirst($this->game).'\\'.$stem.'\\Objects');
     }
 
     public function directory(): string
     {
         $slug = $this->parentSlug ?? $this->endpoint->slug;
+        $stem = StaticGameClientDefinition::resolveSlugStem($slug, $this->game);
 
-        return $this->resolvePath('CDragon/'.Str::studly($slug).'/Objects');
+        return $this->resolvePath('Assets/'.ucfirst($this->game).'/'.$stem.'/Objects');
     }
 
     public function imports(): array
@@ -159,7 +163,7 @@ public function nestedDefinitions(): array
                 fields: $field->subFields,
             );
 
-            $def = new StaticDataDefinition($subEndpoint, $parentSlug, $field->name, $this->childClassPrefix(), $singularize);
+            $def = new StaticDataDefinition($subEndpoint, $parentSlug, $field->name, $this->childClassPrefix(), $singularize, $this->game);
             $nested[] = $def;
 
             foreach ($def->nestedDefinitions() as $deepNested) {
@@ -180,7 +184,9 @@ private function shortClassName(): string
             return $this->classPrefix.$base.'Data';
         }
 
-        return Str::studly(Str::singular($this->endpoint->slug)).'Data';
+        $stem = StaticGameClientDefinition::resolveSlugStem($this->endpoint->slug, $this->game);
+
+        return Str::singular($stem).'Data';
     }
 
     /**
@@ -227,7 +233,8 @@ private function shouldGenerateNested(CDragonField $field, bool $singularize): b
     private function nestedFqcn(string $fieldName, bool $singularize): string
     {
         $slug = $this->parentSlug ?? $this->endpoint->slug;
-        $ns = $this->resolveNamespace('CDragon\\'.Str::studly($slug).'\\Objects');
+        $stem = StaticGameClientDefinition::resolveSlugStem($slug, $this->game);
+        $ns = $this->resolveNamespace('Assets\\'.ucfirst($this->game).'\\'.$stem.'\\Objects');
         $base = $singularize ? Str::studly(Str::singular($fieldName)) : Str::studly($fieldName);
         $cn = $this->childClassPrefix().$base.'Data';
 

generator/Definitions/StaticGameClientDefinition.php

@@ -5,6 +5,7 @@
 namespace Phizz\Generator\Definitions;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\Helpers as GeneratorHelpers;
 use Phizz\Generator\Interfaces\Writable;
@@ -77,12 +78,12 @@ public function __construct(
 
     public function namespace(): string
     {
-        return $this->resolveNamespace('CDragon');
+        return $this->resolveNamespace('Assets\\'.ucfirst($this->game));
     }
 
     public function directory(): string
     {
-        return $this->resolvePath('CDragon');
+        return $this->resolvePath('Assets/'.ucfirst($this->game));
     }
 
     public function imports(): array
@@ -131,21 +132,31 @@ public function definition(): ClassType
     }
 
     private function resolveMethodName(string $slug): string
+    {
+        return Helpers::formatAttribute(self::resolveSlugStem($slug, $this->game), Helpers::CAMEL_CASE);
+    }
+
+    /**
+     * Applies alias mapping and strips the game prefix from a slug, returning
+     * a StudlyCase stem suitable for directory/namespace generation.
+     */
+    public static function resolveSlugStem(string $slug, string $game): string
     {
         $mapped = self::SLUG_ALIASES[strtolower($slug)] ?? $slug;
 
-        if (str_starts_with(strtolower($mapped), $this->game)) {
-            $mapped = lcfirst(substr($mapped, strlen($this->game)));
+        if (str_starts_with(strtolower($mapped), strtolower($game))) {
+            $mapped = substr($mapped, strlen($game));
         }
 
-        return Helpers::formatAttribute($mapped, Helpers::CAMEL_CASE);
+        return Str::studly($mapped);
     }
 
     private function buildObjectMethod(ClassType $class, CDragonEndpoint $endpoint, string $dataShort, string $methodName, string $dataFqcn): void
     {
         $method = $class->addMethod($methodName)
             ->setReturnType($dataFqcn)
-            ->addComment("@return $dataShort");
+            ->setReturnNullable()
+            ->addComment("@return $dataShort|null");
 
         if ($endpoint->isDirectory) {
             $method->addParameter('id')->setType('int');
@@ -167,7 +178,8 @@ private function buildFlatWithIdMethod(ClassType $class, CDragonEndpoint $endpoi
         $idField = $endpoint->idField;
         $method = $class->addMethod($methodName)
             ->setReturnType(Collection::class.'|'.$dataFqcn)
-            ->addComment("@return Collection<int, $dataShort>|$dataShort");
+            ->setReturnNullable()
+            ->addComment("@return Collection<int, $dataShort>|$dataShort|null");
         $method->addParameter('id')->setType('?int')->setDefaultValue(null);
         $method->setBody(
             'return $this->fetch('."\n".

generator/Generators/AssetGenerator.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Phizz\Generator\Generators;
+
+use Phizz\Generator\Definitions\CDragonClientDefinition;
+use Phizz\Generator\Definitions\Definition;
+use Phizz\Generator\Definitions\StaticDataDefinition;
+use Phizz\Generator\Definitions\StaticGameClientDefinition;
+
+class AssetGenerator extends Generator
+{
+    /**
+     * @return Definition[]
+     */
+    public function definitions(): array
+    {
+        $endpoints = $this->config->endpoints;
+
+        $dataDefinitions = [];
+        $lolEndpoints = [];
+        $lolData = [];
+        $tftEndpoints = [];
+        $tftData = [];
+
+        foreach ($endpoints as $endpoint) {
+            $game = str_starts_with(strtolower($endpoint->slug), 'tft') ? 'tft' : 'lol';
+            $data = new StaticDataDefinition($endpoint, game: $game);
+            $dataDefinitions[] = $data;
+
+            foreach ($data->nestedDefinitions() as $nested) {
+                $dataDefinitions[] = $nested;
+            }
+
+            if ($game === 'tft') {
+                $tftEndpoints[] = $endpoint;
+                $tftData[] = $data;
+            } else {
+                $lolEndpoints[] = $endpoint;
+                $lolData[] = $data;
+            }
+        }
+
+        $lolClientDef = new StaticGameClientDefinition('lol', $lolEndpoints, $lolData);
+        $tftClientDef = new StaticGameClientDefinition('tft', $tftEndpoints, $tftData);
+
+        return [...$dataDefinitions, $lolClientDef, $tftClientDef, new CDragonClientDefinition];
+    }
+}