@florajs/datasource-solr 4.0.0 → 5.0.1

package/index.js

@@ -3,30 +3,18 @@
 const http = require('http');
 const querystring = require('querystring');
 
-const _ = require('lodash');
 const { ImplementationError } = require('@florajs/errors');
 
-const SUPPORTED_FILTERS = ['equal', 'notEqual', 'lessOrEqual', 'greaterOrEqual', 'range'];
+const SUPPORTED_FILTERS = ['equal', 'notEqual', 'less', 'lessOrEqual', 'greater', 'greaterOrEqual', 'range'];
+const RANGE_OPERATOR_FILTER_MAPPING = {
+    less: '}',
+    lessOrEqual: ']',
+    greater: '{',
+    greaterOrEqual: '['
+};
 
 const NO_LIMIT = 1000000;
 
-/**
- * Return true if two filters on same attribute can be used as single range filter.
- *
- * @param {Array.<Object>} filters
- * @return {boolean}
- * @private
- */
-function filterRangeQueries(filters) {
-    if (filters.length !== 2) return false;
-
-    const rangeOperators = ['lessOrEqual', 'greaterOrEqual'];
-    const operator1 = filters[0].operator;
-    const operator2 = filters[1].operator;
-
-    return rangeOperators.includes(operator1) && rangeOperators.includes(operator2);
-}
-
 /**
  * Create range filter from a greatOrEqual and lessOrEqual filter.
  *
@@ -35,13 +23,16 @@ function filterRangeQueries(filters) {
  * @private
  */
 function createRangeFilter(attributeFilters) {
-    const rangeFilter = { attribute: attributeFilters[0].attribute, operator: 'range' };
-
     // make sure greaterOrEqual filter comes first
-    attributeFilters.sort((filter) => (filter.operator === 'greaterOrEqual' ? -1 : 1));
-
-    rangeFilter.value = [attributeFilters[0].value, attributeFilters[1].value];
-    return rangeFilter;
+    attributeFilters.sort((filter) => (['greater', 'greaterOrEqual'].includes(filter.operator) ? -1 : 1));
+
+    return {
+        attribute: attributeFilters[0].attribute,
+        operator: 'range',
+        lowerSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[attributeFilters[0].operator],
+        upperSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[attributeFilters[1].operator],
+        value: [attributeFilters[0].value, attributeFilters[1].value]
+    };
 }
 
 /**
@@ -53,13 +44,32 @@ function createRangeFilter(attributeFilters) {
  * @private
  */
 function rangify(filters) {
-    const hasRangeableFilters = filters.some((filter) => ['lessOrEqual', 'greaterOrEqual'].includes(filter.operator));
+    const hasRangeableFilters = filters.some((filter) =>
+        ['less', 'lessOrEqual', 'greater', 'greaterOrEqual'].includes(filter.operator)
+    );
+
     if (!hasRangeableFilters) {
         return filters;
     }
 
-    const groupedAttrs = _.groupBy(filters, 'attribute');
-    const rangeQueries = _.filter(groupedAttrs, filterRangeQueries);
+    const groupedAttrs = filters.reduce((acc, filter) => {
+        acc[filter.attribute] = acc[filter.attribute] || [];
+        acc[filter.attribute].push(filter);
+        return acc;
+    }, {});
+    const rangeQueries = Object.values(groupedAttrs).filter((filters) => {
+        if (filters.length !== 2) return false;
+
+        const rangeOperators = ['less', 'lessOrEqual', 'greater', 'greaterOrEqual'];
+        const operator1 = filters[0].operator;
+        const operator2 = filters[1].operator;
+
+        return (
+            rangeOperators.includes(operator1) &&
+            rangeOperators.includes(operator2) &&
+            operator1.substring(0, 4) !== operator2.substring(0, 4)
+        );
+    });
 
     if (!rangeQueries.length) return filters;
 
@@ -126,12 +136,19 @@ function convertFilterToSolrSyntax(filter) {
     if (!Array.isArray(filter.attribute)) {
         value = escapeValueForSolr(value);
         if (Array.isArray(value)) {
-            if (operator === 'range') value = '[' + value[0] + ' TO ' + value[1] + ']';
-            else value = '(' + value.join(' OR ') + ')';
+            const lowerSolrRangeOperator = filter.lowerSolrRangeOperator || '[';
+            const upperSolrRangeOperator = filter.upperSolrRangeOperator || ']';
+
+            value =
+                operator === 'range'
+                    ? lowerSolrRangeOperator + value[0] + ' TO ' + value[1] + upperSolrRangeOperator
+                    : '(' + value.join(' OR ') + ')';
         }
 
         if (operator !== 'notEqual') {
+            if (operator === 'greater') value = '{' + value + ' TO *]';
             if (operator === 'greaterOrEqual') value = '[' + value + ' TO *]';
+            if (operator === 'less') value = '[* TO ' + value + '}';
             if (operator === 'lessOrEqual') value = '[* TO ' + value + ']';
             return filter.attribute + ':' + value;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@florajs/datasource-solr",
-  "version": "4.0.0",
+  "version": "5.0.1",
   "description": "Solr connection for Flora",
   "main": "index.js",
   "scripts": {
@@ -37,23 +37,22 @@
     }
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "dependencies": {
-    "@florajs/errors": "^3.0.0",
-    "lodash": "^4.17.21"
+    "@florajs/errors": "^3.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/mocha": "^10.0.0",
+    "@types/chai": "^4.3.5",
+    "@types/mocha": "^10.0.1",
     "@types/nock": "^11.1.0",
     "chai": "^4.3.7",
-    "eslint": "^8.27.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.1.0",
-    "nock": "^13.2.9",
+    "mocha": "^10.2.0",
+    "nock": "^13.3.1",
     "pre-commit": "^1.2.2",
-    "prettier": "^2.7.1"
+    "prettier": "^2.8.8"
   }
 }