feat: Implementation of the 'singleton' functionality for storing cla…

…sses and prefixes.

README.md

@@ -30,7 +30,7 @@ php artisan vendor:publish --tag livewire-discover-config
 ``` php
 // Load the namespace to Livewire components.
 'class_namespaces' => [
-	// 'prefix' => '//namespace//',
+	// 'prefix' => 'namespace\\package',
 	'my-components' => 'Namespace\\Livewire',
 	'new-components' => 'User\\Repository\\Livewire',
 ],

src/Exceptions/ComponentNotFoundException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Joserick\LaravelLivewireDiscover\Exceptions;
+
+use Livewire\Exceptions\ComponentNotFoundException as LivewireComponentNotFoundException;
+
+class ComponentNotFoundException extends LivewireComponentNotFoundException
+{
+    public function __construct(array $prefixes, LivewireComponentNotFoundException $previous = null) {
+        parent::__construct('(Also in the prefixes paths: '.implode(', ', array_keys($prefixes)).') '
+        . $previous->getMessage(), 0, $previous);
+    }
+}

src/LaravelLivewireDiscover.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Joserick\LaravelLivewireDiscover;
+
+use Illuminate\Support\Collection;
+use Livewire\Mechanisms\ComponentRegistry;
+
+class LaravelLivewireDiscover extends ComponentRegistry
+{
+    private string $class_namespace;
+    private Collection $class_namespaces;
+
+    /**
+     * Create a new component resolver instance.
+     */
+    public function __construct() {
+        $this->class_namespace = config('livewire.class_namespace');
+        $this->class_namespaces = collect(config('laravel-livewire-discover.class_namespaces'));
+    }
+
+    /**
+     * Add a class / namespace prefix to the resolver.
+     *
+     * @param  string  $prefix
+     * @param  string  $namespace
+     * @return void
+     */
+    public function add(string $prefix, string $namespace) : void
+    {
+        $this->class_namespaces->put($prefix, $namespace);
+    }
+
+    /**
+     * Get the livewire class namespace.
+     *
+     * @return string
+     */
+    public function getClassNamespace() : string
+    {
+        return $this->class_namespace;
+    }
+
+    /**
+     * Get the collection of class namespaces to discover.
+     *
+     * @return string
+     */
+    public function getClassNamespaces() : Collection
+    {
+        return $this->class_namespaces;
+    }
+}

src/LaravelLivewireDiscoverComponentRegistry.php

@@ -4,19 +4,18 @@
 
 use ArrayIterator;
 use Illuminate\Support\Str;
-use Livewire\Exceptions\ComponentNotFoundException;
+use Joserick\LaravelLivewireDiscover\Exceptions\ComponentNotFoundException;
+use Livewire\Exceptions\ComponentNotFoundException as LivewireComponentNotFoundException;
 use Livewire\Mechanisms\ComponentRegistry;
 
 class LaravelLivewireDiscoverComponentRegistry extends ComponentRegistry
 {
     protected function getNameAndClass($nameComponentOrClass)
     {
-        $class_namespace = config('livewire.class_namespace');
-
         $name_class = $this->getNameAndClassDiscovered($nameComponentOrClass,
-            collect(config('laravel-livewire-discover.class_namespaces'))->getIterator());
+            app(LaravelLivewireDiscover::class)->getClassNamespaces()->getIterator());
 
-        config(['livewire.class_namespace' => $class_namespace]);
+        config(['livewire.class_namespace' => app(LaravelLivewireDiscover::class)->getClassNamespace()]);
 
         return $name_class;
     }
@@ -25,15 +24,15 @@ private function getNameAndClassDiscovered($nameComponentOrClass, ArrayIterator
     {
         try {
             return parent::getNameAndClass($nameComponentOrClass);
-        } catch (ComponentNotFoundException $th) {
+        } catch (LivewireComponentNotFoundException $th) {
             if ($class_namespaces->valid()) {
                 if (Str::startsWith($nameComponentOrClass, $class_namespaces->key())) {
                     $nameComponentOrClass = Str::replaceFirst($class_namespaces->key().'-', '', $nameComponentOrClass);
                 }
                 config(['livewire.class_namespace' => $class_namespaces->current()]);
                 $class_namespaces->next();
             } else {
-                throw $th;
+                throw new ComponentNotFoundException($class_namespaces->getArrayCopy(), $th);
             }
 
             return $this->getNameAndClassDiscovered($nameComponentOrClass, $class_namespaces);

src/LaravelLivewireDiscoverManager.php

@@ -6,13 +6,26 @@
 
 class LaravelLivewireDiscoverManager extends LivewireManager
 {
-    public function componentNamespace(string $namespace, string $prefix) {
-        $class_namespaces = collect(config('laravel-livewire-discover.class_namespaces'));
-        $class_namespaces->put($prefix, $namespace);
-        config(['laravel-livewire-discover.class_namespaces' => $class_namespaces->toArray()]);
+    /**
+     * Add a class / namespace prefix to the resolver.
+     *
+     * @param  string  $namespace
+     * @param  string  $prefix
+     * @return void
+     */
+    public function componentNamespace(string $namespace, string $prefix): void
+    {
+        app(LaravelLivewireDiscover::class)->add($prefix, $namespace);
     }
 
-    public function discover(string $namespace, string $prefix)
+    /**
+     * Discover the components of the given namespace.
+     *
+     * @param  string  $namespace
+     * @param  string  $prefix
+     * @return void
+     */
+    public function discover(string $namespace, string $prefix): void
     {
         $this->componentNamespace($namespace, $prefix);
     }

src/LaravelLivewireDiscoverServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Joserick\LaravelLivewireDiscover;
 
-use Illuminate\Support\Facades\Blade;
 use Livewire\LivewireManager;
 use Livewire\Mechanisms\ComponentRegistry;
 use Spatie\LaravelPackageTools\Package;
@@ -22,6 +21,10 @@ public function configurePackage(Package $package): void
             ->name('laravel-livewire-discover')
             ->hasConfigFile('laravel-livewire-discover');
 
+        $this->app->alias(LaravelLivewireDiscover::class, 'laravel-livewire-discover');
+
+        $this->app->singleton(LaravelLivewireDiscover::class);
+
         $this->app->extend(LivewireManager::class, function () {
             return new LaravelLivewireDiscoverManager();
         });