odata-query
Advanced tools
Comparing version 1.0.0 to 1.0.1
@@ -81,5 +81,9 @@ 'use strict'; | ||
} else if (Array.isArray(filters)) { | ||
return '(' + filters.map(function (f) { | ||
// return `(${filters.map(f => buildFilter(f, propPrefix)).join(' and ')})`; | ||
var builtFilters = filters.map(function (f) { | ||
return buildFilter(f, propPrefix); | ||
}).join(' and ') + ')'; | ||
}); | ||
if (builtFilters.length) { | ||
return '(' + builtFilters.join(' and ') + ')'; | ||
} | ||
} else if ((typeof filters === 'undefined' ? 'undefined' : _typeof(filters)) === 'object') { | ||
@@ -91,5 +95,9 @@ var filtersArray = Object.keys(filters).reduce(function (result, filterKey) { | ||
if (Array.isArray(value)) { | ||
result.push('(' + value.map(function (v) { | ||
var op = filterKey; | ||
var _builtFilters = value.map(function (v) { | ||
return buildFilter(v, propPrefix); | ||
}).join(' ' + filterKey + ' ') + ')'); | ||
}); | ||
if (_builtFilters.length) { | ||
result.push('(' + _builtFilters.join(' ' + op + ' ') + ')'); | ||
} | ||
} else if (["number", "string", "boolean"].indexOf(typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== -1 || value instanceof Date) { | ||
@@ -96,0 +104,0 @@ // Simple key/value handled as equals operator |
{ | ||
"name": "odata-query", | ||
"version": "1.0.0", | ||
"version": "1.0.1", | ||
"author": "Sean Lynch <techniq35@gmail.com>", | ||
@@ -5,0 +5,0 @@ "license": "MIT", |
14847
166