@iebh/polyglot 4.7.8 → 4.8.0

package/lib/modules/parse.js

@@ -503,7 +503,7 @@ var parse = function parse(query, options) {
       afterWhitespace = true;
     }
     // Match field codes {{{
-    else if (_lodash["default"].isObject(leaf) && leaf.type !== 'mesh' && (match = new RegExp("^(".concat(fieldCodes, ") *(\\[mp=[^\\]\\n]*\\])?"), "i").exec(q))) {
+    else if (match = new RegExp("^(".concat(fieldCodes, ") *(\\[mp=[^\\]\\n]*\\])?"), "i").exec(q)) {
       // Field specifier - PubMed syntax
       // Figure out the leaf to use (usually the last one) or the previously used group
       var useLeaf;
@@ -511,6 +511,8 @@ var parse = function parse(query, options) {
         useLeaf = leaf;
       } else if (_lodash["default"].isArray(leaf) && lastGroup) {
         useLeaf = lastGroup;
+      } else if (_lodash["default"].isObject(leaf) && leaf.type == 'mesh') {
+        useLeaf = leaf;
       }
       useLeaf.field = _fieldCodesParse["default"][match[1].toLowerCase()];
       if (match[2]) {
@@ -521,12 +523,6 @@ var parse = function parse(query, options) {
         q = q.substr(match[1].length);
       }
       cropString = false;
-    } else if (_lodash["default"].isObject(leaf) && leaf.type == 'mesh' && (match = new RegExp("^(".concat(fieldCodes, ") *(\\[mp=[^\\]\\n]*\\])?"), "i").exec(q))) {
-      // Field specifier - PubMed syntax
-      // Figure out the leaf to use (usually the last one) or the previously used group
-      var useLeaf = leaf;
-      useLeaf.field = _fieldCodesParse["default"][match[1].toLowerCase()];
-      cropString = false;
     }
     // }}}
     /// Comment {{{

package/package.json

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