feat: allow indentation in guidelines and remove in composition

Author: ashleyhindle

src/Install/Assists/Inertia.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Laravel\Boost\Install\Assists;
+
+use Laravel\Roster\Enums\Packages;
+use Laravel\Roster\Roster;
+
+class Inertia
+{
+    public function __construct(private Roster $roster) {}
+
+    public function gte(string $version): bool
+    {
+        return
+            $this->roster->usesVersion(Packages::INERTIA, $version, '>=') ||
+            $this->roster->usesVersion(Packages::INERTIA_REACT, $version, '>=') ||
+            $this->roster->usesVersion(Packages::INERTIA_SVELTE, $version, '>=') ||
+            $this->roster->usesVersion(Packages::INERTIA_VUE, $version, '>=');
+    }
+
+    public function hasFormComponent(): bool
+    {
+        return $this->gte('2.1.0');
+    }
+
+    public function hasFormComponentResets(): bool
+    {
+        return $this->gte('2.1.2');
+    }
+}

src/Install/GuidelineAssist.php

@@ -5,6 +5,9 @@
 namespace Laravel\Boost\Install;
 
 use Illuminate\Database\Eloquent\Model;
+use Laravel\Boost\Install\Assists\Inertia;
+use Laravel\Roster\Enums\Packages;
+use Laravel\Roster\Roster;
 use ReflectionClass;
 use Symfony\Component\Finder\Finder;
 
@@ -19,7 +22,7 @@ class GuidelineAssist
 
     protected static array $classes = [];
 
-    public function __construct()
+    public function __construct(public Roster $roster)
     {
         $this->modelPaths = $this->discover(fn ($reflection) => ($reflection->isSubclassOf(Model::class) && ! $reflection->isAbstract()));
         $this->controllerPaths = $this->discover(fn (ReflectionClass $reflection) => (stripos($reflection->getName(), 'controller') !== false || stripos($reflection->getNamespaceName(), 'controller') !== false));
@@ -156,4 +159,14 @@ public function enumContents(): string
 
         return file_get_contents(current($this->enumPaths));
     }
+
+    public function packageGte(Packages $package, string $version): bool
+    {
+        return $this->roster->usesVersion($package, $version, '>=');
+    }
+
+    public function inertia(): Inertia
+    {
+        return new Inertia($this->roster);
+    }
 }

src/Install/GuidelineComposer.php

@@ -24,7 +24,7 @@ class GuidelineComposer
     public function __construct(protected Roster $roster, protected Herd $herd)
     {
         $this->config = new GuidelineConfig;
-        $this->guidelineAssist = new GuidelineAssist;
+        $this->guidelineAssist = new GuidelineAssist($roster);
     }
 
     public function config(GuidelineConfig $config): self
@@ -50,9 +50,19 @@ public function compose(): string
      */
     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
             ->filter(fn ($content) => ! empty(trim($content)))
-            ->map(fn ($content, $key) => "\n=== {$key} rules ===\n\n".trim($content))
+            ->map(function ($content, $key) {
+                // Remove preceding indentation from `-  guidelines`
+                $content = collect(explode("\n", trim($content)))
+                    ->map(fn ($line) => preg_replace('/\s+-/', '-', $line))
+                    ->join("\n");
+
+                return "\n=== {$key} rules ===\n\n".trim($content);
+            })
             ->join("\n\n"));
     }
 
@@ -139,7 +149,7 @@ protected function find(): Collection
 
         return $guidelines
             ->whereNotNull()
-            ->where(fn ($guideline) => ! empty(trim($guideline)));
+            ->where(fn (string $guideline) => ! empty(trim($guideline)));
     }
 
     /**