refactor: many things

AkrilliA · May 21, 2024 · 1cdf9a3 · 1cdf9a3
1 parent 3edcd8d
commit 1cdf9a3
Show file tree

Hide file tree

Showing 55 changed files with 60 additions and 1,521 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
     "suggest": {
         "spatie/laravel-query-builder": "This package is required for Queries.",
         "spatie/laravel-data": "This package is required for DataTransferObjects.",
-        "spatie/laravel-queueable-action": "This package is required for queueable Actions.",
+        "spatie/laravel-queueable-action": "This package is required for queueable actions.",
         "qossmic/deptrac-shim": "This package can help you enforce architectural decisions by Laraval Beyond."
     },
     "config": {

diff --git a/src/Commands/Abstracts/InfrastructureCommand.php b/src/Commands/Abstracts/InfrastructureCommand.php
diff --git a/src/Commands/MakeAppCommand.php b/src/Commands/MakeAppCommand.php
diff --git a/src/Commands/MakeCollectionCommand.php b/src/Commands/MakeCollectionCommand.php
@@ -3,43 +3,22 @@
 namespace AkrilliA\LaravelBeyond\Commands;
 
 use AkrilliA\LaravelBeyond\Commands\Abstracts\DomainCommand;
-use AkrilliA\LaravelBeyond\NameResolver;
 use AkrilliA\LaravelBeyond\Type;
 
 final class MakeCollectionCommand extends DomainCommand
 {
-    protected $signature = 'beyond:make:collection {name} {--model=} {--force}';
+    protected $signature = 'beyond:make:collection {name} {--force}';
 
     protected $description = 'Make a new collection';
 
     protected function getStub(): string
     {
-        return $this->hasOption('model')
-            ? 'collection.stub'
-            : 'collection.plain.stub';
+        return 'collection.stub';
+
     }
 
     public function getType(): Type
     {
         return new Type('Collection');
     }
-
-    public function setup(NameResolver $fqn): void
-    {
-        if ($model = $this->option('model')) {
-            $command = new MakeModelCommand();
-            $fqn = $command->getNameResolver($fqn->getAppOrDomain().'.'.$model);
-
-            $this->mergePlaceholders([
-                '{{ modelNamespace }}' => $fqn->getNamespace(),
-                '{{ modelClassName }}' => $fqn->getClassName(),
-            ]);
-
-            $this->addOnSuccess(function (string $namespace, string $className) use ($fqn) {
-                $this->call(MakeModelCommand::class, [
-                    'name' => $fqn->getCommandNameArgument(),
-                ]);
-            });
-        }
-    }
 }
diff --git a/src/Commands/MakeMiddlewareCommand.php b/src/Commands/MakeMiddlewareCommand.php
diff --git a/src/Commands/MakeMigrationCommand.php b/src/Commands/MakeMigrationCommand.php
diff --git a/src/Commands/MakeNotificationCommand.php b/src/Commands/MakeNotificationCommand.php
diff --git a/src/Commands/MakePolicyCommand.php b/src/Commands/MakePolicyCommand.php
@@ -2,40 +2,22 @@
 
 namespace AkrilliA\LaravelBeyond\Commands;
 
-use AkrilliA\LaravelBeyond\Commands\Abstracts\DomainCommand;
-use AkrilliA\LaravelBeyond\NameResolver;
+use AkrilliA\LaravelBeyond\Commands\Abstracts\ApplicationCommand;
 use AkrilliA\LaravelBeyond\Type;
-use Illuminate\Support\Str;
 
-final class MakePolicyCommand extends DomainCommand
+final class MakePolicyCommand extends ApplicationCommand
 {
-    protected $signature = 'beyond:make:policy {name} {--model=} {--force}';
+    protected $signature = 'beyond:make:policy {name} {--force}';
 
     protected $description = 'Make a new policy';
 
     protected function getStub(): string
     {
-        return $this->option('model')
-            ? 'policy.stub'
-            : 'policy.plain.stub';
+        return 'policy.stub';
     }
 
     public function getType(): Type
     {
         return new Type('Policy');
     }
-
-    public function setup(NameResolver $fqn): void
-    {
-        if ($model = $this->option('model')) {
-            $command = new MakeModelCommand();
-            $fqn = $command->getNameResolver($fqn->getAppOrDomain().'.'.$model);
-
-            $this->mergePlaceholders([
-                '{{ modelNamespace }}' => $fqn->getNamespace(),
-                '{{ modelClassName }}' => $fqn->getClassName(),
-                '{{ modelVariable }}'  => Str::camel($fqn->getClassName()),
-            ]);
-        }
-    }
 }
diff --git a/src/Commands/MakeQueryCommand.php b/src/Commands/MakeQueryCommand.php
@@ -3,43 +3,21 @@
 namespace AkrilliA\LaravelBeyond\Commands;
 
 use AkrilliA\LaravelBeyond\Commands\Abstracts\ApplicationCommand;
-use AkrilliA\LaravelBeyond\NameResolver;
 use AkrilliA\LaravelBeyond\Type;
 
 final class MakeQueryCommand extends ApplicationCommand
 {
-    protected $signature = 'beyond:make:query {name} {--model=} {--force}';
+    protected $signature = 'beyond:make:query {name} {--force}';
 
     protected $description = 'Make a new query';
 
     protected function getStub(): string
     {
-        return $this->option('model')
-            ? 'query.stub'
-            : 'query.plain.stub';
+        return 'query.stub';
     }
 
     public function getType(): Type
     {
         return new Type('Query');
     }
-
-    public function setup(NameResolver $nameResolver): void
-    {
-        if ($model = $this->option('model')) {
-            $command = new MakeModelCommand();
-            $fqn = $command->getNameResolver($nameResolver->getAppOrDomain().'.'.$model);
-
-            $this->mergePlaceholders([
-                '{{ modelNamespace }}' => $fqn->getNamespace(),
-                '{{ modelClassName }}' => $fqn->getClassName(),
-            ]);
-
-            $this->addOnSuccess(function (string $namespace, string $className) use ($fqn) {
-                $this->call(MakeModelCommand::class, [
-                    'name' => $fqn->getCommandNameArgument(),
-                ]);
-            });
-        }
-    }
 }
diff --git a/src/Commands/PublishDeptracCommand.php b/src/Commands/PublishDeptracCommand.php
diff --git a/src/Exceptions/AppDoesNotExistsException.php b/src/Exceptions/AppDoesNotExistsException.php