wip

Author: brendt

packages/view/src/Elements/ElementFactory.php

@@ -88,11 +88,6 @@ private function makeElement(Token $token, ?Element $parent): ?Element
                 $viewComponentClass->setToken($token);
             }
 
-            if ($viewComponentClass === AnonymousViewComponent::class) {
-                $attributes = implode(' ', $attributes);
-                throw new \Exception($token->tag . ' ' . $attributes . ' not resolved');
-            }
-
             if (! ($viewComponentClass instanceof ViewComponent)) {
                 $viewComponentClass = $this->container->get($viewComponentClass);
             }

packages/view/src/ViewComponentDiscovery.php

@@ -47,18 +47,17 @@ public function discoverPath(DiscoveryLocation $location, string $path): void
 
         $contents = str(file_get_contents($path))->ltrim();
 
-        preg_match('/(?<header>(.|\n)*?)<x-component name="(?<name>[\w\-]+)">/', $contents->toString(), $matches);
-
-        $view = $contents
-            ->replaceRegex('/(?<header>(.|\n)*?)<x-component name="(?<name>[\w\-]+)">/', '')
-            ->replaceRegex('/<\/x-component>$/', '')
-            ->toString();
+        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: $view,
+                    contents: $matches['view'] ?? $contents->toString(),
                     file: $path,
                 ),
             ]);
@@ -73,7 +72,7 @@ public function discoverPath(DiscoveryLocation $location, string $path): void
         $this->discoveryItems->add($location, [
             $matches['name'],
             new AnonymousViewComponent(
-                contents: $matches['header'] . $view,
+                contents: $matches['header'] . $matches['view'],
                 file: $path,
             ),
         ]);