Merge pull request #9 from alphard29/main

update limit
cacing69 · Sep 11, 2023 · e71c423 · e71c423
2 parents 30db9be + 99864df
commit e71c423
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/Parser.php b/src/Parser.php
@@ -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*
 
@@ -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)) {
@@ -177,4 +184,8 @@ public function getDefiners()
     {
         return $this->definers;
     }
+
+    public function getLimit() {
+        return $this->limit;
+    }
 }
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -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]);
+    }
 }