Fix #11, add test cases relative to #11, release 0.2.2 (#16)

Author: teabyii

lib/Language/Helpers/buildQuery.js

@@ -42,9 +42,13 @@ function buildQuery(query, builder = new Builder()) {
             // Now, append that method to the builder object.
             method.setParameters(parameters).callMethodOn(builder)
         } catch (e) {
-            if (Array.isArray(parameters[0])) {
+            const lastIndex = parameters.length - 1
+            if (Array.isArray(parameters[lastIndex])) {
+                if (lastIndex !== 0) {
+                    method.setParameters(parameters.slice(0, lastIndex))
+                }
                 method.callMethodOn(builder)
-                builder.and(buildQuery(parameters[0], new NonCapture()))
+                builder.and(buildQuery(parameters[lastIndex], new NonCapture()))
             } else {
                 throw new SyntaxException(`Invalid parameter given for ${method.origin}`)
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "srl",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Simple Regex Language",
   "main": "lib/SRL.js",
   "scripts": {

test/issue-11-test.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const assert = require('assert')
+const SRL = require('../')
+
+describe('Fix issue 11', () => {
+    it('Numerical quantifies & non-capturing group', () => {
+        const query = new SRL('digit, exactly 5 times, (letter, twice) optional')
+        assert.ok(query.isMatching('12345'))
+        assert.ok(query.isMatching('12345aa'))
+    })
+
+    it('Complicated case', () => {
+        const query = new SRL('begin with, digit, exactly 5 times, ( literally \'-\', digit, exactly 4 times ), optional, must end')
+        assert.ok(query.isMatching('12345-1234'))
+    })
+})
+
+

test/parseParentheses-test.js

@@ -18,8 +18,8 @@ describe('ParseParentheses Test', () => {
         assert.deepEqual(parseParentheses('foo (0)'), [ 'foo', [ '0' ] ])
 
         assert.deepEqual(
-           parseParentheses('foo (bar (nested)) baz'),
-           [ 'foo', [ 'bar', [ 'nested' ] ], 'baz' ]
+            parseParentheses('foo (bar (nested)) baz'),
+            [ 'foo', [ 'bar', [ 'nested' ] ], 'baz' ]
         )
 
         assert.deepEqual(