Merge pull request #12 from askorama/failsafe-when-search-null

fix: should not break when search is null

Author: micheleriva

src/index.test.ts

@@ -205,12 +205,21 @@ describe("special characters", () => {
 });
 
 describe("empty example", () => {
+  // even though it is not expected we should make sure it won't break
   it("should not break when text is null", () => {
     const searchTerm = "C";
     const highlighter = new Highlight();
 
-    // even though it is not expected we should make sure it won't break
     // @ts-expect-error
     assert.strictEqual(highlighter.highlight(null, searchTerm).HTML, "");
   });
+  it("should not break when search term is null", () => {
+    const highlighter = new Highlight();
+
+    assert.strictEqual(
+      // @ts-expect-error
+      highlighter.highlight(null, null).HTML,
+      '<mark class="orama-highlight"></mark>'
+    );
+  });
 });

src/index.ts

@@ -27,7 +27,7 @@ export class Highlight {
   }
 
   public highlight(text: string, searchTerm: string): Highlight {
-    this._searchTerm = searchTerm;
+    this._searchTerm = searchTerm ?? "";
     this._originalText = text ?? "";
 
     const caseSensitive =
@@ -38,7 +38,7 @@ export class Highlight {
     const regexFlags = caseSensitive ? "g" : "gi";
     const boundary = wholeWords ? "\\b" : "";
     const searchTerms = this.escapeRegExp(
-      caseSensitive ? searchTerm : searchTerm.toLowerCase()
+      caseSensitive ? this._searchTerm : this._searchTerm.toLowerCase()
     )
       .trim()
       .split(/\s+/)