@iebh/polyglot 4.9.0 → 4.9.2

package/lib/modules/parse.js

@@ -179,7 +179,7 @@ var parse = function parse(query, options) {
       });
       offset += match[1].length;
       q = q.substr(match[1].length);
-    } else if (match = /^(\$1)\b/i.exec(q)) {
+    } else if (match = /(\$1)\b/i.exec(q)) {
       // $1
       branch.nodes.push({
         type: 'dollarOne',
@@ -187,9 +187,12 @@ var parse = function parse(query, options) {
         cond: match[2] ? match[2].toUpperCase() : '',
         nodes: []
       });
-      offset += match[0].length;
-      q = q.substr(match[0].length);
-      cropString = false;
+      var index = q.indexOf(match[0]);
+      if (index !== -1) {
+        offset += index + 2;
+        q = q.slice(0, index) + q.slice(index + 2);
+        cropString = false;
+      }
     } else if (/^\(/.test(q)) {
       var newGroup = {
         type: 'group',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/polyglot",
-  "version": "4.9.0",
+  "version": "4.9.2",
   "description": "IEBH-SRA tool to convert between different medical database search formats",
   "main": "lib/index.js",
   "scripts": {