odata-query - npm Package Compare versions

Comparing version 5.3.0 to 5.3.1

dist/index.js

@@ -158,7 +158,14 @@ 'use strict';
           return f !== undefined;
+        }).map(function (f) {
+          return LOGICAL_OPERATORS.indexOf(op) !== -1 ? '(' + f + ')' : f;
         });
         if (_builtFilters.length) {
-          result.push('(' + _builtFilters.join(' ' + op + ' ') + ')');
+          if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
+            result.push('(' + _builtFilters.join(' ' + op + ' ') + ')');
+          } else {
+            result.push('' + _builtFilters.join(' ' + op + ' '));
+          }
         }
       } else if (LOGICAL_OPERATORS.indexOf(propName) !== -1) {
+        var _op = propName;
         var _builtFilters2 = Object.keys(value).map(function (valueKey) {
@@ -168,3 +175,3 @@ return buildFilter(_defineProperty({}, valueKey, value[valueKey]));
         if (_builtFilters2.length) {
-          result.push('' + _builtFilters2.join(' ' + propName + ' '));
+          result.push(_builtFilters2.join(' ' + _op + ' '));
         }
@@ -174,4 +181,12 @@ } else if (value instanceof Object) {
         operators.forEach(function (op) {
-          if ([].concat(COMPARISON_OPERATORS, LOGICAL_OPERATORS).indexOf(op) !== -1) {
+          if (COMPARISON_OPERATORS.indexOf(op) !== -1) {
             result.push(propName + ' ' + op + ' ' + handleValue(value[op]));
+          } else if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
+            if (Array.isArray(value[op])) {
+              result.push(value[op].map(function (v) {
+                return '(' + buildFilter(v, propName) + ')';
+              }).join(' ' + op + ' '));
+            } else {
+              result.push('(' + buildFilter(value[op], propName) + ')');
+            }
           } else if (COLLECTION_OPERATORS.indexOf(op) !== -1) {
@@ -178,0 +193,0 @@ var lambaParameter = filterKey[0].toLowerCase();

package.json

 {
   "name": "odata-query",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "author": "Sean Lynch <[e-mail]>",
@@ -5,0 +5,0 @@ "license": "MIT",

No alert changes

Improved metrics

Total package byte prevSize

27020

increased by2.33%

Lines of code

335

increased by4.69%

No dependency changes