Ability to disable highlighting #94

typesense · Feb 19, 2022 · ea96f72 · ea96f72
1 parent 21f2d28
commit ea96f72
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 33 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -17,7 +17,7 @@
     "jestPuppeteer": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": 2020,
     "sourceType": "module"
   },
   "rules": {}

diff --git a/dist/typesense-instantsearch-adapter.min.js b/dist/typesense-instantsearch-adapter.min.js
diff --git a/dist/typesense-instantsearch-adapter.min.js.map b/dist/typesense-instantsearch-adapter.min.js.map
diff --git a/lib/Configuration.js b/lib/Configuration.js
diff --git a/lib/Configuration.js.map b/lib/Configuration.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,9 +76,9 @@
     "prettier": "^2.2.1",
     "puppeteer": "^9.0.0",
     "tsd": "^0.14.0",
+    "typescript": "^4.2.4",
     "webpack": "^5.37.0",
-    "webpack-cli": "^4.7.0",
-    "typescript": "^4.2.4"
+    "webpack-cli": "^4.7.0"
   },
   "dependencies": {
     "typesense": "^1.2.1"

diff --git a/src/Configuration.js b/src/Configuration.js
@@ -13,31 +13,34 @@ export class Configuration {
       ],
     };
 
-    this.server.cacheSearchResultsForSeconds =
-      this.server.cacheSearchResultsForSeconds == null ? 2 * 60 : this.server.cacheSearchResultsForSeconds;
+    this.server.cacheSearchResultsForSeconds = this.server.cacheSearchResultsForSeconds ?? 2 * 60;
 
-    this.additionalSearchParameters = options.additionalSearchParameters || {};
+    this.additionalSearchParameters = options.additionalSearchParameters ?? {};
 
     this.additionalSearchParameters.query_by =
-      this.additionalSearchParameters.queryBy || this.additionalSearchParameters.query_by || "";
+      this.additionalSearchParameters.queryBy ?? this.additionalSearchParameters.query_by ?? "";
 
     this.additionalSearchParameters.sort_by =
-      this.additionalSearchParameters.sortBy || this.additionalSearchParameters.sort_by || "";
+      this.additionalSearchParameters.sortBy ?? this.additionalSearchParameters.sort_by ?? "";
 
     this.additionalSearchParameters.highlightFullFields =
-      this.additionalSearchParameters.highlightFullFields ||
-      this.additionalSearchParameters.highlight_full_fields ||
+      this.additionalSearchParameters.highlightFullFields ??
+      this.additionalSearchParameters.highlight_full_fields ??
       this.additionalSearchParameters.query_by;
 
-    this.geoLocationField = options.geoLocationField || "_geoloc";
+    this.geoLocationField = options.geoLocationField ?? "_geoloc";
 
-    this.collectionSpecificSearchParameters = options.collectionSpecificSearchParameters || {};
+    this.collectionSpecificSearchParameters = options.collectionSpecificSearchParameters ?? {};
 
     Object.keys(this.collectionSpecificSearchParameters).forEach((collection) => {
       const params = this.collectionSpecificSearchParameters[collection];
-      params.query_by = params.queryBy || params.query_by || "";
-      params.sort_by = params.sortBy || params.sort_by || "";
-      params.highlightFullFields = params.highlightFullFields || params.highlight_full_fields || params.query_by;
+      params.query_by = params.queryBy ?? params.query_by;
+      params.sort_by = params.sortBy ?? params.sort_by;
+      params.highlightFullFields =
+        params.highlightFullFields ??
+        params.highlight_full_fields ??
+        this.additionalSearchParameters.highlight_full_fields ??
+        params.query_by;
     });
   }