@arranger/middleware - npm Package Compare versions

Comparing version 1.1.7 to 1.1.8

dist/buildAggregations/injectNestedFiltersToAggs.js

@@ -60,3 +60,3 @@ "use strict";
             bool: {
-              must: nestedSqonFilters[aggContent.nested.path].filter(function (sqonFilter) {
+              should: nestedSqonFilters[aggContent.nested.path].filter(function (sqonFilter) {
                 return aggregationsFilterThemselves || aggName.split(':')[0] !== sqonFilter.content.field;
@@ -97,2 +97,2 @@ }).map(function (sqonFilter) {
 exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZEFnZ3JlZ2F0aW9ucy9pbmplY3ROZXN0ZWRGaWx0ZXJzVG9BZ2dzLmpzIl0sIm5hbWVzIjpbImluamVjdE5lc3RlZEZpbHRlcnNUb0FnZ3MiLCJhZ2dzIiwibmVzdGVkU3FvbkZpbHRlcnMiLCJhZ2dyZWdhdGlvbnNGaWx0ZXJUaGVtc2VsdmVzIiwiT2JqZWN0IiwiZW50cmllcyIsInJlZHVjZSIsImFjYyIsImFnZ05hbWUiLCJhZ2dDb250ZW50Iiwic2tpcFRvTmV4dExldmVsIiwid3JhcEluRmlsdGVyQWdnIiwibmVzdGVkIiwicGF0aCIsImZpbHRlciIsImJvb2wiLCJtdXN0Iiwic3FvbkZpbHRlciIsInNwbGl0IiwiY29udGVudCIsImZpZWxkIiwibWFwIiwibmVzdGVkRmllbGRzIiwiZ2xvYmFsIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQTs7Ozs7QUFLQSxJQUFNQSx5QkFBeUIsR0FBRyxTQUE1QkEseUJBQTRCO0FBQUEsTUFDaENDLElBRGdDLFFBQ2hDQSxJQURnQztBQUFBLE1BRWhDQyxpQkFGZ0MsUUFFaENBLGlCQUZnQztBQUFBLE1BR2hDQyw0QkFIZ0MsUUFHaENBLDRCQUhnQztBQUFBLFNBS2hDQyxNQUFNLENBQUNDLE9BQVAsQ0FBZUosSUFBZixFQUFxQkssTUFBckIsQ0FBNEIsVUFBQ0MsR0FBRCxTQUFnQztBQUFBO0FBQUEsUUFBekJDLE9BQXlCO0FBQUEsUUFBaEJDLFVBQWdCOztBQUMxRCxRQUFNQyxlQUFlLEdBQUcsU0FBbEJBLGVBQWtCLEdBQU07QUFDNUJILE1BQUFBLEdBQUcsQ0FBQ0MsT0FBRCxDQUFILGdCQUNLQyxVQURMO0FBRUVSLFFBQUFBLElBQUksRUFBRUQseUJBQXlCLENBQUM7QUFDOUJDLFVBQUFBLElBQUksRUFBRVEsVUFBVSxDQUFDUixJQURhO0FBRTlCQyxVQUFBQSxpQkFBaUIsRUFBakJBLGlCQUY4QjtBQUc5QkMsVUFBQUEsNEJBQTRCLEVBQTVCQTtBQUg4QixTQUFEO0FBRmpDO0FBUUEsYUFBT0ksR0FBUDtBQUNELEtBVkQ7O0FBV0EsUUFBTUksZUFBZSxHQUFHLFNBQWxCQSxlQUFrQixHQUFNO0FBQzVCSixNQUFBQSxHQUFHLENBQUNDLE9BQUQsQ0FBSCxnQkFDS0MsVUFETDtBQUVFUixRQUFBQSxJQUFJLGdDQUNFUSxVQUFVLENBQUNHLE1BQVgsQ0FBa0JDLElBRHBCLGlEQUNzRDtBQUN0REMsVUFBQUEsTUFBTSxFQUFFO0FBQ05DLFlBQUFBLElBQUksRUFBRTtBQUNKQyxjQUFBQSxJQUFJLEVBQUVkLGlCQUFpQixDQUFDTyxVQUFVLENBQUNHLE1BQVgsQ0FBa0JDLElBQW5CLENBQWpCLENBQ0hDLE1BREcsQ0FFRixVQUFBRyxVQUFVO0FBQUEsdUJBQ1JkLDRCQUE0QixJQUM1QkssT0FBTyxDQUFDVSxLQUFSLENBQWMsR0FBZCxFQUFtQixDQUFuQixNQUEwQkQsVUFBVSxDQUFDRSxPQUFYLENBQW1CQyxLQUZyQztBQUFBLGVBRlIsRUFNSEMsR0FORyxDQU1DLFVBQUFKLFVBQVU7QUFBQSx1QkFDYiwwQkFBUztBQUNQSyxrQkFBQUEsWUFBWSxFQUFFLEVBRFA7QUFFUFIsa0JBQUFBLE1BQU0sRUFBRSwrQkFBaUJHLFVBQWpCO0FBRkQsaUJBQVQsQ0FEYTtBQUFBLGVBTlg7QUFERjtBQURBLFdBRDhDO0FBaUJ0RGhCLFVBQUFBLElBQUksRUFBRUQseUJBQXlCLENBQUM7QUFDOUJDLFlBQUFBLElBQUksRUFBRVEsVUFBVSxDQUFDUixJQURhO0FBRTlCQyxZQUFBQSxpQkFBaUIsRUFBakJBLGlCQUY4QjtBQUc5QkMsWUFBQUEsNEJBQTRCLEVBQTVCQTtBQUg4QixXQUFEO0FBakJ1QixTQUR0RDtBQUZOO0FBNEJBLGFBQU9JLEdBQVA7QUFDRCxLQTlCRDs7QUFnQ0EsUUFBSUUsVUFBVSxDQUFDYyxNQUFYLElBQXFCZCxVQUFVLENBQUNLLE1BQXBDLEVBQTRDO0FBQzFDLGFBQU9KLGVBQWUsRUFBdEI7QUFDRCxLQUZELE1BRU8sSUFBSUQsVUFBVSxDQUFDRyxNQUFmLEVBQXVCO0FBQzVCLFVBQUlWLGlCQUFpQixDQUFDTyxVQUFVLENBQUNHLE1BQVgsQ0FBa0JDLElBQW5CLENBQXJCLEVBQStDO0FBQzdDLGVBQU9GLGVBQWUsRUFBdEI7QUFDRCxPQUZELE1BRU87QUFDTCxlQUFPRCxlQUFlLEVBQXRCO0FBQ0Q7QUFDRixLQU5NLE1BTUE7QUFDTCxhQUFPSCxHQUFQO0FBQ0Q7QUFDRixHQXZERCxFQXVERyx1QkFBVU4sSUFBVixDQXZESCxDQUxnQztBQUFBLENBQWxDOztlQThEZUQseUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBvcFN3aXRjaCB9IGZyb20gJy4uL2J1aWxkUXVlcnknO1xuaW1wb3J0IG5vcm1hbGl6ZUZpbHRlcnMgZnJvbSAnLi4vYnVpbGRRdWVyeS9ub3JtYWxpemVGaWx0ZXJzJztcbmltcG9ydCB7IEFHR1NfV1JBUFBFUl9GSUxURVJFRCB9IGZyb20gJy4uL2NvbnN0YW50cyc7XG5pbXBvcnQgeyBjbG9uZURlZXAgfSBmcm9tICdsb2Rhc2gnO1xuXG4vKlxuICogZHVlIHRvIHRoaXMgcHJvYmxlbTogaHR0cHM6Ly9naXRodWIuY29tL2tpZHMtZmlyc3Qva2YtcG9ydGFsLXVpL2lzc3Vlcy80ODhcbiAqIHF1ZXJpZXMgdGhhdCBhcmUgb24gYSB0ZXJtIHRoYXQgc2hhcmVzIGEgcGFyZW50IHdpdGggYSBhZ2dyZWdhdGlvbiBmaWVsZFxuICogbmVlZHMgdG8gYmUgZHJvcHBlZCBkb3duIHRvIHRoZSBhZ2dyZWdhdGlvbiBsZXZlbCBhcyBhIGZpbHRlci5cbiAqL1xuY29uc3QgaW5qZWN0TmVzdGVkRmlsdGVyc1RvQWdncyA9ICh7XG4gIGFnZ3MsXG4gIG5lc3RlZFNxb25GaWx0ZXJzLFxuICBhZ2dyZWdhdGlvbnNGaWx0ZXJUaGVtc2VsdmVzLFxufSkgPT5cbiAgT2JqZWN0LmVudHJpZXMoYWdncykucmVkdWNlKChhY2MsIFthZ2dOYW1lLCBhZ2dDb250ZW50XSkgPT4ge1xuICAgIGNvbnN0IHNraXBUb05leHRMZXZlbCA9ICgpID0+IHtcbiAgICAgIGFjY1thZ2dOYW1lXSA9IHtcbiAgICAgICAgLi4uYWdnQ29udGVudCxcbiAgICAgICAgYWdnczogaW5qZWN0TmVzdGVkRmlsdGVyc1RvQWdncyh7XG4gICAgICAgICAgYWdnczogYWdnQ29udGVudC5hZ2dzLFxuICAgICAgICAgIG5lc3RlZFNxb25GaWx0ZXJzLFxuICAgICAgICAgIGFnZ3JlZ2F0aW9uc0ZpbHRlclRoZW1zZWx2ZXMsXG4gICAgICAgIH0pLFxuICAgICAgfTtcbiAgICAgIHJldHVybiBhY2M7XG4gICAgfTtcbiAgICBjb25zdCB3cmFwSW5GaWx0ZXJBZ2cgPSAoKSA9PiB7XG4gICAgICBhY2NbYWdnTmFtZV0gPSB7XG4gICAgICAgIC4uLmFnZ0NvbnRlbnQsXG4gICAgICAgIGFnZ3M6IHtcbiAgICAgICAgICBbYCR7YWdnQ29udGVudC5uZXN0ZWQucGF0aH06JHtBR0dTX1dSQVBQRVJfRklMVEVSRUR9YF06IHtcbiAgICAgICAgICAgIGZpbHRlcjoge1xuICAgICAgICAgICAgICBib29sOiB7XG4gICAgICAgICAgICAgICAgbXVzdDogbmVzdGVkU3FvbkZpbHRlcnNbYWdnQ29udGVudC5uZXN0ZWQucGF0aF1cbiAgICAgICAgICAgICAgICAgIC5maWx0ZXIoXG4gICAgICAgICAgICAgICAgICAgIHNxb25GaWx0ZXIgPT5cbiAgICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGlvbnNGaWx0ZXJUaGVtc2VsdmVzIHx8XG4gICAgICAgICAgICAgICAgICAgICAgYWdnTmFtZS5zcGxpdCgnOicpWzBdICE9PSBzcW9uRmlsdGVyLmNvbnRlbnQuZmllbGQsXG4gICAgICAgICAgICAgICAgICApXG4gICAgICAgICAgICAgICAgICAubWFwKHNxb25GaWx0ZXIgPT5cbiAgICAgICAgICAgICAgICAgICAgb3BTd2l0Y2goe1xuICAgICAgICAgICAgICAgICAgICAgIG5lc3RlZEZpZWxkczogW10sXG4gICAgICAgICAgICAgICAgICAgICAgZmlsdGVyOiBub3JtYWxpemVGaWx0ZXJzKHNxb25GaWx0ZXIpLFxuICAgICAgICAgICAgICAgICAgICB9KSxcbiAgICAgICAgICAgICAgICAgICksXG4gICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgYWdnczogaW5qZWN0TmVzdGVkRmlsdGVyc1RvQWdncyh7XG4gICAgICAgICAgICAgIGFnZ3M6IGFnZ0NvbnRlbnQuYWdncyxcbiAgICAgICAgICAgICAgbmVzdGVkU3FvbkZpbHRlcnMsXG4gICAgICAgICAgICAgIGFnZ3JlZ2F0aW9uc0ZpbHRlclRoZW1zZWx2ZXMsXG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICB9LFxuICAgICAgICB9LFxuICAgICAgfTtcbiAgICAgIHJldHVybiBhY2M7XG4gICAgfTtcblxuICAgIGlmIChhZ2dDb250ZW50Lmdsb2JhbCB8fCBhZ2dDb250ZW50LmZpbHRlcikge1xuICAgICAgcmV0dXJuIHNraXBUb05leHRMZXZlbCgpO1xuICAgIH0gZWxzZSBpZiAoYWdnQ29udGVudC5uZXN0ZWQpIHtcbiAgICAgIGlmIChuZXN0ZWRTcW9uRmlsdGVyc1thZ2dDb250ZW50Lm5lc3RlZC5wYXRoXSkge1xuICAgICAgICByZXR1cm4gd3JhcEluRmlsdGVyQWdnKCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gc2tpcFRvTmV4dExldmVsKCk7XG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybiBhY2M7XG4gICAgfVxuICB9LCBjbG9uZURlZXAoYWdncykpO1xuXG5leHBvcnQgZGVmYXVsdCBpbmplY3ROZXN0ZWRGaWx0ZXJzVG9BZ2dzO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZEFnZ3JlZ2F0aW9ucy9pbmplY3ROZXN0ZWRGaWx0ZXJzVG9BZ2dzLmpzIl0sIm5hbWVzIjpbImluamVjdE5lc3RlZEZpbHRlcnNUb0FnZ3MiLCJhZ2dzIiwibmVzdGVkU3FvbkZpbHRlcnMiLCJhZ2dyZWdhdGlvbnNGaWx0ZXJUaGVtc2VsdmVzIiwiT2JqZWN0IiwiZW50cmllcyIsInJlZHVjZSIsImFjYyIsImFnZ05hbWUiLCJhZ2dDb250ZW50Iiwic2tpcFRvTmV4dExldmVsIiwid3JhcEluRmlsdGVyQWdnIiwibmVzdGVkIiwicGF0aCIsImZpbHRlciIsImJvb2wiLCJzaG91bGQiLCJzcW9uRmlsdGVyIiwic3BsaXQiLCJjb250ZW50IiwiZmllbGQiLCJtYXAiLCJuZXN0ZWRGaWVsZHMiLCJnbG9iYWwiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7Ozs7Ozs7Ozs7Ozs7OztBQUVBOzs7OztBQUtBLElBQU1BLHlCQUF5QixHQUFHLFNBQTVCQSx5QkFBNEI7QUFBQSxNQUNoQ0MsSUFEZ0MsUUFDaENBLElBRGdDO0FBQUEsTUFFaENDLGlCQUZnQyxRQUVoQ0EsaUJBRmdDO0FBQUEsTUFHaENDLDRCQUhnQyxRQUdoQ0EsNEJBSGdDO0FBQUEsU0FLaENDLE1BQU0sQ0FBQ0MsT0FBUCxDQUFlSixJQUFmLEVBQXFCSyxNQUFyQixDQUE0QixVQUFDQyxHQUFELFNBQWdDO0FBQUE7QUFBQSxRQUF6QkMsT0FBeUI7QUFBQSxRQUFoQkMsVUFBZ0I7O0FBQzFELFFBQU1DLGVBQWUsR0FBRyxTQUFsQkEsZUFBa0IsR0FBTTtBQUM1QkgsTUFBQUEsR0FBRyxDQUFDQyxPQUFELENBQUgsZ0JBQ0tDLFVBREw7QUFFRVIsUUFBQUEsSUFBSSxFQUFFRCx5QkFBeUIsQ0FBQztBQUM5QkMsVUFBQUEsSUFBSSxFQUFFUSxVQUFVLENBQUNSLElBRGE7QUFFOUJDLFVBQUFBLGlCQUFpQixFQUFqQkEsaUJBRjhCO0FBRzlCQyxVQUFBQSw0QkFBNEIsRUFBNUJBO0FBSDhCLFNBQUQ7QUFGakM7QUFRQSxhQUFPSSxHQUFQO0FBQ0QsS0FWRDs7QUFXQSxRQUFNSSxlQUFlLEdBQUcsU0FBbEJBLGVBQWtCLEdBQU07QUFDNUJKLE1BQUFBLEdBQUcsQ0FBQ0MsT0FBRCxDQUFILGdCQUNLQyxVQURMO0FBRUVSLFFBQUFBLElBQUksZ0NBQ0VRLFVBQVUsQ0FBQ0csTUFBWCxDQUFrQkMsSUFEcEIsaURBQ3NEO0FBQ3REQyxVQUFBQSxNQUFNLEVBQUU7QUFDTkMsWUFBQUEsSUFBSSxFQUFFO0FBQ0pDLGNBQUFBLE1BQU0sRUFBRWQsaUJBQWlCLENBQUNPLFVBQVUsQ0FBQ0csTUFBWCxDQUFrQkMsSUFBbkIsQ0FBakIsQ0FDTEMsTUFESyxDQUVKLFVBQUFHLFVBQVU7QUFBQSx1QkFDUmQsNEJBQTRCLElBQzVCSyxPQUFPLENBQUNVLEtBQVIsQ0FBYyxHQUFkLEVBQW1CLENBQW5CLE1BQTBCRCxVQUFVLENBQUNFLE9BQVgsQ0FBbUJDLEtBRnJDO0FBQUEsZUFGTixFQU1MQyxHQU5LLENBTUQsVUFBQUosVUFBVTtBQUFBLHVCQUNiLDBCQUFTO0FBQ1BLLGtCQUFBQSxZQUFZLEVBQUUsRUFEUDtBQUVQUixrQkFBQUEsTUFBTSxFQUFFLCtCQUFpQkcsVUFBakI7QUFGRCxpQkFBVCxDQURhO0FBQUEsZUFOVDtBQURKO0FBREEsV0FEOEM7QUFpQnREaEIsVUFBQUEsSUFBSSxFQUFFRCx5QkFBeUIsQ0FBQztBQUM5QkMsWUFBQUEsSUFBSSxFQUFFUSxVQUFVLENBQUNSLElBRGE7QUFFOUJDLFlBQUFBLGlCQUFpQixFQUFqQkEsaUJBRjhCO0FBRzlCQyxZQUFBQSw0QkFBNEIsRUFBNUJBO0FBSDhCLFdBQUQ7QUFqQnVCLFNBRHREO0FBRk47QUE0QkEsYUFBT0ksR0FBUDtBQUNELEtBOUJEOztBQWdDQSxRQUFJRSxVQUFVLENBQUNjLE1BQVgsSUFBcUJkLFVBQVUsQ0FBQ0ssTUFBcEMsRUFBNEM7QUFDMUMsYUFBT0osZUFBZSxFQUF0QjtBQUNELEtBRkQsTUFFTyxJQUFJRCxVQUFVLENBQUNHLE1BQWYsRUFBdUI7QUFDNUIsVUFBSVYsaUJBQWlCLENBQUNPLFVBQVUsQ0FBQ0csTUFBWCxDQUFrQkMsSUFBbkIsQ0FBckIsRUFBK0M7QUFDN0MsZUFBT0YsZUFBZSxFQUF0QjtBQUNELE9BRkQsTUFFTztBQUNMLGVBQU9ELGVBQWUsRUFBdEI7QUFDRDtBQUNGLEtBTk0sTUFNQTtBQUNMLGFBQU9ILEdBQVA7QUFDRDtBQUNGLEdBdkRELEVBdURHLHVCQUFVTixJQUFWLENBdkRILENBTGdDO0FBQUEsQ0FBbEM7O2VBOERlRCx5QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IG9wU3dpdGNoIH0gZnJvbSAnLi4vYnVpbGRRdWVyeSc7XG5pbXBvcnQgbm9ybWFsaXplRmlsdGVycyBmcm9tICcuLi9idWlsZFF1ZXJ5L25vcm1hbGl6ZUZpbHRlcnMnO1xuaW1wb3J0IHsgQUdHU19XUkFQUEVSX0ZJTFRFUkVEIH0gZnJvbSAnLi4vY29uc3RhbnRzJztcbmltcG9ydCB7IGNsb25lRGVlcCB9IGZyb20gJ2xvZGFzaCc7XG5cbi8qXG4gKiBkdWUgdG8gdGhpcyBwcm9ibGVtOiBodHRwczovL2dpdGh1Yi5jb20va2lkcy1maXJzdC9rZi1wb3J0YWwtdWkvaXNzdWVzLzQ4OFxuICogcXVlcmllcyB0aGF0IGFyZSBvbiBhIHRlcm0gdGhhdCBzaGFyZXMgYSBwYXJlbnQgd2l0aCBhIGFnZ3JlZ2F0aW9uIGZpZWxkXG4gKiBuZWVkcyB0byBiZSBkcm9wcGVkIGRvd24gdG8gdGhlIGFnZ3JlZ2F0aW9uIGxldmVsIGFzIGEgZmlsdGVyLlxuICovXG5jb25zdCBpbmplY3ROZXN0ZWRGaWx0ZXJzVG9BZ2dzID0gKHtcbiAgYWdncyxcbiAgbmVzdGVkU3FvbkZpbHRlcnMsXG4gIGFnZ3JlZ2F0aW9uc0ZpbHRlclRoZW1zZWx2ZXMsXG59KSA9PlxuICBPYmplY3QuZW50cmllcyhhZ2dzKS5yZWR1Y2UoKGFjYywgW2FnZ05hbWUsIGFnZ0NvbnRlbnRdKSA9PiB7XG4gICAgY29uc3Qgc2tpcFRvTmV4dExldmVsID0gKCkgPT4ge1xuICAgICAgYWNjW2FnZ05hbWVdID0ge1xuICAgICAgICAuLi5hZ2dDb250ZW50LFxuICAgICAgICBhZ2dzOiBpbmplY3ROZXN0ZWRGaWx0ZXJzVG9BZ2dzKHtcbiAgICAgICAgICBhZ2dzOiBhZ2dDb250ZW50LmFnZ3MsXG4gICAgICAgICAgbmVzdGVkU3FvbkZpbHRlcnMsXG4gICAgICAgICAgYWdncmVnYXRpb25zRmlsdGVyVGhlbXNlbHZlcyxcbiAgICAgICAgfSksXG4gICAgICB9O1xuICAgICAgcmV0dXJuIGFjYztcbiAgICB9O1xuICAgIGNvbnN0IHdyYXBJbkZpbHRlckFnZyA9ICgpID0+IHtcbiAgICAgIGFjY1thZ2dOYW1lXSA9IHtcbiAgICAgICAgLi4uYWdnQ29udGVudCxcbiAgICAgICAgYWdnczoge1xuICAgICAgICAgIFtgJHthZ2dDb250ZW50Lm5lc3RlZC5wYXRofToke0FHR1NfV1JBUFBFUl9GSUxURVJFRH1gXToge1xuICAgICAgICAgICAgZmlsdGVyOiB7XG4gICAgICAgICAgICAgIGJvb2w6IHtcbiAgICAgICAgICAgICAgICBzaG91bGQ6IG5lc3RlZFNxb25GaWx0ZXJzW2FnZ0NvbnRlbnQubmVzdGVkLnBhdGhdXG4gICAgICAgICAgICAgICAgICAuZmlsdGVyKFxuICAgICAgICAgICAgICAgICAgICBzcW9uRmlsdGVyID0+XG4gICAgICAgICAgICAgICAgICAgICAgYWdncmVnYXRpb25zRmlsdGVyVGhlbXNlbHZlcyB8fFxuICAgICAgICAgICAgICAgICAgICAgIGFnZ05hbWUuc3BsaXQoJzonKVswXSAhPT0gc3FvbkZpbHRlci5jb250ZW50LmZpZWxkLFxuICAgICAgICAgICAgICAgICAgKVxuICAgICAgICAgICAgICAgICAgLm1hcChzcW9uRmlsdGVyID0+XG4gICAgICAgICAgICAgICAgICAgIG9wU3dpdGNoKHtcbiAgICAgICAgICAgICAgICAgICAgICBuZXN0ZWRGaWVsZHM6IFtdLFxuICAgICAgICAgICAgICAgICAgICAgIGZpbHRlcjogbm9ybWFsaXplRmlsdGVycyhzcW9uRmlsdGVyKSxcbiAgICAgICAgICAgICAgICAgICAgfSksXG4gICAgICAgICAgICAgICAgICApLFxuICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIGFnZ3M6IGluamVjdE5lc3RlZEZpbHRlcnNUb0FnZ3Moe1xuICAgICAgICAgICAgICBhZ2dzOiBhZ2dDb250ZW50LmFnZ3MsXG4gICAgICAgICAgICAgIG5lc3RlZFNxb25GaWx0ZXJzLFxuICAgICAgICAgICAgICBhZ2dyZWdhdGlvbnNGaWx0ZXJUaGVtc2VsdmVzLFxuICAgICAgICAgICAgfSksXG4gICAgICAgICAgfSxcbiAgICAgICAgfSxcbiAgICAgIH07XG4gICAgICByZXR1cm4gYWNjO1xuICAgIH07XG5cbiAgICBpZiAoYWdnQ29udGVudC5nbG9iYWwgfHwgYWdnQ29udGVudC5maWx0ZXIpIHtcbiAgICAgIHJldHVybiBza2lwVG9OZXh0TGV2ZWwoKTtcbiAgICB9IGVsc2UgaWYgKGFnZ0NvbnRlbnQubmVzdGVkKSB7XG4gICAgICBpZiAobmVzdGVkU3FvbkZpbHRlcnNbYWdnQ29udGVudC5uZXN0ZWQucGF0aF0pIHtcbiAgICAgICAgcmV0dXJuIHdyYXBJbkZpbHRlckFnZygpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHNraXBUb05leHRMZXZlbCgpO1xuICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gYWNjO1xuICAgIH1cbiAgfSwgY2xvbmVEZWVwKGFnZ3MpKTtcblxuZXhwb3J0IGRlZmF1bHQgaW5qZWN0TmVzdGVkRmlsdGVyc1RvQWdncztcbiJdfQ==

dist/buildQuery/index.js

@@ -215,4 +215,2 @@ "use strict";
   if (isNested && pivot === ((_esFilters$2 = esFilters[0]) === null || _esFilters$2 === void 0 ? void 0 : _esFilters$2.nested.path)) {
-    return applyBooleanWrapper(esFilters);
-  } else {
     var flattned = esFilters.reduce(function (bools, esFilter) {
@@ -225,2 +223,4 @@ return op === _constants.AND_OP || op === _constants.NOT_OP ? collapseNestedFilters({
     return applyBooleanWrapper(flattned);
+  } else {
+    return applyBooleanWrapper(esFilters);
   }
@@ -308,2 +308,19 @@ }
     }
+  } else if ([_constants.ALL_OP].includes(op)) {
+    return getGroupFilter({
+      nestedFields: nestedFields,
+      filter: {
+        op: _constants.AND_OP,
+        pivot: pivot || '.',
+        content: filter.content.value.map(function (v) {
+          return {
+            op: _constants.IN_OP,
+            content: {
+              field: filter.content.field,
+              value: [v]
+            }
+          };
+        })
+      }
+    });
   } else if ([_constants.GT_OP, _constants.GTE_OP, _constants.LT_OP, _constants.LTE_OP].includes(op)) {
@@ -335,13 +352,7 @@ return getRangeFilter({
   if (Object.keys(rawFilters || {}).length === 0) return {};
-  var output = opSwitch({
+  return opSwitch({
     nestedFields: nestedFields,
     filter: (0, _normalizeFilters.default)(rawFilters)
   });
-  console.log('input: ', JSON.stringify({
-    nestedFields: nestedFields,
-    filters: rawFilters
-  }));
-  console.log('output: ', JSON.stringify(output));
-  return output;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/buildQuery/index.js"],"names":["wrapFilter","esFilter","nestedFields","filter","isNot","content","field","split","slice","map","p","i","segments","join","includes","reverse","reduce","path","getRegexFilter","op","value","regexp","replace","getTermFilter","terms","item","getFuzzyFilter","fields","sortedNested","sort","a","b","length","nestedMap","acc","group","find","y","push","Object","values","getMissingFilter","exists","boost","getRangeFilter","range","max","min","collapseNestedFilters","bools","filterIsNested","basePath","get","found","bool","wrappers","getGroupFilter","pivot","applyBooleanWrapper","esFilters","opSwitch","isNested","nested","flattned","getSetFilter","index","type","id","flatMap","getBetweenFilter","Error","rawFilters","filters","keys","output","console","log","JSON","stringify"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport {\n  ES_NESTED,\n  ES_QUERY,\n  ES_BOOL,\n  BETWEEN_OP,\n  GT_OP,\n  GTE_OP,\n  LT_OP,\n  LTE_OP,\n  IN_OP,\n  NOT_IN_OP,\n  SOME_NOT_IN_OP,\n  ES_MUST,\n  ES_MUST_NOT,\n  ES_MULTI_MATCH,\n  ES_FIELDS,\n  ES_TYPE,\n  ES_PHRASE_PREFIX,\n  ES_ARRANGER_SET_INDEX,\n  ES_ARRANGER_SET_TYPE,\n  OR_OP,\n  AND_OP,\n  FILTER_OP,\n  NOT_OP,\n  REGEX,\n  SET_ID,\n  MISSING,\n} from '../constants';\nimport normalizeFilters from './normalizeFilters';\nimport {\n  isNested,\n  readPath,\n  wrapMustNot,\n  wrapNested,\n  mergePath,\n  wrapShould,\n  wrapMust,\n  toEsRangeValue,\n} from '../utils/esFilter';\n\nconst wrapFilter = ({ esFilter, nestedFields, filter, isNot }) => {\n  return filter.content.field\n    .split('.')\n    .slice(0, -1)\n    .map((p, i, segments) => segments.slice(0, i + 1).join('.'))\n    .filter(p => nestedFields.includes(p))\n    .reverse()\n    .reduce(\n      (esFilter, path, i) => wrapNested(esFilter, path),\n      isNot ? wrapMustNot(esFilter) : esFilter,\n    );\n};\n\nfunction getRegexFilter({ nestedFields, filter }) {\n  const { op, content: { field, value: [value] } } = filter;\n  const esFilter = wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: { regexp: { [field]: value.replace('*', '.*') } },\n    isNot: NOT_IN_OP === op,\n  });\n\n  return op === SOME_NOT_IN_OP ? wrapMustNot(esFilter) : esFilter;\n}\n\nfunction getTermFilter({ nestedFields, filter }) {\n  const { op, content: { value, field } } = filter;\n  const esFilter = wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: { terms: { [field]: value.map(item => item || ''), boost: 0 } },\n    isNot: NOT_IN_OP === op,\n  });\n\n  return op === SOME_NOT_IN_OP ? wrapMustNot(esFilter) : esFilter;\n}\n\nfunction getFuzzyFilter({ nestedFields, filter }) {\n  const { content } = filter;\n  const { value, fields } = content;\n\n  // group queries by their nesting level\n  const sortedNested = nestedFields.slice().sort((a, b) => b.length - a.length);\n  const nestedMap = fields.reduce((acc, field) => {\n    const group = sortedNested.find(y => field.includes(y)) || '';\n    if (acc[group]) {\n      acc[group].push(field);\n    } else {\n      acc[group] = [field];\n    }\n    return acc;\n  }, {});\n\n  // construct one multi match per nested group\n  return wrapShould(\n    Object.values(nestedMap).map(fields =>\n      wrapFilter({\n        filter: { ...filter, content: { ...content, field: fields[0] } },\n        nestedFields,\n        esFilter: {\n          [ES_MULTI_MATCH]: {\n            [ES_QUERY]: value,\n            [ES_FIELDS]: fields,\n            [ES_TYPE]: ES_PHRASE_PREFIX,\n          },\n        },\n      }),\n    ),\n  );\n}\n\nfunction getMissingFilter({ nestedFields, filter }) {\n  const { content: { field } } = filter;\n  return wrapFilter({\n    esFilter: { exists: { field: field, boost: 0 } },\n    nestedFields,\n    filter,\n    isNot: true,\n  });\n}\n\nfunction getRangeFilter({ nestedFields, filter }) {\n  const { op, content: { field, value } } = filter;\n  return wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: {\n      range: {\n        [field]: {\n          boost: 0,\n          [op]: toEsRangeValue(\n            [GT_OP, GTE_OP].includes(op) ? _.max(value) : _.min(value),\n          ),\n        },\n      },\n    },\n  });\n}\n\nfunction collapseNestedFilters({ esFilter, bools }) {\n  const filterIsNested = isNested(esFilter);\n  const basePath = [...(filterIsNested ? [ES_NESTED, ES_QUERY] : []), ES_BOOL];\n  const path = [ES_MUST, ES_MUST_NOT]\n    .map(p => [...basePath, p])\n    .find(path => _.get(esFilter, path));\n\n  const found =\n    path &&\n    bools.find(\n      bool =>\n        filterIsNested\n          ? readPath(bool) === readPath(esFilter)\n          : _.get(bool, path),\n    );\n\n  return [\n    ...bools.filter(bool => bool !== found),\n    found\n      ? mergePath(\n          found,\n          path,\n          filterIsNested\n            ? collapseNestedFilters({\n                esFilter: _.get(esFilter, path)[0],\n                bools: _.get(found, path, []),\n              })\n            : [..._.get(found, path), ..._.get(esFilter, path)],\n        )\n      : esFilter,\n  ];\n}\n\nconst wrappers = {\n  [AND_OP]: wrapMust,\n  [OR_OP]: wrapShould,\n  [NOT_OP]: wrapMustNot,\n};\nfunction getGroupFilter({ nestedFields, filter: { content, op, pivot } }) {\n  const applyBooleanWrapper = wrappers[op];\n  const esFilters = content.map(filter => opSwitch({ nestedFields, filter }));\n  const isNested = !!esFilters[0]?.nested;\n  if (isNested && pivot === esFilters[0]?.nested.path) {\n    return applyBooleanWrapper(esFilters);\n  } else {\n    const flattned = esFilters.reduce(\n      (bools, esFilter) =>\n        op === AND_OP || op === NOT_OP\n          ? collapseNestedFilters({ esFilter, bools })\n          : [...bools, esFilter],\n      [],\n    );\n    return applyBooleanWrapper(flattned);\n  }\n}\n\nfunction getSetFilter({ nestedFields, filter, filter: { content, op } }) {\n  return wrapFilter({\n    isNot: op === NOT_IN_OP,\n    filter,\n    nestedFields,\n    esFilter: {\n      terms: {\n        boost: 0,\n        [content.field]: {\n          index: ES_ARRANGER_SET_INDEX,\n          type: ES_ARRANGER_SET_TYPE,\n          id: _.flatMap([content.value])[0].replace('set_id:', ''),\n          path: 'ids',\n        },\n      },\n    },\n  });\n}\n\nconst getBetweenFilter = ({ nestedFields, filter }) => {\n  const { content: { field, value } } = filter;\n  return wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: {\n      range: {\n        [field]: {\n          boost: 0,\n          [GTE_OP]: _.min(value),\n          [LTE_OP]: _.max(value),\n        },\n      },\n    },\n  });\n};\n\nexport const opSwitch = ({ nestedFields, filter }) => {\n  const { op, pivot, content: { value } } = filter;\n  // we need a way to handle object fields before the following error is valid\n  // if (pivot && pivot !== '.' && !nestedFields.includes(pivot)) {\n  //   throw new Error(`Invalid pivot field \"${pivot}\", not a nested field`);\n  // }\n  if ([OR_OP, AND_OP, NOT_OP].includes(op)) {\n    return getGroupFilter({ nestedFields, filter });\n  } else if ([IN_OP, NOT_IN_OP, SOME_NOT_IN_OP].includes(op)) {\n    if (`${value[0]}`.includes(REGEX)) {\n      return getRegexFilter({ nestedFields, filter });\n    } else if (`${value[0]}`.includes(SET_ID)) {\n      return getSetFilter({ nestedFields, filter });\n    } else if (`${value[0]}`.includes(MISSING)) {\n      return getMissingFilter({ nestedFields, filter });\n    } else {\n      return getTermFilter({ nestedFields, filter });\n    }\n  } else if ([GT_OP, GTE_OP, LT_OP, LTE_OP].includes(op)) {\n    return getRangeFilter({ nestedFields, filter });\n  } else if ([BETWEEN_OP].includes(op)) {\n    return getBetweenFilter({ nestedFields, filter });\n  } else if (FILTER_OP === op) {\n    return getFuzzyFilter({ nestedFields, filter });\n  } else {\n    throw new Error('unknown op');\n  }\n};\n\nexport default function({ nestedFields, filters: rawFilters }) {\n  if (Object.keys(rawFilters || {}).length === 0) return {};\n  const output = opSwitch({\n    nestedFields,\n    filter: normalizeFilters(rawFilters),\n  });\n  console.log(\n    'input: ',\n    JSON.stringify({\n      nestedFields,\n      filters: rawFilters,\n    }),\n  );\n  console.log('output: ', JSON.stringify(output));\n  return output;\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/buildQuery/index.js"],"names":["wrapFilter","esFilter","nestedFields","filter","isNot","content","field","split","slice","map","p","i","segments","join","includes","reverse","reduce","path","getRegexFilter","op","value","regexp","replace","getTermFilter","terms","item","getFuzzyFilter","fields","sortedNested","sort","a","b","length","nestedMap","acc","group","find","y","push","Object","values","getMissingFilter","exists","boost","getRangeFilter","range","max","min","collapseNestedFilters","bools","filterIsNested","basePath","get","found","bool","wrappers","getGroupFilter","pivot","applyBooleanWrapper","esFilters","opSwitch","isNested","nested","flattned","getSetFilter","index","type","id","flatMap","getBetweenFilter","v","Error","rawFilters","filters","keys"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport {\n  ES_NESTED,\n  ES_QUERY,\n  ES_BOOL,\n  BETWEEN_OP,\n  GT_OP,\n  GTE_OP,\n  LT_OP,\n  LTE_OP,\n  IN_OP,\n  NOT_IN_OP,\n  SOME_NOT_IN_OP,\n  ES_MUST,\n  ES_MUST_NOT,\n  ES_MULTI_MATCH,\n  ES_FIELDS,\n  ES_TYPE,\n  ES_PHRASE_PREFIX,\n  ES_ARRANGER_SET_INDEX,\n  ES_ARRANGER_SET_TYPE,\n  OR_OP,\n  AND_OP,\n  FILTER_OP,\n  NOT_OP,\n  REGEX,\n  SET_ID,\n  MISSING,\n  ALL_OP,\n} from '../constants';\nimport normalizeFilters from './normalizeFilters';\nimport {\n  isNested,\n  readPath,\n  wrapMustNot,\n  wrapNested,\n  mergePath,\n  wrapShould,\n  wrapMust,\n  toEsRangeValue,\n} from '../utils/esFilter';\n\nconst wrapFilter = ({ esFilter, nestedFields, filter, isNot }) => {\n  return filter.content.field\n    .split('.')\n    .slice(0, -1)\n    .map((p, i, segments) => segments.slice(0, i + 1).join('.'))\n    .filter(p => nestedFields.includes(p))\n    .reverse()\n    .reduce(\n      (esFilter, path, i) => wrapNested(esFilter, path),\n      isNot ? wrapMustNot(esFilter) : esFilter,\n    );\n};\n\nfunction getRegexFilter({ nestedFields, filter }) {\n  const { op, content: { field, value: [value] } } = filter;\n  const esFilter = wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: { regexp: { [field]: value.replace('*', '.*') } },\n    isNot: NOT_IN_OP === op,\n  });\n\n  return op === SOME_NOT_IN_OP ? wrapMustNot(esFilter) : esFilter;\n}\n\nfunction getTermFilter({ nestedFields, filter }) {\n  const { op, content: { value, field } } = filter;\n  const esFilter = wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: { terms: { [field]: value.map(item => item || ''), boost: 0 } },\n    isNot: NOT_IN_OP === op,\n  });\n\n  return op === SOME_NOT_IN_OP ? wrapMustNot(esFilter) : esFilter;\n}\n\nfunction getFuzzyFilter({ nestedFields, filter }) {\n  const { content } = filter;\n  const { value, fields } = content;\n\n  // group queries by their nesting level\n  const sortedNested = nestedFields.slice().sort((a, b) => b.length - a.length);\n  const nestedMap = fields.reduce((acc, field) => {\n    const group = sortedNested.find(y => field.includes(y)) || '';\n    if (acc[group]) {\n      acc[group].push(field);\n    } else {\n      acc[group] = [field];\n    }\n    return acc;\n  }, {});\n\n  // construct one multi match per nested group\n  return wrapShould(\n    Object.values(nestedMap).map(fields =>\n      wrapFilter({\n        filter: { ...filter, content: { ...content, field: fields[0] } },\n        nestedFields,\n        esFilter: {\n          [ES_MULTI_MATCH]: {\n            [ES_QUERY]: value,\n            [ES_FIELDS]: fields,\n            [ES_TYPE]: ES_PHRASE_PREFIX,\n          },\n        },\n      }),\n    ),\n  );\n}\n\nfunction getMissingFilter({ nestedFields, filter }) {\n  const { content: { field } } = filter;\n  return wrapFilter({\n    esFilter: { exists: { field: field, boost: 0 } },\n    nestedFields,\n    filter,\n    isNot: true,\n  });\n}\n\nfunction getRangeFilter({ nestedFields, filter }) {\n  const { op, content: { field, value } } = filter;\n  return wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: {\n      range: {\n        [field]: {\n          boost: 0,\n          [op]: toEsRangeValue(\n            [GT_OP, GTE_OP].includes(op) ? _.max(value) : _.min(value),\n          ),\n        },\n      },\n    },\n  });\n}\n\nfunction collapseNestedFilters({ esFilter, bools }) {\n  const filterIsNested = isNested(esFilter);\n  const basePath = [...(filterIsNested ? [ES_NESTED, ES_QUERY] : []), ES_BOOL];\n  const path = [ES_MUST, ES_MUST_NOT]\n    .map(p => [...basePath, p])\n    .find(path => _.get(esFilter, path));\n\n  const found =\n    path &&\n    bools.find(\n      bool =>\n        filterIsNested\n          ? readPath(bool) === readPath(esFilter)\n          : _.get(bool, path),\n    );\n\n  return [\n    ...bools.filter(bool => bool !== found),\n    found\n      ? mergePath(\n          found,\n          path,\n          filterIsNested\n            ? collapseNestedFilters({\n                esFilter: _.get(esFilter, path)[0],\n                bools: _.get(found, path, []),\n              })\n            : [..._.get(found, path), ..._.get(esFilter, path)],\n        )\n      : esFilter,\n  ];\n}\n\nconst wrappers = {\n  [AND_OP]: wrapMust,\n  [OR_OP]: wrapShould,\n  [NOT_OP]: wrapMustNot,\n};\nfunction getGroupFilter({ nestedFields, filter: { content, op, pivot } }) {\n  const applyBooleanWrapper = wrappers[op];\n  const esFilters = content.map(filter => opSwitch({ nestedFields, filter }));\n  const isNested = !!esFilters[0]?.nested;\n  if (isNested && pivot === esFilters[0]?.nested.path) {\n    const flattned = esFilters.reduce(\n      (bools, esFilter) =>\n        op === AND_OP || op === NOT_OP\n          ? collapseNestedFilters({ esFilter, bools })\n          : [...bools, esFilter],\n      [],\n    );\n    return applyBooleanWrapper(flattned);\n  } else {\n    return applyBooleanWrapper(esFilters);\n  }\n}\n\nfunction getSetFilter({ nestedFields, filter, filter: { content, op } }) {\n  return wrapFilter({\n    isNot: op === NOT_IN_OP,\n    filter,\n    nestedFields,\n    esFilter: {\n      terms: {\n        boost: 0,\n        [content.field]: {\n          index: ES_ARRANGER_SET_INDEX,\n          type: ES_ARRANGER_SET_TYPE,\n          id: _.flatMap([content.value])[0].replace('set_id:', ''),\n          path: 'ids',\n        },\n      },\n    },\n  });\n}\n\nconst getBetweenFilter = ({ nestedFields, filter }) => {\n  const { content: { field, value } } = filter;\n  return wrapFilter({\n    filter,\n    nestedFields,\n    esFilter: {\n      range: {\n        [field]: {\n          boost: 0,\n          [GTE_OP]: _.min(value),\n          [LTE_OP]: _.max(value),\n        },\n      },\n    },\n  });\n};\n\nexport const opSwitch = ({ nestedFields, filter }) => {\n  const { op, pivot, content: { value } } = filter;\n  // we need a way to handle object fields before the following error is valid\n  // if (pivot && pivot !== '.' && !nestedFields.includes(pivot)) {\n  //   throw new Error(`Invalid pivot field \"${pivot}\", not a nested field`);\n  // }\n  if ([OR_OP, AND_OP, NOT_OP].includes(op)) {\n    return getGroupFilter({ nestedFields, filter });\n  } else if ([IN_OP, NOT_IN_OP, SOME_NOT_IN_OP].includes(op)) {\n    if (`${value[0]}`.includes(REGEX)) {\n      return getRegexFilter({ nestedFields, filter });\n    } else if (`${value[0]}`.includes(SET_ID)) {\n      return getSetFilter({ nestedFields, filter });\n    } else if (`${value[0]}`.includes(MISSING)) {\n      return getMissingFilter({ nestedFields, filter });\n    } else {\n      return getTermFilter({ nestedFields, filter });\n    }\n  } else if ([ALL_OP].includes(op)) {\n    return getGroupFilter({\n      nestedFields,\n      filter: {\n        op: AND_OP,\n        pivot: pivot || '.',\n        content: filter.content.value.map(v => ({\n          op: IN_OP,\n          content: {\n            field: filter.content.field,\n            value: [v],\n          },\n        })),\n      },\n    });\n  } else if ([GT_OP, GTE_OP, LT_OP, LTE_OP].includes(op)) {\n    return getRangeFilter({ nestedFields, filter });\n  } else if ([BETWEEN_OP].includes(op)) {\n    return getBetweenFilter({ nestedFields, filter });\n  } else if (FILTER_OP === op) {\n    return getFuzzyFilter({ nestedFields, filter });\n  } else {\n    throw new Error('unknown op');\n  }\n};\n\nexport default function({ nestedFields, filters: rawFilters }) {\n  if (Object.keys(rawFilters || {}).length === 0) return {};\n  return opSwitch({\n    nestedFields,\n    filter: normalizeFilters(rawFilters),\n  });\n}\n"]}

dist/buildQuery/normalizeFilters.js

@@ -12,4 +12,2 @@ "use strict";
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -70,30 +68,3 @@
 };
-/**
- * Special handlings for ALL_OP:
- * - "all" special default for "pivot" based on the content
- * field
- * - preserves grouping so for easy conversion to ES query based on pivot
- **/
 
-
-var transformAllOp = function transformAllOp(filter) {
-  var _applyDefaultPivots;
-
-  var content = filter.content;
-  var field = content.field;
-  var fieldPaths = field.includes('.') ? field.split('.') : [];
-  var defaultPivot = fieldPaths.length ? fieldPaths.slice(0, fieldPaths.length - 1).join('.') : null;
-  return applyDefaultPivots((_applyDefaultPivots = {
-    op: _constants.AND_OP
-  }, _defineProperty(_applyDefaultPivots, _UNFLAT_KEY_, true), _defineProperty(_applyDefaultPivots, "pivot", filter.pivot || defaultPivot), _defineProperty(_applyDefaultPivots, "content", filter.content.value.map(function (val) {
-    return {
-      op: _constants.IN_OP,
-      content: {
-        field: filter.content.field,
-        value: [val]
-      }
-    };
-  })), _applyDefaultPivots));
-};
-
 function normalizeFilters(filter) {
@@ -142,4 +113,2 @@ var op = filter.op,
     });
-  } else if ([_constants.ALL_OP].includes(op)) {
-    return transformAllOp(filter);
   } else if ([_constants.AND_OP, _constants.OR_OP, _constants.NOT_OP].includes(op)) {
@@ -158,2 +127,2 @@ return groupingOptimizer(filter);
 exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/buildQuery/normalizeFilters.js"],"names":["_UNFLAT_KEY_","groupingOptimizer","op","content","pivot","map","normalizeFilters","reduce","filters","f","samePivot","isSpecialFilter","value","some","x","includes","applyDefaultPivots","filter","transformAllOp","field","fieldPaths","split","defaultPivot","length","slice","join","val","Error","Array","isArray","concat","specialFilters","specialValue","normalValues","psv","output"],"mappings":"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","sourcesContent":["import { omit, isArray, min, max } from 'lodash';\nimport {\n  IN_OP,\n  NOT_IN_OP,\n  OR_OP,\n  AND_OP,\n  NOT_OP,\n  OP_ALIASES,\n  ARRAY_CONTENT,\n  REGEX,\n  SET_ID,\n  MISSING,\n  ALL_OP,\n} from '../constants';\n\n// _UNFLAT_KEY_ is a ephemeral mark for groupingOptimizer to not apply grouping\nconst _UNFLAT_KEY_ = '__unflat__';\nfunction groupingOptimizer({ op, content, pivot }) {\n  return {\n    op,\n    pivot,\n    content: content.map(normalizeFilters).reduce((filters, f) => {\n      const samePivot = f.pivot === pivot || !f.pivot;\n      if (f.op === op && !f[_UNFLAT_KEY_] && samePivot) {\n        return [...filters, ...f.content];\n      } else {\n        return [...filters, omit(f, _UNFLAT_KEY_)];\n      }\n    }, []),\n  };\n}\n\nfunction isSpecialFilter(value) {\n  return [REGEX, SET_ID, MISSING].some(x => `${value}`.includes(x));\n}\n\nconst applyDefaultPivots = filter => {\n  const { content, pivot = null } = filter;\n  const { value } = content;\n  if (value) {\n    return {\n      ...filter,\n      pivot,\n    };\n  } else {\n    return {\n      ...filter,\n      pivot,\n      content: filter.content.map(applyDefaultPivots),\n    };\n  }\n};\n\n/**\n * Special handlings for ALL_OP:\n * - \"all\" special default for \"pivot\" based on the content\n * field\n * - preserves grouping so for easy conversion to ES query based on pivot\n **/\nconst transformAllOp = filter => {\n  const { content } = filter;\n  const field = content.field;\n  const fieldPaths = field.includes('.') ? field.split('.') : [];\n  const defaultPivot = fieldPaths.length\n    ? fieldPaths.slice(0, fieldPaths.length - 1).join('.')\n    : null;\n  return applyDefaultPivots({\n    op: AND_OP,\n    [_UNFLAT_KEY_]: true,\n    pivot: filter.pivot || defaultPivot,\n    content: filter.content.value.map(val => ({\n      op: IN_OP,\n      content: {\n        field: filter.content.field,\n        value: [val],\n      },\n    })),\n  });\n};\n\nfunction normalizeFilters(filter) {\n  const { op, content } = filter;\n\n  if (!op) {\n    throw Error(`Must specify \"op\" in filters: ${filter}`);\n  } else if (!content) {\n    throw Error(`Must specify \"content\" in filters: ${filter}`);\n  }\n\n  const { value } = content;\n  if (OP_ALIASES[op]) {\n    return normalizeFilters({ ...filter, op: OP_ALIASES[op] });\n  } else if (ARRAY_CONTENT.includes(op) && !Array.isArray(value)) {\n    return normalizeFilters({\n      ...filter,\n      content: { ...content, value: [].concat(value) },\n    });\n  } else if (\n    [IN_OP, NOT_IN_OP].includes(op) &&\n    value.some(isSpecialFilter) &&\n    value.length > 1\n  ) {\n    // Separate filters with special handling into separate filters and \"or\" them with the normal filter\n    const specialFilters = value.filter(isSpecialFilter).map(specialValue => ({\n      ...filter,\n      content: { ...content, value: [specialValue] },\n    }));\n\n    const normalValues = value.filter(psv => !isSpecialFilter(psv));\n    const filters =\n      normalValues.length > 0\n        ? [\n            { ...filter, content: { ...content, value: normalValues } },\n            ...specialFilters,\n          ]\n        : specialFilters;\n\n    return normalizeFilters({ op: OR_OP, content: filters });\n  } else if ([ALL_OP].includes(op)) {\n    return transformAllOp(filter);\n  } else if ([AND_OP, OR_OP, NOT_OP].includes(op)) {\n    return groupingOptimizer(filter);\n  } else {\n    return filter;\n  }\n}\n\nexport default filter => {\n  const output = filter ? applyDefaultPivots(normalizeFilters(filter)) : filter;\n  return output;\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZFF1ZXJ5L25vcm1hbGl6ZUZpbHRlcnMuanMiXSwibmFtZXMiOlsiX1VORkxBVF9LRVlfIiwiZ3JvdXBpbmdPcHRpbWl6ZXIiLCJvcCIsImNvbnRlbnQiLCJwaXZvdCIsIm1hcCIsIm5vcm1hbGl6ZUZpbHRlcnMiLCJyZWR1Y2UiLCJmaWx0ZXJzIiwiZiIsInNhbWVQaXZvdCIsImlzU3BlY2lhbEZpbHRlciIsInZhbHVlIiwic29tZSIsIngiLCJpbmNsdWRlcyIsImFwcGx5RGVmYXVsdFBpdm90cyIsImZpbHRlciIsIkVycm9yIiwiQXJyYXkiLCJpc0FycmF5IiwiY29uY2F0IiwibGVuZ3RoIiwic3BlY2lhbEZpbHRlcnMiLCJzcGVjaWFsVmFsdWUiLCJub3JtYWxWYWx1ZXMiLCJwc3YiLCJvdXRwdXQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFDQTs7Ozs7Ozs7Ozs7O0FBY0E7QUFDQSxJQUFNQSxZQUFZLEdBQUcsWUFBckI7O0FBQ0EsU0FBU0MsaUJBQVQsT0FBbUQ7QUFBQSxNQUF0QkMsRUFBc0IsUUFBdEJBLEVBQXNCO0FBQUEsTUFBbEJDLE9BQWtCLFFBQWxCQSxPQUFrQjtBQUFBLE1BQVRDLEtBQVMsUUFBVEEsS0FBUztBQUNqRCxTQUFPO0FBQ0xGLElBQUFBLEVBQUUsRUFBRkEsRUFESztBQUVMRSxJQUFBQSxLQUFLLEVBQUxBLEtBRks7QUFHTEQsSUFBQUEsT0FBTyxFQUFFQSxPQUFPLENBQUNFLEdBQVIsQ0FBWUMsZ0JBQVosRUFBOEJDLE1BQTlCLENBQXFDLFVBQUNDLE9BQUQsRUFBVUMsQ0FBVixFQUFnQjtBQUM1RCxVQUFNQyxTQUFTLEdBQUdELENBQUMsQ0FBQ0wsS0FBRixLQUFZQSxLQUFaLElBQXFCLENBQUNLLENBQUMsQ0FBQ0wsS0FBMUM7O0FBQ0EsVUFBSUssQ0FBQyxDQUFDUCxFQUFGLEtBQVNBLEVBQVQsSUFBZSxDQUFDTyxDQUFDLENBQUNULFlBQUQsQ0FBakIsSUFBbUNVLFNBQXZDLEVBQWtE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WUFBWSxDQUFDSCxNQUFiLEdBQXNCLENBQXRCLGlCQUVXTCxNQUZYO0FBRW1CZCxNQUFBQSxPQUFPLGVBQU9BLE9BQVA7QUFBZ0JTLFFBQUFBLEtBQUssRUFBRWE7QUFBdkI7QUFGMUIsa0NBR1NGLGNBSFQsS0FLSUEsY0FOTjtBQVFBLFdBQU9qQixnQkFBZ0IsQ0FBQztBQUFFSixNQUFBQSxFQUFFLGtCQUFKO0FBQWFDLE1BQUFBLE9BQU8sRUFBRUs7QUFBdEIsS0FBRCxDQUF2QjtBQUNELEdBckJNLE1BcUJBLElBQUkseURBQXdCTyxRQUF4QixDQUFpQ2IsRUFBakMsQ0FBSixFQUEwQztBQUMvQyxXQUFPRCxpQkFBaUIsQ0FBQ2dCLE1BQUQsQ0FBeEI7QUFDRCxHQUZNLE1BRUE7QUFDTCxXQUFPQSxNQUFQO0FBQ0Q7QUFDRjs7ZUFFYyxrQkFBQUEsTUFBTSxFQUFJO0FBQ3ZCLE1BQU1VLE1BQU0sR0FBR1YsTUFBTSxHQUFHRCxrQkFBa0IsQ0FBQ1YsZ0JBQWdCLENBQUNXLE1BQUQsQ0FBakIsQ0FBckIsR0FBa0RBLE1BQXZFO0FBQ0EsU0FBT1UsTUFBUDtBQUNELEMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBvbWl0LCBpc0FycmF5LCBtaW4sIG1heCB9IGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQge1xuICBJTl9PUCxcbiAgTk9UX0lOX09QLFxuICBPUl9PUCxcbiAgQU5EX09QLFxuICBOT1RfT1AsXG4gIE9QX0FMSUFTRVMsXG4gIEFSUkFZX0NPTlRFTlQsXG4gIFJFR0VYLFxuICBTRVRfSUQsXG4gIE1JU1NJTkcsXG4gIEFMTF9PUCxcbn0gZnJvbSAnLi4vY29uc3RhbnRzJztcblxuLy8gX1VORkxBVF9LRVlfIGlzIGEgZXBoZW1lcmFsIG1hcmsgZm9yIGdyb3VwaW5nT3B0aW1pemVyIHRvIG5vdCBhcHBseSBncm91cGluZ1xuY29uc3QgX1VORkxBVF9LRVlfID0gJ19fdW5mbGF0X18nO1xuZnVuY3Rpb24gZ3JvdXBpbmdPcHRpbWl6ZXIoeyBvcCwgY29udGVudCwgcGl2b3QgfSkge1xuICByZXR1cm4ge1xuICAgIG9wLFxuICAgIHBpdm90LFxuICAgIGNvbnRlbnQ6IGNvbnRlbnQubWFwKG5vcm1hbGl6ZUZpbHRlcnMpLnJlZHVjZSgoZmlsdGVycywgZikgPT4ge1xuICAgICAgY29uc3Qgc2FtZVBpdm90ID0gZi5waXZvdCA9PT0gcGl2b3QgfHwgIWYucGl2b3Q7XG4gICAgICBpZiAoZi5vcCA9PT0gb3AgJiYgIWZbX1VORkxBVF9LRVlfXSAmJiBzYW1lUGl2b3QpIHtcbiAgICAgICAgcmV0dXJuIFsuLi5maWx0ZXJzLCAuLi5mLmNvbnRlbnRdO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIFsuLi5maWx0ZXJzLCBvbWl0KGYsIF9VTkZMQVRfS0VZXyldO1xuICAgICAgfVxuICAgIH0sIFtdKSxcbiAgfTtcbn1cblxuZnVuY3Rpb24gaXNTcGVjaWFsRmlsdGVyKHZhbHVlKSB7XG4gIHJldHVybiBbUkVHRVgsIFNFVF9JRCwgTUlTU0lOR10uc29tZSh4ID0+IGAke3ZhbHVlfWAuaW5jbHVkZXMoeCkpO1xufVxuXG5jb25zdCBhcHBseURlZmF1bHRQaXZvdHMgPSBmaWx0ZXIgPT4ge1xuICBjb25zdCB7IGNvbnRlbnQsIHBpdm90ID0gbnVsbCB9ID0gZmlsdGVyO1xuICBjb25zdCB7IHZhbHVlIH0gPSBjb250ZW50O1xuICBpZiAodmFsdWUpIHtcbiAgICByZXR1cm4ge1xuICAgICAgLi4uZmlsdGVyLFxuICAgICAgcGl2b3QsXG4gICAgfTtcbiAgfSBlbHNlIHtcbiAgICByZXR1cm4ge1xuICAgICAgLi4uZmlsdGVyLFxuICAgICAgcGl2b3QsXG4gICAgICBjb250ZW50OiBmaWx0ZXIuY29udGVudC5tYXAoYXBwbHlEZWZhdWx0UGl2b3RzKSxcbiAgICB9O1xuICB9XG59O1xuXG5mdW5jdGlvbiBub3JtYWxpemVGaWx0ZXJzKGZpbHRlcikge1xuICBjb25zdCB7IG9wLCBjb250ZW50IH0gPSBmaWx0ZXI7XG5cbiAgaWYgKCFvcCkge1xuICAgIHRocm93IEVycm9yKGBNdXN0IHNwZWNpZnkgXCJvcFwiIGluIGZpbHRlcnM6ICR7ZmlsdGVyfWApO1xuICB9IGVsc2UgaWYgKCFjb250ZW50KSB7XG4gICAgdGhyb3cgRXJyb3IoYE11c3Qgc3BlY2lmeSBcImNvbnRlbnRcIiBpbiBmaWx0ZXJzOiAke2ZpbHRlcn1gKTtcbiAgfVxuXG4gIGNvbnN0IHsgdmFsdWUgfSA9IGNvbnRlbnQ7XG4gIGlmIChPUF9BTElBU0VTW29wXSkge1xuICAgIHJldHVybiBub3JtYWxpemVGaWx0ZXJzKHsgLi4uZmlsdGVyLCBvcDogT1BfQUxJQVNFU1tvcF0gfSk7XG4gIH0gZWxzZSBpZiAoQVJSQVlfQ09OVEVOVC5pbmNsdWRlcyhvcCkgJiYgIUFycmF5LmlzQXJyYXkodmFsdWUpKSB7XG4gICAgcmV0dXJuIG5vcm1hbGl6ZUZpbHRlcnMoe1xuICAgICAgLi4uZmlsdGVyLFxuICAgICAgY29udGVudDogeyAuLi5jb250ZW50LCB2YWx1ZTogW10uY29uY2F0KHZhbHVlKSB9LFxuICAgIH0pO1xuICB9IGVsc2UgaWYgKFxuICAgIFtJTl9PUCwgTk9UX0lOX09QXS5pbmNsdWRlcyhvcCkgJiZcbiAgICB2YWx1ZS5zb21lKGlzU3BlY2lhbEZpbHRlcikgJiZcbiAgICB2YWx1ZS5sZW5ndGggPiAxXG4gICkge1xuICAgIC8vIFNlcGFyYXRlIGZpbHRlcnMgd2l0aCBzcGVjaWFsIGhhbmRsaW5nIGludG8gc2VwYXJhdGUgZmlsdGVycyBhbmQgXCJvclwiIHRoZW0gd2l0aCB0aGUgbm9ybWFsIGZpbHRlclxuICAgIGNvbnN0IHNwZWNpYWxGaWx0ZXJzID0gdmFsdWUuZmlsdGVyKGlzU3BlY2lhbEZpbHRlcikubWFwKHNwZWNpYWxWYWx1ZSA9PiAoe1xuICAgICAgLi4uZmlsdGVyLFxuICAgICAgY29udGVudDogeyAuLi5jb250ZW50LCB2YWx1ZTogW3NwZWNpYWxWYWx1ZV0gfSxcbiAgICB9KSk7XG5cbiAgICBjb25zdCBub3JtYWxWYWx1ZXMgPSB2YWx1ZS5maWx0ZXIocHN2ID0+ICFpc1NwZWNpYWxGaWx0ZXIocHN2KSk7XG4gICAgY29uc3QgZmlsdGVycyA9XG4gICAgICBub3JtYWxWYWx1ZXMubGVuZ3RoID4gMFxuICAgICAgICA/IFtcbiAgICAgICAgICAgIHsgLi4uZmlsdGVyLCBjb250ZW50OiB7IC4uLmNvbnRlbnQsIHZhbHVlOiBub3JtYWxWYWx1ZXMgfSB9LFxuICAgICAgICAgICAgLi4uc3BlY2lhbEZpbHRlcnMsXG4gICAgICAgICAgXVxuICAgICAgICA6IHNwZWNpYWxGaWx0ZXJzO1xuXG4gICAgcmV0dXJuIG5vcm1hbGl6ZUZpbHRlcnMoeyBvcDogT1JfT1AsIGNvbnRlbnQ6IGZpbHRlcnMgfSk7XG4gIH0gZWxzZSBpZiAoW0FORF9PUCwgT1JfT1AsIE5PVF9PUF0uaW5jbHVkZXMob3ApKSB7XG4gICAgcmV0dXJuIGdyb3VwaW5nT3B0aW1pemVyKGZpbHRlcik7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIGZpbHRlcjtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBmaWx0ZXIgPT4ge1xuICBjb25zdCBvdXRwdXQgPSBmaWx0ZXIgPyBhcHBseURlZmF1bHRQaXZvdHMobm9ybWFsaXplRmlsdGVycyhmaWx0ZXIpKSA6IGZpbHRlcjtcbiAgcmV0dXJuIG91dHB1dDtcbn07XG4iXX0=

package.json

 {
   "name": "@arranger/middleware",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Arranger Middleware",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

test/buildAggregations/buildAggregations.test.js

@@ -217,3 +217,3 @@ import buildAggregations from '../../src/buildAggregations';
                 bool: {
-                  must: [],
+                  should: [],
                 },
@@ -419,3 +419,3 @@ },
                 bool: {
-                  must: [
+                  should: [
                     {
@@ -550,3 +550,3 @@ terms: {
                         bool: {
-                          must: [
+                          should: [
                             {
@@ -646,3 +646,3 @@ terms: {
                 bool: {
-                  must: [
+                  should: [
                     {
@@ -649,0 +649,0 @@ terms: {

test/buildQuery/buildQuery.test.js

@@ -84,2 +84,128 @@ import buildQuery from '../../src/buildQuery';
 
+test('buildQuery "all" ops', () => {
+  const tests = [
+    {
+      input: {
+        nestedFields: ['diagnoses'],
+        filters: {
+          op: 'and',
+          content: [
+            {
+              op: 'all',
+              content: {
+                field: 'diagnoses.diagnosis',
+                value: ['ganglioglioma', 'low grade glioma'],
+              },
+            },
+          ],
+        },
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              bool: {
+                must: [
+                  {
+                    nested: {
+                      path: 'diagnoses',
+                      query: {
+                        bool: {
+                          must: [
+                            {
+                              terms: {
+                                'diagnoses.diagnosis': ['ganglioglioma'],
+                                boost: 0,
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    },
+                  },
+                  {
+                    nested: {
+                      path: 'diagnoses',
+                      query: {
+                        bool: {
+                          must: [
+                            {
+                              terms: {
+                                'diagnoses.diagnosis': ['low grade glioma'],
+                                boost: 0,
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    },
+    {
+      input: {
+        nestedFields: ['diagnoses'],
+        filters: {
+          op: 'and',
+          content: [
+            {
+              op: 'all',
+              pivot: 'diagnoses',
+              content: {
+                field: 'diagnoses.diagnosis',
+                value: ['ganglioglioma', 'low grade glioma'],
+              },
+            },
+          ],
+        },
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              bool: {
+                must: [
+                  {
+                    nested: {
+                      path: 'diagnoses',
+                      query: {
+                        bool: {
+                          must: [
+                            {
+                              terms: {
+                                'diagnoses.diagnosis': ['ganglioglioma'],
+                                boost: 0,
+                              },
+                            },
+                            {
+                              terms: {
+                                'diagnoses.diagnosis': ['low grade glioma'],
+                                boost: 0,
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    },
+  ];
+  tests.forEach(({ input, output }) => {
+    const actualOutput = buildQuery(input);
+    console.log('actualOutput: ', JSON.stringify(actualOutput));
+    expect(actualOutput).toEqual(output);
+  });
+});
+
 test('buildQuery "and", "or" ops nested inside each other', () => {
@@ -140,9 +266,3 @@ const tests = [
         nestedFields: [],
-        filters: {
-          op: '!=',
-          content: {
-            field: 'project_code',
-            value: 'ACC',
-          },
-        },
+        filters: { op: '!=', content: { field: 'project_code', value: 'ACC' } },
       },
@@ -159,16 +279,4 @@ output: {
           content: [
-            {
-              op: '=',
-              content: {
-                field: 'program',
-                value: ['TCGA'],
-              },
-            },
-            {
-              op: '=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'program', value: ['TCGA'] } },
+            { op: '=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -192,16 +300,4 @@ },
           content: [
-            {
-              op: '=',
-              content: {
-                field: 'program',
-                value: ['TCGA'],
-              },
-            },
-            {
-              op: '!=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'program', value: ['TCGA'] } },
+            { op: '!=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -230,25 +326,7 @@ },
               content: [
-                {
-                  op: '=',
-                  content: {
-                    field: 'program',
-                    value: ['TCGA'],
-                  },
-                },
-                {
-                  op: '=',
-                  content: {
-                    field: 'project',
-                    value: ['ACC'],
-                  },
-                },
+                { op: '=', content: { field: 'program', value: ['TCGA'] } },
+                { op: '=', content: { field: 'project', value: ['ACC'] } },
               ],
             },
-            {
-              op: '=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -276,25 +354,7 @@ },
               content: [
-                {
-                  op: '=',
-                  content: {
-                    field: 'program',
-                    value: ['TCGA'],
-                  },
-                },
-                {
-                  op: '=',
-                  content: {
-                    field: 'project',
-                    value: ['ACC'],
-                  },
-                },
+                { op: '=', content: { field: 'program', value: ['TCGA'] } },
+                { op: '=', content: { field: 'project', value: ['ACC'] } },
               ],
             },
-            {
-              op: '!=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '!=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -324,25 +384,7 @@ },
               content: [
-                {
-                  op: '=',
-                  content: {
-                    field: 'program',
-                    value: ['TCGA'],
-                  },
-                },
-                {
-                  op: '!=',
-                  content: {
-                    field: 'project',
-                    value: ['ACC'],
-                  },
-                },
+                { op: '=', content: { field: 'program', value: ['TCGA'] } },
+                { op: '!=', content: { field: 'project', value: ['ACC'] } },
               ],
             },
-            {
-              op: '=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -370,25 +412,7 @@ },
               content: [
-                {
-                  op: '=',
-                  content: {
-                    field: 'program',
-                    value: ['TCGA'],
-                  },
-                },
-                {
-                  op: '!=',
-                  content: {
-                    field: 'project',
-                    value: ['ACC'],
-                  },
-                },
+                { op: '=', content: { field: 'program', value: ['TCGA'] } },
+                { op: '!=', content: { field: 'project', value: ['ACC'] } },
               ],
             },
-            {
-              op: '!=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '!=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -401,9 +425,5 @@ },
             { terms: { program: ['TCGA'], boost: 0 } },
+            { bool: { must_not: [{ terms: { project: ['ACC'], boost: 0 } }] } },
             {
-              bool: {
-                must_not: [
-                  { terms: { project: ['ACC'], boost: 0 } },
-                  { terms: { status: ['legacy'], boost: 0 } },
-                ],
-              },
+              bool: { must_not: [{ terms: { status: ['legacy'], boost: 0 } }] },
             },
@@ -420,16 +440,4 @@ ],
           content: [
-            {
-              op: '=',
-              content: {
-                field: 'program',
-                value: ['TCGA'],
-              },
-            },
-            {
-              op: '=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'program', value: ['TCGA'] } },
+            { op: '=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -453,16 +461,4 @@ },
           content: [
-            {
-              op: '=',
-              content: {
-                field: 'program',
-                value: ['TCGA'],
-              },
-            },
-            {
-              op: '!=',
-              content: {
-                field: 'status',
-                value: ['legacy'],
-              },
-            },
+            { op: '=', content: { field: 'program', value: ['TCGA'] } },
+            { op: '!=', content: { field: 'status', value: ['legacy'] } },
           ],
@@ -488,26 +484,8 @@ },
           content: [
+            { op: '=', content: { field: 'project', value: ['ACC'] } },
             {
-              op: '=',
-              content: {
-                field: 'project',
-                value: ['ACC'],
-              },
-            },
-            {
               op: 'and',
               content: [
-                {
-                  op: '=',
-                  content: {
-                    field: 'program',
-                    value: ['TCGA'],
-                  },
-                },
-                {
-                  op: '=',
-                  content: {
-                    field: 'status',
-                    value: ['legacy'],
-                  },
-                },
+                { op: '=', content: { field: 'program', value: ['TCGA'] } },
+                { op: '=', content: { field: 'status', value: ['legacy'] } },
               ],
@@ -540,15 +518,9 @@ },
           content: [
+            { op: '!=', content: { field: 'access', value: 'protected' } },
             {
-              op: '!=',
-              content: { field: 'access', value: 'protected' },
-            },
-            {
               op: 'and',
               content: [
+                { op: '=', content: { field: 'center.code', value: '01' } },
                 {
                   op: '=',
-                  content: { field: 'center.code', value: '01' },
-                },
-                {
-                  op: '=',
                   content: {
@@ -581,9 +553,3 @@ field: 'cases.project.primary_site',
         nestedFields: [],
-        filters: {
-          op: '=',
-          content: {
-            field: 'is_canonical',
-            value: [true],
-          },
-        },
+        filters: { op: '=', content: { field: 'is_canonical', value: [true] } },
       },
@@ -595,9 +561,3 @@ output: { terms: { is_canonical: [true], boost: 0 } },
         nestedFields: [],
-        filters: {
-          op: '=',
-          content: {
-            field: 'case_count',
-            value: [24601],
-          },
-        },
+        filters: { op: '=', content: { field: 'case_count', value: [24601] } },
       },
@@ -608,3 +568,3 @@ output: { terms: { case_count: [24601], boost: 0 } },
 
-  tests.forEach(({ input, output }) => {
+  tests.forEach(({ input, output }, i) => {
     const actualOutput = buildQuery(input);
@@ -611,0 +571,0 @@ expect(actualOutput).toEqual(output);

test/buildQuery/buildQueryNested.test.js

@@ -68,2 +68,13 @@ import buildQuery from '../../src/buildQuery';
                       },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'participants',
+                query: {
+                  bool: {
+                    must: [
                       {
@@ -105,3 +116,3 @@ nested: {
 
-test('buildQuery ">=" and "<=" nested', () => {
+test('buildQuery single ">="', () => {
   const nestedFields = ['files', 'files.foo', 'files.foo.bar', 'files.nn.baz'];
@@ -114,9 +125,3 @@ const tests = [
           content: [
-            {
-              content: {
-                field: 'files.foo.name',
-                value: 7,
-              },
-              op: '>=',
-            },
+            { content: { field: 'files.foo.name', value: 7 }, op: '>=' },
           ],
@@ -131,2 +136,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -137,2 +143,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -143,6 +150,3 @@ bool: {
                                   range: {
-                                    'files.foo.name': {
-                                      boost: 0,
-                                      gte: 7,
-                                    },
+                                    'files.foo.name': { boost: 0, gte: 7 },
                                   },
@@ -153,3 +157,2 @@ },
                           },
-                          path: 'files.foo',
                         },
@@ -160,3 +163,2 @@ },
                 },
-                path: 'files',
               },
@@ -211,2 +213,3 @@ },
               nested: {
+                path: 'files',
                 query: {
@@ -217,15 +220,35 @@ bool: {
                         terms: {
-                          boost: 0,
                           'files.data_category': [
                             'Simple Nucleotide Variation',
                           ],
+                          boost: 0,
                         },
                       },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
                       {
                         terms: {
+                          'files.experimental_strategy': ['WXS'],
                           boost: 0,
-                          'files.experimental_strategy': ['WXS'],
                         },
                       },
                     ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
                     must_not: [
@@ -242,3 +265,2 @@ {
                 },
-                path: 'files',
               },
@@ -444,6 +466,3 @@ },
                 {
-                  content: {
-                    field: 'project.project_id',
-                    value: 'TCGA-BRCA',
-                  },
+                  content: { field: 'project.project_id', value: 'TCGA-BRCA' },
                   op: '=',
@@ -463,2 +482,3 @@ },
               nested: {
+                path: 'files',
                 query: {
@@ -473,6 +493,17 @@ bool: {
                       },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
                       {
                         terms: {
+                          'files.experimental_strategy': ['WGS'],
                           boost: 0,
-                          'files.experimental_strategy': ['WGS'],
                         },
@@ -483,3 +514,2 @@ },
                 },
-                path: 'files',
               },
@@ -505,13 +535,7 @@ },
             {
-              content: {
-                field: 'files.experimental_strategy',
-                value: 'WGS',
-              },
+              content: { field: 'files.experimental_strategy', value: 'WGS' },
               op: '=',
             },
             {
-              content: {
-                field: 'project.project_id',
-                value: 'TCGA-BRCA',
-              },
+              content: { field: 'project.project_id', value: 'TCGA-BRCA' },
               op: '=',
@@ -528,2 +552,3 @@ },
               nested: {
+                path: 'files',
                 query: {
@@ -538,6 +563,17 @@ bool: {
                       },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
                       {
                         terms: {
+                          'files.experimental_strategy': ['WGS'],
                           boost: 0,
-                          'files.experimental_strategy': ['WGS'],
                         },
@@ -548,3 +584,2 @@ },
                 },
-                path: 'files',
               },
@@ -570,6 +605,3 @@ },
                 {
-                  content: {
-                    field: 'project.primary_site',
-                    value: 'Brain',
-                  },
+                  content: { field: 'project.primary_site', value: 'Brain' },
                   op: '=',
@@ -589,11 +621,20 @@ },
               nested: {
+                path: 'files',
                 query: {
                   bool: {
+                    must: [{ terms: { 'files.access': ['open'], boost: 0 } }],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
                     must: [
-                      { terms: { boost: 0, 'files.access': ['open'] } },
-                      { terms: { boost: 0, 'files.center.code': ['01'] } },
+                      { terms: { 'files.center.code': ['01'], boost: 0 } },
                     ],
                   },
                 },
-                path: 'files',
               },
@@ -622,6 +663,3 @@ },
                 {
-                  content: {
-                    field: 'project.primary_site',
-                    value: 'Brain',
-                  },
+                  content: { field: 'project.primary_site', value: 'Brain' },
                   op: '=',
@@ -641,13 +679,22 @@ },
               nested: {
+                path: 'files',
                 query: {
                   bool: {
                     must_not: [
-                      { terms: { boost: 0, 'files.access': ['protected'] } },
+                      { terms: { 'files.access': ['protected'], boost: 0 } },
                     ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
                     must: [
-                      { terms: { boost: 0, 'files.center.code': ['01'] } },
+                      { terms: { 'files.center.code': ['01'], boost: 0 } },
                     ],
                   },
                 },
-                path: 'files',
               },
@@ -687,23 +734,22 @@ },
               nested: {
+                path: 'files',
                 query: {
                   bool: {
-                    must_not: [
-                      {
-                        terms: {
-                          boost: 0,
-                          'files.center.code': ['04'],
-                        },
-                      },
-                    ],
                     must: [
-                      {
-                        terms: {
-                          boost: 0,
-                          'files.access': ['protected4'],
-                        },
-                      },
+                      { terms: { 'files.access': ['protected4'], boost: 0 } },
                     ],
                   },
                 },
+              },
+            },
+            {
+              nested: {
                 path: 'files',
+                query: {
+                  bool: {
+                    must_not: [
+                      { terms: { 'files.center.code': ['04'], boost: 0 } },
+                    ],
+                  },
+                },
               },
@@ -720,23 +766,11 @@ },
           content: [
+            { content: { field: 'files.access', value: 'protected' }, op: '=' },
             {
-              content: {
-                field: 'files.access',
-                value: 'protected',
-              },
-              op: '=',
-            },
-            {
               content: [
                 {
-                  content: {
-                    field: 'files.center.code',
-                    value: '01',
-                  },
+                  content: { field: 'files.center.code', value: '01' },
                   op: '!=',
                 },
                 {
-                  content: {
-                    field: 'project.primary_site',
-                    value: 'Brain',
-                  },
+                  content: { field: 'project.primary_site', value: 'Brain' },
                   op: '=',
@@ -756,31 +790,25 @@ },
               nested: {
+                path: 'files',
                 query: {
                   bool: {
-                    must_not: [
-                      {
-                        terms: {
-                          boost: 0,
-                          'files.center.code': ['01'],
-                        },
-                      },
-                    ],
                     must: [
-                      {
-                        terms: {
-                          boost: 0,
-                          'files.access': ['protected'],
-                        },
-                      },
+                      { terms: { 'files.access': ['protected'], boost: 0 } },
                     ],
                   },
                 },
-                path: 'files',
               },
             },
             {
-              terms: {
-                'project.primary_site': ['Brain'],
-                boost: 0,
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must_not: [
+                      { terms: { 'files.center.code': ['01'], boost: 0 } },
+                    ],
+                  },
+                },
               },
             },
+            { terms: { 'project.primary_site': ['Brain'], boost: 0 } },
           ],
@@ -795,16 +823,4 @@ },
           content: [
-            {
-              content: {
-                field: 'files.foo.name',
-                value: 'cname',
-              },
-              op: '=',
-            },
-            {
-              content: {
-                field: 'files.foo.code',
-                value: '01',
-              },
-              op: '=',
-            },
+            { content: { field: 'files.foo.name', value: 'cname' }, op: '=' },
+            { content: { field: 'files.foo.code', value: '01' }, op: '=' },
           ],
@@ -819,2 +835,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -825,2 +842,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -835,7 +853,26 @@ bool: {
                                 },
+                              ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must: [
                                 {
-                                  terms: {
-                                    boost: 0,
-                                    'files.foo.code': ['01'],
-                                  },
+                                  terms: { 'files.foo.code': ['01'], boost: 0 },
                                 },
@@ -845,3 +882,2 @@ ],
                           },
-                          path: 'files.foo',
                         },
@@ -852,3 +888,2 @@ },
                 },
-                path: 'files',
               },
@@ -865,16 +900,4 @@ },
           content: [
-            {
-              content: {
-                field: 'files.foo.name',
-                value: 'cname',
-              },
-              op: '=',
-            },
-            {
-              content: {
-                field: 'files.foo.code',
-                value: '01',
-              },
-              op: '!=',
-            },
+            { content: { field: 'files.foo.name', value: 'cname' }, op: '=' },
+            { content: { field: 'files.foo.code', value: '01' }, op: '!=' },
           ],
@@ -889,2 +912,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -895,18 +919,36 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
                             bool: {
-                              must_not: [
+                              must: [
                                 {
                                   terms: {
+                                    'files.foo.name': ['cname'],
                                     boost: 0,
-                                    'files.foo.code': ['01'],
                                   },
                                 },
                               ],
-                              must: [
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must_not: [
                                 {
-                                  terms: {
-                                    'files.foo.name': ['cname'],
-                                    boost: 0,
-                                  },
+                                  terms: { 'files.foo.code': ['01'], boost: 0 },
                                 },
@@ -916,3 +958,2 @@ ],
                           },
-                          path: 'files.foo',
                         },
@@ -923,3 +964,2 @@ },
                 },
-                path: 'files',
               },
@@ -936,16 +976,4 @@ },
           content: [
-            {
-              content: {
-                field: 'files.foo.name',
-                value: 'cname',
-              },
-              op: '!=',
-            },
-            {
-              content: {
-                field: 'files.foo.code',
-                value: '01',
-              },
-              op: '=',
-            },
+            { content: { field: 'files.foo.name', value: 'cname' }, op: '!=' },
+            { content: { field: 'files.foo.code', value: '01' }, op: '=' },
           ],
@@ -960,2 +988,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -966,2 +995,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -977,8 +1007,25 @@ bool: {
                               ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
                               must: [
                                 {
-                                  terms: {
-                                    boost: 0,
-                                    'files.foo.code': ['01'],
-                                  },
+                                  terms: { 'files.foo.code': ['01'], boost: 0 },
                                 },
@@ -988,3 +1035,2 @@ ],
                           },
-                          path: 'files.foo',
                         },
@@ -995,3 +1041,2 @@ },
                 },
-                path: 'files',
               },
@@ -1008,9 +1053,3 @@ },
           content: [
-            {
-              content: {
-                field: 'files.foo.name',
-                value: 'cname',
-              },
-              op: '!=',
-            },
+            { content: { field: 'files.foo.name', value: 'cname' }, op: '!=' },
           ],
@@ -1025,2 +1064,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -1031,2 +1071,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -1044,3 +1085,2 @@ bool: {
                           },
-                          path: 'files.foo',
                         },
@@ -1051,3 +1091,2 @@ },
                 },
-                path: 'files',
               },
@@ -1063,6 +1102,3 @@ },
         filters: {
-          content: {
-            field: 'files.foo.code',
-            value: ['01'],
-          },
+          content: { field: 'files.foo.code', value: ['01'] },
           op: 'not-in',
@@ -1073,2 +1109,3 @@ },
         nested: {
+          path: 'files',
           query: {
@@ -1079,15 +1116,10 @@ bool: {
                   nested: {
+                    path: 'files.foo',
                     query: {
                       bool: {
                         must_not: [
-                          {
-                            terms: {
-                              boost: 0,
-                              'files.foo.code': ['01'],
-                            },
-                          },
+                          { terms: { 'files.foo.code': ['01'], boost: 0 } },
                         ],
                       },
                     },
-                    path: 'files.foo',
                   },
@@ -1098,3 +1130,2 @@ },
           },
-          path: 'files',
         },
@@ -1109,15 +1140,6 @@ },
             {
-              content: {
-                field: 'files.foo.bar.name',
-                value: 'cname',
-              },
+              content: { field: 'files.foo.bar.name', value: 'cname' },
               op: '=',
             },
-            {
-              content: {
-                field: 'files.foo.bar.code',
-                value: '01',
-              },
-              op: '=',
-            },
+            { content: { field: 'files.foo.bar.code', value: '01' }, op: '=' },
           ],
@@ -1132,2 +1154,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -1138,2 +1161,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -1144,2 +1168,3 @@ bool: {
                                   nested: {
+                                    path: 'files.foo.bar',
                                     query: {
@@ -1154,6 +1179,39 @@ bool: {
                                           },
+                                        ],
+                                      },
+                                    },
+                                  },
+                                },
+                              ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must: [
+                                {
+                                  nested: {
+                                    path: 'files.foo.bar',
+                                    query: {
+                                      bool: {
+                                        must: [
                                           {
                                             terms: {
+                                              'files.foo.bar.code': ['01'],
                                               boost: 0,
-                                              'files.foo.bar.code': ['01'],
                                             },
@@ -1164,3 +1222,2 @@ },
                                     },
-                                    path: 'files.foo.bar',
                                   },
@@ -1171,3 +1228,2 @@ },
                           },
-                          path: 'files.foo',
                         },
@@ -1178,3 +1234,2 @@ },
                 },
-                path: 'files',
               },
@@ -1195,6 +1250,3 @@ },
             },
-            {
-              content: { field: 'files.foo.bar.code', value: '01' },
-              op: '=',
-            },
+            { content: { field: 'files.foo.bar.code', value: '01' }, op: '=' },
           ],
@@ -1209,2 +1261,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -1215,2 +1268,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -1221,2 +1275,3 @@ bool: {
                                   nested: {
+                                    path: 'files.foo.bar',
                                     query: {
@@ -1232,7 +1287,38 @@ bool: {
                                         ],
+                                      },
+                                    },
+                                  },
+                                },
+                              ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must: [
+                                {
+                                  nested: {
+                                    path: 'files.foo.bar',
+                                    query: {
+                                      bool: {
                                         must: [
                                           {
                                             terms: {
+                                              'files.foo.bar.code': ['01'],
                                               boost: 0,
-                                              'files.foo.bar.code': ['01'],
                                             },
@@ -1243,3 +1329,2 @@ },
                                     },
-                                    path: 'files.foo.bar',
                                   },
@@ -1250,3 +1335,2 @@ },
                           },
-                          path: 'files.foo',
                         },
@@ -1257,3 +1341,2 @@ },
                 },
-                path: 'files',
               },
@@ -1274,6 +1357,3 @@ },
             },
-            {
-              content: { field: 'files.code', value: 'beep' },
-              op: '=',
-            },
+            { content: { field: 'files.code', value: 'beep' }, op: '=' },
           ],
@@ -1288,2 +1368,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -1294,2 +1375,3 @@ bool: {
                         nested: {
+                          path: 'files.nn.baz',
                           query: {
@@ -1307,10 +1389,17 @@ bool: {
                           },
-                          path: 'files.nn.baz',
                         },
                       },
-                      { terms: { 'files.code': ['beep'], boost: 0 } },
                     ],
                   },
                 },
+              },
+            },
+            {
+              nested: {
                 path: 'files',
+                query: {
+                  bool: {
+                    must: [{ terms: { 'files.code': ['beep'], boost: 0 } }],
+                  },
+                },
               },
@@ -1354,2 +1443,3 @@ },
               nested: {
+                path: 'files',
                 query: {
@@ -1360,15 +1450,35 @@ bool: {
                         terms: {
-                          boost: 0,
                           'files.data_category': [
                             'Simple Nucleotide Variation',
                           ],
+                          boost: 0,
                         },
                       },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
                       {
                         terms: {
+                          'files.experimental_strategy': ['WXS'],
                           boost: 0,
-                          'files.experimental_strategy': ['WXS'],
                         },
                       },
                     ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
                     must_not: [
@@ -1385,3 +1495,2 @@ {
                 },
-                path: 'files',
               },
@@ -1395,3 +1504,3 @@ },
 
-  tests.forEach(({ input, output }) => {
+  tests.forEach(({ input, output }, i) => {
     const actualOutput = buildQuery(input);
@@ -1398,0 +1507,0 @@ expect(actualOutput).toEqual(output);

test/buildQuery/buildQueryWildcard.test.js

@@ -9,6 +9,3 @@ import buildQuery from '../../src/buildQuery';
         nestedFields,
-        filters: {
-          content: { field: 'case_id', value: ['006*'] },
-          op: 'in',
-        },
+        filters: { content: { field: 'case_id', value: ['006*'] }, op: 'in' },
       },
@@ -51,6 +48,3 @@ output: { regexp: { case_id: '006.*' } },
           content: [
-            {
-              content: { field: 'case_id', value: ['006*', 'v1'] },
-              op: 'in',
-            },
+            { content: { field: 'case_id', value: ['006*', 'v1'] }, op: 'in' },
           ],
@@ -80,13 +74,7 @@ op: 'and',
           content: [
+            { content: { field: 'case_id', value: ['006*', 'v1'] }, op: 'in' },
             {
-              content: { field: 'case_id', value: ['006*', 'v1'] },
+              content: { field: 'project.primary_site', value: ['Brain'] },
               op: 'in',
             },
-            {
-              content: {
-                field: 'project.primary_site',
-                value: ['Brain'],
-              },
-              op: 'in',
-            },
           ],
@@ -127,2 +115,3 @@ op: 'and',
               nested: {
+                path: 'files',
                 query: {
@@ -133,2 +122,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -141,3 +131,2 @@ bool: {
                           },
-                          path: 'files.foo',
                         },
@@ -148,3 +137,2 @@ },
                 },
-                path: 'files',
               },
@@ -180,2 +168,3 @@ },
                     nested: {
+                      path: 'files',
                       query: {
@@ -186,2 +175,3 @@ bool: {
                               nested: {
+                                path: 'files.foo',
                                 query: {
@@ -196,3 +186,2 @@ bool: {
                                 },
-                                path: 'files.foo',
                               },
@@ -203,3 +192,2 @@ },
                       },
-                      path: 'files',
                     },
@@ -209,2 +197,3 @@ },
                     nested: {
+                      path: 'files',
                       query: {
@@ -215,2 +204,3 @@ bool: {
                               nested: {
+                                path: 'files.foo',
                                 query: {
@@ -225,3 +215,2 @@ bool: {
                                 },
-                                path: 'files.foo',
                               },
@@ -232,3 +221,2 @@ },
                       },
-                      path: 'files',
                     },
@@ -238,2 +226,3 @@ },
                     nested: {
+                      path: 'files',
                       query: {
@@ -244,2 +233,3 @@ bool: {
                               nested: {
+                                path: 'files.foo',
                                 query: {
@@ -254,3 +244,2 @@ bool: {
                                 },
-                                path: 'files.foo',
                               },
@@ -261,3 +250,2 @@ },
                       },
-                      path: 'files',
                     },
@@ -289,2 +277,3 @@ },
               nested: {
+                path: 'files',
                 query: {
@@ -295,2 +284,3 @@ bool: {
                         nested: {
+                          path: 'files.foo',
                           query: {
@@ -300,3 +290,47 @@ bool: {
                                 { regexp: { 'files.foo.name1': '.*cname' } },
+                              ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must: [
                                 { regexp: { 'files.foo.name2': 'cn.*me' } },
+                              ],
+                            },
+                          },
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+            {
+              nested: {
+                path: 'files',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        nested: {
+                          path: 'files.foo',
+                          query: {
+                            bool: {
+                              must: [
                                 { regexp: { 'files.foo.name3': 'cname.*' } },
@@ -306,3 +340,2 @@ ],
                           },
-                          path: 'files.foo',
                         },
@@ -313,3 +346,2 @@ },
                 },
-                path: 'files',
               },
@@ -316,0 +348,0 @@ },

test/buildQuery/normalizeFilter.test.js

@@ -10,54 +10,2 @@ import normalizeFilters from '../../src/buildQuery/normalizeFilters';
 
-test(`normalizeFilters must handle "all" op`, () => {
-  const input = {
-    op: AND_OP,
-    content: [
-      {
-        op: ALL_OP,
-        content: {
-          field: 'some_field',
-          value: ['val1', 'val2', 'val3'],
-        },
-      },
-    ],
-  };
-  const output = {
-    op: AND_OP,
-    pivot: null,
-    content: [
-      {
-        op: AND_OP,
-        pivot: null,
-        content: [
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'some_field',
-              value: ['val1'],
-            },
-          },
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'some_field',
-              value: ['val2'],
-            },
-          },
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'some_field',
-              value: ['val3'],
-            },
-          },
-        ],
-      },
-    ],
-  };
-  expect(normalizeFilters(input)).toEqual(output);
-});
-
 test(`normalizeFilters must preserve pivots`, () => {
@@ -93,239 +41,1 @@ const input = {
 });
-
-test(`normalizeFilters must handle pivots for "all" op`, () => {
-  const input = {
-    op: AND_OP,
-    content: [
-      {
-        op: ALL_OP,
-        pivot: 'nested.nested1',
-        content: {
-          field: 'nested.nested1.some_field',
-          value: ['val1', 'val2'],
-        },
-      },
-    ],
-  };
-  const output = {
-    op: AND_OP,
-    pivot: null,
-    content: [
-      {
-        op: AND_OP,
-        pivot: 'nested.nested1',
-        content: [
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'nested.nested1.some_field',
-              value: ['val1'],
-            },
-          },
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'nested.nested1.some_field',
-              value: ['val2'],
-            },
-          },
-        ],
-      },
-    ],
-  };
-  expect(normalizeFilters(input)).toEqual(output);
-});
-
-test(`normalizeFilters must initialize pivots for "all" op`, () => {
-  const input = {
-    op: AND_OP,
-    content: [
-      {
-        op: ALL_OP,
-        content: {
-          field: 'nested.nested1.some_field',
-          value: ['val1', 'val2'],
-        },
-      },
-    ],
-  };
-  const output = {
-    op: AND_OP,
-    pivot: null,
-    content: [
-      {
-        op: AND_OP,
-        pivot: 'nested.nested1',
-        content: [
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'nested.nested1.some_field',
-              value: ['val1'],
-            },
-          },
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'nested.nested1.some_field',
-              value: ['val2'],
-            },
-          },
-        ],
-      },
-    ],
-  };
-  expect(normalizeFilters(input)).toEqual(output);
-});
-
-test(`normalizeFilters must optimize properly`, () => {
-  const input = {
-    op: AND_OP,
-    content: [
-      {
-        op: AND_OP,
-        content: [
-          {
-            op: IN_OP,
-            content: {
-              field: 'some_field',
-              value: ['val3'],
-            },
-          },
-          {
-            op: OR_OP,
-            content: [
-              {
-                op: IN_OP,
-                content: {
-                  field: 'some_field',
-                  value: ['val3'],
-                },
-              },
-              {
-                op: AND_OP,
-                content: [
-                  {
-                    op: IN_OP,
-                    content: {
-                      field: 'some_field',
-                      value: ['val3'],
-                    },
-                  },
-                  {
-                    op: AND_OP,
-                    content: [
-                      {
-                        op: IN_OP,
-                        content: {
-                          field: 'some_field',
-                          value: ['val3'],
-                        },
-                      },
-                      {
-                        op: AND_OP,
-                        content: [
-                          {
-                            op: ALL_OP,
-                            content: {
-                              field: 'some_field',
-                              value: ['val3', 'val3', 'val3'],
-                            },
-                          },
-                        ],
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      },
-    ],
-  };
-  const output = {
-    op: AND_OP,
-    pivot: null,
-    content: [
-      {
-        op: IN_OP,
-        pivot: null,
-        content: {
-          field: 'some_field',
-          value: ['val3'],
-        },
-      },
-      {
-        op: OR_OP,
-        pivot: null,
-        content: [
-          {
-            op: IN_OP,
-            pivot: null,
-            content: {
-              field: 'some_field',
-              value: ['val3'],
-            },
-          },
-          {
-            op: AND_OP,
-            pivot: null,
-            content: [
-              {
-                op: IN_OP,
-                pivot: null,
-                content: {
-                  field: 'some_field',
-                  value: ['val3'],
-                },
-              },
-              {
-                op: IN_OP,
-                pivot: null,
-                content: {
-                  field: 'some_field',
-                  value: ['val3'],
-                },
-              },
-              {
-                op: AND_OP,
-                pivot: null,
-                content: [
-                  {
-                    op: IN_OP,
-                    pivot: null,
-                    content: {
-                      field: 'some_field',
-                      value: ['val3'],
-                    },
-                  },
-                  {
-                    op: IN_OP,
-                    pivot: null,
-                    content: {
-                      field: 'some_field',
-                      value: ['val3'],
-                    },
-                  },
-                  {
-                    op: IN_OP,
-                    pivot: null,
-                    content: {
-                      field: 'some_field',
-                      value: ['val3'],
-                    },
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      },
-    ],
-  };
-  expect(normalizeFilters(input)).toEqual(output);
-});

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

233369

decreased by-1.63%

Lines of code

5082

decreased by-3.82%

No dependency changes