fumadocs-core 13.3.1 → 13.3.3

package/dist/search/server.d.ts

@@ -1,4 +1,4 @@
-import { NextRequest, NextResponse } from 'next/server';
+import { NextRequest } from 'next/server';
 import { S as StructuredData } from '../remark-structure-Dj8oa5Ba.js';
 import { SortedResult } from './shared.js';
 import { I as I18nConfig } from '../config-inq6kP6y.js';
@@ -28,8 +28,14 @@ type ToI18n<T extends {
 };
 declare function createI18nSearchAPI<T extends 'simple' | 'advanced'>(type: T, options: T extends 'simple' ? ToI18n<SimpleOptions> : ToI18n<AdvancedOptions>): SearchAPI;
 
-interface SearchAPI {
-    GET: (request: NextRequest) => Promise<NextResponse<SortedResult[]>>;
+interface SearchServer {
+    search: (query: string, options?: {
+        locale?: string;
+        tag?: string;
+    }) => Promise<SortedResult[]>;
+}
+interface SearchAPI extends SearchServer {
+    GET: (request: NextRequest) => Promise<Response>;
     search: (query: string, options?: {
         locale?: string;
         tag?: string;
@@ -61,7 +67,7 @@ interface Index {
     url: string;
     keywords?: string;
 }
-declare function initSearchAPI({ indexes, language }: SimpleOptions): SearchAPI;
+declare function initSimpleSearch({ indexes, language, }: SimpleOptions): SearchServer;
 interface AdvancedIndex {
     id: string;
     title: string;
@@ -77,6 +83,6 @@ interface AdvancedIndex {
     structuredData: StructuredData;
     url: string;
 }
-declare function initSearchAPIAdvanced({ indexes, language, tag, }: AdvancedOptions): SearchAPI;
+declare function initAdvancedSearch({ indexes, language, tag, }: AdvancedOptions): SearchServer;
 
-export { type AdvancedIndex, type AdvancedOptions, type Dynamic, type Index, type SearchAPI, type SimpleOptions, createI18nSearchAPI, createI18nSearchAPI$1 as createI18nSearchAPIExperimental, createSearchAPI, initSearchAPI, initSearchAPIAdvanced };
+export { type AdvancedIndex, type AdvancedOptions, type Dynamic, type Index, type SearchAPI, type SearchServer, type SimpleOptions, createI18nSearchAPI, createI18nSearchAPI$1 as createI18nSearchAPIExperimental, createSearchAPI, initAdvancedSearch, initSimpleSearch };

package/dist/search/server.js

@@ -4,14 +4,14 @@ import "../chunk-MLKGABMK.js";
 import { Document } from "flexsearch";
 
 // src/search/create-endpoint.ts
-import { NextResponse } from "next/server";
-function createEndpoint(search) {
+function createEndpoint(server) {
+  const { search } = server;
   return {
     search,
     async GET(request) {
       const query = request.nextUrl.searchParams.get("query");
-      if (!query) return NextResponse.json([]);
-      return NextResponse.json(
+      if (!query) return Response.json([]);
+      return Response.json(
         await search(query, {
           tag: request.nextUrl.searchParams.get("tag") ?? void 0,
           locale: request.nextUrl.searchParams.get("locale") ?? void 0
@@ -24,23 +24,43 @@ function createEndpoint(search) {
 // src/search/i18n-api.ts
 function createI18nSearchAPI(type, options) {
   const map = /* @__PURE__ */ new Map();
-  return createEndpoint(async (query, searchOptions) => {
-    if (map.size === 0) {
-      const indexes = typeof options.indexes === "function" ? await options.indexes() : options.indexes;
-      for (const locale of options.i18n.languages) {
-        const api = createSearchAPI(type, {
+  async function init() {
+    if (options.i18n.languages.length === 0) {
+      return;
+    }
+    const indexes = typeof options.indexes === "function" ? await options.indexes() : options.indexes;
+    for (const locale of options.i18n.languages) {
+      const localeIndexes = indexes.filter((index) => index.locale === locale);
+      if (type === "simple") {
+        map.set(
+          locale,
+          initSimpleSearch({
+            ...options,
+            language: locale,
+            indexes: localeIndexes
+          })
+        );
+        continue;
+      }
+      map.set(
+        locale,
+        initAdvancedSearch({
           ...options,
           language: locale,
-          indexes: indexes.filter((index) => index.locale === locale)
-        });
-        map.set(locale, api);
-      }
+          indexes: localeIndexes
+        })
+      );
+    }
+  }
+  return createEndpoint({
+    search: async (query, searchOptions) => {
+      if (map.size === 0) await init();
+      const handler = map.get(
+        searchOptions?.locale ?? options.i18n.defaultLanguage
+      );
+      if (handler) return handler.search(query, searchOptions);
+      return [];
     }
-    const handler = map.get(
-      searchOptions?.locale ?? options.i18n.defaultLanguage
-    );
-    if (handler) return handler.search(query, searchOptions);
-    return [];
   });
 }
 
@@ -59,23 +79,28 @@ function createI18nSearchAPI2(type, options) {
       })
     );
   }
-  return createEndpoint(async (query, searchOptions) => {
-    if (searchOptions?.locale) {
-      const handler = map.get(searchOptions.locale);
-      if (handler) return handler.search(query, searchOptions);
+  return createEndpoint({
+    search: async (query, searchOptions) => {
+      if (searchOptions?.locale) {
+        const handler = map.get(searchOptions.locale);
+        if (handler) return handler.search(query, searchOptions);
+      }
+      return [];
     }
-    return [];
   });
 }
 
 // src/search/server.ts
 function createSearchAPI(type, options) {
   if (type === "simple") {
-    return initSearchAPI(options);
+    return createEndpoint(initSimpleSearch(options));
   }
-  return initSearchAPIAdvanced(options);
+  return createEndpoint(initAdvancedSearch(options));
 }
-function initSearchAPI({ indexes, language }) {
+function initSimpleSearch({
+  indexes,
+  language
+}) {
   const store = ["title", "url"];
   async function getDocument() {
     const items = typeof indexes === "function" ? await indexes() : indexes;
@@ -128,21 +153,23 @@ function initSearchAPI({ indexes, language }) {
     return index;
   }
   const doc = getDocument();
-  return createEndpoint(async (query) => {
-    const results = (await doc).search(query, 5, {
-      enrich: true,
-      suggest: true
-    });
-    if (results.length === 0) return [];
-    return results[0].result.map((page) => ({
-      type: "page",
-      content: page.doc.title,
-      id: page.doc.url,
-      url: page.doc.url
-    }));
-  });
+  return {
+    search: async (query) => {
+      const results = (await doc).search(query, 5, {
+        enrich: true,
+        suggest: true
+      });
+      if (results.length === 0) return [];
+      return results[0].result.map((page) => ({
+        type: "page",
+        content: page.doc.title,
+        id: page.doc.url,
+        url: page.doc.url
+      }));
+    }
+  };
 }
-function initSearchAPIAdvanced({
+function initAdvancedSearch({
   indexes,
   language,
   tag = false
@@ -218,49 +245,51 @@ function initSearchAPIAdvanced({
     return index;
   }
   const doc = getDocument();
-  return createEndpoint(async (query, options) => {
-    const index = await doc;
-    const results = index.search(query, 5, {
-      enrich: true,
-      tag: options?.tag,
-      limit: 6
-    });
-    const map = /* @__PURE__ */ new Map();
-    for (const item of results[0]?.result ?? []) {
-      if (item.doc.type === "page") {
-        if (!map.has(item.doc.id)) {
-          map.set(item.doc.id, []);
+  return {
+    search: async (query, options) => {
+      const index = await doc;
+      const results = index.search(query, 5, {
+        enrich: true,
+        tag: options?.tag,
+        limit: 6
+      });
+      const map = /* @__PURE__ */ new Map();
+      for (const item of results[0]?.result ?? []) {
+        if (item.doc.type === "page") {
+          if (!map.has(item.doc.id)) {
+            map.set(item.doc.id, []);
+          }
+          continue;
         }
-        continue;
+        const list = map.get(item.doc.page_id) ?? [];
+        list.push({
+          id: item.doc.id,
+          content: item.doc.content,
+          type: item.doc.type,
+          url: item.doc.url
+        });
+        map.set(item.doc.page_id, list);
       }
-      const list = map.get(item.doc.page_id) ?? [];
-      list.push({
-        id: item.doc.id,
-        content: item.doc.content,
-        type: item.doc.type,
-        url: item.doc.url
-      });
-      map.set(item.doc.page_id, list);
-    }
-    const sortedResult = [];
-    for (const [id, items] of map.entries()) {
-      const page = index.get(id);
-      if (!page) continue;
-      sortedResult.push({
-        id: page.id,
-        content: page.content,
-        type: "page",
-        url: page.url
-      });
-      sortedResult.push(...items);
+      const sortedResult = [];
+      for (const [id, items] of map.entries()) {
+        const page = index.get(id);
+        if (!page) continue;
+        sortedResult.push({
+          id: page.id,
+          content: page.content,
+          type: "page",
+          url: page.url
+        });
+        sortedResult.push(...items);
+      }
+      return sortedResult;
     }
-    return sortedResult;
-  });
+  };
 }
 export {
   createI18nSearchAPI2 as createI18nSearchAPI,
   createI18nSearchAPI as createI18nSearchAPIExperimental,
   createSearchAPI,
-  initSearchAPI,
-  initSearchAPIAdvanced
+  initAdvancedSearch,
+  initSimpleSearch
 };

package/dist/server/index.d.ts

@@ -35,6 +35,10 @@ interface GetGithubLastCommitOptions {
      * GitHub access token
      */
     token?: string;
+    /**
+     * SHA or ref (branch or tag) name.
+     */
+    sha?: string;
     /**
      * Custom query parameters
      */
@@ -47,6 +51,6 @@ interface GetGithubLastCommitOptions {
  * By default, this will cache the result forever.
  * Set `options.next.revalidate` to customise this.
  */
-declare function getGithubLastEdit({ repo, token, owner, path, options, params: customParams, }: GetGithubLastCommitOptions): Promise<Date | null>;
+declare function getGithubLastEdit({ repo, token, owner, path, sha, options, params: customParams, }: GetGithubLastCommitOptions): Promise<Date | null>;
 
 export { type GetGithubLastCommitOptions, findNeighbour, flattenTree, getGithubLastEdit, separatePageTree };

package/dist/server/index.js

@@ -55,6 +55,7 @@ async function getGithubLastEdit({
   token,
   owner,
   path,
+  sha,
   options = {},
   params: customParams = {}
 }) {
@@ -63,6 +64,7 @@ async function getGithubLastEdit({
   params.set("path", path);
   params.set("page", "1");
   params.set("per_page", "1");
+  if (sha) params.set("sha", sha);
   for (const [key, value] of Object.entries(customParams)) {
     params.set(key, value);
   }

package/dist/source/index.js

@@ -13,7 +13,7 @@ function parseFilePath(path) {
   const dotIdx = base.lastIndexOf(".");
   const nameWithLocale = dotIdx !== -1 ? base.slice(0, dotIdx) : base;
   const flattenedPath = [dirname, nameWithLocale].filter((p) => p.length > 0).join("/");
-  const [name, locale] = nameWithLocale.split(".");
+  const [name, locale] = getLocale(nameWithLocale);
   return {
     dirname,
     name,
@@ -25,7 +25,7 @@ function parseFilePath(path) {
 function parseFolderPath(path) {
   const segments = splitPath(slash(path));
   const base = segments.at(-1) ?? "";
-  const [name, locale] = base.split(".");
+  const [name, locale] = getLocale(base);
   const flattenedPath = segments.join("/");
   return {
     dirname: segments.slice(0, -1).join("/"),
@@ -35,6 +35,13 @@ function parseFolderPath(path) {
     path: flattenedPath
   };
 }
+function getLocale(name) {
+  const sep = name.lastIndexOf(".");
+  if (sep === -1) return [name];
+  const locale = name.slice(sep + 1);
+  if (/\d+/.exec(locale)) return [name];
+  return [name.slice(0, sep), locale];
+}
 function normalizePath(path) {
   const segments = splitPath(slash(path));
   if (segments[0] === "." || segments[0] === "..")

package/dist/toc.js

@@ -49,8 +49,7 @@ function useAnchorObserver(watch, single) {
       if (element.scrollTop === 0 && single) setActiveAnchor(watch.slice(0, 1));
       else if (element.scrollTop + element.clientHeight >= element.scrollHeight - 6) {
         setActiveAnchor((active) => {
-          const last = active.at(-1);
-          return last ? watch.slice(watch.indexOf(last)) : active;
+          return active.length > 0 ? watch.slice(watch.indexOf(active[0])) : watch.slice(-1);
         });
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "13.3.1",
+  "version": "13.3.3",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",