Options feature improved, group and nonCapturingGroup methods added to BuilderPattern

Author: MaestroError

searchTest/search.php

@@ -21,11 +21,11 @@
 ===========================================================
 | ROWS | Found in (count)  | F & Decoded | F & D as whole |
 ===========================================================
-| 1000 | 7.6 ms (890)      | 44.8 ms     | 11.5 ms        |
-| 2500 | 17.25ms (2186)    | 108 ms      | 30 ms          |
-| 5000 | 34.4 ms (4347)    | 219 ms      | 62 ms          |
-| 10K  | 67.4 ms (8669)    | 413 ms      | 112 ms         |
-| 20K  | 131 ms (17313)    | 823 ms      | 251 ms         |
+| 1000 | 7.6 ms (890)      | 44.8 ms     | 11.5 ms        | 5 Mb
+| 2500 | 17.25ms (2186)    | 108 ms      | 30 ms          | 14 Mb
+| 5000 | 34.4 ms (4347)    | 219 ms      | 62 ms          | 29 Mb
+| 10K  | 67.4 ms (8669)    | 413 ms      | 112 ms         | 58 Mb
+| 20K  | 131 ms (17313)    | 823 ms      | 251 ms         | 116 Mb
 ===========================================================
 ===Keyword:="green"========================================
 */

src/Builder.php

@@ -67,7 +67,7 @@ protected function processConfigArray(array $options) {
 
     protected function processCallback(callable $callback) {
         $optionsBuilder = new OptionsBuilder();
-        $optionsBuilder = $callback($optionsBuilder);
+        $callback($optionsBuilder);
         $this->processConfigArray($optionsBuilder->getOptions());
     }
 

src/Patterns/BasePattern.php

@@ -186,7 +186,7 @@ protected static function processArguments(array $args, array $values): array {
 
     protected static function processCallback(callable $callback): array {
         $optionsBuilder = new OptionsBuilder();
-        $optionsBuilder = $callback($optionsBuilder);
+        $callback($optionsBuilder);
         return $optionsBuilder->getOptions();
     }
 

src/Patterns/BuilderPattern.php

@@ -63,5 +63,19 @@ private function getLengthOption($length = null, $minLength = 0, $maxLength = 0)
 
         return "+";  // Default case, one or more times
     }
+
+    public function group(callable $callback): self {
+        $subPattern = new self($this->builder);
+        $callback($subPattern);
+        $this->pattern .= '(' . $subPattern->getPattern() . ')';
+        return $this;
+    }
+
+    public function nonCapturingGroup(callable $callback): self {
+        $subPattern = new self($this->builder);
+        $callback($subPattern);
+        $this->pattern .= '(?:' . $subPattern->getPattern() . ')';
+        return $this;
+    }
 
 }

tests/Feature/Patterns/CurrencyPatternTest.php

@@ -51,7 +51,8 @@
     $builder = new Builder("$1000, €200, £30");
 
     $check = $builder->currency(function($query) {
-        return $query->specificCurrencies(['￥']);
+        $query->specificCurrencies(['￥']); // You can use options without return
+        // return $query->specificCurrencies(['￥']); // Or with return, both has the same effect
     })->checkString();
 
     // Assert that currencies not in the specific symbols are not matched

tests/Feature/Patterns/EmailPatternTest.php

@@ -48,7 +48,7 @@
     $builder = new Builder("[email protected]");
 
     $check = $builder->email(function($query) {
-        return $query->onlyExtensions(['com', 'org']);
+        $query->onlyExtensions(['com', 'org']);
     })->check();
 
     // Assert that the email with an unlisted extension is not validated

tests/Unit/Patterns/BuilderPatternTest.php

@@ -392,3 +392,52 @@
     expect(preg_match($regex, ' '))->toBe(0); // Only one invisible character
     expect(preg_match($regex, '   '))->toBe(0); // More than 2 invisible characters
 });
+
+
+test('group method creates capturing groups correctly', function () {
+    $builder = new BuilderPattern();
+    $builder->group(function($group) {
+        $group->digits(3); // Matches exactly 3 digits
+    })->character("-")->digits(2); // Followed by a hyphen and 2 digits
+
+    $regex = $builder->getMatchesValidationPattern();
+    expect(preg_match($regex, '123-45'))->toBe(1);
+    expect(preg_match($regex, '12345'))->toBe(0); // No hyphen
+    expect(preg_match($regex, '12-34'))->toBe(0); // First group doesn't have 3 digits
+});
+
+test('nonCapturingGroup method creates non-capturing groups correctly', function () {
+    $builder = new BuilderPattern();
+    $builder->nonCapturingGroup(function($group) {
+        $group->digits(3); // Matches exactly 3 digits
+    })->character("-")->digits(2); // Followed by a hyphen and 2 digits
+
+    $regex = $builder->getMatchesValidationPattern();
+    expect(preg_match($regex, '123-45'))->toBe(1);
+    expect(preg_match($regex, '12345'))->toBe(0); // No hyphen
+    expect(preg_match($regex, '12-34'))->toBe(0); // First group doesn't have 3 digits
+});
+
+test('capturing group captures content correctly', function () {
+    $builder = new BuilderPattern();
+    $builder->group(function($group) {
+        $group->exact('abc'); 
+    });
+
+    $regex = $builder->getMatchesValidationPattern();
+    $matches = [];
+    preg_match($regex, 'abcdef', $matches);
+    expect($matches[1])->toBe('abc'); // Check the captured content
+});
+
+test('non-capturing group does not capture content', function () {
+    $builder = new BuilderPattern();
+    $builder->nonCapturingGroup(function($group) {
+        $group->exact('abc');
+    });
+
+    $regex = $builder->getInputValidationPattern();
+    $matches = [];
+    preg_match($regex, 'abcdef', $matches);
+    expect(isset($matches[1]))->toBeFalse(); // No captured content
+});