Merge pull request #54 from EINDEX/feat/fuzzy-search

Author: EINDEX

src/pages/background/index.ts

@@ -102,8 +102,8 @@ browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
 
 const badgeSearch = async (url: string | undefined, tabId: number) => {
   if (!url) return;
-  const cleanUrl = removeUrlHash(url);
-  const searchRes = await logseqClient.blockSearch(cleanUrl);
+  const searchURL = new URL(url)
+  const searchRes = await logseqClient.urlSearch(searchURL);
   const resultCount = searchRes.count ? searchRes.count!.toString() : '';
   await setExtensionBadge(resultCount, tabId);
 };

src/pages/logseq/client.ts

@@ -241,19 +241,21 @@ export default class LogseqClient {
   ): Promise<LogseqResponseType<LogseqSearchResult>> => {
     const { name: graphName } = await this.getCurrentGraph();
     const res = await this.find(query);
-    const blocks = (await Promise.all(
-      res.map(async (item) => {
-        const content = this.format(item.content, graphName, query)
-        if(!content) return null;
-        return {
-          html: content,
-          uuid: item.uuid,
-          page: await this.getPage({
-            id: item.page.id,
-          } as LogseqPageIdenity),
-        } as LogseqBlockType;
-      }),
-    )).filter((b)=>b);
+    const blocks = (
+      await Promise.all(
+        res.map(async (item) => {
+          const content = this.format(item.content, graphName, query);
+          if (!content) return null;
+          return {
+            html: content,
+            uuid: item.uuid,
+            page: await this.getPage({
+              id: item.page.id,
+            } as LogseqPageIdenity),
+          } as LogseqBlockType;
+        }),
+      )
+    ).filter((b) => b);
     return {
       status: 200,
       msg: 'success',
@@ -343,4 +345,81 @@ export default class LogseqClient {
       return this.findLogseqInternal(query);
     });
   };
+
+  private margeSearchResult = (...searchResult: LogseqSearchResult[]) => {
+    const result = {
+      blocks: [],
+      pages: [],
+      graph: '',
+    } as LogseqSearchResult;
+    const blockSet = new Set();
+    const pageSet = new Set();
+    searchResult.forEach((search) => {
+      search.blocks.forEach((block) => {
+        if (!blockSet.has(block.uuid)) {
+          blockSet.add(block.uuid);
+          result.blocks.push(block);
+        }
+      });
+      search.pages.forEach((page) => {
+        if (!pageSet.has(page.name)) {
+          pageSet.add(page.name);
+          result.pages.push(page);
+        }
+      });
+    });
+    return result;
+  };
+
+  public urlSearch = async (
+    url: URL,
+    options: { fuzzy?: boolean } = { fuzzy: false },
+  ): Promise<LogseqResponseType<LogseqSearchResult | null>> => {
+    return await this.catchIssues(async () => {
+      const results = [];
+
+      if (url.hash) {
+        results.push(
+          (
+            await this.findLogseqInternal(
+              url.host + url.pathname + url.search + url.hash,
+            )
+          ).response,
+        );
+      }
+      if (url.search) {
+        results.push(
+          (await this.findLogseqInternal(url.host + url.pathname + url.search))
+            .response,
+        );
+      }
+      if (url.pathname) {
+        results.push(
+          (await this.findLogseqInternal(url.host + url.pathname)).response,
+        );
+      }
+      if (url.host && options.fuzzy) {
+        results.push({
+          blocks: [
+            {
+              html: '↓ fuzzy search ↓',
+              uuid: null,
+              page: null,
+            },
+          ],
+          pages: [],
+          graph: '',
+        } as LogseqSearchResult);
+        results.push((await this.findLogseqInternal(url.host)).response);
+      }
+      const result = this.margeSearchResult(...results);
+      const resp: LogseqResponseType<LogseqSearchResult> = {
+        status: 200,
+        msg: 'success',
+        response: result,
+        count: result.blocks.length + result.pages.length,
+      };
+      return resp;
+    });
+  };
 }

src/pages/popup/Popup.tsx

@@ -20,7 +20,7 @@ export default function Popup() {
 
   const mountOpenPageMethod = () => {
     const innerFunction = () => {
-      if(isLoading) return;
+      if (isLoading) return;
       document.querySelectorAll('a').forEach((e) => {
         if (e.onclick === null) {
           e.onclick = () => {
@@ -33,7 +33,7 @@ export default function Popup() {
           };
         }
         if (!isLoading) {
-            clearInterval(interval);
+          clearInterval(interval);
 
         }
       });
@@ -49,9 +49,11 @@ export default function Popup() {
       let queryOptions = { active: true, lastFocusedWindow: true };
       let [tab] = await Browser.tabs.query(queryOptions);
       setIsLoading(true);
-      if (!tab.url) return;
-      const url = removeUrlHash(tab.url);
-      const result = await client.blockSearch(url);
+      if (!tab || !tab.url) return;
+
+      const tabURL = new URL(tab.url);
+      const result = await client.urlSearch(tabURL, {fuzzy: true});
+
       if (result.status !== 200) return;
       setLogseqSearchResult(result.response!);
       mountOpenPageMethod();