Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Compiler/Compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function compile(Node $node): Node
protected function shouldCompile(ComponentSource $source): bool
{
if ($source->directives->blaze()) {
return true;
return $source->directives->blaze('compile') ?? true;
}

return $this->config->shouldCompile($source->path)
Expand Down
12 changes: 11 additions & 1 deletion src/Support/Utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ class Utils
*/
public static function parseBlazeDirective(string $expression): array
{
return BlazeDirective::parseParameters($expression);
$params = BlazeDirective::parseParameters($expression);

if (data_get($params, 'compile', true) === false && data_get($params, 'memo', false) === true) {
throw new \InvalidArgumentException('Cannot set `memo: true` with `compile: false` in @blaze directive.');
}

if (data_get($params, 'compile', true) === false && data_get($params, 'fold', false) === true) {
throw new \InvalidArgumentException('Cannot set `fold: true` with `compile: false` in @blaze directive.');
}

return $params;
}

/**
Expand Down
15 changes: 14 additions & 1 deletion tests/Compiler/CompilerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

use Livewire\Blaze\Parser\Parser;
use Livewire\Blaze\Compiler\Compiler;
use Livewire\Blaze\Config;
use Livewire\Blaze\Parser\Nodes\ComponentNode;
use Livewire\Blaze\Support\Utils;

test('compiles self-closing components', function () {
Expand Down Expand Up @@ -76,4 +78,15 @@
'<?php $__blaze->popData(); ?> ',
'<?php unset($__resolved) ?>',
]));
});
});

test('does not compile components with blaze directive override set to false', function () {
$input = '<x-compile-false />';

app(Config::class)->add(fixture_path('views/components'));

$node = app(Parser::class)->parse($input)[0];
$compiled = app(Compiler::class)->compile($node);

expect($compiled)->toBeInstanceOf(ComponentNode::class);
});
12 changes: 12 additions & 0 deletions tests/Folder/FolderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,18 @@
expect($folded)->toBeInstanceOf(ComponentNode::class);
});

test('does not fold components with blaze directive override set to false', function () {
$input = '<x-foldable.fold-false />';

app(Config::class)->add(fixture_path('views/components/foldable'), fold: true);

$node = app(Parser::class)->parse($input)[0];
$compiled = app(Folder::class)->fold($node);

expect($compiled)->toBeInstanceOf(ComponentNode::class);
});


test('folds components with no blaze directive if enabled in config', function () {
$input = '<x-foldable.input-no-blaze />';

Expand Down
11 changes: 11 additions & 0 deletions tests/Memoizer/MemoizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,15 @@
$memoized = app(Memoizer::class)->memoize($node);

expect($memoized)->toBeInstanceOf(TextNode::class);
});

test('does not memoize components with blaze directive override set to false', function () {
$input = '<x-memoizable.memo-false />';

app(Config::class)->add(fixture_path('views/components/memoizable'), memo: true);

$node = app(Parser::class)->parse($input)[0];
$compiled = app(Memoizer::class)->memoize($node);

expect($compiled)->toBeInstanceOf(ComponentNode::class);
});
3 changes: 3 additions & 0 deletions tests/fixtures/views/components/compile-false.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@blaze(compile: false)

<div></div>
3 changes: 3 additions & 0 deletions tests/fixtures/views/components/foldable/fold-false.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@blaze(fold: false)

<div></div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@blaze(memo: false)

<div></div>
Loading