Accept boolean conjunction in runtime facets (bump 2.4.3)

Author: cigolpl

README.md

@@ -241,7 +241,7 @@ const result = itemsjs.search({
     tags: {
       selected: ['1980s', 'historical'],
       options: {
-        conjunction: 'OR',      // AND/OR for this facet only
+        conjunction: 'OR',      // AND/OR for this facet only (also accepts boolean true/false)
         size: 30,               // how many buckets to return
         sortBy: 'count',        // 'count' | 'key'
         sortDir: 'desc',        // 'asc' | 'desc'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemsjs",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Created to perform fast search on small json dataset (up to 1000 elements).",
   "type": "module",
   "scripts": {

src/utils/config.js

@@ -68,6 +68,16 @@ export const parse_boolean_query = function (query) {
   });
 };
 
+const normalizeConjunction = (value) => {
+  if (typeof value === 'boolean') {
+    return value ? 'AND' : 'OR';
+  }
+  if (typeof value === 'string') {
+    return value.toUpperCase() === 'OR' ? 'OR' : 'AND';
+  }
+  return 'AND';
+};
+
 /**
  * Builds a boolean query string from runtime facet selections.
  * Respects per-facet conjunction (AND/OR). Unknown facets are ignored.
@@ -90,8 +100,9 @@ export const buildFiltersQueryFromFacets = function (facets, configuration) {
       return;
     }
 
-    const conjunction =
-      facets[facetName]?.options?.conjunction === 'OR' ? 'OR' : 'AND';
+    const conjunction = normalizeConjunction(
+      facets[facetName]?.options?.conjunction,
+    );
 
     const parts = selected.map((val) => {
       const stringVal = String(val);
@@ -144,8 +155,9 @@ export const normalizeRuntimeFacetConfig = function (facets, configuration) {
     if (options) {
       const mapped = {};
 
-      if (options.conjunction) {
-        mapped.conjunction = options.conjunction !== 'OR';
+      if (options.conjunction !== undefined) {
+        const conj = normalizeConjunction(options.conjunction);
+        mapped.conjunction = conj === 'AND';
       }
 
       if (typeof options.size === 'number') {

tests/searchSpec.js

@@ -351,6 +351,38 @@ describe('search', function () {
     done();
   });
 
+  it('accepts boolean conjunction in runtime facets (false => OR, true => AND)', function test(done) {
+    const itemsjs = itemsJS(items, configuration);
+
+    // false => OR
+    const orResult = itemsjs.search({
+      facets: {
+        tags: {
+          selected: ['c', 'e'],
+          options: {
+            conjunction: false,
+          },
+        },
+      },
+    });
+    assert.equal(orResult.pagination.total, 4);
+
+    // true => AND should return 0 for disjoint values
+    const andResult = itemsjs.search({
+      facets: {
+        tags: {
+          selected: ['c', 'e'],
+          options: {
+            conjunction: true,
+          },
+        },
+      },
+    });
+    assert.equal(andResult.pagination.total, 0);
+
+    done();
+  });
+
   it('makes search with non existing filter value with conjunction true should return no results', function test(done) {
     const itemsjs = itemsJS(items, configuration);