@tooee/search 0.2.4 → 0.3.1

package/src/search-hook.ts

@@ -1,62 +1,62 @@
-import { useCallback, useEffect, useRef, useState } from "react"
-import { useSelector } from "@xstate/store-react"
-import { useCommand, useMode, useSetMode, type Mode } from "@tooee/commands"
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useSelector } from "@xstate/store-react";
+import { useCommand, useMode, useSetMode } from "@tooee/commands";
+import type { Mode } from "@tooee/commands";
 import {
   createNavSearchStore,
   selectCurrentMatchIndex,
   selectMatches,
   selectSearchActive,
   selectSearchQuery,
-  type NavSearchDeps,
-  type NavSearchStore,
-  type RowKey,
-} from "./nav-search-store.js"
+} from "./nav-search-store.js";
+import type { NavSearchDeps, NavSearchStore, RowKey } from "./nav-search-store.js";
 
 export interface UseSearchOptions {
-  match: (query: string) => number[]
-  onJump: (index: number) => void
-  enabled?: boolean
-  deps?: readonly unknown[]
+  match: (query: string) => number[];
+  onJump: (index: number) => void;
+  enabled?: boolean;
+  deps?: readonly unknown[];
 }
 
 export interface SearchState {
-  searchQuery: string
-  searchActive: boolean
-  setSearchQuery: (query: string) => void
-  matchingLines: number[]
-  currentMatchIndex: number
-  submitSearch: () => void
+  searchQuery: string;
+  searchActive: boolean;
+  setSearchQuery: (query: string) => void;
+  matchingLines: number[];
+  currentMatchIndex: number;
+  submitSearch: () => void;
 }
 
-const CURSOR_MODES: Mode[] = ["cursor"]
-const ALL_MODES: Mode[] = ["cursor", "select", "insert"]
+const CURSOR_MODES: Mode[] = ["cursor"];
+const ALL_MODES: Mode[] = ["cursor", "select", "insert"];
 
-export function useNavSearchStore(options: {
-  keys: readonly RowKey[]
-  isSelectable?: (index: number) => boolean
-  preserveCursorByKey?: boolean
+export const useNavSearchStore = function useNavSearchStore(options: {
+  keys: readonly RowKey[];
+  isSelectable?: (index: number) => boolean;
+  preserveCursorByKey?: boolean;
 }): NavSearchStore {
-  const depsRef = useRef<NavSearchDeps>({ isSelectable: options.isSelectable ?? (() => true) })
-  depsRef.current.isSelectable = options.isSelectable ?? (() => true)
-  const [store] = useState(() =>
-    createNavSearchStore({ keys: options.keys, deps: depsRef.current }),
-  )
+  const depsRef = useRef<NavSearchDeps>({ isSelectable: options.isSelectable ?? (() => true) });
+  depsRef.current.isSelectable = options.isSelectable ?? (() => true);
+  const [store, setStore] = useState(() =>
+    createNavSearchStore({ deps: depsRef.current, keys: options.keys }),
+  );
+  void setStore;
   useEffect(() => {
-    const currentKeys = store.getSnapshot().context.rowKeys
+    const currentKeys = store.getSnapshot().context.rowKeys;
     const keysChanged =
       currentKeys.length !== options.keys.length ||
-      currentKeys.some((key, index) => !Object.is(key, options.keys[index]))
+      currentKeys.some((key, index) => !Object.is(key, options.keys[index]));
     if (keysChanged) {
       store.trigger.rowsChanged({
         keys: options.keys,
         preserveCursorByKey: options.preserveCursorByKey,
-      })
+      });
     }
-  }, [store, options.keys, options.preserveCursorByKey])
-  return store
-}
+  }, [store, options.keys, options.preserveCursorByKey]);
+  return store;
+};
 
-export function useSearchBindings(
+export const useSearchBindings = function useSearchBindings(
   store: NavSearchStore,
   {
     match,
@@ -65,101 +65,119 @@ export function useSearchBindings(
     deps = [],
   }: Omit<UseSearchOptions, "onJump"> & { onJump?: (index: number) => void },
 ): SearchState {
-  const mode = useMode()
-  const setMode = useSetMode()
-  const matchRef = useRef(match)
-  matchRef.current = match
-  const onJumpRef = useRef(onJump)
-  onJumpRef.current = onJump
+  const mode = useMode();
+  const setMode = useSetMode();
+  const matchRef = useRef(match);
+  matchRef.current = match;
+  const onJumpRef = useRef(onJump);
+  onJumpRef.current = onJump;
 
   useEffect(() => {
-    const subscription = store.on("jumped", ({ index }) => onJumpRef.current?.(index))
-    return () => subscription.unsubscribe()
-  }, [store])
+    const subscription = store.on("jumped", ({ index }) => onJumpRef.current?.(index));
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [store]);
   useEffect(() => {
-    const subscription = store.on("restoreMode", ({ mode: restored }) => setMode(restored))
-    return () => subscription.unsubscribe()
-  }, [store, setMode])
+    const subscription = store.on("restoreMode", ({ mode: restored }) => {
+      setMode(restored);
+    });
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [store, setMode]);
 
-  const searchQuery = useSelector(store, (snapshot) => selectSearchQuery(snapshot.context))
-  const searchActive = useSelector(store, (snapshot) => selectSearchActive(snapshot.context))
-  const matchingLines = useSelector(store, (snapshot) =>
-    selectMatches(snapshot.context),
-  ) as number[]
+  const searchQuery = useSelector(store, (snapshot) => selectSearchQuery(snapshot.context));
+  const searchActive = useSelector(store, (snapshot) => selectSearchActive(snapshot.context));
+  const selectedMatches = useSelector(store, (snapshot) => selectMatches(snapshot.context));
+  // Deferred(lint-sweep): redesign the public selector result as readonly (separate stream)
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- preserve the existing mutable public SearchState type
+  const matchingLines = selectedMatches as number[];
   const currentMatchIndex = useSelector(store, (snapshot) =>
     selectCurrentMatchIndex(snapshot.context),
-  )
+  );
 
   const updateSearchQuery = useCallback(
     (query: string) => {
-      store.trigger.searchChanged({ query, matches: query ? matchRef.current(query) : [] })
+      store.trigger.searchChanged({ matches: query ? matchRef.current(query) : [], query });
     },
     [store],
-  )
+  );
 
   // Re-match a committed query once when the caller-declared content changes.
-  const depsRef = useRef(deps)
+  const depsRef = useRef(deps);
   useEffect(() => {
     if (
       depsRef.current.every((value, index) => Object.is(value, deps[index])) &&
       depsRef.current.length === deps.length
-    )
-      return
-    depsRef.current = deps
-    const query = selectSearchQuery(store.getSnapshot().context)
-    if (query) store.trigger.searchChanged({ query, matches: matchRef.current(query) })
-  }, [deps, store])
+    ) {
+      return;
+    }
+    depsRef.current = deps;
+    const query = selectSearchQuery(store.getSnapshot().context);
+    if (query) {
+      store.trigger.searchChanged({ matches: matchRef.current(query), query });
+    }
+  }, [deps, store]);
 
   useCommand({
-    id: "cursor-search-start",
-    title: "Search",
+    enabled,
+    handler: () => {
+      store.trigger.searchStarted({ mode });
+      setMode("insert");
+    },
     hotkey: "/",
+    id: "cursor-search-start",
     modes: CURSOR_MODES,
+    title: "Search",
+  });
+  useCommand({
     enabled,
     handler: () => {
-      store.trigger.searchStarted({ mode })
-      setMode("insert")
+      store.trigger.searchNext({});
     },
-  })
-  useCommand({
-    id: "cursor-search-next",
-    title: "Next match",
     hotkey: "n",
+    id: "cursor-search-next",
     modes: CURSOR_MODES,
-    enabled,
+    title: "Next match",
     when: () => !selectSearchActive(store.getSnapshot().context),
-    handler: () => store.trigger.searchNext({}),
-  })
+  });
   useCommand({
-    id: "cursor-search-prev",
-    title: "Previous match",
+    enabled,
+    handler: () => {
+      store.trigger.searchPrevious({});
+    },
     hotkey: "shift+n",
+    id: "cursor-search-prev",
     modes: CURSOR_MODES,
-    enabled,
+    title: "Previous match",
     when: () => !selectSearchActive(store.getSnapshot().context),
-    handler: () => store.trigger.searchPrevious({}),
-  })
+  });
   useCommand({
-    id: "search-cancel",
-    title: "Cancel search",
+    enabled,
+    handler: () => {
+      store.trigger.searchCancelled({});
+    },
     hotkey: "escape",
+    id: "search-cancel",
     modes: ALL_MODES,
-    enabled,
+    title: "Cancel search",
     when: () => selectSearchActive(store.getSnapshot().context),
-    handler: () => store.trigger.searchCancelled({}),
-  })
+  });
 
   return {
-    searchQuery,
+    currentMatchIndex,
+    matchingLines,
     searchActive,
+    searchQuery,
     setSearchQuery: updateSearchQuery,
-    matchingLines,
-    currentMatchIndex,
-    submitSearch: () => store.trigger.searchSubmitted({}),
-  }
-}
+    submitSearch: () => {
+      store.trigger.searchSubmitted({});
+    },
+  };
+};
 
-export function useSearch(options: UseSearchOptions): SearchState {
-  const store = useNavSearchStore({ keys: [] })
-  return useSearchBindings(store, options)
-}
+export const useSearch = function useSearch(options: UseSearchOptions): SearchState {
+  const store = useNavSearchStore({ keys: [] });
+  return useSearchBindings(store, options);
+};

package/src/search.ts

@@ -1,18 +1,20 @@
-export function findMatchingLines(text: string, query: string): number[] {
-  if (!query) return []
-  const lowerQuery = query.toLowerCase()
-  const results: number[] = []
-  let lineStart = 0
-  let lineNum = 0
-  for (let i = 0; i <= text.length; i++) {
+export const findMatchingLines = function findMatchingLines(text: string, query: string): number[] {
+  if (!query) {
+    return [];
+  }
+  const lowerQuery = query.toLowerCase();
+  const results: number[] = [];
+  let lineStart = 0;
+  let lineNum = 0;
+  for (let i = 0; i <= text.length; i += 1) {
     if (i === text.length || text[i] === "\n") {
-      const line = text.slice(lineStart, i).toLowerCase()
+      const line = text.slice(lineStart, i).toLowerCase();
       if (line.includes(lowerQuery)) {
-        results.push(lineNum)
+        results.push(lineNum);
       }
-      lineStart = i + 1
-      lineNum++
+      lineStart = i + 1;
+      lineNum += 1;
     }
   }
-  return results
-}
+  return results;
+};

package/dist/SearchBar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SearchBar.d.ts","sourceRoot":"","sources":["../src/SearchBar.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,QAAQ,EAAE,SAAS,EACnB,UAAU,EACV,YAAY,GACb,EAAE,cAAc,6BAoChB"}

package/dist/SearchBar.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../src/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAWxC,MAAM,UAAU,SAAS,CAAC,EACxB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,QAAQ,EAAE,SAAS,EACnB,UAAU,EACV,YAAY,GACG;IACf,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAA;IAE5B,MAAM,YAAY,GAChB,UAAU,KAAK,SAAS,IAAI,UAAU,GAAG,CAAC;QACxC,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,UAAU,EAAE;QAC5C,CAAC,CAAC,UAAU,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YACpC,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,EAAE,CAAA;IAEV,OAAO,CACL,eACE,KAAK,EAAE;YACL,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,CAAC;YACb,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;SAChB,aAED,eAAM,OAAO,EAAC,GAAG,EAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAI,EACjD,gBACE,KAAK,EAAE,KAAK,EACZ,OAAO,QACP,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAC,aAAa,EAC7B,sBAAsB,EAAC,aAAa,EACpC,SAAS,EAAE,KAAK,CAAC,IAAI,EACrB,WAAW,EAAE,KAAK,CAAC,MAAM,EACzB,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAC9C,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,GACtB,EACD,YAAY,CAAC,CAAC,CAAC,eAAM,OAAO,EAAE,IAAI,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,GAAI,CAAC,CAAC,CAAC,IAAI,IACxF,CACP,CAAA;AACH,CAAC"}