@aiao/rxdb-plugin-search-react 0.0.20 → 0.0.21

package/out-tsc/vitest/vite.config.d.mts

@@ -0,0 +1,3 @@
+declare const _default: import("vite").UserConfigFnObject;
+export default _default;
+//# sourceMappingURL=vite.config.d.mts.map

package/out-tsc/vitest/vite.config.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite.config.d.mts","sourceRoot":"","sources":["../../vite.config.mts"],"names":[],"mappings":";AAOA,wBA+CI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiao/rxdb-plugin-search-react",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -15,13 +15,13 @@
     }
   },
   "dependencies": {
-    "@aiao/rxdb-plugin-search": "0.0.20"
+    "@aiao/rxdb-plugin-search": "0.0.21"
   },
   "peerDependencies": {
     "@aiao/rxdb": "*",
-    "react": ">=18.0.0",
+    "react": "^19.2.7",
     "rxjs": "^7.8.2",
-    "@aiao/rxdb-plugin-search": "0.0.20"
+    "@aiao/rxdb-plugin-search": "0.0.21"
   },
   "publishConfig": {
     "access": "public"

package/src/index.spec.ts

@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+
+import type { SearchExecutionError, SearchHandle, SearchOptions, SearchResult, SearchState } from './index.js';
+
+type PublicSearchApi = {
+  error: SearchExecutionError | undefined;
+  handle: SearchHandle;
+  options: SearchOptions;
+  result: SearchResult;
+  state: SearchState;
+};
+
+describe('React public search API', () => {
+  it('exposes the core search types from the package entrypoint', () => {
+    const contract: PublicSearchApi | undefined = undefined;
+    expect(contract).toBeUndefined();
+  });
+});

package/src/index.ts

@@ -8,5 +8,12 @@
  * @packageDocumentation
  */
 
+export type {
+  SearchExecutionError,
+  SearchHandle,
+  SearchOptions,
+  SearchResult,
+  SearchState
+} from '@aiao/rxdb-plugin-search';
 export { useSearch } from './use-search.js';
 export type { SearchSourceLike, UseSearchReturn } from './use-search.js';

package/src/use-search.spec.ts

@@ -148,4 +148,77 @@ describe('useSearch (React binding, T039)', () => {
     renderHook(() => useSearch(src, { initialQuery: 'hi' }));
     expect(src.searchSpy).toHaveBeenCalledWith('hi', { initialQuery: 'hi' });
   });
+
+  it('rebuilds the handle when source changes', () => {
+    vi.useFakeTimers();
+    const first = makeHandle();
+    const second = makeHandle();
+    const firstSource = makeSource(first.handle);
+    const secondSource = makeSource(second.handle);
+    const { result, rerender } = renderHook(({ source }) => useSearch(source), {
+      initialProps: { source: firstSource as SearchSourceLike }
+    });
+
+    rerender({ source: secondSource });
+    act(() => vi.runAllTimers());
+    act(() => result.current.setQuery('next'));
+
+    expect(first.destroyed.value).toBe(true);
+    expect(first.setQuery).not.toHaveBeenCalled();
+    expect(secondSource.searchSpy).toHaveBeenCalledTimes(1);
+    expect(second.setQuery).toHaveBeenCalledWith('next');
+  });
+
+  it('does not rebuild for a semantically identical inline options object', () => {
+    vi.useFakeTimers();
+    const h = makeHandle();
+    const src = makeSource(h.handle);
+    const { rerender } = renderHook(() => useSearch(src, { debounce: 10, collections: ['Todo'] }));
+
+    rerender();
+    act(() => vi.runAllTimers());
+
+    expect(src.searchSpy).toHaveBeenCalledTimes(1);
+    expect(h.destroyed.value).toBe(false);
+  });
+
+  it('routes calls to the latest handle even via a callback captured before rebuild', () => {
+    vi.useFakeTimers();
+    const first = makeHandle();
+    const second = makeHandle();
+    const firstSource = makeSource(first.handle);
+    const secondSource = makeSource(second.handle);
+    const { result, rerender } = renderHook(({ source }) => useSearch(source), {
+      initialProps: { source: firstSource as SearchSourceLike }
+    });
+    const staleSetQuery = result.current.setQuery;
+
+    rerender({ source: secondSource });
+    act(() => vi.runAllTimers());
+
+    act(() => staleSetQuery('after-rebuild'));
+
+    expect(second.setQuery).toHaveBeenCalledWith('after-rebuild');
+    expect(first.setQuery).not.toHaveBeenCalled();
+  });
+
+  it('keeps stable setQuery/clear/retry/loadMore identities across handle rebuilds', () => {
+    vi.useFakeTimers();
+    const first = makeHandle();
+    const second = makeHandle();
+    const firstSource = makeSource(first.handle);
+    const secondSource = makeSource(second.handle);
+    const { result, rerender } = renderHook(({ source }) => useSearch(source), {
+      initialProps: { source: firstSource as SearchSourceLike }
+    });
+    const { setQuery, clear, retry, loadMore } = result.current;
+
+    rerender({ source: secondSource });
+    act(() => vi.runAllTimers());
+
+    expect(result.current.setQuery).toBe(setQuery);
+    expect(result.current.clear).toBe(clear);
+    expect(result.current.retry).toBe(retry);
+    expect(result.current.loadMore).toBe(loadMore);
+  });
 });

package/src/use-search.ts

@@ -49,6 +49,30 @@ export interface UseSearchReturn {
   retry: () => void;
 }
 
+function collectionsEqual(left: readonly string[] | undefined, right: readonly string[] | undefined): boolean {
+  if (left === right) return true;
+  if (left === undefined || right === undefined || left.length !== right.length) return false;
+  return left.every((value, index) => value === right[index]);
+}
+
+function searchOptionsEqual(left: SearchOptions | undefined, right: SearchOptions | undefined): boolean {
+  if (left === right) return true;
+  if (left === undefined || right === undefined) return false;
+  return (
+    left.debounce === right.debounce &&
+    left.pageSize === right.pageSize &&
+    left.snippetLength === right.snippetLength &&
+    left.initialQuery === right.initialQuery &&
+    collectionsEqual(left.collections, right.collections)
+  );
+}
+
+function useStableSearchOptions(options: SearchOptions | undefined): SearchOptions | undefined {
+  const stableOptions = useRef(options);
+  if (!searchOptionsEqual(stableOptions.current, options)) stableOptions.current = options;
+  return stableOptions.current;
+}
+
 /**
  * 将 `SearchHandle` 的响应式输出适配为 React hook。
  *
@@ -63,15 +87,10 @@ export interface UseSearchReturn {
  * @public
  */
 export function useSearch(source: SearchSourceLike, options?: SearchOptions): UseSearchReturn {
-  const initial = options?.initialQuery ?? '';
-  // 保持 handle 引用稳定：仅在 source 变化时重建
-  const handleRef = useRef<SearchHandle | null>(null);
-  const destroyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  if (handleRef.current === null) {
-    handleRef.current = source.search(initial, options);
-  }
-  const handle = handleRef.current;
+  const stableOptions = useStableSearchOptions(options);
+  const initial = stableOptions?.initialQuery ?? '';
 
+  const handleRef = useRef<SearchHandle | null>(null);
   const [query, setQueryState] = useState<string>(initial);
   const [results, setResults] = useState<readonly SearchResult[]>([]);
   const [state, setState] = useState<SearchState>('idle');
@@ -79,42 +98,37 @@ export function useSearch(source: SearchSourceLike, options?: SearchOptions): Us
   const [hasMore, setHasMore] = useState<boolean>(false);
 
   useEffect(() => {
-    if (destroyTimerRef.current !== null) {
-      clearTimeout(destroyTimerRef.current);
-      destroyTimerRef.current = null;
-    }
+    // handle 是命令式控制器，不参与渲染，存入 ref 而非 state：
+    // 避免 handle 变化触发多余的重渲染，并让 setQuery/clear/retry/loadMore
+    // 始终读取最新 handle，不会在 rebuild 后仍调用到已销毁的旧实例。
+    const newHandle = source.search(initial, stableOptions);
+    handleRef.current = newHandle;
+    setQueryState(initial);
 
     const subs = new Subscription();
-    subs.add(handle.results$.subscribe(r => setResults(r)));
-    subs.add(handle.state$.subscribe(s => setState(s)));
-    subs.add(handle.error$.subscribe(e => setError(e)));
-    subs.add(handle.hasMore$.subscribe(h => setHasMore(h)));
+    subs.add(newHandle.results$.subscribe(r => setResults(r)));
+    subs.add(newHandle.state$.subscribe(s => setState(s)));
+    subs.add(newHandle.error$.subscribe(e => setError(e)));
+    subs.add(newHandle.hasMore$.subscribe(h => setHasMore(h)));
     return () => {
       subs.unsubscribe();
-      destroyTimerRef.current = setTimeout(() => {
-        handle.destroy();
-        handleRef.current = null;
-        destroyTimerRef.current = null;
-      }, 0);
+      newHandle.destroy();
+      if (handleRef.current === newHandle) handleRef.current = null;
     };
-    // handle 生命周期由 ref 管理，仅挂载时订阅一次
-  }, []);
+  }, [source, stableOptions, initial]);
 
-  const setQuery = useCallback(
-    (q: string) => {
-      setQueryState(q);
-      handle.setQuery(q);
-    },
-    [handle]
-  );
+  const setQuery = useCallback((q: string) => {
+    setQueryState(q);
+    handleRef.current?.setQuery(q);
+  }, []);
 
   const clear = useCallback(() => {
     setQueryState('');
-    handle.clear();
-  }, [handle]);
+    handleRef.current?.clear();
+  }, []);
 
-  const retry = useCallback(() => handle.retry(), [handle]);
-  const loadMore = useCallback(() => handle.loadMore(), [handle]);
+  const retry = useCallback(() => handleRef.current?.retry(), []);
+  const loadMore = useCallback(() => handleRef.current?.loadMore() ?? Promise.resolve(), []);
 
   return useMemo(
     () => ({ query, setQuery, results, state, error, hasMore, loadMore, clear, retry }),

package/tsconfig.json

@@ -1,4 +1,7 @@
 {
+  "compilerOptions": {
+    "ignoreDeprecations": "6.0"
+  },
   "extends": "../../tsconfig.base.json",
   "files": [],
   "include": [],

package/tsconfig.spec.json

@@ -4,7 +4,8 @@
     "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"],
     "jsx": "react-jsx",
     "module": "esnext",
-    "moduleResolution": "bundler"
+    "moduleResolution": "bundler",
+    "rootDir": "."
   },
   "extends": "../../tsconfig.base.json",
   "include": [

package/vite.config.mts

@@ -10,7 +10,11 @@ export default defineConfig(() => ({
   cacheDir: '../../node_modules/.vite/packages/rxdb-plugin-search-react',
   plugins: [
     react(),
-    dts({ entryRoot: 'src', tsconfigPath: path.join(import.meta.dirname, 'tsconfig.lib.json') }),
+    dts({
+      entryRoot: 'src',
+      pathsToAliases: false,
+      tsconfigPath: path.join(import.meta.dirname, 'tsconfig.lib.json')
+    }),
     ...(process.env.CI === 'true' && process.env.CODECOV_TOKEN ?
       [
         codecovVitePlugin({
@@ -35,7 +39,9 @@ export default defineConfig(() => ({
       fileName: 'index',
       formats: ['es' as const]
     },
-    rollupOptions: {
+    rolldownOptions: {
+      // dts 插件生成声明文件天然比 Rolldown 原生链接阶段慢，抑制误报的 PLUGIN_TIMINGS 警告
+      checks: { pluginTimings: false },
       external: [/^@aiao\//, 'react', 'react-dom', 'react/jsx-runtime', 'rxjs']
     }
   },
@@ -45,7 +51,6 @@ export default defineConfig(() => ({
     globals: true,
     environment: 'jsdom',
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    passWithNoTests: true,
     reporters: ['default'],
     coverage: {
       reportsDirectory: './test-output/vitest/coverage',