Refactors/simplify out of box experience

Stillat · Feb 11, 2024 · fc14708 · fc14708
1 parent 46e59cf
commit fc14708
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/Console/Commands/ValidateBladeCommand.php b/src/Console/Commands/ValidateBladeCommand.php
@@ -6,6 +6,7 @@
 use Stillat\BladeParser\Document\Document;
 use Stillat\BladeParser\Errors\BladeError;
 use Stillat\BladeParser\Errors\ErrorFamily;
+use Stillat\BladeParser\Providers\ValidatorServiceProvider;
 use Stillat\BladeParser\Validation\Workspaces\PhpStanWrapper;
 use Stillat\BladeParser\Workspaces\Workspace;
 
@@ -31,7 +32,7 @@ public function handle(Workspace $workspace)
         $totalStart = microtime(true);
         $bladeStart = microtime(true);
         $workspace->withCoreValidators()
-            ->ignoreDirectives(config('blade.validation.ignore_directives', []))
+            ->ignoreDirectives(ValidatorServiceProvider::getIgnoreDirectives())
             ->addDirectory(resource_path('views'));
 
         $runMessage = "Running {$workspace->validator()->getValidatorCount()} validators against {$workspace->getFileCount()} files.";

diff --git a/src/Providers/ValidatorServiceProvider.php b/src/Providers/ValidatorServiceProvider.php
@@ -14,13 +14,18 @@
 
 class ValidatorServiceProvider extends ServiceProvider
 {
+    public static function getIgnoreDirectives()
+    {
+        return array_merge(config('blade.validation.ignore_directives', []), ['livewire']);
+    }
+
     public function register()
     {
         $this->mergeConfigFrom(
             __DIR__.'/../../config/validation.php', 'blade.validation'
         );
 
-        $globalIgnoreDirectives = config('blade.validation.ignore_directives', []);
+        $globalIgnoreDirectives = self::getIgnoreDirectives();
         $globalCustomDirectives = config('blade.validation.custom_directives', []);
 
         $availableConfig = config('blade.validation.options');

diff --git a/src/Validation/PhpSyntaxValidator.php b/src/Validation/PhpSyntaxValidator.php
@@ -12,6 +12,7 @@
 use Stillat\BladeParser\Nodes\AbstractNode;
 use Stillat\BladeParser\Nodes\DirectiveNode;
 use Stillat\BladeParser\Nodes\LiteralNode;
+use Stillat\BladeParser\Providers\ValidatorServiceProvider;
 
 class PhpSyntaxValidator
 {
@@ -29,7 +30,7 @@ public function __construct()
     {
         $this->compilerOptions = new DocumentCompilerOptions();
         $this->compilerOptions->throwExceptionOnUnknownComponentClass = false;
-        $this->compilerOptions->ignoreDirectives = config('blade.validation.ignore_directives', []);
+        $this->compilerOptions->ignoreDirectives = ValidatorServiceProvider::getIgnoreDirectives();
         $this->compilerOptions->appendCallbacks[] = function (AppendState $state) {
             for ($i = $state->beforeLineNumber; $i <= $state->afterLineNumber; $i++) {
                 $this->sourceMap[$i] = $state->node->position->startLine;
@@ -113,7 +114,7 @@ public function checkDocument(Document $document, ?int $originalLine = null): Ph
     public function checkString(string $content, ?int $originalLine = null): PhpSyntaxValidationResult
     {
         return $this->checkDocument(
-            Document::fromText($content, documentOptions: new DocumentOptions(ignoreDirectives: config('blade.validation.ignore_directives', []))), $originalLine
+            Document::fromText($content, documentOptions: new DocumentOptions(ignoreDirectives: ValidatorServiceProvider::getIgnoreDirectives())), $originalLine
         );
     }
 

diff --git a/src/Workspaces/Concerns/CompilesWorkspace.php b/src/Workspaces/Concerns/CompilesWorkspace.php
@@ -120,7 +120,7 @@ public function getCompilerOptions(): DocumentCompilerOptions
 
         $options = new DocumentCompilerOptions();
         $options->throwExceptionOnUnknownComponentClass = false;
-        $options->ignoreDirectives = config('blade.validation.ignore_directives', []);
+        $options->ignoreDirectives = $this->ignoreDirectives;
 
         return $options;
     }