fix: resolve quantifier overwrite bug in withOptional syntactic sugar

Author: Mirkoddd

README.md

@@ -70,7 +70,7 @@ String priceRegex = anywhere()
     )
     .shake();
 
-// Result: Cost: \$[0-9]+(?:(?:\\.[0-9]{2}))?
+// Result: Cost: \$[0-9]+(?:\.[0-9]{2})?
 ```
 
 ## API Overview

build.gradle

@@ -1,6 +1,6 @@
 allprojects {
     group = 'com.mirkoddd'
-    version = '1.1.0'
+    version = '1.1.1'
 
     repositories {
         mavenCentral()

sift-core/src/main/java/com/mirkoddd/sift/SiftBuilder.java

@@ -107,12 +107,12 @@ public ConnectorStep any() {
     // --- CONNECTORS ---
     @Override
     public ConnectorStep withOptional(SiftPattern pattern) {
-        return this.optional().followedBy(pattern);
+        return this.followedBy().optional().followedBy(pattern);
     }
 
     @Override
     public ConnectorStep withOptional(char character) {
-        return this.optional().followedBy(character);
+        return this.followedBy().optional().followedBy(character);
     }
 
     @Override

sift-core/src/test/java/com/mirkoddd/sift/SiftTest.java

@@ -334,4 +334,30 @@ void wordBoundaries() {
             assertRegexDoesNotMatch(regex, "scatter");
         }
     }
+
+    @Test
+    @DisplayName("Bugfix: withOptional syntactic sugar should not overwrite previous quantifiers")
+    void syntacticSugarQuantifierBug() {
+        String regex = anywhere()
+                .oneOrMore().digits()
+                .withOptional(literal("A"))
+                .shake();
+
+        // before fix: [0-9]?(?:A)?
+        assertEquals("[0-9]+(?:A)?", regex);
+
+        //from README.md
+        String priceRegex = anywhere()
+                .followedBy(literal("Cost: $"))
+                .followedBy().oneOrMore().digits()
+                .withOptional(
+                        anywhere().followedBy('.').followedBy().exactly(2).digits()
+                )
+                .shake();
+
+
+        assertEquals("Cost: \\$[0-9]+(?:\\.[0-9]{2})?", priceRegex);
+        assertRegexMatches(priceRegex, "Cost: $10");
+        assertRegexMatches(priceRegex, "Cost: $10.99");
+    }
 }