Skip to content

FEATURE: Parse tags inside of props #13

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

Open
grebaldi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FEATURE: Parse tags inside of props #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73227dd
TASK: Write tests for props containing tags
grebaldi Mar 8, 2018
db422a4
FEATURE: Parse tags inside of props
grebaldi Mar 8, 2018
9c0fe31
TASK: Fix whitespaces
grebaldi Mar 8, 2018
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
15 changes: 14 additions & 1 deletion src/Expression/Expression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use PackageFactory\Afx\Exception;
use PackageFactory\Afx\Lexer;
use PackageFactory\Afx\Parser;

class Expression
{
Expand All @@ -29,7 +30,7 @@ public static function parse(Lexer $lexer)
if ($lexer->isClosingBrace()) {
if ($braceCount === 0) {
$lexer->consume();
return $contents;
return self::postProcessContents($contents);
}

$braceCount--;
Expand All @@ -38,4 +39,16 @@ public static function parse(Lexer $lexer)
$contents .= $lexer->consume();
}
}

protected static function postProcessContents($contents)
{
$trimmedContents = trim($contents);

if ($trimmedContents{0} === '<') {
$parser = new Parser($trimmedContents);
return $parser->parse()[0];
}

return $contents;
}
}
13 changes: 9 additions & 4 deletions src/Expression/Prop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ public static function parse(Lexer $lexer)
break;

case $lexer->isOpeningBrace():
$value = [
'type' => 'expression',
'payload' => Expression::parse($lexer)
];
$expression = Expression::parse($lexer);
if (is_string($expression)) {
$value = [
'type' => 'expression',
'payload' => $expression
];
} else {
$value = $expression;
}
break;
default:
throw new Exception(sprintf(
Expand Down
78 changes: 78 additions & 0 deletions tests/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,84 @@ public function shouldHandleWhitespace()
);
}

/**
* @test
*/
public function shouldParsePropsContainingTags()
{
$parser = new Parser('<collection itemRenderer={<li>Hello World!</li>}/>');

$this->assertEquals(
[
[
'type' => 'node',
'payload' => [
'identifier' => 'collection',
'props' => [
'itemRenderer' => [
'type' => 'node',
'payload' => [
'identifier' => 'li',
'props' => [],
'children' => [
[
'type' => 'text',
'payload' => 'Hello World!'
]
],
'selfClosing' => false
]
]
],
'children' => [],
'selfClosing' => true
]
]
],
$parser->parse()
);
}

/**
* @test
*/
public function shouldParsePropsContainingTagsWithLineBreaks()
{
$parser = new Parser('<collection itemRenderer={
<div>Foo Bar</div>
}/>');

$this->assertEquals(
[
[
'type' => 'node',
'payload' => [
'identifier' => 'collection',
'props' => [
'itemRenderer' => [
'type' => 'node',
'payload' => [
'identifier' => 'div',
'props' => [],
'children' => [
[
'type' => 'text',
'payload' => 'Foo Bar'
]
],
'selfClosing' => false
]
]
],
'children' => [],
'selfClosing' => true
]
]
],
$parser->parse()
);
}

/**
* @test
* @expectedException \PackageFactory\Afx\Exception
Expand Down