Skip to content
New issue

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

#

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

Already on GitHub? # to your account

update limit #9

Merged
merged 4 commits into from
Sep 11, 2023
Merged

update limit #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6285c
update limit
alphard29 Sep 11, 2023
73509ef
Update Parser.php
cacing69 Sep 11, 2023
72848f4
Update ParserTest.php
cacing69 Sep 11, 2023
99864df
Update Parser.php
cacing69 Sep 11, 2023
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
17 changes: 14 additions & 3 deletions src/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Parser
use HasRawProperty;
use HasDefinersProperty;
use HasFiltersProperty;
public $limit;
protected $limit;
public $onDocumentLoaded;
// 1). \s*from\s*\(\s*(.*?)\s*\)\s*define\s*(.*?)\s*filter\s*(.*)\s*limit\s*(.*)\s*

Expand Down Expand Up @@ -52,9 +52,16 @@ public function __construct($raw)
$this->source = new Source($_from[1]);

if (preg_match("/define\s*(.*)/is", $raw, $_definer)) {
if (preg_match("/filter\s*(.*)\s*limit/i", $_definer[1], $_filter)) {
if (preg_match("/filter\s*(.*)\s*limit/is", $_definer[1], $_filter)) {
// get limit
if (preg_match("/limit\s(\d)/is", $_filter[1], $_limit)) {
preg_match("/(.*?)\s*filter/is", $_definer[1], $_extractDefinerFromFilter);
// extract definer
$this->makeDefiners($_extractDefinerFromFilter[1]);

// extract filter
$this->makeFilters($_filter[1]);

if (preg_match("/limit\s*(\d+)\s*/is", $_definer[1], $_limit)) {
$this->limit = intval($_limit[1]);
}
} elseif (preg_match("/filter\s*(.*)/is", $_definer[1], $_filter)) {
Expand Down Expand Up @@ -177,4 +184,8 @@ public function getDefiners()
{
return $this->definers;
}

public function getLimit() {
return $this->limit;
}
}
25 changes: 25 additions & 0 deletions tests/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,29 @@ public function testParseQueryWithReplaceAndAttrAndAppendNodeDefinerReverse2ButW
$this->assertSame('attr(href, div > h1 > span > a)', $parser->getDefiners()[1]);
$this->assertSame("replace('i am', 'you are', div > h1 > span > a)", $parser->getDefiners()[2]);
}

public function testParseWithLimit()
{
$query = "
from ( .item )
define
append_node(.list > .item, li) as list,
attr(href, div > h1 > span > a),
replace('i am', 'you are', div > h1 > span > a)
filter
span > a.title has 'lorem' and
attr(id, span > a) > 9
limit 1
";

$parser = new Parser($query);

$this->assertSame('.item', $parser->getSource()->getRaw());
$this->assertCount(3, $parser->getDefiners(), 'should have 2 definers');
$this->assertCount(2, $parser->getFilters()['and'], 'should have 2 filters');
$this->assertSame(1, $parser->getLimit());
$this->assertSame('append_node(.list > .item, li) as list', $parser->getDefiners()[0]);
$this->assertSame('attr(href, div > h1 > span > a)', $parser->getDefiners()[1]);
$this->assertSame("replace('i am', 'you are', div > h1 > span > a)", $parser->getDefiners()[2]);
}
}