Introduced applayer commands, and make:resource

Author: mennovanhout

README.md

@@ -24,13 +24,20 @@ sail artisan vendor:publish --tag=ddd-commands
 
 _Config explanation is added inside the published ddd-commands.php file_
 
-## Commands:
+## App layer Commands:
+If you are not using sail please replace "sail" with "php" in commands below
+
+| Command                                                  | Default output path                      | Documentation                                                            |
+|----------------------------------------------------------|------------------------------------------|--------------------------------------------------------------------------|
+| `sail artisan make:resource {app_layer} {domain} {name}` | `src/App/{app_layer}/{domain}/Resources` | [Laravel Documentation](https://laravel.com/docs/9.x/eloquent-resources) |
+
+## Domain Commands:
 If you are not using sail please replace "sail" with "php" in commands below
 
 | Command                                    | Default output path                       | Documentation                                                                   |
 |--------------------------------------------|-------------------------------------------|---------------------------------------------------------------------------------|
-| `sail artisan make:model {domain} {name}`  | `src/Domain/{domain}/Models`              | [Laravel Documentation](https://laravel.com/docs/8.x/eloquent)                  |
-| `sail artisan make:job {domain} {name}`    | `src/Domain/{domain}/Jobs`                | [Laravel Documentation](https://laravel.com/docs/8.x/queues#creating-jobs)      |
-| `sail artisan make:mail {domain} {name}`   | `src/Domain/{domain}/Mails`               | [Laravel Documentation](https://laravel.com/docs/8.x/mail#generating-mailables) |
+| `sail artisan make:model {domain} {name}`  | `src/Domain/{domain}/Models`              | [Laravel Documentation](https://laravel.com/docs/9.x/eloquent)                  |
+| `sail artisan make:job {domain} {name}`    | `src/Domain/{domain}/Jobs`                | [Laravel Documentation](https://laravel.com/docs/9.x/queues#creating-jobs)      |
+| `sail artisan make:mail {domain} {name}`   | `src/Domain/{domain}/Mails`               | [Laravel Documentation](https://laravel.com/docs/9.x/mail#generating-mailables) |
 | `sail artisan make:action {domain} {name}` | `src/Domain/{domain}/Actions`             | (None yet)                                                                      |
 | `sail artisan make:dto {domain} {name}`    | `src/Domain/{domain}/DataTransferObjects` | (None yet)                                                                      |

src/Console/Commands/ResourceMakeCommand.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace DomainDrivenLaravel\Commands\Console\Commands;
+
+use DomainDrivenLaravel\Commands\Console\Traits\AppLayerCommandTrait;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Console\ResourceMakeCommand as Command;
+
+class ResourceMakeCommand extends Command
+{
+    use AppLayerCommandTrait;
+
+    protected $name = 'make:resource';
+    protected $signature = 'make:resource {app_layer} {domain} {name} {--collection}';
+
+    public function __construct()
+    {
+        parent::__construct(new Filesystem());
+    }
+
+    protected function subdirectoryName(): string
+    {
+        return 'Resources';
+    }
+}

src/Console/Traits/AppLayerCommandTrait.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace DomainDrivenLaravel\Commands\Console\Traits;
+
+use Illuminate\Support\Str;
+
+trait AppLayerCommandTrait
+{
+    abstract public function argument($key = null);
+    abstract protected function subdirectoryName(): string;
+
+    protected function rootNamespace(): string
+    {
+        return config('ddd-commands.app_layer.root_namespace');
+    }
+
+    protected function getPath($name): string
+    {
+        $name = Str::replaceFirst($this->rootNamespace(), '', $name);
+
+        return config('ddd-commands.app_layer.path').str_replace('\\', '/', $name).'.php';
+    }
+
+    protected function getDefaultNamespace($rootNamespace): string
+    {
+        $appLayer = ucfirst($this->argument('app_layer'));
+        $domain = ucfirst($this->argument('domain'));
+
+        return "{$rootNamespace}\\{$appLayer}\\{$domain}\\{$this->subdirectoryName()}";
+    }
+}

src/Console/Traits/DomainCommandTrait.php

@@ -16,14 +16,16 @@ protected function rootNamespace(): string
 
     protected function getPath($name): string
     {
+        $name = ucfirst($name);
+
         $name = Str::replaceFirst($this->rootNamespace(), '', $name);
 
         return config('ddd-commands.domain.path').str_replace('\\', '/', $name).'.php';
     }
 
     protected function getDefaultNamespace($rootNamespace): string
     {
-        $domain = $this->argument('domain');
+        $domain = ucfirst($this->argument('domain'));
 
         return "{$rootNamespace}\\{$domain}\\{$this->subdirectoryName()}";
     }

src/Providers/DomainDrivenCommandsProvider.php

@@ -4,6 +4,7 @@
 
 use DomainDrivenLaravel\Commands\Console\Commands\JobMakeCommand;
 use DomainDrivenLaravel\Commands\Console\Commands\MailMakeCommand;
+use DomainDrivenLaravel\Commands\Console\Commands\ResourceMakeCommand;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use DomainDrivenLaravel\Commands\Console\Commands\ActionMakeCommand;
@@ -31,8 +32,9 @@ public function boot()
             [
                 ModelMakeCommand::class,
                 JobMakeCommand::class,
-                MailMakeCommand::class,
                 ActionMakeCommand::class,
+                MailMakeCommand::class,
+                ResourceMakeCommand::class,
                 DataTransferObjectMakeCommand::class,
             ]
         );
@@ -64,6 +66,10 @@ public function register()
         $this->app->extend('command.mail.make', function (\Illuminate\Foundation\Console\MailMakeCommand $command) {
             return new MailMakeCommand;
         });
+
+        $this->app->extend('command.resource.make', function (\Illuminate\Foundation\Console\ResourceMakeCommand $command) {
+            return new ResourceMakeCommand;
+        });
     }
 
     /**
@@ -78,6 +84,7 @@ public function provides(): array
             'command.make.job',
             'command.make.mail',
             'command.make.action',
+            'command.make.resource',
             'command.make.dto',
         ];
     }

src/config/ddd-commands.php

@@ -8,5 +8,9 @@
     'domain' => [
         'root_namespace' => 'Domain',
         'path' => 'src/Domain/'
+    ],
+    'app_layer' => [
+        'root_namespace' => 'App',
+        'path' => 'src/App/'
     ]
 ];