Merge pull request #61 from dinhquochan/feature/support-namespace

[Feature] Add support subdirectories in a vendor namespace and global prefix (fixes #60)

src/Component.php

@@ -60,6 +60,11 @@ protected function determineDefaultTag(string $view): string
 
         $tag = kebab_case(end($baseComponentName));
 
+        if (str_contains($view, '::') && ! str_contains($tag, '::')) {
+            $namespace = array_first(explode('::', $view));
+            $tag = "{$namespace}::{$tag}";
+        }
+
         return $tag;
     }
 }

src/ComponentDirectory/NamespacedDirectory.php

@@ -31,7 +31,7 @@ public function getAbsoluteDirectory(): string
             throw CouldNotRegisterComponent::viewPathNotFound($viewPath);
         }
 
-        return $absoluteDirectory;
+        return $viewPath ? "{$absoluteDirectory}/{$viewPath}" : $absoluteDirectory;
     }
 
     public function getViewName(SplFileInfo $viewFile): string

tests/Features/ComponentCompilation/ComponentCompilationTest.php

@@ -115,6 +115,18 @@ public function it_works_with_a_global_prefix()
         $this->assertMatchesViewSnapshot('globalPrefix');
     }
 
+    /** @test */
+    public function a_global_prefix_works_with_namespaced_component()
+    {
+        View::addNamespace('namespaced-components', __DIR__.'/stubs/namespacedComponents');
+
+        BladeX::component('namespaced-components::namespacedCard');
+
+        BladeX::prefix('x');
+
+        $this->assertMatchesViewSnapshot('namespacedGlobalPrefix');
+    }
+
     /** @test */
     public function it_compiles_components_that_use_a_global_function()
     {

tests/Features/ComponentCompilation/__snapshots__/ComponentCompilationTest__a_global_prefix_works_with_namespaced_component__1.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<div>
+  <div class="card">
+    <h1>Profile</h1>
+    <div>My content</div>
+  </div>
+</div>

tests/Features/ComponentCompilation/__snapshots__/ComponentCompilationTest__a_global_prefix_works_with_namespaced_component__2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<div><?php $__env->startComponent(
+           'namespaced-components::namespacedCard',
+           array_merge(app(Spatie\BladeX\ContextStack::class)->read(),
+           ['title' => 'Profile'])
+        ); ?> 
+    My content
+ <?php echo $__env->renderComponent(); ?> 
+</div>

tests/Features/ComponentCompilation/stubs/namespacedComponents/namespacedCard.blade.php

@@ -0,0 +1,4 @@
+<div class="card">
+    <h1>{!! is_array($title) ? $title[0] : $title !!}</h1>
+    <div>{{ $slot }}</div>
+</div>

tests/Features/ComponentCompilation/stubs/views/namespacedGlobalPrefix.blade.php

@@ -0,0 +1,3 @@
+<x-namespaced-components::namespaced-card title="Profile">
+    My content
+</x-namespaced-components::namespaced-card>

tests/Features/Registration/RegistrationTest.php

@@ -166,6 +166,25 @@ public function it_can_register_a_directory_containing_namespaced_view_component
         ], $registeredComponents);
     }
 
+    /** @test */
+    public function it_can_register_a_subdirectory_containing_namespaced_view_components()
+    {
+        View::addNamespace('subdirectory-namespaced-test', __DIR__.'/stubs/components/namespacedComponents');
+
+        BladeX::component('subdirectory-namespaced-test::components.*');
+
+        $registeredComponents = collect(BladeX::registeredComponents())
+            ->mapWithKeys(function (Component $bladeXComponent) {
+                return [$bladeXComponent->tag => $bladeXComponent->view];
+            })
+            ->toArray();
+
+        $this->assertEquals([
+            'context' => 'bladex::context',
+            'subdirectory-namespaced-test::namespaced-view1' => 'subdirectory-namespaced-test::components.namespacedView1',
+        ], $registeredComponents);
+    }
+
     /** @test */
     public function it_overwrites_the_previous_component_when_registering_one_with_the_same_name()
     {

tests/Features/Registration/stubs/components/namespacedComponents/components/namespacedView1.blade.php

@@ -0,0 +1 @@
+namespaced with subdirectory view 1