chore: merge with master

Author: Ni Nelli

config/entity-generator.php

@@ -22,7 +22,6 @@
         'relation' => 'entity-generator::relation',
         'repository' => 'entity-generator::repository',
         'service' => 'entity-generator::service',
-        'service_with_trait' => 'entity-generator::service_with_trait',
         'controller' => 'entity-generator::controller',
         'request' => 'entity-generator::request',
         'routes' => 'entity-generator::routes',

src/Commands/MakeEntityCommand.php

@@ -90,7 +90,7 @@ class MakeEntityCommand extends Command
     protected $rules = [
         'only' => [
             'only-api' => [ResourceGenerator::class, ControllerGenerator::class, RequestsGenerator::class, TestsGenerator::class],
-            'only-entity' => [MigrationGenerator::class, ModelGenerator::class, ServiceGenerator::class, RepositoryGenerator::class, FactoryGenerator::class, SeederGenerator::class],
+            'only-entity' => [MigrationGenerator::class, ModelGenerator::class, RepositoryGenerator::class, ServiceGenerator::class, FactoryGenerator::class, SeederGenerator::class],
             'only-model' => [ModelGenerator::class],
             'only-repository' => [RepositoryGenerator::class],
             'only-service' => [ServiceGenerator::class],

src/DTO/RelationsDTO.php

@@ -11,9 +11,4 @@ public function __construct(
         public array $belongsToMany = [],
     ) {
     }
-
-    public function toArray(): array
-    {
-        return get_object_vars($this);
-    }
 }

src/Generators/AbstractTestsGenerator.php

@@ -25,6 +25,8 @@ abstract class AbstractTestsGenerator extends EntityGenerator
 
     public function generate(): void
     {
+        $this->createNamespace('factories');
+
         if ($this->canGenerateUserData()) {
             $this->withAuth = true;
         }
@@ -173,7 +175,7 @@ protected function getMockModel($model): array
             return [];
         }
 
-        $factoryNamespace = "{$this->getOrCreateNamespace('factories')}\\{$model}Factory";
+        $factoryNamespace = "{$this->getNamespace('factories')}\\{$model}Factory";
         $factory = $factoryNamespace::new();
 
         return $factory

src/Generators/ControllerGenerator.php

@@ -31,6 +31,8 @@ public function generate(): void
             return;
         }
 
+        $this->createNamespace('controllers');
+
         $controllerContent = $this->getControllerContent($this->model);
 
         $this->saveClass('controllers', "{$this->model}Controller", $controllerContent);
@@ -45,10 +47,10 @@ protected function getControllerContent($model): string
         return $this->getStub('controller', [
             'entity' => $model,
             'requestsFolder' => $model,
-            'namespace' => $this->getOrCreateNamespace('controllers'),
-            'requestsNamespace' => $this->getOrCreateNamespace('requests'),
-            'resourcesNamespace' => $this->getOrCreateNamespace('resources'),
-            'servicesNamespace' => $this->getOrCreateNamespace('services'),
+            'namespace' => $this->getNamespace('controllers'),
+            'requestsNamespace' => $this->getNamespace('requests'),
+            'resourcesNamespace' => $this->getNamespace('resources'),
+            'servicesNamespace' => $this->getNamespace('services'),
         ]);
     }
 
@@ -98,7 +100,7 @@ protected function addUseController(string $routesPath): void
         $routesFileContent = file_get_contents($routesPath);
 
         $stub = $this->getStub('use_routes', [
-            'namespace' => $this->getOrCreateNamespace('controllers'),
+            'namespace' => $this->getNamespace('controllers'),
             'entity' => $this->model
         ]);
 

src/Generators/EntityGenerator.php

@@ -36,7 +36,7 @@ abstract class EntityGenerator
 
     protected $paths = [];
     protected $model;
-    protected $modelSubFolder = null;
+    protected $modelSubFolder = '';
     protected $fields;
     protected $relations = [];
     protected $crudOptions;
@@ -90,11 +90,29 @@ public function __construct()
         $this->paths = config('entity-generator.paths');
     }
 
-    protected function getOrCreateNamespace(string $configPath, ?string $subFolder = null): string
+    protected function getNamespace(string $configPath, ?string $subFolder = null): string
     {
-        $path = when($subFolder, fn () => Str::finish($this->paths[$configPath], '/') . $subFolder, $this->paths[$configPath]);
-        
-        $pathParts = explode('/', $path);
+        $pathParts = $this->getNamespacePathParts($configPath, $subFolder);
+
+        $namespace = array_map(fn (string $part) => ucfirst($part), $pathParts);
+
+        return implode('\\', $namespace);
+    }
+
+    protected function createNamespace(string $configPath, ?string $subFolder = null): void
+    {
+        $path = $this->getPath($configPath, $subFolder);
+
+        $fullPath = base_path($path);
+
+        if (!file_exists($fullPath)) {
+            mkdir($fullPath, 0777, true);
+        }
+    }
+
+    protected function getNamespacePathParts(string $configPath, ?string $subFolder = null): array
+    {
+        $pathParts = explode('/', $this->getPath($configPath, $subFolder));
 
         if (Str::endsWith(Arr::last($pathParts), '.php')) {
             array_pop($pathParts);
@@ -106,17 +124,12 @@ protected function getOrCreateNamespace(string $configPath, ?string $subFolder =
             }
         }
 
-        $namespace = array_map(function (string $part) {
-            return ucfirst($part);
-        }, $pathParts);
-
-        $fullPath = base_path($path);
-
-        if (!file_exists($fullPath)) {
-            mkdir($fullPath, 0777, true);
-        }
+        return $pathParts;
+    }
 
-        return implode('\\', $namespace);
+    protected function getPath(string $configPath, ?string $subFolder = null): string
+    {
+        return when($subFolder, fn () => Str::finish($this->paths[$configPath], '/') . $subFolder, $this->paths[$configPath]);
     }
 
     protected function isFolderHasCorrectCase(string $folder, string $configPath): bool
@@ -239,7 +252,7 @@ protected function getRelatedModels(string $model, string $creatableClass): arra
     protected function generateRelativePath(string $namespace, string $basePath): string
     {
         return Str::after(
-            subject: $this->namespaceToPath($namespace), 
+            subject: $this->namespaceToPath($namespace),
             search: $this->namespaceToPath($basePath) . '/',
         );
     }
@@ -253,7 +266,7 @@ protected function getModelClass(string $model): string
     {
         $subfolder = when($model === $this->model, $this->modelSubFolder);
 
-        $modelNamespace = $this->getOrCreateNamespace('models', $subfolder);
+        $modelNamespace = $this->getNamespace('models', $subfolder);
 
         return "{$modelNamespace}\\{$model}";
     }
@@ -276,4 +289,15 @@ protected function isStubExists(string $stubName, ?string $generationType = null
 
         return true;
     }
+
+    protected function prepareRelations(): array
+    {
+        $result = [];
+
+        foreach ($this->relations as $relationType => $relations) {
+            $result[$relationType] = array_map(fn ($relation) => class_basename($relation), $relations);
+        }
+
+        return $result;
+    }
 }

src/Generators/FactoryGenerator.php

@@ -48,11 +48,13 @@ public function generate(): void
             return;
         }
 
+        $this->createNamespace('factories');
+
         $factoryContent = $this->getStub('factory', [
-            'namespace' => $this->getOrCreateNamespace('factories'),
+            'namespace' => $this->getNamespace('factories'),
             'entity' => $this->model,
             'fields' => $this->prepareFields(),
-            'modelNamespace' => $this->getOrCreateNamespace('models', $this->modelSubFolder),
+            'modelNamespace' => $this->getNamespace('models', $this->modelSubFolder),
         ]);
 
         $this->saveClass('factories', "{$this->model}Factory", $factoryContent);

src/Generators/MigrationGenerator.php

@@ -33,17 +33,6 @@ public function generate(): void
         event(new SuccessCreateMessage("Created a new Migration: {$entities}_create_table"));
     }
 
-    protected function prepareRelations(): array
-    {
-        $result = [];
-
-        foreach ($this->relations->toArray() as $relationType => $relations) {
-            $result[$relationType] = array_map(fn ($relation) => Str::afterLast($relation, '/'), $relations);
-        }
-
-        return $result;
-    }
-
     protected function isJson(string $typeName): bool
     {
         return $typeName === 'json';

src/Generators/ModelGenerator.php

@@ -27,6 +27,8 @@ public function generate(): void
         }
 
         if ($this->isStubExists('model') && (!$this->hasRelations() || $this->isStubExists('relation', 'model'))) {
+            $this->createNamespace('models', $this->modelSubFolder);
+
             $this->prepareRelatedModels();
             $modelContent = $this->getNewModelContent();
 
@@ -48,7 +50,7 @@ protected function getNewModelContent(): string
             'fields' => Arr::collapse($this->fields),
             'relations' => $this->prepareRelations(),
             'casts' => $this->getCasts($this->fields),
-            'namespace' => $this->getOrCreateNamespace('models', $this->modelSubFolder),
+            'namespace' => $this->getNamespace('models', $this->modelSubFolder),
             'importRelations' => $this->getImportedRelations(),
             'anotationProperties' => $this->generateAnnotationProperties($this->fields),
             'hasCarbonField' => !empty($this->fields['timestamp']) || !empty($this->fields['timestamp-required']),
@@ -111,7 +113,7 @@ protected function insertImport(string &$classContent, string $import): void
         }
     }
 
-    public function prepareRelations(): array
+    protected function prepareRelations(): array
     {
         $result = [];
 
@@ -185,12 +187,12 @@ protected function shouldImportRelation(string $relation): bool
     {
         $relationNamespace = when(Str::contains($relation, '/'), fn () => Str::beforeLast($relation, '/'), '');
 
-        return $relationNamespace != $this->modelSubFolder;
+        return $relationNamespace !== $this->modelSubFolder;
     }
 
     protected function generateClassNamespace(string $className, ?string $folder = null): string
     {
-        $path = $this->getOrCreateNamespace('models', $folder);
+        $path = $this->getNamespace('models', $folder);
         $psrPath = Str::replace('/', '\\', $className);
 
         return "{$path}\\{$psrPath}";

src/Generators/NovaResourceGenerator.php

@@ -77,14 +77,16 @@ public function generate(): void
                 return;
             }
 
+            $this->createNamespace('nova');
+
             $novaFields = $this->prepareNovaFields();
 
             $fileContent = $this->getStub('nova_resource', [
                 'model' => $this->model,
                 'fields' => $novaFields,
                 'types' => array_unique(data_get($novaFields, '*.type')),
-                'modelNamespace' => $this->getOrCreateNamespace('models', $this->modelSubFolder),
-                'namespace' => $this->getOrCreateNamespace('nova')
+                'modelNamespace' => $this->getNamespace('models', $this->modelSubFolder),
+                'namespace' => $this->getNamespace('nova')
             ]);
 
             $this->saveClass('nova', "{$this->model}Resource", $fileContent, $this->modelSubFolder);