fix circular dependency

Author: NickOvt

lib/prepare-search-filter.js

@@ -1,9 +1,17 @@
 'use strict';
 
 const ObjectId = require('mongodb').ObjectId;
-const { toMongoAndTextSearch } = require('./search-query');
 const { escapeRegexStr } = require('./tools');
 
+const toMongoAndTextSearch = value =>
+    (value || '')
+        .toString()
+        .trim()
+        .split(/\s+/)
+        .filter(term => term)
+        .map(term => `"${term.replace(/(["\\])/g, '\\$1')}"`)
+        .join(' ');
+
 const uidRangeStringToQuery = uidRange => {
     if (!uidRange) {
         return;
@@ -358,4 +366,4 @@ const prepareSearchFilter = async (db, user, payload) => {
     return { filter, query };
 };
 
-module.exports = { uidRangeStringToQuery, prepareSearchFilter };
+module.exports = { uidRangeStringToQuery, prepareSearchFilter, toMongoAndTextSearch };

lib/search-query.js

@@ -3,7 +3,7 @@
 const SearchString = require('search-string').default;
 const parser = require('logic-query-parser');
 const { escapeRegexStr } = require('./tools');
-const { uidRangeStringToQuery } = require('./prepare-search-filter');
+const { uidRangeStringToQuery, toMongoAndTextSearch } = require('./prepare-search-filter');
 const { ObjectId } = require('mongodb');
 
 const getBooleanValue = value => {
@@ -43,15 +43,6 @@ const getDateValue = value => {
     return isNaN(date.getTime()) ? false : date;
 };
 
-const toMongoAndTextSearch = value =>
-    (value || '')
-        .toString()
-        .trim()
-        .split(/\s+/)
-        .filter(term => term)
-        .map(term => `"${term.replace(/(["\\])/g, '\\$1')}"`)
-        .join(' ');
-
 const createMongoTextQuery = (value, opts = {}) => ({
     $text: {
         $search: opts.useAndSearch === false || opts.mode === 'or' ? value : toMongoAndTextSearch(value)
@@ -800,7 +791,7 @@ const getElasticSearchQuery = async (db, user, queryStr) => {
     return searchQuery;
 };
 
-module.exports = { parseSearchQuery, getMongoDBQuery, getElasticSearchQuery, toMongoAndTextSearch };
+module.exports = { parseSearchQuery, getMongoDBQuery, getElasticSearchQuery };
 /*
 if (process.env.DEBUG_TEST_QUERY && process.env.NODE_ENV !== 'production') {
     const util = require('util'); // eslint-disable-line