fix: tests for @boostsnippet and conditional assistant inclusion

Author: ashleyhindle

.ai/inertia-laravel/2/core.blade.php

@@ -21,4 +21,6 @@
     @else
         - This version of Inertia does NOT support `resetOnError`, `resetOnSuccess`, or `setDefaultsOnSuccess` on the `<Form>` component. Using these will cause errors.
    @endif
+@else
+    - Build forms using the `useForm` helper. Use the code examples and `search-docs` tool with the `useForm helper` query for guidance.
 @endif

.ai/inertia-react/core.blade.php

@@ -2,8 +2,7 @@
 
 - Use `router.visit()` or `<Link>` for navigation instead of traditional links.
 
-<code-snippet lang="react" name="Inertia Client Navigation">
-    import { Link } from '@inertiajs/react'
-
-    <Link href="/">Home</Link>
-</code-snippet>
+@boostsnippet("Inertia Client Navigation", "react")
+import { Link } from '@inertiajs/react'
+<Link href="/">Home</Link>
+@endboostsnippet

.ai/inertia-vue/core.blade.php

@@ -3,8 +3,7 @@
 - Vue components must have a single root element.
 - Use `router.visit()` or `<Link>` for navigation instead of traditional links.
 
-<code-snippet lang="vue" name="Inertia Client Navigation">
+@boostsnippet("Inertia Client Navigation", "vue")
     import { Link } from '@inertiajs/vue3'
-
     <Link href="/">Home</Link>
-</code-snippet>
+@endboostsnippet

src/BoostServiceProvider.php

@@ -166,22 +166,6 @@ private function registerBrowserLogger(): void
     private function registerBladeDirectives(BladeCompiler $bladeCompiler): void
     {
         $bladeCompiler->directive('boostJs', fn () => '<?php echo \\Laravel\\Boost\\Services\\BrowserLogger::getScript(); ?>');
-
-        $bladeCompiler->directive('boostsnippet', function (string $expression) {
-            preg_match('/^(.*?),\s*(.*?)$/', $expression, $matches);
-            $name = isset($matches[1]) ? trim($matches[1], '\'"` ') : '';
-            $lang = isset($matches[2]) ? trim($matches[2], '\'"` ') : 'html';
-            $name = str_replace('___SINGLE_BACKTICK___', '`', $name);
-
-            return "<?php \$__snippetStack[] = ['name' => '{$name}', 'lang' => '{$lang}']; ob_start(); ?>";
-        });
-
-        $bladeCompiler->directive('endboostsnippet', function () {
-            return '<?php $__snippetContent = ob_get_clean(); $__snippet = array_pop($__snippetStack); ?>'
-                .'<code-snippet name="<?php echo $__snippet[\'name\']; ?>" lang="<?php echo $__snippet[\'lang\']; ?>">'."\n"
-                .'<?php echo $__snippetContent; ?>'
-                .'</code-snippet>'."\n\n";
-        });
     }
 
     private static function mapJsTypeToPsr3Level(string $type): string

src/Install/Assists/Inertia.php

@@ -14,7 +14,7 @@ public function __construct(private Roster $roster)
     public function gte(string $version): bool
     {
         return
-            $this->roster->usesVersion(Packages::INERTIA, $version, '>=') ||
+            $this->roster->usesVersion(Packages::INERTIA_LARAVEL, $version, '>=') ||
             $this->roster->usesVersion(Packages::INERTIA_REACT, $version, '>=') ||
             $this->roster->usesVersion(Packages::INERTIA_SVELTE, $version, '>=') ||
             $this->roster->usesVersion(Packages::INERTIA_VUE, $version, '>=');

src/Install/GuidelineComposer.php

@@ -53,7 +53,7 @@ public static function composeGuidelines(Collection $guidelines): string
         // We want to allow indentation in the guideline blade files
         // But we don't want the indentation in the outputted file
 
-        return trim($guidelines
+        return str_replace("\n\n\n\n", "\n\n", trim($guidelines
             ->filter(fn ($content) => ! empty(trim($content)))
             ->map(function ($content, $key) {
                 // Remove preceding indentation from `-  guidelines`
@@ -63,7 +63,7 @@ public static function composeGuidelines(Collection $guidelines): string
 
                 return "\n=== {$key} rules ===\n\n".trim($content);
             })
-            ->join("\n\n"));
+            ->join("\n\n")));
     }
 
     /**
@@ -206,8 +206,8 @@ protected function guideline(string $path): ?string
             return null;
         }
 
-        // Read the file content
         $content = file_get_contents($path);
+        $content = $this->processBoostSnippets($content);
 
         // Temporarily replace backticks and PHP opening tags with placeholders before Blade processing
         // This prevents Blade from trying to execute PHP code examples and supports inline code
@@ -221,7 +221,26 @@ protected function guideline(string $path): ?string
             'assist' => $this->guidelineAssist,
         ]);
         $rendered = str_replace(array_values($placeholders), array_keys($placeholders), $rendered);
+        $rendered = str_replace(array_keys($this->storedSnippets), array_values($this->storedSnippets), $rendered);
+        $this->storedSnippets = []; // Clear for next use
 
         return trim($rendered);
     }
+
+    private array $storedSnippets = [];
+
+    private function processBoostSnippets(string $content): string
+    {
+        return preg_replace_callback('/(?<!@)@boostsnippet\(\s*(?P<nameQuote>[\'"])(?P<name>[^\1]*?)\1(?:\s*,\s*(?P<langQuote>[\'"])(?P<lang>[^\3]*?)\3)?\s*\)(?P<content>.*?)@endboostsnippet/s', function ($matches) {
+            $name = $matches['name'];
+            $lang = ! empty($matches['lang']) ? $matches['lang'] : 'html';
+            $snippetContent = $matches['content'];
+
+            $placeholder = '___BOOST_SNIPPET_'.count($this->storedSnippets).'___';
+
+            $this->storedSnippets[$placeholder] = '<code-snippet name="'.$name.'" lang="'.$lang.'">'."\n".$snippetContent."\n".'</code-snippet>'."\n\n";
+
+            return $placeholder;
+        }, $content);
+    }
 }

tests/Feature/Install/GuidelineComposerTest.php

@@ -25,13 +25,14 @@
     $packages = new PackageCollection([
         new Package(Packages::LARAVEL, 'laravel/framework', '11.0.0'),
         new Package(Packages::INERTIA_REACT, 'inertiajs/inertia-react', $version),
+        new Package(Packages::INERTIA_LARAVEL, 'inertiajs/inertia-laravel', $shouldInclude212Features ? '2.1.2' : '2.1.0'),
     ]);
 
     $this->roster->shouldReceive('packages')->andReturn($packages);
     // Mock all Inertia package version checks
     $this->roster->shouldReceive('usesVersion')
-        ->with(Packages::INERTIA, '2.1.0', '>=')
-        ->andReturn(false);
+        ->with(Packages::INERTIA_LARAVEL, '2.1.0', '>=')
+        ->andReturn($shouldIncludeForm);
     $this->roster->shouldReceive('usesVersion')
         ->with(Packages::INERTIA_REACT, '2.1.0', '>=')
         ->andReturn($shouldIncludeForm);
@@ -43,8 +44,8 @@
         ->andReturn(false);
 
     $this->roster->shouldReceive('usesVersion')
-        ->with(Packages::INERTIA, '2.1.2', '>=')
-        ->andReturn(false);
+        ->with(Packages::INERTIA_LARAVEL, '2.1.2', '>=')
+        ->andReturn($shouldInclude212Features);
     $this->roster->shouldReceive('usesVersion')
         ->with(Packages::INERTIA_REACT, '2.1.2', '>=')
         ->andReturn($shouldInclude212Features);
@@ -176,7 +177,7 @@
     $this->roster->shouldReceive('packages')->andReturn($packages);
     // Mock all Inertia package version checks for this test too
     $this->roster->shouldReceive('usesVersion')
-        ->with(Packages::INERTIA, '2.1.0', '>=')
+        ->with(Packages::INERTIA_LARAVEL, '2.1.0', '>=')
         ->andReturn(false);
     $this->roster->shouldReceive('usesVersion')
         ->with(Packages::INERTIA_REACT, '2.1.0', '>=')