wip

Author: brendt

packages/view/src/ViewComponentDiscovery.php

@@ -9,6 +9,7 @@
 use Tempest\Discovery\DiscoveryLocation;
 use Tempest\Discovery\IsDiscovery;
 use Tempest\Reflection\ClassReflector;
+use Tempest\Support\Str\ImmutableString;
 use Tempest\View\Components\AnonymousViewComponent;
 
 use function Tempest\Support\str;
@@ -43,38 +44,47 @@ public function discoverPath(DiscoveryLocation $location, string $path): void
             return;
         }
 
+        $contents = str(file_get_contents($path))->ltrim();
+
+        if ($contents->contains('<x-component name="')) {
+            $this->registerElementComponent(
+                location: $location,
+                path: $path,
+                contents: $contents,
+            );
+
+            return;
+        }
+
         $fileName = str(pathinfo($path, PATHINFO_FILENAME))->before('.');
 
-        $contents = str(file_get_contents($path))->ltrim();
+        if ($fileName->startsWith('x-')) {
+            $this->registerFileComponent(
+                location: $location,
+                path: $path,
+                fileName: $fileName,
+                contents: $contents,
+            );
+        }
+    }
 
-        preg_match('/(?<header>(.|\n)*?)<x-component/', $contents->toString(), $header);
-        $header = $header['header'] ?? null;
+    private function registerElementComponent(DiscoveryLocation $location, string $path, ImmutableString $contents): void
+    {
+        $header = $contents
+            ->before('<x-component name="')
+            ->toString();
 
-        preg_match('/(.|\n)*?<x-component name="(?<name>[\w\-]+)">/', $contents->toString(), $name);
-        $name = $name['name'] ?? null;
+        $name = $contents
+            ->afterFirst('<x-component name="')
+            ->before('"')
+            ->toString();
 
         $view = trim(preg_replace(
             ['/^(.|\n)*?<x-component name="[\w\-]+">/', '/<\/x-component>$/'],
             '',
             $contents->toString(),
         ) ?? '');
 
-        if ($fileName->startsWith('x-') && $name === null) {
-            $this->discoveryItems->add($location, [
-                $fileName->toString(),
-                new AnonymousViewComponent(
-                    contents: $view ?: $contents->toString(),
-                    file: $path,
-                ),
-            ]);
-
-            return;
-        }
-
-        if ($name === null || $header === null) {
-            return;
-        }
-
         $this->discoveryItems->add($location, [
             $name,
             new AnonymousViewComponent(
@@ -84,6 +94,21 @@ public function discoverPath(DiscoveryLocation $location, string $path): void
         ]);
     }
 
+    private function registerFileComponent(
+        DiscoveryLocation $location,
+        string $path,
+        ImmutableString $fileName,
+        ImmutableString $contents
+    ): void {
+        $this->discoveryItems->add($location, [
+            $fileName->toString(),
+            new AnonymousViewComponent(
+                contents: $contents->toString(),
+                file: $path,
+            ),
+        ]);
+    }
+
     public function apply(): void
     {
         foreach ($this->discoveryItems as [$name, $viewComponent]) {