Support namespaced Resources + suffix name

src/Generators/ControllerGenerator.php

@@ -139,16 +139,8 @@ protected function buildMethods(Controller $controller)
                     $body .= self::INDENT.$statement->output().PHP_EOL;
                 } elseif ($statement instanceof ResourceStatement) {
                     $fqcn = config('blueprint.namespace').'\\Http\\Resources\\'.($controller->namespace() ? $controller->namespace().'\\' : '').$statement->name();
-
                     $method = str_replace('* @return \\Illuminate\\Http\\Response', '* @return \\'.$fqcn, $method);
-
-                    $import = $fqcn;
-                    if (!$statement->collection()) {
-                        $import .= ' as '.$statement->name().'Resource';
-                    }
-
-                    $this->addImport($controller, $import);
-
+                    $this->addImport($controller, $fqcn);
                     $body .= self::INDENT.$statement->output().PHP_EOL;
                 } elseif ($statement instanceof RedirectStatement) {
                     $body .= self::INDENT.$statement->output().PHP_EOL;

src/Models/Statements/ResourceStatement.php

@@ -31,10 +31,10 @@ public function __construct(string $reference, bool $collection = false, bool $p
     public function name(): string
     {
         if ($this->collection()) {
-            return  Str::studly(Str::singular($this->reference)) . 'Collection';
+            return Str::studly(Str::singular($this->reference)) . 'Collection';
         }
 
-        return  Str::studly(Str::singular($this->reference));
+        return Str::studly(Str::singular($this->reference)) . 'Resource';
     }
 
     public function reference(): string
@@ -55,11 +55,6 @@ public function paginate(): bool
     public function output(): string
     {
         $code = 'return new ' . $this->name();
-
-        if (!$this->collection()) {
-            $code .= 'Resource';
-        }
-
         $code .= '($' . $this->reference();
 
         if ($this->paginate()) {

tests/Feature/Generator/Statements/ResourceGeneratorTest.php

@@ -83,10 +83,10 @@ public function output_writes_resources_for_render_statements()
 
         $this->files->expects('exists')
             ->twice()
-            ->with('app/Http/Resources/User.php')
+            ->with('app/Http/Resources/UserResource.php')
             ->andReturns(false, true);
         $this->files->expects('put')
-            ->with('app/Http/Resources/User.php', $this->fixture('resources/user.php'));
+            ->with('app/Http/Resources/UserResource.php', $this->fixture('resources/user.php'));
 
         $this->files->expects('exists')
             ->twice()
@@ -98,7 +98,7 @@ public function output_writes_resources_for_render_statements()
         $tokens = $this->blueprint->parse($this->fixture('drafts/resource-statements.yaml'));
         $tree = $this->blueprint->analyze($tokens);
 
-        $this->assertEquals(['created' => ['app/Http/Resources/UserCollection.php', 'app/Http/Resources/User.php']], $this->subject->output($tree));
+        $this->assertEquals(['created' => ['app/Http/Resources/UserCollection.php', 'app/Http/Resources/UserResource.php']], $this->subject->output($tree));
     }
 
     /**
@@ -118,10 +118,10 @@ public function output_writes_namespaced_classes()
 
         $this->files->expects('exists')
             ->times(3)
-            ->with('app/Http/Resources/Api/Certificate.php')
+            ->with('app/Http/Resources/Api/CertificateResource.php')
             ->andReturns(false, true, true);
         $this->files->expects('put')
-            ->with('app/Http/Resources/Api/Certificate.php', $this->fixture('resources/certificate.php'));
+            ->with('app/Http/Resources/Api/CertificateResource.php', $this->fixture('resources/certificate.php'));
 
         $this->files->expects('exists')
             ->with('app/Http/Resources/Api/CertificateCollection.php')
@@ -133,7 +133,7 @@ public function output_writes_namespaced_classes()
         $tree = $this->blueprint->analyze($tokens);
 
         $this->assertEquals([
-            'created' => ['app/Http/Resources/Api/CertificateCollection.php', 'app/Http/Resources/Api/Certificate.php'],
+            'created' => ['app/Http/Resources/Api/CertificateCollection.php', 'app/Http/Resources/Api/CertificateResource.php'],
         ], $this->subject->output($tree));
     }
 }

tests/Feature/Lexers/StatementLexerTest.php

@@ -663,7 +663,7 @@ public function it_returns_a_resource_statement()
         $this->assertCount(1, $actual);
         $this->assertInstanceOf(ResourceStatement::class, $actual[0]);
 
-        $this->assertEquals('User', $actual[0]->name());
+        $this->assertEquals('UserResource', $actual[0]->name());
         $this->assertEquals('user', $actual[0]->reference());
         $this->assertFalse($actual[0]->collection());
         $this->assertFalse($actual[0]->paginate());

tests/fixtures/controllers/api-routes-example.php

@@ -6,8 +6,8 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Api\CertificateStoreRequest;
 use App\Http\Requests\Api\CertificateUpdateRequest;
-use App\Http\Resources\Api\Certificate as CertificateResource;
 use App\Http\Resources\Api\CertificateCollection;
+use App\Http\Resources\Api\CertificateResource;
 use Illuminate\Http\Request;
 
 class CertificateController extends Controller
@@ -25,7 +25,7 @@ public function index(Request $request)
 
     /**
      * @param \App\Http\Requests\Api\CertificateStoreRequest $request
-     * @return \App\Http\Resources\Api\Certificate
+     * @return \App\Http\Resources\Api\CertificateResource
      */
     public function store(CertificateStoreRequest $request)
     {
@@ -37,7 +37,7 @@ public function store(CertificateStoreRequest $request)
     /**
      * @param \Illuminate\Http\Request $request
      * @param \App\Certificate $certificate
-     * @return \App\Http\Resources\Api\Certificate
+     * @return \App\Http\Resources\Api\CertificateResource
      */
     public function show(Request $request, Certificate $certificate)
     {
@@ -47,7 +47,7 @@ public function show(Request $request, Certificate $certificate)
     /**
      * @param \App\Http\Requests\Api\CertificateUpdateRequest $request
      * @param \App\Certificate $certificate
-     * @return \App\Http\Resources\Api\Certificate
+     * @return \App\Http\Resources\Api\CertificateResource
      */
     public function update(CertificateUpdateRequest $request, Certificate $certificate)
     {

tests/fixtures/controllers/certificate-controller.php

@@ -5,8 +5,8 @@
 use App\Certificate;
 use App\Http\Requests\CertificateStoreRequest;
 use App\Http\Requests\CertificateUpdateRequest;
-use App\Http\Resources\Certificate as CertificateResource;
 use App\Http\Resources\CertificateCollection;
+use App\Http\Resources\CertificateResource;
 use Illuminate\Http\Request;
 
 class CertificateController extends Controller
@@ -24,7 +24,7 @@ public function index(Request $request)
 
     /**
      * @param \App\Http\Requests\CertificateStoreRequest $request
-     * @return \App\Http\Resources\Certificate
+     * @return \App\Http\Resources\CertificateResource
      */
     public function store(CertificateStoreRequest $request)
     {
@@ -36,7 +36,7 @@ public function store(CertificateStoreRequest $request)
     /**
      * @param \Illuminate\Http\Request $request
      * @param \App\Certificate $certificate
-     * @return \App\Http\Resources\Certificate
+     * @return \App\Http\Resources\CertificateResource
      */
     public function show(Request $request, Certificate $certificate)
     {
@@ -46,7 +46,7 @@ public function show(Request $request, Certificate $certificate)
     /**
      * @param \App\Http\Requests\CertificateUpdateRequest $request
      * @param \App\Certificate $certificate
-     * @return \App\Http\Resources\Certificate
+     * @return \App\Http\Resources\CertificateResource
      */
     public function update(CertificateUpdateRequest $request, Certificate $certificate)
     {

tests/fixtures/controllers/certificate-type-controller.php

@@ -5,8 +5,8 @@
 use App\CertificateType;
 use App\Http\Requests\CertificateTypeStoreRequest;
 use App\Http\Requests\CertificateTypeUpdateRequest;
-use App\Http\Resources\CertificateType as CertificateTypeResource;
 use App\Http\Resources\CertificateTypeCollection;
+use App\Http\Resources\CertificateTypeResource;
 use Illuminate\Http\Request;
 
 class CertificateTypeController extends Controller
@@ -24,7 +24,7 @@ public function index(Request $request)
 
     /**
      * @param \App\Http\Requests\CertificateTypeStoreRequest $request
-     * @return \App\Http\Resources\CertificateType
+     * @return \App\Http\Resources\CertificateTypeResource
      */
     public function store(CertificateTypeStoreRequest $request)
     {
@@ -36,7 +36,7 @@ public function store(CertificateTypeStoreRequest $request)
     /**
      * @param \Illuminate\Http\Request $request
      * @param \App\CertificateType $certificateType
-     * @return \App\Http\Resources\CertificateType
+     * @return \App\Http\Resources\CertificateTypeResource
      */
     public function show(Request $request, CertificateType $certificateType)
     {
@@ -46,7 +46,7 @@ public function show(Request $request, CertificateType $certificateType)
     /**
      * @param \App\Http\Requests\CertificateTypeUpdateRequest $request
      * @param \App\CertificateType $certificateType
-     * @return \App\Http\Resources\CertificateType
+     * @return \App\Http\Resources\CertificateTypeResource
      */
     public function update(CertificateTypeUpdateRequest $request, CertificateType $certificateType)
     {

tests/fixtures/controllers/custom-models-namespace.php

@@ -4,8 +4,8 @@
 
 use App\Http\Requests\TagStoreRequest;
 use App\Http\Requests\TagUpdateRequest;
-use App\Http\Resources\Tag as TagResource;
 use App\Http\Resources\TagCollection;
+use App\Http\Resources\TagResource;
 use App\Models\Tag;
 use Illuminate\Http\Request;
 
@@ -24,7 +24,7 @@ public function index(Request $request)
 
     /**
      * @param \App\Http\Requests\TagStoreRequest $request
-     * @return \App\Http\Resources\Tag
+     * @return \App\Http\Resources\TagResource
      */
     public function store(TagStoreRequest $request)
     {
@@ -36,7 +36,7 @@ public function store(TagStoreRequest $request)
     /**
      * @param \Illuminate\Http\Request $request
      * @param \App\Models\Tag $tag
-     * @return \App\Http\Resources\Tag
+     * @return \App\Http\Resources\TagResource
      */
     public function show(Request $request, Tag $tag)
     {
@@ -46,7 +46,7 @@ public function show(Request $request, Tag $tag)
     /**
      * @param \App\Http\Requests\TagUpdateRequest $request
      * @param \App\Models\Tag $tag
-     * @return \App\Http\Resources\Tag
+     * @return \App\Http\Resources\TagResource
      */
     public function update(TagUpdateRequest $request, Tag $tag)
     {

tests/fixtures/controllers/resource-statements.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\User as UserResource;
 use App\Http\Resources\UserCollection;
+use App\Http\Resources\UserResource;
 use App\User;
 use Illuminate\Http\Request;
 
@@ -20,7 +20,7 @@ public function index(Request $request)
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @return \App\Http\Resources\User
+     * @return \App\Http\Resources\UserResource
      */
     public function store(Request $request)
     {
@@ -30,7 +30,7 @@ public function store(Request $request)
     /**
      * @param \Illuminate\Http\Request $request
      * @param \App\User $user
-     * @return \App\Http\Resources\User
+     * @return \App\Http\Resources\UserResource
      */
     public function show(Request $request, User $user)
     {

tests/fixtures/resources/certificate.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class Certificate extends JsonResource
+class CertificateResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

tests/fixtures/resources/user.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class User extends JsonResource
+class UserResource extends JsonResource
 {
     /**
      * Transform the resource into an array.