Apply g flag as default, remove keyword 'all', and tweak test cases.

lib/Builder.js

@@ -80,7 +80,7 @@ class Builder {
         this._regEx = []
 
         /** @var {string} _modifiers Raw modifier to apply on. */
-        this._modifiers = ''
+        this._modifiers = 'g'
 
         /** @var {number} _lastMethodType Type of last method, to avoid invalid builds. */
         this._lastMethodType = METHOD_TYPE_BEGIN
@@ -379,10 +379,6 @@ class Builder {
     /*                   MODIFIER MAPPER                      */
     /**********************************************************/
 
-    all() {
-        return this._addUniqueModifier('g')
-    }
-
     multiLine() {
         return this._addUniqueModifier('m')
     }
@@ -486,6 +482,7 @@ class Builder {
         this._regEx.push(condition)
         return this
     }
+
     /**
      * Validate method call. This will throw an exception if the called method makes no sense at this point.
      * Will add the current type as the last method type.
@@ -619,6 +616,8 @@ class Builder {
     }
 
     /**
+     * Clone a new builder object.
+     *
      * @return {Builder}
      */
     clone() {
@@ -633,6 +632,18 @@ class Builder {
         return clone
     }
 
+    /**
+     * Remote specific flag.
+     *
+     * @param  {string} flag
+     * @return {Builder}
+     */
+    removeModifier(flag) {
+        this._modifiers.replace(flag, '')
+
+        return this
+    }
+
     /**********************************************************/
     /*                   REGEX METHODS                        */
     /**********************************************************/
@@ -645,6 +656,52 @@ class Builder {
         const regexp = this.get()
         return regexp.test.apply(regexp, arguments)
     }
+
+    /**********************************************************/
+    /*                 ADDITIONAL METHODS                     */
+    /**********************************************************/
+
+    /**
+     * Just like test in RegExp, but reset lastIndex.
+     *
+     * @param  {string} target
+     * @return {boolean}
+     */
+    isMatching(target) {
+        const result = this.test(target)
+        this.get().lastIndex = 0
+        return result
+    }
+
+    /**
+     * Just like match in String, but reset lastIndex.
+     *
+     * @param  {string} target
+     * @return {array|null}
+     */
+    getMatch(target) {
+        const regex = this.get()
+        const result = regex.exec(target)
+        regex.lastIndex = 0
+        return result
+    }
+
+    /**
+     * Get all matches, just like loop for RegExp.exec.
+     * @param  {string} target
+     */
+    getMatches(target) {
+        const result = []
+        const regex = this.get()
+        let temp = null
+
+        while(temp = regex.exec(target)) {
+            result.push(temp)
+        }
+        regex.lastIndex = 0
+
+        return result
+    }
 }
 
 module.exports = Builder

lib/Language/Helpers/methodMatch.js

@@ -23,7 +23,6 @@ const mapper = {
     'new line': { 'class': SimpleMethod, 'method': 'newLine' },
     'whitespace': { 'class': SimpleMethod, 'method': 'whitespace' },
     'no whitespace': { 'class': SimpleMethod, 'method': 'noWhitespace' },
-    'all': { 'class': SimpleMethod, 'method': 'all' },
     'anything': { 'class': SimpleMethod, 'method': 'any' },
     'tab': { 'class': SimpleMethod, 'method': 'atb' },
     'digit': { 'class': SimpleMethod, 'method': 'digit' },

test/builder-test.js

@@ -3,7 +3,7 @@
 const assert = require('assert')
 const SRL = require('../lib/Builder')
 
-describe('Builder Test', () => {
+describe('Builder isMatching', () => {
     it('Simple Phone Number Format', () => {
         const regex = new SRL()
             .startsWith()
@@ -15,12 +15,12 @@ describe('Builder Test', () => {
             .digit().onceOrMore()
             .mustEnd()
 
-        assert.ok(regex.test('+49 123-45'))
-        assert.ok(regex.exec('+492 1235-4'))
-        assert.ok(!regex.test('+49 123 45'))
-        assert.ok(!regex.exec('49 123-45'))
-        assert.ok(!regex.test('a+49 123-45'))
-        assert.ok(!regex.test('+49 123-45b'))
+        assert.ok(regex.isMatching('+49 123-45'))
+        assert.ok(regex.isMatching('+492 1235-4'))
+        assert.ok(!regex.isMatching('+49 123 45'))
+        assert.ok(!regex.isMatching('49 123-45'))
+        assert.ok(!regex.isMatching('a+49 123-45'))
+        assert.ok(!regex.isMatching('+49 123-45b'))
     })
 
     it('Simple Email Format', () => {
@@ -39,15 +39,14 @@ describe('Builder Test', () => {
             .letter().atLeast(2)
             .mustEnd()
             .caseInsensitive()
-            .get() // Use get() to test resulting RegExp object.
-
-        assert.equal('sample@example.com'.match(regex)[0], 'sample@example.com')
-        assert.equal(regex.exec('super-He4vy.add+ress@top-Le.ve1.domains'), 'super-He4vy.add+ress@top-Le.ve1.domains')
-        assert.ok(!regex.test('sample.example.com'))
-        assert.ok(!regex.test('missing@tld'))
-        assert.ok(!regex.test('hav ing@spac.es'))
-        assert.ok(!regex.test('no@pe.123'))
-        assert.ok(!regex.test('invalid@email.com123'))
+
+        assert.equal(regex.getMatch('sample@example.com')[0], 'sample@example.com')
+        assert.equal(regex.getMatch('super-He4vy.add+ress@top-Le.ve1.domains')[0], 'super-He4vy.add+ress@top-Le.ve1.domains')
+        assert.ok(!regex.isMatching('sample.example.com'))
+        assert.ok(!regex.isMatching('missing@tld'))
+        assert.ok(!regex.isMatching('hav ing@spac.es'))
+        assert.ok(!regex.isMatching('no@pe.123'))
+        assert.ok(!regex.isMatching('invalid@email.com123'))
     })
 
     it('Capture Group', () => {
@@ -65,14 +64,13 @@ describe('Builder Test', () => {
                 query.letter().onceOrMore()
             })
             .literally('.')
-            .get()
 
-        assert.ok(regex.test('my favorite color: blue.'))
-        assert.ok(regex.test('my favorite colour is green.'))
-        assert.ok(!regex.test('my favorite colour is green!'))
+        assert.ok(regex.isMatching('my favorite color: blue.'))
+        assert.ok(regex.isMatching('my favorite colour is green.'))
+        assert.ok(!regex.isMatching('my favorite colour is green!'))
 
         const testcase = 'my favorite colour is green. And my favorite color: yellow.'
-        const matches = testcase.match(regex)
+        const matches = regex.getMatch(testcase)
         assert.equal(matches[1], 'green')
     })
 
@@ -86,12 +84,12 @@ describe('Builder Test', () => {
             .tab()
             .mustEnd()
             .multiLine()
-            .get()
+
         const target = `
         ba\t
         aaabbb
         `
-        assert.ok(regex.test(target))
+        assert.ok(regex.isMatching(target))
 
         const regex2 = new SRL()
             .startsWith()
@@ -101,10 +99,10 @@ describe('Builder Test', () => {
             .onceOrMore()
             .literally('b')
             .mustEnd()
-            .get()
+
         const target2 = `a
         b`
-        assert.ok(regex2.test(target2))
+        assert.ok(regex2.isMatching(target2))
     })
 
     it('Replace', () => {
@@ -133,28 +131,25 @@ describe('Builder Test', () => {
                     .whitespace().optional()
                     .lazy()
             })
-            .get()
 
-        const matches = ',, '.match(regex)
+        const matches = regex.getMatch(',, ')
         assert.equal(matches[1], ',,')
         assert.notEqual(matches[1], ',, ')
 
         const regex2 = new SRL()
             .literally(',')
             .atLeast(1)
             .lazy()
-            .get()
 
-        const matches2 = regex2.exec(',,,,,')
+        const matches2 = regex2.getMatch(',,,,,')
         assert.equal(matches2[0], ',')
         assert.notEqual(matches2[0], ',,,,,')
 
     })
 
-    it('Global', () => {
+    it('Global as Default', () => {
         const regex = new SRL()
             .literally('a')
-            .all()
             .get()
 
         let count = 0
@@ -169,9 +164,9 @@ describe('Builder Test', () => {
             .raw('b[a-z]r')
             .raw(/\d+/)
 
-        assert.ok(regex.test('foobzr123'))
-        assert.ok(regex.test('foobar1'))
-        assert.ok(!regex.test('fooa'))
-        assert.ok(!regex.test('foobar'))
+        assert.ok(regex.isMatching('foobzr123'))
+        assert.ok(regex.isMatching('foobar1'))
+        assert.ok(!regex.isMatching('fooa'))
+        assert.ok(!regex.isMatching('foobar'))
     })
 })

test/cache-test.js

@@ -12,7 +12,7 @@ describe('Cache', () => {
     })
 
     it('In interpreter', () => {
-        const RE = /(?:a)/
+        const RE = /(?:a)/g
         const query = new Interpreter('Literally "a"')
         assert.deepEqual(query.get(), RE)