@rspress-theme-anatole/theme-default 0.7.33 → 0.7.35

package/dist/bundle.js

@@ -2560,6 +2560,13 @@ class LocalProvider {
     #cjkIndex;
     #cyrillicIndex;
     #fetchPromise;
+    #readyPromise;
+    #shouldUseCjkIndex(lang) {
+        return /^(ja|zh|ko)(-|$)/i.test(lang ?? '');
+    }
+    #shouldUseCyrillicIndex(lang) {
+        return /^(ru|uk|bg|sr|mk|be|kk|ky|tg|mn)(-|$)/i.test(lang ?? '');
+    }
     async #getPages(lang, version) {
         const searchIndexGroupID = `${version ?? ''}###${lang ?? ''}`;
         if (!__WEBPACK_EXTERNAL_MODULE_virtual_search_index_hash_00b0989e__["default"][searchIndexGroupID]) return [];
@@ -2587,39 +2594,55 @@ class LocalProvider {
         return this.#fetchPromise;
     }
     async init(options) {
-        const pagesForSearch = (await this.fetchSearchIndex(options)).map((page) => ({
-            ...page,
-            normalizedContent: normalizeTextCase(page.content),
-            headers: page.toc.map((header) => normalizeTextCase(header.text)).join(' '),
-            normalizedTitle: normalizeTextCase(page.title)
-        }));
-        const createOptions = {
-            tokenize: 'full',
-            document: {
-                id: 'id',
-                store: true,
-                index: [
-                    'normalizedTitle',
-                    'headers',
-                    'normalizedContent'
-                ]
-            },
-            cache: 100
-        };
-        this.#index = new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document(createOptions);
-        this.#cjkIndex = new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document({
-            ...createOptions,
-            tokenize: (str) => tokenize(str, cjkRegex)
-        });
-        this.#cyrillicIndex = new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document({
-            ...createOptions,
-            tokenize: (str) => tokenize(str, LocalProvider_cyrillicRegex)
-        });
-        for (const item of pagesForSearch) {
-            this.#index.addAsync(item.id, item);
-            this.#cjkIndex.addAsync(item.id, item);
-            this.#cyrillicIndex.addAsync(item.id, item);
+        if (this.#readyPromise) return this.#readyPromise;
+        this.#readyPromise = (async () => {
+            const { currentLang } = options;
+            const pagesForSearch = (await this.fetchSearchIndex(options)).map((page) => ({
+                ...page,
+                normalizedContent: normalizeTextCase(page.content),
+                headers: page.toc.map((header) => normalizeTextCase(header.text)).join(' '),
+                normalizedTitle: normalizeTextCase(page.title)
+            }));
+            const createOptions = {
+                tokenize: 'full',
+                document: {
+                    id: 'id',
+                    store: true,
+                    index: [
+                        'normalizedTitle',
+                        'headers',
+                        'normalizedContent'
+                    ]
+                },
+                cache: 100
+            };
+            this.#index = new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document(createOptions);
+            this.#cjkIndex = this.#shouldUseCjkIndex(currentLang) ? new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document({
+                ...createOptions,
+                tokenize: (str) => tokenize(str, cjkRegex)
+            }) : void 0;
+            this.#cyrillicIndex = this.#shouldUseCyrillicIndex(currentLang) ? new __WEBPACK_EXTERNAL_MODULE_flexsearch__["default"].Document({
+                ...createOptions,
+                tokenize: (str) => tokenize(str, LocalProvider_cyrillicRegex)
+            }) : void 0;
+            const addTasks = [];
+            for (const item of pagesForSearch) {
+                addTasks.push(this.#index.addAsync(item.id, item));
+                this.#cjkIndex && addTasks.push(this.#cjkIndex.addAsync(item.id, item));
+                this.#cyrillicIndex && addTasks.push(this.#cyrillicIndex.addAsync(item.id, item));
+            }
+            await Promise.all(addTasks);
+        })();
+        try {
+            await this.#readyPromise;
+        } catch (error) {
+            this.#readyPromise = void 0;
+            this.#index = void 0;
+            this.#cjkIndex = void 0;
+            this.#cyrillicIndex = void 0;
+            throw error;
         }
+        return this.#readyPromise;
     }
     async search(query) {
         const { keyword, limit } = query;
@@ -2632,11 +2655,12 @@ class LocalProvider {
                 'normalizedContent'
             ]
         };
-        const searchResult = await Promise.all([
+        const searchTasks = [
             this.#index?.searchAsync(keyword, options),
             this.#cjkIndex?.searchAsync(keyword, options),
             this.#cyrillicIndex?.searchAsync(keyword, options)
-        ]);
+        ].filter(Boolean);
+        const searchResult = await Promise.all(searchTasks);
         const combinedSearchResult = [];
         const pushedId = new Set();
         function insertCombinedSearchResult(resultFromOneSearchIndex) {
@@ -2716,6 +2740,7 @@ class PageSearcher {
         return this.#provider?.fetchSearchIndex(this.#options);
     }
     async match(keyword, limit = 7) {
+        await this.init();
         const searchResult = await this.#provider?.search({
             keyword,
             limit
@@ -6412,6 +6437,7 @@ const KEY_CODE = {
     SEARCH: 'KeyK',
     ESC: 'Escape'
 };
+const SEARCH_PREWARM_EVENT = 'rspress-search-prewarm';
 const useDebounce = (cb) => {
     const cbRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(cb);
     cbRef.current = cb;
@@ -6463,98 +6489,92 @@ function SearchPanel({ focused, setFocused }) {
     const currentSuggestions = searchResult[resultTabIndex]?.result ?? [];
     const currentRenderType = searchResult[resultTabIndex]?.renderType ?? types_RenderType.Default;
     if (false === search) return null;
-    // Extract related products from frontmatter for solution pages
+    const SCOPE_EXCLUDED_PATHS = new Set([
+        'index.html',
+        'index',
+        'what-is-coming-in-cloud',
+        'what-is-coming-in-cloud.html',
+        'solution-pages'
+    ]);
+    const normalizeScopeSegments = (rawPath) => {
+        if (!rawPath || 'string' != typeof rawPath) return [];
+        if (/^(https?:)?\/\//i.test(rawPath)) return [];
+        return rawPath.split('#')[0].split('?')[0].replace(/\\/g, '/').split('/').filter(Boolean).filter((segment) => '.' !== segment && '..' !== segment);
+    };
+    const normalizeProductName = (value) => {
+        const normalizedValue = value?.replace(/\.html$/, '').trim();
+        return normalizedValue || null;
+    };
+    const extractProductNameFromLink = (link) => {
+        const segments = normalizeScopeSegments(link);
+        if (!segments.length) return null;
+        const productPageIndex = segments.indexOf('product-page');
+        if (productPageIndex >= 0) return normalizeProductName(segments[productPageIndex + 1] || '');
+        const firstSegment = normalizeProductName(segments[0] || '');
+        if (!firstSegment || SCOPE_EXCLUDED_PATHS.has(firstSegment)) return null;
+        return firstSegment;
+    };
     const getRelatedProductsFromFrontmatter = (frontmatter) => {
+        const explicitProducts = Array.isArray(frontmatter?.relatedProducts) ? frontmatter.relatedProducts.map((item) => normalizeProductName(String(item))).filter(Boolean) : [];
+        if (explicitProducts.length) return Array.from(new Set(explicitProducts));
         if (!frontmatter?.features?.rows) return [];
-        
         const products = [];
-        
-        // Loop through all rows and items in features
-        frontmatter.features.rows.forEach(row => {
-            if (row.items) {
-                row.items.forEach(item => {
-                    if (item.link) {
-                        // Extract product name from link
-                        const linkPath = item.link
-                            .replace(/^\.\.\//, '')  // Remove ../
-                            .replace(/^\.\//, '');   // Remove ./
-                        
-                        const productName = linkPath.split('/')[0];
-                        
-                        if (productName && !products.includes(productName)) {
-                            products.push(productName);
-                        }
-                    }
-                });
-            }
+        frontmatter.features.rows.forEach((row) => {
+            if (row.items) row.items.forEach((item) => {
+                const productName = extractProductNameFromLink(item.link);
+                if (productName && !products.includes(productName)) products.push(productName);
+            });
         });
-        
         return products;
     };
-    // Calculate search scope
-    const searchScope = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(() => {
-        if (typeof window === 'undefined') return null;
-        
-        const pathname = window.location.pathname;
+    const getScopedPathInfo = (pathname, basePath, localeLangs) => {
         const pathParts = pathname.split('/').filter(Boolean);
-        
-        // Get language settings from site config
-        const localeLanguages = Object.values(siteData?.themeConfig?.locales || {});
-        const langArr = localeLanguages.map((item) => item.lang) || [];
-        
         let startIndex = 0;
-        
-        // Skip base path if present
-        const baseTrimmed = (base || '').replace(/^\/|\/$/g, '');
-        if (baseTrimmed && pathParts[startIndex] === baseTrimmed) {
-            startIndex++;
-        }
-        
-        // Skip language prefix if present (e.g., /en/, /vn/, /zh/)
-        if (langArr.includes(pathParts[startIndex])) {
-            startIndex++;
-        }
-        
+        const baseTrimmed = (basePath || '').replace(/^\/|\/$/g, '');
+        if (baseTrimmed && pathParts[startIndex] === baseTrimmed) startIndex++;
+        if (localeLangs.includes(pathParts[startIndex])) startIndex++;
         const firstSegment = pathParts[startIndex] || null;
-        const secondSegment = pathParts[startIndex + 1] || null;
-        
-        // Check if this is a solution page (contains 'solution-pages' in path)
-        if (firstSegment === 'solution-pages') {
-            const solutionFile = secondSegment || '';
-            const solutionName = solutionFile.replace(/\.html$/, '');
-            
-            // Get related products from frontmatter
-            const relatedProducts = getRelatedProductsFromFrontmatter(frontmatter);
-            
-            return {
-                scopeType: 'solution',
-                solutionName: solutionName,
-                relatedProducts: relatedProducts,
-                scopePath: null
+        const secondSegment = normalizeProductName(pathParts[startIndex + 1] || '');
+        if ('solution-pages' === firstSegment) return {
+            scopeType: 'solution',
+            solutionName: secondSegment,
+            relatedProducts: getRelatedProductsFromFrontmatter(frontmatter),
+            scopePath: null
+        };
+        if ('product-page' === firstSegment) {
+            if (!secondSegment) return {
+                scopeType: null,
+                scopePath: null,
+                relatedProducts: null
             };
-        }
-        
-        // Product page: /m365/... or /d365/...
-        const productName = firstSegment;
-        
-        // Exclude common non-product paths
-        const excludedPaths = ['index.html', 'index', 'what-is-coming-in-cloud', 'what-is-coming-in-cloud.html', 'solution-pages'];
-        
-        if (productName && !excludedPaths.includes(productName)) {
             return {
                 scopeType: 'product',
-                productName: productName,
-                scopePath: `/${productName}`,
+                productName: secondSegment,
+                scopePath: `/${secondSegment}`,
                 relatedProducts: null
             };
         }
-        
-        // No specific scope (homepage or other pages)
+        const productName = normalizeProductName(firstSegment || '');
+        if (productName && !SCOPE_EXCLUDED_PATHS.has(productName)) return {
+            scopeType: 'product',
+            productName: productName,
+            scopePath: `/${productName}`,
+            relatedProducts: null
+        };
         return {
             scopeType: null,
             scopePath: null,
             relatedProducts: null
         };
+    };
+    // Calculate search scope
+    const searchScope = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(() => {
+        if (typeof window === 'undefined') return null;
+        const pathname = window.location.pathname;
+        // Get language settings from site config
+        const localeLanguages = Object.values(siteData?.themeConfig?.locales || {});
+        const langArr = localeLanguages.map((item) => item.lang) || [];
+        return getScopedPathInfo(pathname, base, langArr);
     }, [focused, siteData, base, frontmatter]);
     const createSearcher = () => {
         if (pageSearcherRef.current) return pageSearcherRef.current;
@@ -6571,12 +6591,29 @@ function SearchPanel({ focused, setFocused }) {
         pageSearcherConfigRef.current = pageSearcherConfig;
         return pageSearcherRef.current;
     };
-    async function initSearch() {
-        if ('initial' !== initStatus) return;
+    async function ensureSearcherReady() {
         const searcher = createSearcher();
+        if ('inited' === initStatus) return searcher;
+        if ('initing' === initStatus) {
+            await searcher.init();
+            return searcher;
+        }
         setInitStatus('initing');
-        await searcher.init();
-        setInitStatus('inited');
+        try {
+            await searcher.init();
+            setInitStatus('inited');
+            return searcher;
+        } catch (error) {
+            console.error(error);
+            pageSearcherRef.current = null;
+            pageSearcherConfigRef.current = null;
+            setInitStatus('initial');
+            throw error;
+        }
+    }
+    async function initSearch() {
+        if ('initial' !== initStatus) return;
+        const searcher = await ensureSearcherReady();
         const query = searchInputRef.current?.value;
         if (query) {
             const matched = await searcher.match(query);
@@ -6660,12 +6697,33 @@ function SearchPanel({ focused, setFocused }) {
         focused
     ]);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(() => {
-        if ('requestIdleCallback' in window && !pageSearcherRef.current) window.requestIdleCallback(() => {
-            const searcher = createSearcher();
-            searcher.fetchSearchIndex();
-        });
+        if ('undefined' === typeof window) return;
+        let idleCallbackId;
+        const prewarm = () => {
+            ensureSearcherReady().catch(() => {});
+        };
+        const onPrewarm = () => {
+            prewarm();
+        };
+        window.addEventListener(SEARCH_PREWARM_EVENT, onPrewarm);
+        if (!pageSearcherRef.current) {
+            if ('requestIdleCallback' in window) idleCallbackId = window.requestIdleCallback(() => {
+                prewarm();
+            });
+            else idleCallbackId = window.setTimeout(() => {
+                prewarm();
+            }, 300);
+        }
+        return () => {
+            window.removeEventListener(SEARCH_PREWARM_EVENT, onPrewarm);
+            if (void 0 !== idleCallbackId) {
+                if ('cancelIdleCallback' in window) window.cancelIdleCallback(idleCallbackId);
+                else window.clearTimeout(idleCallbackId);
+            }
+        };
     }, []);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(() => {
+        if (!pageSearcherConfigRef.current) return;
         const { currentLang, currentVersion } = pageSearcherConfigRef.current ?? {};
         const isLangChanged = lang !== currentLang;
         const isVersionChanged = versionedSearch && version !== currentVersion;
@@ -6680,6 +6738,9 @@ function SearchPanel({ focused, setFocused }) {
         version,
         versionedSearch
     ]);
+    const DEFAULT_SEARCH_LIMIT = 7;
+    const SCOPED_SEARCH_LIMIT = 50;
+    const SCOPED_SEARCH_RETRY_LIMIT = 100;
     const filterResultsByScope = (results, scope, basePath, currentLang) => {
         if (!scope || !scope.scopeType) {
             return results;
@@ -6743,18 +6804,38 @@ function SearchPanel({ focused, setFocused }) {
             };
         });
     };
+    const hasSearchResults = (results) => results.some((resultGroup) => (resultGroup?.result?.length ?? 0) > 0);
+    const getScopedSearchLimit = (scope, retry = false) => {
+        if (!scope?.scopeType) return DEFAULT_SEARCH_LIMIT;
+        return retry ? SCOPED_SEARCH_RETRY_LIMIT : SCOPED_SEARCH_LIMIT;
+    };
     const handleQueryChangedImpl = async (value) => {
         let newQuery = value;
         setQuery(newQuery);
         if (search && 'remote' === search.mode && search.searchLoading) setIsSearching(true);
         if (newQuery) {
+            try {
+                await ensureSearcherReady();
+            } catch (_error) {
+                setIsSearching(false);
+                return;
+            }
             const searchResult = [];
             if ('beforeSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
                 const key = 'beforeSearch';
                 const transformedQuery = await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery);
                 if (transformedQuery) newQuery = transformedQuery;
             }
-            const defaultSearchResult = await pageSearcherRef.current?.match(newQuery);
+            let defaultSearchResult = await pageSearcherRef.current?.match(newQuery, getScopedSearchLimit(searchScope));
+            let filteredDefaultSearchResult = filterResultsByScope(
+                defaultSearchResult || DEFAULT_RESULT,
+                searchScope,
+                base,
+                lang
+            );
+            if (searchScope?.scopeType && !hasSearchResults(filteredDefaultSearchResult)) {
+                defaultSearchResult = await pageSearcherRef.current?.match(newQuery, getScopedSearchLimit(searchScope, true));
+            }
             if (defaultSearchResult) searchResult.push(...defaultSearchResult);
             if ('onSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
                 const key = 'onSearch';
@@ -6963,10 +7044,16 @@ function Search() {
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(() => {
         setMetaKey(/(Mac|iPhone|iPod|iPad)/i.test(navigator.platform) ? '⌘' : 'Ctrl');
     }, []);
+    const triggerSearchPrewarm = () => {
+        if ('undefined' === typeof window) return;
+        window.dispatchEvent(new CustomEvent(SEARCH_PREWARM_EVENT));
+    };
     return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)(__WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.Fragment, {
         children: [
             (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
                 className: `rspress-nav-search-button ${Search_index_module.navSearchButton}`,
+                onMouseEnter: triggerSearchPrewarm,
+                onFocusCapture: triggerSearchPrewarm,
                 onClick: () => setFocused(true),
                 children: (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("button", {
                     children: [
@@ -6997,6 +7084,8 @@ function Search() {
             }),
             (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
                 className: Search_index_module.mobileNavSearchButton,
+                onMouseEnter: triggerSearchPrewarm,
+                onTouchStart: triggerSearchPrewarm,
                 onClick: () => setFocused(true),
                 children: (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(SvgWrapper, {
                     icon: __WEBPACK_EXTERNAL_MODULE__theme_assets_search_1c295ce0__["default"]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rspress-theme-anatole/theme-default",
   "author": "Anatole Tong",
-  "version": "0.7.33",
+  "version": "0.7.35",
   "license": "MIT",
   "sideEffects": [
     "*.css",
@@ -21,8 +21,8 @@
   "types": "./dist/bundle.d.ts",
   "dependencies": {
     "@mdx-js/react": "2.3.0",
-    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.33",
-    "@rspress-theme-anatole/shared": "0.7.33",
+    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.35",
+    "@rspress-theme-anatole/shared": "0.7.35",
     "@rspress/runtime": "1.43.8",
     "body-scroll-lock": "4.0.0-beta.0",
     "copy-to-clipboard": "^3.3.3",