perf(view): improve view component discovery performance (#1191)

Author: brendt

packages/support/src/Regex/functions.php

@@ -77,21 +77,25 @@ function get_all_matches(
     }
 
     /**
-     * Returns the specified match of `$pattern` in `$subject`. If no match is specified, returns the first group.
+     * Returns the specified match of `$pattern` in `$subject`. If no match is specified, returns the whole matching array.
      *
      * @param non-empty-string $pattern The pattern to match against.
      * @param 0|256|512|768 $flags
      */
     function get_match(
         Stringable|string $subject,
         Stringable|string $pattern,
-        array|Stringable|int|string $match = 1,
+        null|array|Stringable|int|string $match = null,
         mixed $default = null,
         int $flags = 0,
         int $offset = 0,
     ): null|int|string|array {
         $result = get_matches($subject, $pattern, false, $flags, $offset);
 
+        if ($match === null) {
+            return $result;
+        }
+
         if (is_array($match)) {
             return arr($result)
                 ->filter(fn ($_, string|int $key) => in_array($key, $match, strict: false)) // @mago-expect strictness/require-strict-behavior

packages/support/tests/Regex/FunctionsTest.php

@@ -85,7 +85,7 @@ public function test_get_match(): void
     {
         $this->assertSame('10', get_match('10-abc', '/(?<id>\d+)-.*/', match: 'id'));
         $this->assertSame('10', get_match('10-abc', '/(\d+)-.*/', match: 1));
-        $this->assertSame('10', get_match('10-abc', '/(\d+)-.*/'));
+        $this->assertSame([0 => '10-abc', 1 => '10'], get_match('10-abc', '/(\d+)-.*/'));
         $this->assertSame('10-abc', get_match('10-abc', '/\d+-.*/', match: 0));
         $this->assertSame(null, get_match('10-abc', '/\d+-.*/', match: 1));
 

packages/view/src/Elements/ElementFactory.php

@@ -7,6 +7,7 @@
 use Tempest\Container\Container;
 use Tempest\Core\AppConfig;
 use Tempest\View\Attributes\PhpAttribute;
+use Tempest\View\Components\AnonymousViewComponent;
 use Tempest\View\Components\DynamicViewComponent;
 use Tempest\View\Element;
 use Tempest\View\Parser\TempestViewCompiler;

packages/view/src/Parser/TempestViewCompiler.php

@@ -200,7 +200,9 @@ private function cleanupCompiled(string $compiled): string
                 return $matches[0];
             }
 
-            $imports[$matches[0]] = $matches[0];
+            $import = trim($matches[0]);
+
+            $imports[$import] = $import;
 
             return '';
         });

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,35 +44,61 @@ public function discoverPath(DiscoveryLocation $location, string $path): void
             return;
         }
 
-        $fileName = str(pathinfo($path, PATHINFO_FILENAME))->before('.');
         $contents = str(file_get_contents($path))->ltrim();
 
-        preg_match(
-            pattern: '/(?<header>(.|\n)*?)<x-component name="(?<name>[\w\-]+)">(?<view>(.|\n)*?)<\/x-component>/',
-            subject: $contents->toString(),
-            matches: $matches,
-        );
-
-        if ($fileName->startsWith('x-') && ! isset($matches['name'])) {
-            $this->discoveryItems->add($location, [
-                $fileName->toString(),
-                new AnonymousViewComponent(
-                    contents: $matches['view'] ?? $contents->toString(),
-                    file: $path,
-                ),
-            ]);
+        $fileName = str(pathinfo($path, PATHINFO_FILENAME))->before('.');
 
-            return;
+        if ($fileName->startsWith('x-')) {
+            $this->registerFileComponent(
+                location: $location,
+                path: $path,
+                fileName: $fileName,
+                contents: $contents,
+            );
+        } elseif ($contents->contains('<x-component name="')) {
+            $this->registerElementComponent(
+                location: $location,
+                path: $path,
+                contents: $contents,
+            );
         }
+    }
 
-        if (! isset($matches['name'], $matches['header'])) {
-            return;
-        }
+    private function registerElementComponent(DiscoveryLocation $location, string $path, ImmutableString $contents): void
+    {
+        $header = $contents
+            ->before('<x-component name="')
+            ->toString();
+
+        $name = $contents
+            ->afterFirst('<x-component name="')
+            ->before('"')
+            ->toString();
+
+        $view = $contents
+            ->afterFirst('<x-component name="' . $name . '">')
+            ->beforeLast('</x-component>')
+            ->toString();
+
+        $this->discoveryItems->add($location, [
+            $name,
+            new AnonymousViewComponent(
+                contents: $header . $view,
+                file: $path,
+            ),
+        ]);
+    }
 
+    private function registerFileComponent(
+        DiscoveryLocation $location,
+        string $path,
+        ImmutableString $fileName,
+        ImmutableString $contents,
+    ): void {
         $this->discoveryItems->add($location, [
-            $matches['name'],
+            $fileName->toString(),
             new AnonymousViewComponent(
-                contents: $matches['header'] . $matches['view'],
+                contents: $contents->toString(),
                 file: $path,
             ),
         ]);

tests/Integration/View/x-auto-registered-with-declaration.view.php

@@ -3,6 +3,4 @@
 
 ?>
 
-<x-component name="x-auto-registered-with-declaration">
-	<span>{{ to_title_case('hello world') }}</span>
-</x-component>
+<span>{{ to_title_case('hello world') }}</span>