edit: refactor search, more uniform type handling

Author: hp4k1h5

src/search.ts

@@ -49,14 +49,8 @@ function buildOPS(
   if (!queryTerms.length) return
 
   /* phrases */
-  let phrases = queryTerms
-    .filter((qT: term) => qT.type == 'phr')
-    .map((phrase: any) => buildPhrase(phrase, collections, key))
-  if (!phrases.length) {
-    phrases = undefined
-  } else {
-    phrases = aql.join(phrases, opWord)
-  }
+  let phrases = queryTerms.filter((qT: term) => qT.type == 'phr')
+  phrases = buildPhrases(phrases, collections, key, opWord)
 
   /* tokens */
   let tokens = queryTerms.filter((qT: { type: string }) => qT.type === 'tok')
@@ -68,6 +62,20 @@ function buildOPS(
   return tokens || phrases
 }
 
+function buildPhrases(
+  phrases: term[],
+  collections: collection[],
+  key: string,
+  opWord: string,
+): any {
+  if (!phrases.length) return undefined
+
+  return aql.join(
+    phrases.map((phrase: any) => buildPhrase(phrase, collections, key)),
+    opWord,
+  )
+}
+
 function buildPhrase(
   phrase: term,
   collections: collection[],