refactor: add improvements to action interfaces

src/Contracts/Bus/Commands/Dispatcher.php

@@ -19,7 +19,7 @@
 
 namespace LaravelJsonApi\Contracts\Bus\Commands;
 
-use LaravelJsonApi\Core\Bus\Commands\Command;
+use LaravelJsonApi\Core\Bus\Commands\Command\Command;
 use LaravelJsonApi\Core\Bus\Commands\Result;
 
 interface Dispatcher

src/Contracts/Bus/Queries/Dispatcher.php

@@ -19,7 +19,7 @@
 
 namespace LaravelJsonApi\Contracts\Bus\Queries;
 
-use LaravelJsonApi\Core\Bus\Queries\Query;
+use LaravelJsonApi\Core\Bus\Queries\Query\Query;
 use LaravelJsonApi\Core\Bus\Queries\Result;
 
 interface Dispatcher

src/Contracts/Http/Actions/FetchOne.php

@@ -27,20 +27,16 @@
 interface FetchOne extends Responsable
 {
     /**
-     * Set the JSON:API resource type for the action.
+     * Set the target for the action.
      *
-     * @param ResourceType|string $type
-     * @return $this
-     */
-    public function withType(ResourceType|string $type): static;
-
-    /**
-     * Set the JSON:API resource id for the action, or the model (if bindings have been substituted).
+     * A model can be set if the bindings have been substituted, or if the action is being
+     * run manually.
      *
+     * @param ResourceType|string $type
      * @param object|string $idOrModel
      * @return $this
      */
-    public function withIdOrModel(object|string $idOrModel): static;
+    public function withTarget(ResourceType|string $type, object|string $idOrModel): static;
 
     /**
      * Set the object that implements controller hooks.

src/Contracts/Http/Actions/FetchRelated.php

@@ -27,28 +27,21 @@
 interface FetchRelated extends Responsable
 {
     /**
-     * Set the JSON:API resource type for the action.
+     * Set the target for the action.
      *
-     * @param ResourceType|string $type
-     * @return $this
-     */
-    public function withType(ResourceType|string $type): static;
-
-    /**
-     * Set the JSON:API resource id for the action, or the model (if bindings have been substituted).
+     * A model can be set if the bindings have been substituted, or if the action is being
+     * run manually.
      *
+     * @param ResourceType|string $type
      * @param object|string $idOrModel
-     * @return $this
-     */
-    public function withIdOrModel(object|string $idOrModel): static;
-
-    /**
-     * Set the JSON:API field name of the relationship that is being fetched.
-     *
      * @param string $fieldName
      * @return $this
      */
-    public function withFieldName(string $fieldName): static;
+    public function withTarget(
+        ResourceType|string $type,
+        object|string $idOrModel,
+        string $fieldName,
+    ): static;
 
     /**
      * Set the object that implements controller hooks.

src/Contracts/Http/Actions/FetchRelationship.php

@@ -27,28 +27,21 @@
 interface FetchRelationship extends Responsable
 {
     /**
-     * Set the JSON:API resource type for the action.
+     * Set the target for the action.
      *
-     * @param ResourceType|string $type
-     * @return $this
-     */
-    public function withType(ResourceType|string $type): static;
-
-    /**
-     * Set the JSON:API resource id for the action, or the model (if bindings have been substituted).
+     * A model can be set if the bindings have been substituted, or if the action is being
+     * run manually.
      *
+     * @param ResourceType|string $type
      * @param object|string $idOrModel
-     * @return $this
-     */
-    public function withIdOrModel(object|string $idOrModel): static;
-
-    /**
-     * Set the JSON:API field name of the relationship that is being fetched.
-     *
      * @param string $fieldName
      * @return $this
      */
-    public function withFieldName(string $fieldName): static;
+    public function withTarget(
+        ResourceType|string $type,
+        object|string $idOrModel,
+        string $fieldName,
+    ): static;
 
     /**
      * Set the object that implements controller hooks.

src/Contracts/Http/Actions/Update.php

@@ -27,20 +27,16 @@
 interface Update extends Responsable
 {
     /**
-     * Set the JSON:API resource type for the action.
+     * Set the target for the action.
      *
-     * @param ResourceType|string $type
-     * @return $this
-     */
-    public function withType(ResourceType|string $type): static;
-
-    /**
-     * Set the JSON:API resource id for the action, or the model (if bindings have been substituted).
+     * A model can be set if the bindings have been substituted, or if the action is being
+     * run manually.
      *
+     * @param ResourceType|string $type
      * @param object|string $idOrModel
      * @return $this
      */
-    public function withIdOrModel(object|string $idOrModel): static;
+    public function withTarget(ResourceType|string $type, object|string $idOrModel): static;
 
     /**
      * Set the object that implements controller hooks.

src/Core/Bus/Commands/Command.php → src/Core/Bus/Commands/Command/Command.php

@@ -17,7 +17,7 @@
 
 declare(strict_types=1);
 
-namespace LaravelJsonApi\Core\Bus\Commands;
+namespace LaravelJsonApi\Core\Bus\Commands\Command;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\ValidatedInput;

src/Core/Bus/Commands/Concerns/Identifiable.php → src/Core/Bus/Commands/Command/Identifiable.php

@@ -17,7 +17,7 @@
 
 declare(strict_types=1);
 
-namespace LaravelJsonApi\Core\Bus\Commands\Concerns;
+namespace LaravelJsonApi\Core\Bus\Commands\Command;
 
 use RuntimeException;
 

src/Core/Bus/Commands/IsIdentifiable.php → src/Core/Bus/Commands/Command/IsIdentifiable.php

@@ -17,7 +17,7 @@
 
 declare(strict_types=1);
 
-namespace LaravelJsonApi\Core\Bus\Commands;
+namespace LaravelJsonApi\Core\Bus\Commands\Command;
 
 use LaravelJsonApi\Core\Document\Input\Values\ResourceId;
 

src/Core/Bus/Commands/Dispatcher.php

@@ -21,6 +21,7 @@
 
 use Illuminate\Contracts\Container\Container;
 use LaravelJsonApi\Contracts\Bus\Commands\Dispatcher as DispatcherContract;
+use LaravelJsonApi\Core\Bus\Commands\Command\Command;
 use LaravelJsonApi\Core\Bus\Commands\Store\StoreCommand;
 use LaravelJsonApi\Core\Bus\Commands\Store\StoreCommandHandler;
 use LaravelJsonApi\Core\Bus\Commands\Update\UpdateCommand;

src/Core/Bus/Commands/Middleware/LookupModelIfMissing.php

@@ -21,8 +21,8 @@
 
 use Closure;
 use LaravelJsonApi\Contracts\Store\Store;
-use LaravelJsonApi\Core\Bus\Commands\Command;
-use LaravelJsonApi\Core\Bus\Commands\IsIdentifiable;
+use LaravelJsonApi\Core\Bus\Commands\Command\Command;
+use LaravelJsonApi\Core\Bus\Commands\Command\IsIdentifiable;
 use LaravelJsonApi\Core\Bus\Commands\Result;
 use LaravelJsonApi\Core\Document\Error;
 use Symfony\Component\HttpFoundation\Response;

src/Core/Bus/Commands/Store/StoreCommand.php

@@ -21,9 +21,9 @@
 
 use Illuminate\Http\Request;
 use LaravelJsonApi\Contracts\Http\Controllers\Hooks\StoreImplementation;
+use LaravelJsonApi\Core\Bus\Commands\Command\Command;
 use LaravelJsonApi\Core\Document\Input\Values\ResourceType;
 use LaravelJsonApi\Core\Extensions\Atomic\Operations\Create;
-use LaravelJsonApi\Core\Bus\Commands\Command;
 
 class StoreCommand extends Command
 {

src/Core/Bus/Commands/Update/UpdateCommand.php

@@ -21,9 +21,9 @@
 
 use Illuminate\Http\Request;
 use LaravelJsonApi\Contracts\Http\Controllers\Hooks\UpdateImplementation;
-use LaravelJsonApi\Core\Bus\Commands\Command;
-use LaravelJsonApi\Core\Bus\Commands\Concerns\Identifiable;
-use LaravelJsonApi\Core\Bus\Commands\IsIdentifiable;
+use LaravelJsonApi\Core\Bus\Commands\Command\Command;
+use LaravelJsonApi\Core\Bus\Commands\Command\Identifiable;
+use LaravelJsonApi\Core\Bus\Commands\Command\IsIdentifiable;
 use LaravelJsonApi\Core\Document\Input\Values\ResourceId;
 use LaravelJsonApi\Core\Document\Input\Values\ResourceType;
 use LaravelJsonApi\Core\Extensions\Atomic\Operations\Update;

src/Core/Bus/Queries/Dispatcher.php

@@ -21,6 +21,7 @@
 
 use Illuminate\Contracts\Container\Container;
 use LaravelJsonApi\Contracts\Bus\Queries\Dispatcher as DispatcherContract;
+use LaravelJsonApi\Core\Bus\Queries\Query\Query;
 use RuntimeException;
 
 class Dispatcher implements DispatcherContract

src/Core/Bus/Queries/FetchMany/FetchManyQuery.php

@@ -21,7 +21,7 @@
 
 use Illuminate\Http\Request;
 use LaravelJsonApi\Contracts\Http\Controllers\Hooks\IndexImplementation;
-use LaravelJsonApi\Core\Bus\Queries\Query;
+use LaravelJsonApi\Core\Bus\Queries\Query\Query;
 use LaravelJsonApi\Core\Document\Input\Values\ResourceType;
 
 class FetchManyQuery extends Query