Skip to content

Improve attribute parser #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calebporzio merged 6 commits into from
Oct 20, 2025
Merged

Improve attribute parser #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86dbf69
Remove stray newline characters
joshhanley Oct 19, 2025
cb91c6a
Improve attribute parser
joshhanley Oct 20, 2025
b4f503c
wip
joshhanley Oct 20, 2025
50f3cae
wip
joshhanley Oct 20, 2025
e0c3360
Fix test
joshhanley Oct 20, 2025
8d4385e
wip
joshhanley Oct 20, 2025
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
128 changes: 33 additions & 95 deletions src/Support/AttributeParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,14 @@ public function parseAndReplaceDynamics(
return $attributesString;
}

// :name="..." or :name=$var
$attributesString = preg_replace_callback('/(\s*):([a-zA-Z0-9_-]+)\s*=\s*("[^"]*"|\$[a-zA-Z0-9_]+)/', function ($matches) use (&$attributePlaceholders, &$attributeNameToPlaceholder) {
// :name="..."
$attributesString = preg_replace_callback('/(?<!\S)(\s*):([A-Za-z0-9_:-]+)\s*=\s*"([^"]*)"/', function ($matches) use (&$attributePlaceholders, &$attributeNameToPlaceholder) {
$whitespace = $matches[1];
$attributeName = $matches[2];
$attributeValue = $matches[3];

// Strip double quotes from attribute value...
$attributeValue = trim($attributeValue, '"');

$placeholder = 'ATTR_PLACEHOLDER_' . count($attributePlaceholders);
if (preg_match('/^"\$([a-zA-Z0-9_]+)"$/', $attributeValue, $m)) {
$attributePlaceholders[$placeholder] = '{{ $' . $m[1] . ' }}';
} elseif ($attributeValue !== '' && $attributeValue[0] === '$') {
$attributePlaceholders[$placeholder] = '{{ ' . $attributeValue . ' }}';
} else {
$attributePlaceholders[$placeholder] = $attributeValue;
}
$attributePlaceholders[$placeholder] = '{{ ' . $attributeValue . ' }}';
$attributeNameToPlaceholder[$attributeName] = $placeholder;

return $whitespace . $attributeName . '="' . $placeholder . '"';
Expand Down Expand Up @@ -97,111 +88,58 @@ public function parseAndReplaceDynamics(
public function parseAttributeStringToArray(string $attributesString): array
{
$attributes = [];
$processedPositions = [];

// Handle :name="..." or :name=$var syntax
preg_match_all('/(?:^|\s):([a-zA-Z0-9_:-]+)\s*=\s*("[^"]*"|\$[a-zA-Z0-9_]+)/', $attributesString, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
foreach ($matches as $match) {
$start = $match[0][1];
$end = $start + strlen($match[0][0]);
$processedPositions[] = [$start, $end];

$attributeName = str($match[1][0])->camel()->toString();
$attributeValue = trim($match[2][0], '"');
$original = trim($match[0][0]);
// Handle :name="..." syntax
preg_match_all('/(?:^|\s):([A-Za-z0-9_:-]+)\s*=\s*"([^"]*)"/', $attributesString, $matches, PREG_SET_ORDER);
foreach ($matches as $m) {
$attributeName = str($m[1])->camel()->toString();
if (isset($attributes[$attributeName])) continue;

$attributes[$attributeName] = [
'isDynamic' => true,
'value' => $attributeValue,
'original' => $original,
'value' => $m[2],
'original' => trim($m[0]),
];
}

// Handle short :$var syntax (expands to :var="$var")
preg_match_all('/(?:^|\s):\$([a-zA-Z0-9_:-]+)(?=\s|$)/', $attributesString, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
foreach ($matches as $match) {
$start = $match[0][1];
$end = $start + strlen($match[0][0]);

// Skip if this position was already processed
$skip = false;
foreach ($processedPositions as [$procStart, $procEnd]) {
if ($start >= $procStart && $end <= $procEnd) {
$skip = true;
break;
}
}
if ($skip) continue;

$processedPositions[] = [$start, $end];

$attributeName = str($match[1][0])->camel()->toString();
$attributeValue = '$' . $match[1][0];
$original = trim($match[0][0]);
preg_match_all('/(?:^|\s):\$([A-Za-z0-9_:-]+)(?=\s|$)/', $attributesString, $matches, PREG_SET_ORDER);
foreach ($matches as $m) {
$raw = $m[1];
$attributeName = str($raw)->camel()->toString();
if (isset($attributes[$attributeName])) continue;

$attributes[$attributeName] = [
'isDynamic' => true,
'value' => $attributeValue,
'original' => $original,
'value' => '$' . $raw,
'original' => trim($m[0]),
];
}

// Handle regular name="value" syntax
preg_match_all('/(\s*)([a-zA-Z0-9_:-]+)\s*=\s*("[^"]*")/', $attributesString, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
foreach ($matches as $match) {
$start = $match[0][1];
$end = $start + strlen($match[0][0]);

// Skip if this position was already processed
$skip = false;
foreach ($processedPositions as [$procStart, $procEnd]) {
if ($start >= $procStart && $end <= $procEnd) {
$skip = true;
break;
}
}
if ($skip) continue;

$processedPositions[] = [$start, $end];

$attributeName = str($match[2][0])->camel()->toString();
$attributeValue = trim($match[3][0], '"');
$original = trim($match[0][0]);
preg_match_all('/(?:^|\s)(?!:)([A-Za-z0-9_:-]+)\s*=\s*"([^"]*)"/', $attributesString, $matches, PREG_SET_ORDER);
foreach ($matches as $m) {
$attributeName = str($m[1])->camel()->toString();
if (isset($attributes[$attributeName])) continue;

$attributes[$attributeName] = [
'isDynamic' => false,
'value' => $attributeValue,
'original' => $original,
'value' => $m[2],
'original' => trim($m[0]),
];
}

// Handle boolean attributes (single words without values)
preg_match_all('/(\s*)([a-zA-Z0-9_:-]+)(?=\s|$)/', $attributesString, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
foreach ($matches as $match) {
$start = $match[0][1];
$end = $start + strlen($match[0][0]);

// Skip if this position was already processed
$skip = false;
foreach ($processedPositions as [$procStart, $procEnd]) {
if ($start >= $procStart && $end <= $procEnd) {
$skip = true;
break;
}
}
if ($skip) continue;

$attributeName = str($match[2][0])->camel()->toString();
$original = trim($match[0][0]);

// Only add if not already processed as a key-value pair
if (!array_key_exists($attributeName, $attributes)) {
$attributes[$attributeName] = [
'isDynamic' => false,
'value' => true,
'original' => $original,
];
}
preg_match_all('/(?:^|\s)([A-Za-z0-9_:-]+)(?=\s|$)/', $attributesString, $matches, PREG_SET_ORDER);
foreach ($matches as $m) {
$attributeName = str($m[1])->camel()->toString();
if (isset($attributes[$attributeName])) continue;

$attributes[$attributeName] = [
'isDynamic' => false,
'value' => true,
'original' => trim($m[0]),
];
}

return $attributes;
Expand Down
101 changes: 100 additions & 1 deletion tests/AttributeParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,100 @@
use Livewire\Blaze\Support\AttributeParser;

describe('parse attributes', function () {
it('parses and replaces dynamic attributes with name and value syntax', function() {
$input = ':name="$foo"';
$output = 'name="ATTR_PLACEHOLDER_0"';

$attributePlaceholders = [];
$attributeNameToPlaceholder = [];

$result = (new AttributeParser)->parseAndReplaceDynamics($input, $attributePlaceholders, $attributeNameToPlaceholder);

expect($result)->toBe($output);

expect($attributePlaceholders)->toBe([
'ATTR_PLACEHOLDER_0' => '{{ $foo }}',
]);

expect($attributeNameToPlaceholder)->toBe([
'name' => 'ATTR_PLACEHOLDER_0',
]);
});

it('parses and replaces dynamic attributes with short syntax', function() {
$input = ':$name';
$output = 'name="ATTR_PLACEHOLDER_0"';

$attributePlaceholders = [];
$attributeNameToPlaceholder = [];

$result = (new AttributeParser)->parseAndReplaceDynamics($input, $attributePlaceholders, $attributeNameToPlaceholder);

expect($result)->toBe($output);

expect($attributePlaceholders)->toBe([
'ATTR_PLACEHOLDER_0' => '{{ $name }}',
]);

expect($attributeNameToPlaceholder)->toBe([
'name' => 'ATTR_PLACEHOLDER_0',
]);
});

it('parses and replaces dynamic attributes echoed within a value', function() {
$input = 'name="foo {{ $type }}"';
$output = 'name="foo ATTR_PLACEHOLDER_0"';

$attributePlaceholders = [];
$attributeNameToPlaceholder = [];

$result = (new AttributeParser)->parseAndReplaceDynamics($input, $attributePlaceholders, $attributeNameToPlaceholder);

expect($result)->toBe($output);

expect($attributePlaceholders)->toBe([
'ATTR_PLACEHOLDER_0' => '{{ $type }}',
]);

expect($attributeNameToPlaceholder)->toBe([]);
});

it('does not parse static attributes with colon in the name when used alone', function() {
$input = 'icon:trailing="chevrons-up-down"';
$output = 'icon:trailing="chevrons-up-down"';

$attributePlaceholders = [];
$attributeNameToPlaceholder = [];

$result = (new AttributeParser)->parseAndReplaceDynamics($input, $attributePlaceholders, $attributeNameToPlaceholder);

expect($result)->toBe($output);

expect($attributePlaceholders)->toBe([]);

expect($attributeNameToPlaceholder)->toBe([]);
});

it('does not parse static attributes with colon in the name when used with dynamic attributes', function() {
$input = ':name="$foo" icon:trailing="chevrons-up-down"';
$output = 'name="ATTR_PLACEHOLDER_0" icon:trailing="chevrons-up-down"';

$attributePlaceholders = [];
$attributeNameToPlaceholder = [];

$result = (new AttributeParser)->parseAndReplaceDynamics($input, $attributePlaceholders, $attributeNameToPlaceholder);

expect($result)->toBe($output);

expect($attributePlaceholders)->toBe([
'ATTR_PLACEHOLDER_0' => '{{ $foo }}',
]);

expect($attributeNameToPlaceholder)->toBe([
'name' => 'ATTR_PLACEHOLDER_0',
]);
});

it('parses static attributes', function () {
$input = 'name="Bob" searchable="true"';
$output = [
Expand Down Expand Up @@ -144,8 +238,13 @@
});

it('parses static attributes which contain colons', function () {
$input = 'wire:sort:item="{{ $id }}"';
$input = 'icon:trailing="chevrons-up-down" wire:sort:item="{{ $id }}"';
$output = [
'icon:trailing' => [
'isDynamic' => false,
'value' => 'chevrons-up-down',
'original' => 'icon:trailing="chevrons-up-down"',
],
'wire:sort:item' => [
'isDynamic' => false,
'value' => '{{ $id }}',
Expand Down
13 changes: 13 additions & 0 deletions tests/FluxTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use Illuminate\Support\Facades\Route;

describe('flux component integration', function () {
beforeEach(function () {
// Manually register Livewire and Flux providers for these tests
Expand All @@ -17,4 +19,15 @@
expect($output)->toContain('data-flux-heading');
expect($output)->not->toContain('flux:heading');
});

it('folds link component with dynamic route helper link', function() {
Route::get('/dashboard', fn() => 'dashboard')->name('dashboard');

$input = '<flux:link :href="route(\'dashboard\')">Dashboard</flux:link>';
$output = app('blaze')->compile($input);

expect($output)
->toContain('<a ')
->toContain(' href="{{ route(\'dashboard\') }}"');
});
});